cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 22:48:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict, add dept gorkas to selectors

Browse Source
This commit is contained in:
Killian
2023-05-25 01:03:17 +01:00
parent df699feabc
commit 058c57a299
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_uni_selector.dm
+24 -12
View File
@@ -43,7 +43,8 @@
"TG&C utility suit"=/obj/item/clothing/under/rank/neo_commandutil,
"TG&C black suit"=/obj/item/clothing/under/rank/neo_captain_blacksuit,
"TG&C parade uniform"=/obj/item/clothing/under/rank/neo_captain_parade,
"TG&C jumpkilt"=/obj/item/clothing/under/rank/neo_captain_kilt
"TG&C jumpkilt"=/obj/item/clothing/under/rank/neo_captain_kilt,
"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_cmd_gorka
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
@@ -73,7 +74,8 @@
"TG&C parade uniform"=/obj/item/clothing/under/rank/neo_hop_parade_masc,
"TG&C parade dress"=/obj/item/clothing/under/rank/neo_hop_parade_fem,
"TG&C turtleneck"=/obj/item/clothing/under/rank/neo_hop_turtle,
"TG&C turtleneck w/ skirt"=/obj/item/clothing/under/rank/neo_hop_turtle_skirt
"TG&C turtleneck w/ skirt"=/obj/item/clothing/under/rank/neo_hop_turtle_skirt,
"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_cmd_gorka
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
@@ -90,7 +92,8 @@
var/list/selector_uniforms = list(
"TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_pilot,
"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_pilot_skirt,
"Major Bill's flightsuit"=/obj/item/clothing/under/mbill_flight
"Major Bill's flightsuit"=/obj/item/clothing/under/mbill_flight,
"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_pilot_gorka
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
@@ -148,7 +151,8 @@
"Utility uniform, navy"=/obj/item/clothing/under/utility/blue,
"Utility uniform, grey"=/obj/item/clothing/under/utility/grey,
"Utility uniform, tan"=/obj/item/clothing/under/utility/tan,
"Utility uniform, green"=/obj/item/clothing/under/utility/green
"Utility uniform, green"=/obj/item/clothing/under/utility/green,
"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_civvie_gorka
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
@@ -194,7 +198,8 @@
"TG&C bodyguard's suit"=/obj/item/clothing/under/rank/bodyguard_suit,
"TG&C bodyguard's skirt"=/obj/item/clothing/under/rank/bodyguard_skirt,
"TG&C bodyguard's turtleneck"=/obj/item/clothing/under/rank/bodyguard_turtleneck,
"TG&C bodyguard's turtleneck w/ skirt"=/obj/item/clothing/under/rank/bodyguard_turtleskirt
"TG&C bodyguard's turtleneck w/ skirt"=/obj/item/clothing/under/rank/bodyguard_turtleskirt,
"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_sec_gorka
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
@@ -267,7 +272,8 @@
"ST: Next Generation Command"=/obj/item/clothing/under/rank/trek/command/next,
"ST: Voyager Command"=/obj/item/clothing/under/rank/trek/command/voy,
"ST: DS9 Command"=/obj/item/clothing/under/rank/trek/command/ds9,
"ST: Enterprise Command"=/obj/item/clothing/under/rank/trek/command/ent
"ST: Enterprise Command"=/obj/item/clothing/under/rank/trek/command/ent,
"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_hos_gorka
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
@@ -369,7 +375,8 @@
"ST: DS9 Command"=/obj/item/clothing/under/rank/trek/command/ds9,
"ST: Enterprise Command"=/obj/item/clothing/under/rank/trek/command/ent,
"TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_chiefengi,
"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_chiefengi_skirt
"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_chiefengi_skirt,
"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_ce_gorka
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
@@ -394,7 +401,8 @@
"ST: Enterprise Ops"=/obj/item/clothing/under/rank/trek/engsec/ent,
"voidsuit underlayer"=/obj/item/clothing/under/undersuit/hazard,
"TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_engi,
"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_engi_skirt
"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_engi_skirt,
"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_engi_gorka
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
@@ -443,7 +451,8 @@
"TG&C virology jumpsuit"=/obj/item/clothing/under/rank/neo_viro,
"TG&C virology jumpskirt"=/obj/item/clothing/under/rank/neo_viro_skirt,
"TG&C dark jumpsuit"=/obj/item/clothing/under/rank/neo_med_dark,
"TG&C dark jumpskirt"=/obj/item/clothing/under/rank/neo_med_dark_skirt
"TG&C dark jumpskirt"=/obj/item/clothing/under/rank/neo_med_dark_skirt,
"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_med_gorka
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
@@ -509,7 +518,8 @@
"TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_cmo,
"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_cmo_skirt,
"TG&C turtleneck"=/obj/item/clothing/under/rank/neo_cmo_turtle,
"TG&C turtleneck w/ skirt"=/obj/item/clothing/under/rank/neo_cmo_turtle_skirt
"TG&C turtleneck w/ skirt"=/obj/item/clothing/under/rank/neo_cmo_turtle_skirt,
"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_cmo_gorka
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
@@ -535,7 +545,8 @@
"TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_rd_suit,
"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_rd_suit_skirt,
"TG&C turtleneck"=/obj/item/clothing/under/rank/neo_rd_turtle,
"TG&C turtleneck w/ skirt"=/obj/item/clothing/under/rank/neo_rd_turtle_skirt
"TG&C turtleneck w/ skirt"=/obj/item/clothing/under/rank/neo_rd_turtle_skirt,
"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_rd_gorka
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
@@ -558,7 +569,8 @@
"ST: Next Generation Med-Sci"=/obj/item/clothing/under/rank/trek/medsci/next,
"ST: Voyager Med-Sci"=/obj/item/clothing/under/rank/trek/medsci/voy,
"ST: DS9 Med-Sci"=/obj/item/clothing/under/rank/trek/medsci/ds9,
"ST: Enterprise Med-Sci"=/obj/item/clothing/under/rank/trek/medsci/ent
"ST: Enterprise Med-Sci"=/obj/item/clothing/under/rank/trek/medsci/ent,
"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_sci_gorka
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))