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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-09-24 17:16:54 -04:00
committed by GitHub
parent b2cbd3b06f
commit 55e91dd6a1
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
-17
View File
@@ -734,22 +734,6 @@
ckeywhitelist = list("pimientopyro")
character_name = list("Scylla Casmus")
<<<<<<< HEAD
||||||| parent of c5f5e58323... Merge pull request #11593 from PastelPrinceDan/fwuff
/datum/gear/fluff/zaku_sweatervest
path = /obj/item/clothing/suit/varsity/green/sweater_vest
display_name = "Zaku's Sweater Vest"
slot = slot_wear_suit
ckeywhitelist = list("pimientopyro")
character_name = list("Zaku Fyodorovna")
/datum/gear/fluff/kiyoshi_cloak
path = /obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing
display_name = "glowing cloak"
ckeywhitelist = list("pastelprincedan")
character_name = list("Kiyoshi Maki", "Masumi Maki")
=======
/datum/gear/fluff/zaku_sweatervest
path = /obj/item/clothing/suit/varsity/green/sweater_vest
display_name = "Zaku's Sweater Vest"
@@ -769,7 +753,6 @@
ckeywhitelist = list("pastelprincedan")
character_name = list("Masumi Maki")
>>>>>>> c5f5e58323... Merge pull request #11593 from PastelPrinceDan/fwuff
// Q CKEYS
// R CKEYS