cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-22 04:37:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-14893

Browse Source
This commit is contained in:
Nadyr
2023-05-29 19:09:57 -04:00
committed by GitHub
parent 182873418f 2ba64a5b79
commit 883f2430ce
24 changed files with 337 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+6
View File
@@ -425,6 +425,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_uni_selector.dm
+11 -11
View File
@@ -190,11 +190,11 @@
"corrections officer"=/obj/item/clothing/under/rank/neo_corrections,
"corrections officer w/ skirt"=/obj/item/clothing/under/rank/neo_corrections_skirt,
"runner's turtleneck"=/obj/item/clothing/under/rank/neo_runner,
"ST: Original Series Ops"=/obj/item/clothing/under/rank/trek/engsec,
"ST: Next Generation Ops"=/obj/item/clothing/under/rank/trek/engsec/next,
"ST: Voyager Ops"=/obj/item/clothing/under/rank/trek/engsec/voy,
"ST: DS9 Ops"=/obj/item/clothing/under/rank/trek/engsec/ds9,
"ST: Enterprise Ops"=/obj/item/clothing/under/rank/trek/engsec/ent,
"ST: Original Series Ops"=/obj/item/clothing/under/rank/trek/sec, //CHOMPedit start: we splitterk engsec into eng and sec
"ST: Next Generation Ops"=/obj/item/clothing/under/rank/trek/sec/next,
"ST: Voyager Ops"=/obj/item/clothing/under/rank/trek/sec/voy,
"ST: DS9 Ops"=/obj/item/clothing/under/rank/trek/sec/ds9,
"ST: Enterprise Ops"=/obj/item/clothing/under/rank/trek/sec/ent, //CHOMPedit end
"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,
@@ -394,11 +394,11 @@
"skirt"=/obj/item/clothing/under/rank/engineer/skirt,
"turtleneck"=/obj/item/clothing/under/rank/engineer/turtleneck,
"KHI uniform"=/obj/item/clothing/under/rank/khi/eng,
"ST: Original Series Ops"=/obj/item/clothing/under/rank/trek/engsec,
"ST: Next Generation Ops"=/obj/item/clothing/under/rank/trek/engsec/next,
"ST: Voyager Ops"=/obj/item/clothing/under/rank/trek/engsec/voy,
"ST: DS9 Ops"=/obj/item/clothing/under/rank/trek/engsec/ds9,
"ST: Enterprise Ops"=/obj/item/clothing/under/rank/trek/engsec/ent,
"ST: Original Series Ops"=/obj/item/clothing/under/rank/trek/eng, //CHOMPedit start: we split trek engsec into eng and sec
"ST: Next Generation Ops"=/obj/item/clothing/under/rank/trek/eng/next,
"ST: Voyager Ops"=/obj/item/clothing/under/rank/trek/eng/voy,
"ST: DS9 Ops"=/obj/item/clothing/under/rank/trek/eng/ds9,
"ST: Enterprise Ops"=/obj/item/clothing/under/rank/trek/eng/ent, //CHOMPedit end
"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,
@@ -589,4 +589,4 @@
"TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_robo,
"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_robo_skirt
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))