Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes skirt preferences for Inteq uniforms #3934

Merged
merged 6 commits into from
Jan 4, 2025
+19 −16
Merged

Fixes skirt preferences for Inteq uniforms #3934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
021e829
Makes all the things
Ical92 Dec 25, 2024
a631138
UpdatePath Commit ID
Ical92 Dec 25, 2024
50a5ae4
I need a nap
Ical92 Dec 25, 2024
1dd81ab
Finalizes UpdatePath script
Ical92 Dec 26, 2024
d1d7c6d
Very long skirts
Ical92 Dec 29, 2024
9d1dbfb
Misunderstood oops
Ical92 Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _maps/shuttles/inteq/inteq_colossus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2955,7 +2955,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 @@ -3079,7 +3079,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,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 @@ -5742,7 +5742,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 @@ -7250,7 +7250,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 @@ -7436,7 +7436,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1841,7 +1841,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 @@ -3174,7 +3174,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 @@ -3280,7 +3280,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 @@ -4203,7 +4203,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 @@ -4831,7 +4831,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,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 @@ -1240,7 +1240,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
View file
Open in desktop
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
View file
Open in desktop
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
Ical92 marked this conversation as resolved.
Show resolved Hide resolved
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
View file
Open in desktop
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}
Loading