diff --git a/modular_doppler/loadout_categories/categories/backpacks.dm b/modular_doppler/loadout_categories/categories/backpacks.dm index 50416a4734f41e..6c9943934a8029 100644 --- a/modular_doppler/loadout_categories/categories/backpacks.dm +++ b/modular_doppler/loadout_categories/categories/backpacks.dm @@ -131,10 +131,6 @@ group = "Miscellaneous" abstract_type = /datum/loadout_item/backpack/misc -/datum/loadout_item/backpack/misc/modsuit_civilian - name = "Civilian Modsuit" - item_path = /obj/item/mod/control/pre_equipped/civilian - /datum/loadout_item/backpack/misc/adventurer name = "Adventurer's Bandolier" item_path = /obj/item/storage/backpack/satchel/crusader diff --git a/modular_doppler/loadout_categories/categories/belts.dm b/modular_doppler/loadout_categories/categories/belts.dm index 7ff33077e623d9..0260f7dd92b15a 100644 --- a/modular_doppler/loadout_categories/categories/belts.dm +++ b/modular_doppler/loadout_categories/categories/belts.dm @@ -163,6 +163,10 @@ group = "Miscellaneous" abstract_type = /datum/loadout_item/belts/misc +/datum/loadout_item/belts/misc/modsuit_civilian + name = "Civilian Modsuit" + item_path = /obj/item/mod/control/pre_equipped/civilian + /datum/loadout_item/belts/misc/lantern name = "Lantern" item_path = /obj/item/flashlight/lantern diff --git a/modular_doppler/modsuits/icons/mod_civilian.dmi b/modular_doppler/modsuits/icons/mod_civilian.dmi new file mode 100644 index 00000000000000..11748e276d03ad Binary files /dev/null and b/modular_doppler/modsuits/icons/mod_civilian.dmi differ diff --git a/modular_doppler/modsuits/icons/worn.dmi b/modular_doppler/modsuits/icons/worn.dmi new file mode 100644 index 00000000000000..e5b988ba4930a1 Binary files /dev/null and b/modular_doppler/modsuits/icons/worn.dmi differ diff --git a/modular_doppler/modsuits/mod_theme.dm b/modular_doppler/modsuits/mod_theme.dm new file mode 100644 index 00000000000000..e2579d30cbe87c --- /dev/null +++ b/modular_doppler/modsuits/mod_theme.dm @@ -0,0 +1,40 @@ +/datum/mod_theme/civilian + slot_flags = ITEM_SLOT_BELT + inbuilt_modules = list(/obj/item/mod/module/storage/civilian) + variants = list( + "civilian" = list( + MOD_ICON_OVERRIDE = 'modular_doppler/modsuits/icons/mod_civilian.dmi', + MOD_WORN_ICON_OVERRIDE = 'modular_doppler/modsuits/icons/worn.dmi', + /obj/item/clothing/head/mod = list( + UNSEALED_LAYER = NECK_LAYER, + UNSEALED_CLOTHING = SNUG_FIT, + SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE|HEADINTERNALS, + UNSEALED_INVISIBILITY = HIDEFACIALHAIR, + SEALED_INVISIBILITY = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT, + SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF, + UNSEALED_MESSAGE = HELMET_UNSEAL_MESSAGE, + SEALED_MESSAGE = HELMET_SEAL_MESSAGE, + ), + /obj/item/clothing/suit/mod = list( + UNSEALED_CLOTHING = THICKMATERIAL, + SEALED_CLOTHING = STOPSPRESSUREDAMAGE, + SEALED_INVISIBILITY = HIDEJUMPSUIT, + UNSEALED_MESSAGE = CHESTPLATE_UNSEAL_MESSAGE, + SEALED_MESSAGE = CHESTPLATE_SEAL_MESSAGE, + ), + /obj/item/clothing/gloves/mod = list( + UNSEALED_CLOTHING = THICKMATERIAL, + SEALED_CLOTHING = STOPSPRESSUREDAMAGE, + CAN_OVERSLOT = TRUE, + UNSEALED_MESSAGE = GAUNTLET_UNSEAL_MESSAGE, + SEALED_MESSAGE = GAUNTLET_SEAL_MESSAGE, + ), + /obj/item/clothing/shoes/mod = list( + UNSEALED_CLOTHING = THICKMATERIAL, + SEALED_CLOTHING = STOPSPRESSUREDAMAGE, + CAN_OVERSLOT = TRUE, + UNSEALED_MESSAGE = BOOT_UNSEAL_MESSAGE, + SEALED_MESSAGE = BOOT_SEAL_MESSAGE, + ), + ), + ) diff --git a/modular_doppler/modsuits/mod_types.dm b/modular_doppler/modsuits/mod_types.dm new file mode 100644 index 00000000000000..198a14a6b5e740 --- /dev/null +++ b/modular_doppler/modsuits/mod_types.dm @@ -0,0 +1,5 @@ +/obj/item/mod/control/pre_equipped/civilian + applied_modules = list( + /obj/item/mod/module/welding, + /obj/item/mod/module/flashlight, + ) diff --git a/modular_doppler/modsuits/modules_general.dm b/modular_doppler/modsuits/modules_general.dm new file mode 100644 index 00000000000000..8db816dfec7bf8 --- /dev/null +++ b/modular_doppler/modsuits/modules_general.dm @@ -0,0 +1,11 @@ +/obj/item/mod/module/storage/civilian + name = "MOD case civilian storage module" + desc = "A small storage device fitted to civilian grade MOD control units, provided with \ + the efforts of Nakamura Engineering." + complexity = 2 + max_w_class = WEIGHT_CLASS_SMALL + required_slots = list(ITEM_SLOT_BELT) + removable = FALSE + +/obj/item/mod/module/status_readout + required_slots = list(ITEM_SLOT_BACK|ITEM_SLOT_BELT) diff --git a/modular_doppler/modular_quirks/entombed/code/entombed.dm b/modular_doppler/modular_quirks/entombed/code/entombed.dm index a9e96b080497eb..9b3e068f57841b 100644 --- a/modular_doppler/modular_quirks/entombed/code/entombed.dm +++ b/modular_doppler/modular_quirks/entombed/code/entombed.dm @@ -23,12 +23,14 @@ var/life_support_failed = FALSE /// Alternate icon files for each modular skin var/list/modular_icon_files = list( + "civilian" = 'modular_doppler/modsuits/icons/mod_civilian.dmi', "colonist" = 'modular_doppler/colony_fabricator/icons/modsuits/mod.dmi', "moonlight" = 'modular_doppler/special_modsuits/icons/mod.dmi', "orbiter" = 'modular_doppler/special_modsuits/icons/mod.dmi', ) /// Alternate icon files for each modular worn skin var/list/modular_worn_files = list( + "civilian" = 'modular_doppler/modsuits/icons/worn.dmi', "colonist" = 'modular_doppler/colony_fabricator/icons/modsuits/mod_worn.dmi', "moonlight" = 'modular_doppler/special_modsuits/icons/mod_worn.dmi', "orbiter" = 'modular_doppler/special_modsuits/icons/mod_worn.dmi', diff --git a/tgstation.dme b/tgstation.dme index 2e435353ef23cb..4ccb32fb8ac0b4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7144,6 +7144,9 @@ #include "modular_doppler\mining\equipment\trophies_misc.dm" #include "modular_doppler\modsuits\anomalock_edits.dm" #include "modular_doppler\modsuits\kinesis.dm" +#include "modular_doppler\modsuits\mod_theme.dm" +#include "modular_doppler\modsuits\mod_types.dm" +#include "modular_doppler\modsuits\modules_general.dm" #include "modular_doppler\modsuits\tap_to_control.dm" #include "modular_doppler\modular_antagonists\_dynamic_rulesets.dm" #include "modular_doppler\modular_antagonists\pirate_disabler.dm"