cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2023-01-27 10:17:13 -05:00
committed by GitHub
parent 59819128b4
commit d563e53d9b
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
View File

@@ -1334,8 +1334,6 @@
// Y CKEYS // Y CKEYS
<<<<<<< HEAD
=======
/datum/gear/fluff/lemon_plush /datum/gear/fluff/lemon_plush
path = /obj/item/toy/plushie/fluff/lemonplush path = /obj/item/toy/plushie/fluff/lemonplush
display_name = "yellow slime plushie" display_name = "yellow slime plushie"
@@ -1348,7 +1346,6 @@
ckeywhitelist = list("yeehawguvnah") ckeywhitelist = list("yeehawguvnah")
character_name = list("Cephyra") character_name = list("Cephyra")
>>>>>>> 1adfa7995a... Merge pull request #14358 from faaaay/loaded-dice
// Z CKEYS // Z CKEYS
/datum/gear/fluff/tachika_medal /datum/gear/fluff/tachika_medal
path = /obj/item/clothing/accessory/medal/conduct path = /obj/item/clothing/accessory/medal/conduct