From b6c94b39b300d0a88c4712df056380310dcaff35 Mon Sep 17 00:00:00 2001 From: Ical <86125936+Ical92@users.noreply.github.com> Date: Sat, 4 Jan 2025 11:50:05 -0500 Subject: [PATCH] Fixes skirt preferences for Inteq uniforms (#3934) ## About The Pull Request Because of how Inteq clothing was pathed, uniforms were failing to get the subtype for skirts meaning they could not be properly selected. Ex. expecting `.../corpsman/skirt` when it was actually `.../skirt/corpsman`. This fixes the paths for skirts and updates them on used maps. ## Why It's Good For The Game Lets players actually use Inteq skirtlenecks, rather than failing to retrieve the subtype and falling back to a regular turtleneck. ## Changelog :cl: fix: skirt preferences now work for inteq uniforms /:cl: --- _maps/shuttles/inteq/inteq_colossus.dmm | 4 ++-- _maps/shuttles/inteq/inteq_talos.dmm | 8 ++++---- _maps/shuttles/inteq/inteq_valor.dmm | 10 +++++----- _maps/shuttles/inteq/inteq_vaquero.dmm | 4 ++-- code/modules/clothing/outfits/factions/inteq.dm | 1 - code/modules/clothing/under/syndicate.dm | 6 ++++-- tools/UpdatePaths/Scripts/3934_inteq_skirts.txt | 2 ++ 7 files changed, 19 insertions(+), 16 deletions(-) create mode 100644 tools/UpdatePaths/Scripts/3934_inteq_skirts.txt diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm index 096f8d427098..cc71943f0ae2 100644 --- a/_maps/shuttles/inteq/inteq_colossus.dmm +++ b/_maps/shuttles/inteq/inteq_colossus.dmm @@ -3038,7 +3038,7 @@ /obj/item/clothing/gloves/color/yellow, /obj/item/storage/belt/utility, /obj/item/clothing/under/syndicate/inteq/artificer, -/obj/item/clothing/under/syndicate/inteq/skirt/artificer, +/obj/item/clothing/under/syndicate/inteq/artificer/skirt, /obj/item/clothing/head/soft/inteq, /obj/item/clothing/head/hardhat, /obj/item/clothing/shoes/combat, @@ -3162,7 +3162,7 @@ /obj/item/storage/belt/medical/webbing, /obj/item/clothing/suit/armor/inteq/corpsman, /obj/item/clothing/head/soft/inteq/corpsman, -/obj/item/clothing/under/syndicate/inteq/skirt/corpsman, +/obj/item/clothing/under/syndicate/inteq/corpsman/skirt, /obj/item/clothing/under/syndicate/inteq/corpsman, /obj/machinery/button/shieldwallgen{ dir = 1; diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 343f96e514b3..8dfb33fd4725 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -218,7 +218,7 @@ /obj/item/clothing/suit/hazardvest, /obj/item/clothing/gloves/color/yellow, /obj/item/clothing/under/syndicate/inteq/artificer, -/obj/item/clothing/under/syndicate/inteq/skirt/artificer, +/obj/item/clothing/under/syndicate/inteq/artificer/skirt, /obj/item/clothing/head/soft/inteq, /obj/item/clothing/head/hardhat, /obj/item/clothing/shoes/combat, @@ -5812,7 +5812,7 @@ /obj/item/clothing/suit/hazardvest, /obj/item/clothing/gloves/color/yellow, /obj/item/clothing/under/syndicate/inteq/artificer, -/obj/item/clothing/under/syndicate/inteq/skirt/artificer, +/obj/item/clothing/under/syndicate/inteq/artificer/skirt, /obj/item/clothing/head/soft/inteq, /obj/item/clothing/head/hardhat, /obj/item/clothing/shoes/combat, @@ -7356,7 +7356,7 @@ req_access_txt = "56" }, /obj/item/clothing/under/syndicate/inteq/artificer, -/obj/item/clothing/under/syndicate/inteq/skirt/artificer, +/obj/item/clothing/under/syndicate/inteq/artificer/skirt, /obj/item/storage/backpack/industrial, /obj/item/clothing/suit/toggle/industrial, /obj/item/clothing/head/hardhat/white, @@ -7558,7 +7558,7 @@ /obj/item/clothing/suit/hazardvest, /obj/item/clothing/gloves/color/yellow, /obj/item/clothing/under/syndicate/inteq/artificer, -/obj/item/clothing/under/syndicate/inteq/skirt/artificer, +/obj/item/clothing/under/syndicate/inteq/artificer/skirt, /obj/item/clothing/head/soft/inteq, /obj/item/clothing/head/hardhat, /obj/item/clothing/shoes/combat, diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm index 2bb5331f1dae..dd828389c380 100644 --- a/_maps/shuttles/inteq/inteq_valor.dmm +++ b/_maps/shuttles/inteq/inteq_valor.dmm @@ -1884,7 +1884,7 @@ /obj/item/storage/backpack/messenger/med, /obj/item/clothing/head/soft/inteq/corpsman, /obj/item/clothing/suit/armor/inteq/corpsman, -/obj/item/clothing/under/syndicate/inteq/skirt/corpsman, +/obj/item/clothing/under/syndicate/inteq/corpsman/skirt, /obj/item/clothing/under/syndicate/inteq/corpsman, /obj/effect/turf_decal/siding/thinplating{ dir = 4 @@ -3238,7 +3238,7 @@ /obj/item/storage/backpack/messenger/med, /obj/item/clothing/head/soft/inteq/corpsman, /obj/item/clothing/suit/armor/inteq/corpsman, -/obj/item/clothing/under/syndicate/inteq/skirt/corpsman, +/obj/item/clothing/under/syndicate/inteq/corpsman/skirt, /obj/item/clothing/under/syndicate/inteq/corpsman, /obj/effect/turf_decal/box/white/corners{ dir = 1 @@ -3344,7 +3344,7 @@ /obj/item/clothing/gloves/color/yellow, /obj/item/storage/belt/utility, /obj/item/clothing/under/syndicate/inteq/artificer, -/obj/item/clothing/under/syndicate/inteq/skirt/artificer, +/obj/item/clothing/under/syndicate/inteq/artificer/skirt, /obj/item/clothing/head/soft/inteq, /obj/item/clothing/head/hardhat, /obj/item/clothing/shoes/combat, @@ -4288,7 +4288,7 @@ /obj/item/storage/backpack/messenger/med, /obj/item/clothing/head/soft/inteq/corpsman, /obj/item/clothing/suit/armor/inteq/corpsman, -/obj/item/clothing/under/syndicate/inteq/skirt/corpsman, +/obj/item/clothing/under/syndicate/inteq/corpsman/skirt, /obj/item/clothing/under/syndicate/inteq/corpsman, /obj/effect/turf_decal/box/white/corners{ dir = 8 @@ -4926,7 +4926,7 @@ /obj/item/clothing/shoes/combat, /obj/item/megaphone/command, /obj/item/clothing/under/syndicate/inteq/corpsman, -/obj/item/clothing/under/syndicate/inteq/skirt/corpsman, +/obj/item/clothing/under/syndicate/inteq/corpsman/skirt, /obj/item/clothing/suit/armor/hos/inteq, /obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, /obj/item/storage/backpack/messenger/med, diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm index 8a869d9bb413..c87af460d4ef 100644 --- a/_maps/shuttles/inteq/inteq_vaquero.dmm +++ b/_maps/shuttles/inteq/inteq_vaquero.dmm @@ -906,7 +906,7 @@ /obj/item/clothing/suit/toggle/industrial, /obj/item/storage/belt/utility, /obj/item/clothing/under/syndicate/inteq/artificer, -/obj/item/clothing/under/syndicate/inteq/skirt/artificer, +/obj/item/clothing/under/syndicate/inteq/artificer/skirt, /obj/item/clothing/head/soft/inteq, /obj/item/clothing/head/hardhat, /obj/item/clothing/shoes/combat, @@ -1257,7 +1257,7 @@ /obj/item/storage/belt/medical/webbing, /obj/item/clothing/suit/armor/inteq/corpsman, /obj/item/clothing/head/soft/inteq/corpsman, -/obj/item/clothing/under/syndicate/inteq/skirt/corpsman, +/obj/item/clothing/under/syndicate/inteq/corpsman/skirt, /obj/item/clothing/under/syndicate/inteq/corpsman, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 diff --git a/code/modules/clothing/outfits/factions/inteq.dm b/code/modules/clothing/outfits/factions/inteq.dm index e63bc44a440b..95307aded9f9 100644 --- a/code/modules/clothing/outfits/factions/inteq.dm +++ b/code/modules/clothing/outfits/factions/inteq.dm @@ -235,7 +235,6 @@ belt = /obj/item/storage/belt/medical/webbing/paramedic ears = /obj/item/radio/headset/inteq/captain uniform = /obj/item/clothing/under/syndicate/inteq/corpsman - alt_uniform = /obj/item/clothing/under/syndicate/inteq/skirt/corpsman shoes = /obj/item/clothing/shoes/combat suit = /obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt alt_suit = /obj/item/clothing/suit/armor/inteq/corpsman diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index 613238051fc3..4e8297e88d79 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -240,10 +240,11 @@ icon_state = "inteqeng" supports_variations = KEPORI_VARIATION | VOX_VARIATION | DIGITIGRADE_VARIATION -/obj/item/clothing/under/syndicate/inteq/skirt/artificer +/obj/item/clothing/under/syndicate/inteq/artificer/skirt name = "inteq artificer overall skirt" desc = "A black set of overalls in the likeness of a skirt atop a standard issue turtleneck, for the IRMG's support division Artificers." icon_state = "inteqeng_skirt" + body_parts_covered = CHEST|GROIN|ARMS supports_variations = KEPORI_VARIATION | DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/syndicate/inteq/corpsman @@ -252,10 +253,11 @@ icon_state = "inteqmed" supports_variations = KEPORI_VARIATION | VOX_VARIATION | DIGITIGRADE_VARIATION -/obj/item/clothing/under/syndicate/inteq/skirt/corpsman +/obj/item/clothing/under/syndicate/inteq/corpsman/skirt name = "inteq corpsman skirtleneck" desc = "A sterile white turtleneck with a free flowing black skirt, it is emblazoned with the lettering 'IRMG' on the shoulder. For the IRMG's support division Corpsmen." icon_state = "inteqmed_skirt" + body_parts_covered = CHEST|GROIN|ARMS supports_variations = KEPORI_VARIATION | VOX_VARIATION | DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/syndicate/inteq/honorable diff --git a/tools/UpdatePaths/Scripts/3934_inteq_skirts.txt b/tools/UpdatePaths/Scripts/3934_inteq_skirts.txt new file mode 100644 index 000000000000..13721735e014 --- /dev/null +++ b/tools/UpdatePaths/Scripts/3934_inteq_skirts.txt @@ -0,0 +1,2 @@ +/obj/item/clothing/under/syndicate/inteq/skirt/corpsman : /obj/item/clothing/under/syndicate/inteq/corpsman/skirt{@OLD} +/obj/item/clothing/under/syndicate/inteq/skirt/artificer : /obj/item/clothing/under/syndicate/inteq/corpsman/artificers{@OLD} \ No newline at end of file