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

Merge remote-tracking branch 'upstream/master' into kk-loadouts

Browse Source
This commit is contained in:
Killian
2023-06-13 20:35:16 +01:00
parent b238b3e560 4cc6ce3fcb
commit cf4c49890e
789 changed files with 20163 additions and 7291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+20
View File
@@ -472,6 +472,20 @@
ckeywhitelist = list("fuackwit422")
character_name = list("Zera Livanne")
/datum/gear/fluff/zera_cloak
path = /obj/item/clothing/head/fluff/zerahat
display_name = "Grand Purple Hat"
slot = slot_head
ckeywhitelist = list("fuackwit422")
character_name = list("Zera Livanne")
/datum/gear/fluff/zera_hat
path = /obj/item/clothing/suit/storage/toggle/labcoat/fluff/zeracloak
display_name = "Grand Purple Cloak"
slot = slot_wear_suit
ckeywhitelist = list("fuackwit422")
character_name = list("Zera Livanne")
// G CKEYS
@@ -501,6 +515,12 @@
ckeywhitelist = list("hunterbirk")
character_name = list("Amaryll")
/datum/gear/fluff/aria_conduct_medal
path = /obj/item/clothing/accessory/medal/conduct
display_name = "Aria's Distinguished Conduct Medal"
ckeywhitelist = list("hunterbirk")
character_name = list("Aria Blue")
// I CKEYS
/datum/gear/fluff/ruda_badge
path = /obj/item/clothing/accessory/badge/holo/detective/ruda
code/modules/client/preference_setup/loadout/loadout_mask.dm
+2 -2
View File
@@ -68,11 +68,11 @@
for(var/gaiter in typesof(/obj/item/clothing/accessory/gaiter))
var/obj/item/clothing/accessory/gaiter_type = gaiter
gaiters[initial(gaiter_type.name)] = gaiter_type
gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, /proc/cmp_text_asc))
gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/gear/mask/lace
display_name = "lace veil"
path = /obj/item/clothing/mask/lacemask
/datum/gear/mask/lace/New()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += gear_tweak_free_color_choice
code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm
+9 -1
View File
@@ -35,4 +35,12 @@
/datum/gear/shoes/flats/alt
display_name = "flats, alt"
path = /obj/item/clothing/shoes/flats/white/color/alt
path = /obj/item/clothing/shoes/flats/white/color/alt
/datum/gear/shoes/sandals_elegant
display_name = "sandals, elegant"
path = /obj/item/clothing/shoes/sandals_elegant
/datum/gear/shoes/sandals_elegant/New()
..()
gear_tweaks += gear_tweak_free_color_choice
code/modules/client/preference_setup/loadout/loadout_suit.dm
+20
View File
@@ -301,6 +301,26 @@
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/suit/ranger_poncho
display_name = "ranger poncho selection"
path = /obj/item/clothing/accessory/poncho/roles/ranger
cost = 1
/datum/gear/suit/ranger_poncho/New()
..()
var/list/ranger_ponchos = list(
"red ranger poncho" = /obj/item/clothing/accessory/poncho/roles/ranger,
"tan ranger poncho" = /obj/item/clothing/accessory/poncho/roles/ranger/tan,
"gray ranger poncho" = /obj/item/clothing/accessory/poncho/roles/ranger/gray,
"green ranger poncho" = /obj/item/clothing/accessory/poncho/roles/ranger/green,
"blue ranger poncho" = /obj/item/clothing/accessory/poncho/roles/ranger/blue,
"purple ranger poncho" = /obj/item/clothing/accessory/poncho/roles/ranger/purple,
"orange ranger poncho" = /obj/item/clothing/accessory/poncho/roles/ranger/orange,
"charcoal ranger poncho" = /obj/item/clothing/accessory/poncho/roles/ranger/charcoal,
"white ranger poncho" = /obj/item/clothing/accessory/poncho/roles/ranger/snow
)
gear_tweaks += new/datum/gear_tweak/path(ranger_ponchos)
/datum/gear/suit/unathi_robe
display_name = "roughspun robe"
path = /obj/item/clothing/suit/unathi/robe
code/modules/client/preference_setup/loadout/loadout_uni_selector.dm
+22 -10
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))
@@ -149,7 +152,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))
@@ -195,7 +199,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))
@@ -268,7 +273,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))
@@ -370,7 +376,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))
@@ -396,6 +403,7 @@
"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 gorka suit"=/obj/item/clothing/under/rank/neo_engi_gorka,
"hazard jumpsuit"=/obj/item/clothing/under/hazard
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
@@ -446,6 +454,7 @@
"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 gorka suit"=/obj/item/clothing/under/rank/neo_med_gorka,
"sterile jumpsuit"=/obj/item/clothing/under/sterile
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
@@ -512,7 +521,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))
@@ -538,7 +548,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))
@@ -561,7 +572,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))