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

Merge pull request #2876 from cadyn/upstream-merge-11424

Browse Source 
Merge Upstream Pull Request 11424
This commit is contained in:
Nadyr
2021-08-25 22:47:34 -04:00
committed by GitHub
parent f19dc1b2eb 4514820882
commit 6868e2fef7
4 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+2 -2
View File
@@ -695,7 +695,7 @@
path = /obj/item/clothing/suit/storage/hooded/wintercoat/security/fluff/evelyn/
display_name = "warden's navy winter coat"
ckeywhitelist = list("pandora029")
character_name = list("Evelyn Tareen")
character_name = list("Evelyn Tareen", "Velyn Tareen")
/datum/gear/fluff/lily_medal
path = /obj/item/clothing/accessory/medal/silver/unity
@@ -762,7 +762,7 @@
display_name = "LUNA's Distinguished Conduct Medal"
ckeywhitelist = list("residentcody")
character_name = list("LUNA")
/datum/gear/fluff/pathfinder_id
path = /obj/item/weapon/card/id/event/polymorphic/itg
display_name = "Pathfinder's ITG ID"