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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Repede
2019-12-21 21:35:09 -05:00
committed by GitHub
parent 6b935d64ec d402f161ff
commit b41698c720
7 changed files with 325 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm
+2 -2
View File
@@ -796,14 +796,14 @@
character_name = list("Vasharr Zahirn")
/datum/gear/fluff/vasharr_under
path = /obj/item/clothing/under/utility/sifguard/engineering/command/fluff/vasharr
path = /obj/item/clothing/under/explorer/utility/command/engineering/fluff/vasharr
display_name = "Cartographer Engineering Command Uniform"
description = "A Engineering Command Uniform from the Galactic Cartographers Society, A group of intrepid explorers. This one has gold trim and organge blazes."
ckeywhitelist = list("radiantflash")
character_name = list("Vasharr Zahirn")
/datum/gear/fluff/vasharr_coat
path = /obj/item/clothing/suit/storage/service/sifguard/engineering/command/fluff/vasharr
path = /obj/item/clothing/suit/storage/explorer/engineering/command/fluff/vasharr
display_name = "Cartographer Engineering Command Jacket"
description = "A Engineering Command Jacket from the Galactic Cartographers Society, A group of intrepid explorers. It has gold buttons and orange trim."
ckeywhitelist = list("radiantflash")