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

Merge branch 'master' into cigs

Browse Source
This commit is contained in:
David Winters
2021-04-10 22:38:54 -04:00
parent ddf09d50cc 5df0eac6bd
commit 8b70c010c6
172 changed files with 25188 additions and 25273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
-1
View File
@@ -44,7 +44,6 @@
display_name = "collar, holo"
path = /obj/item/clothing/accessory/collar/holo
//TFF 17/6/19 - public loadout addition: Indigestible Holocollar
/datum/gear/collar/holo/indigestible
display_name = "collar, holo (indigestible)"
path = /obj/item/clothing/accessory/collar/holo/indigestible
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+6
View File
@@ -741,6 +741,12 @@
ckeywhitelist = list("pimientopyro")
character_name = list("Scylla Casmus")
/datum/gear/fluff/kiyoshi_cloak
path = /obj/item/clothing/accessory/poncho/fluff/cloakglowing
display_name = "glowing cloak"
ckeywhitelist = list("pastelprincedan")
character_name = list("Kiyoshi Maki", "Masumi Maki")
// Q CKEYS
// R CKEYS