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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hawk_v3
2019-09-23 20:55:18 +01:00
parent 9f7c9ac4bd 0a21df2dc1
commit b22f2284fe
62 changed files with 93431 additions and 57080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+4 -4
View File
@@ -144,13 +144,13 @@
/datum/gear/fluff/sariU_disk
path = /obj/item/weapon/disk/limb/eggnerdltd
display_name = "Sari-U's Eggnerd Disk"
ckeywhitelist = list("cross_exonar")
ckeywhitelist = list("crossexonar")
character_name = list("Sari-U")
/datum/gear/fluff/sariE_disk
path = /obj/item/weapon/disk/limb/eggnerdltd
display_name = "Sari-E's Eggnerd Disk"
ckeywhitelist = list("cross_exonar")
ckeywhitelist = list("crossexonar")
character_name = list("Sari-E")
// D CKEYS
@@ -494,14 +494,14 @@
/datum/gear/fluff/resh_uniform
path = /obj/item/clothing/suit/security/navyhos
display_name = "Resh's HoS Uniform"
ckeywhitelist = list("mr_signmeup")
ckeywhitelist = list("mrsignmeup")
character_name = list("Reshskakskakss Seekiseekis")
allowed_roles = list("Head of Security")
/datum/gear/fluff/daniel_medal
path = /obj/item/clothing/accessory/medal/conduct
display_name = "Daniel's Conduct Medal"
ckeywhitelist = list("mr_signmeup")
ckeywhitelist = list("mrsignmeup")
character_name = list("Daniel Fisher")
// N CKEYS