Skip to content

Commit

Permalink
Fixes skirt preferences for Inteq uniforms (#3934)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## 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.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## 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.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
fix: skirt preferences now work for inteq uniforms
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Ical92 authored Jan 4, 2025
1 parent 29af48d commit b6c94b3
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 16 deletions.
4 changes: 2 additions & 2 deletions _maps/shuttles/inteq/inteq_colossus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions _maps/shuttles/inteq/inteq_talos.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions _maps/shuttles/inteq/inteq_valor.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/inteq/inteq_vaquero.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion code/modules/clothing/outfits/factions/inteq.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions code/modules/clothing/under/syndicate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions tools/UpdatePaths/Scripts/3934_inteq_skirts.txt
Original file line number Diff line number Diff line change
@@ -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}

0 comments on commit b6c94b3

Please sign in to comment.