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 6da30124277..72e964c5273 100644 --- a/modular_nova/master_files/code/modules/clothing/under/syndicate.dm +++ b/modular_nova/master_files/code/modules/clothing/under/syndicate.dm @@ -31,7 +31,7 @@ inhand_icon_state = "b_suit" can_adjust = TRUE has_sensor = HAS_SENSORS - armor_type = /datum/armor/clothing_under/none + armor_type = /datum/armor/clothing_under supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION unique_reskin = list( RESKIN_NT = "tactifool_blue", @@ -49,19 +49,15 @@ name = "tacticool skirtleneck" desc = "A snug skirtleneck, in fabulous Nanotrasen-blue. Just looking at it makes you want to buy a NT-certifed coffee, go into the office, and -work-." icon_state = "tactifool_blue_skirt" - armor_type = /datum/armor/clothing_under/none + gets_cropped_on_taurs = FALSE body_parts_covered = CHEST|GROIN|ARMS female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY dying_key = DYE_REGISTRY_JUMPSKIRT supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - unique_reskin = list( - RESKIN_NT = "tactifool_blue_skirt", - RESKIN_CHARCOAL = "tactifool_skirt" - ) /obj/item/clothing/under/syndicate/bloodred/sleepytime/sensors //Halloween-only has_sensor = HAS_SENSORS - armor_type = /datum/armor/clothing_under/none + armor_type = /datum/armor/clothing_under supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION /obj/item/clothing/under/syndicate/nova/baseball @@ -69,22 +65,70 @@ 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/unarmoured + name = "suspicious tactical turtleneck" + desc = "A non-descript and slightly suspicious looking turtleneck with digital camouflage cargo pants." + icon_state = "syndicate" + inhand_icon_state = "bl_suit" + has_sensor = HAS_SENSORS + armor_type = /datum/armor/clothing_under + +/obj/item/clothing/under/syndicate/unarmoured/skirt + name = "suspicious tactical skirtleneck" + desc = "A non-descript and slightly suspicious looking skirtleneck." + icon_state = "syndicate_skirt" + gets_cropped_on_taurs = FALSE + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + dying_key = DYE_REGISTRY_JUMPSKIRT + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + +/obj/item/clothing/under/syndicate/unarmoured/examine_more(mob/user) + . = ..() + . += span_notice("The armor has been removed from the fabric.") + +/obj/item/clothing/under/syndicate/nova/tactical/unarmoured + name = "suspicious tactical turtleneck" + desc = "A snug syndicate-red turtleneck with charcoal-black cargo pants." + icon_state = "syndicate_red" + inhand_icon_state = "r_suit" + has_sensor = HAS_SENSORS + armor_type = /datum/armor/clothing_under + unique_reskin = null + +/obj/item/clothing/under/syndicate/nova/tactical/unarmoured/skirt + name = "suspicious tactical skirtleneck" + desc = "A pair of spiffy overalls with a turtleneck underneath, this one is a skirt instead, breezy." + icon_state = "syndicate_red_skirt" + gets_cropped_on_taurs = FALSE + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + dying_key = DYE_REGISTRY_JUMPSKIRT + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + +/obj/item/clothing/under/syndicate/nova/tactical/unarmoured/examine_more(mob/user) + . = ..() + . += span_notice("The armor has been removed from the fabric.") + /obj/item/clothing/under/syndicate/nova/overalls/unarmoured - name = "tacticool utility overalls turtleneck" + name = "suspicious 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 + armor_type = /datum/armor/clothing_under has_sensor = HAS_SENSORS can_adjust = TRUE /obj/item/clothing/under/syndicate/nova/overalls/unarmoured/skirt - name = "tacticool utility overalls skirtleneck" + name = "suspicious utility overalls skirtleneck" desc = "A pair of spiffy overalls with a turtleneck underneath, this one is a skirt instead, breezy." icon_state = "syndicate_overallskirt" + gets_cropped_on_taurs = FALSE female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY dying_key = DYE_REGISTRY_JUMPSKIRT supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON +/obj/item/clothing/under/syndicate/nova/overalls/unarmoured/examine_more(mob/user) + . = ..() + . += span_notice("The armor has been removed from the fabric.") + /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." @@ -149,7 +193,7 @@ desc = "Throughout the stars, rumors of mad scientists and angry drill sergeants run rampant; of creatures in armor black as night, being led by men or women wearing this uniform. They share one thing: a deep, natonalistic zeal of the dream of America." icon_state = "enclave" can_adjust = TRUE - armor_type = /datum/armor/clothing_under/none + armor_type = /datum/armor/clothing_under /obj/item/clothing/under/syndicate/nova/enclave/officer name = "neo-American officer uniform" 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 0d619fdcbcf..4a0fc3225b9 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 @@ -531,19 +531,35 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ /datum/loadout_item/under/miscellaneous/tacticool_turtleneck name = "Tacticool Turtleneck" - item_path = /obj/item/clothing/under/syndicate/tacticool //This has been rebalanced in modular_nova\master_files\code\modules\clothing\under\syndicate.dm + item_path = /obj/item/clothing/under/syndicate/tacticool /datum/loadout_item/under/miscellaneous/tactical_skirt 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 + item_path = /obj/item/clothing/under/syndicate/tacticool/skirt + +/datum/loadout_item/under/miscellaneous/syndicate_unarmoured + name = "Suspicious Tactical Turtleneck (Grey)" + item_path = /obj/item/clothing/under/syndicate/unarmoured + +/datum/loadout_item/under/miscellaneous/syndicate_unarmoured_skirt + name = "Suspicious Tactical Skirtleneck (Grey)" + item_path = /obj/item/clothing/under/syndicate/unarmoured/skirt + +/datum/loadout_item/under/miscellaneous/syndicate_nova_unarmoured + name = "Suspicious Tactical Turtleneck (Red)" + item_path = /obj/item/clothing/under/syndicate/nova/tactical/unarmoured + +/datum/loadout_item/under/miscellaneous/syndicate_nova_unarmoured_skirt + name = "Suspicious Tactical Skirtleneck (Red)" + item_path = /obj/item/clothing/under/syndicate/nova/tactical/unarmoured/skirt /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 + name = "Suspicious Utility Overalls Turtleneck" + item_path = /obj/item/clothing/under/syndicate/nova/overalls/unarmoured /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 + name = "Suspicious Utility Overalls Skirtleneck" + item_path = /obj/item/clothing/under/syndicate/nova/overalls/unarmoured/skirt /datum/loadout_item/under/miscellaneous/tactical_pants name = "Tactical Pants"