From dcc8e13442409071d4bb3f5355b36073e29e3307 Mon Sep 17 00:00:00 2001 From: Jinshee <96621959+Jinshee@users.noreply.github.com> Date: Tue, 5 Mar 2024 09:58:13 -0800 Subject: [PATCH] unarmored syndie clothes port (#1264) * unarmored syndie clothes mirror gwahgwah:3 * oopsi changed module name + ticked dme * oopsi pt 2 dme update * :3 renamed items as per GoldenAlpharex request * GRAHH MODULAR i dont actually know if this is what "modularizing" is its just one of those buzzwords that feels rlly fitting here okay thank you baibai now * requested changes gwahgwah --------- Co-authored-by: Jinshee --- .../code/modules/clothing/under/syndicate.dm | 28 +++++++++++++++++++ .../loadout_items/loadout_datum_masks.dm | 4 +++ .../under/loadout_datum_under.dm | 8 ++++++ 3 files changed, 40 insertions(+) diff --git a/modular_nova/master_files/code/modules/clothing/under/syndicate.dm b/modular_nova/master_files/code/modules/clothing/under/syndicate.dm index 504575c1252..6da30124277 100644 --- a/modular_nova/master_files/code/modules/clothing/under/syndicate.dm +++ b/modular_nova/master_files/code/modules/clothing/under/syndicate.dm @@ -69,6 +69,34 @@ desc = "Aaand the Syndicate Snakes are up to bat, ready for one of their signature nuclear home-runs! Lets show these corpos a good time." //NT pitches their plasma/bluespace(something) icon_state = "syndicate_baseball" +/obj/item/clothing/under/syndicate/nova/overalls/unarmoured + name = "tacticool utility overalls turtleneck" + desc = "A pair of spiffy overalls with a turtleneck underneath, useful for both engineering and botanical work." + icon_state = "syndicate_overalls" + armor_type = /datum/armor/clothing_under/none + has_sensor = HAS_SENSORS + can_adjust = TRUE + +/obj/item/clothing/under/syndicate/nova/overalls/unarmoured/skirt + name = "tacticool utility overalls skirtleneck" + desc = "A pair of spiffy overalls with a turtleneck underneath, this one is a skirt instead, breezy." + icon_state = "syndicate_overallskirt" + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + dying_key = DYE_REGISTRY_JUMPSKIRT + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + +/obj/item/clothing/mask/gas/sechailer/half_mask + name = "tacticool neck gaiter" + desc = "A black techwear mask. Its low-profile design contrasts with the edge. Has a small respirator to be used with internals." + actions_types = list(/datum/action/item_action/adjust) + alternate_worn_layer = BODY_FRONT_UNDER_CLOTHES + icon_state = "half_mask" + icon = 'modular_nova/master_files/icons/obj/clothing/masks.dmi' + worn_icon = 'modular_nova/master_files/icons/mob/clothing/mask.dmi' + unique_death = 'modular_nova/master_files/sound/effects/hacked.ogg' + voice_filter = null + use_radio_beeps_tts = FALSE + /* * TACTICAL (Real) */ diff --git a/modular_nova/modules/loadouts/loadout_items/loadout_datum_masks.dm b/modular_nova/modules/loadouts/loadout_items/loadout_datum_masks.dm index 29faad93ed7..574850154e0 100644 --- a/modular_nova/modules/loadouts/loadout_items/loadout_datum_masks.dm +++ b/modular_nova/modules/loadouts/loadout_items/loadout_datum_masks.dm @@ -89,6 +89,10 @@ GLOBAL_LIST_INIT(loadout_masks, generate_loadout_items(/datum/loadout_item/mask) name = "Half Mask Respirator" item_path = /obj/item/clothing/mask/gas/respirator +/datum/loadout_item/mask/sechailer_half_mask + name = "Tacticool Neck Gaiter" + item_path = /obj/item/clothing/mask/gas/sechailer/half_mask + /* * JOB-LOCKED */ diff --git a/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm index 55539fa6f97..ee2360b1c7e 100644 --- a/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm +++ b/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm @@ -529,6 +529,14 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Tacticool Skirtleneck" item_path = /obj/item/clothing/under/syndicate/tacticool/skirt //This has been rebalanced in modular_nova\master_files\code\modules\clothing\under\syndicate.dm +/datum/loadout_item/under/miscellaneous/syndicate_nova_overalls_unarmoured + name = "Tacticool Utility Overalls Turtleneck" + item_path = /obj/item/clothing/under/syndicate/nova/overalls/unarmoured //This has been rebalanced in modular_nova\master_files\code\modules\clothing\under\syndicate.dm :3 + +/datum/loadout_item/under/miscellaneous/syndicate_nova_overalls_unarmoured_skirt + name = "Tacticool Overalls Skirtleneck" + item_path = /obj/item/clothing/under/syndicate/nova/overalls/unarmoured/skirt //This has been rebalanced in modular_nova\master_files\code\modules\clothing\under\syndicate.dm :3 + /datum/loadout_item/under/miscellaneous/tactical_pants name = "Tactical Pants" item_path = /obj/item/clothing/under/pants/tactical