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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-05-27 15:49:17 -04:00
committed by GitHub
parent 360c2f6308
commit c94c50e953
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
-3
View File
@@ -60,8 +60,6 @@
ckeywhitelist = list("aegisoa")
character_name = list("Xander Bevin")
<<<<<<< HEAD
=======
/datum/gear/fluff/charlotte_medal
path = /obj/item/clothing/accessory/medal/silver/security
display_name = "Charlotte's Robust Security Medal"
@@ -98,7 +96,6 @@
ckeywhitelist = list("allweek")
character_name = list("Fifi The Magnificent")
>>>>>>> 0426f96ff8... Merge pull request #12994 from FunnyCatEnjoyer/FunnyCat
/datum/gear/fluff/lynn_penlight
path = /obj/item/device/flashlight/pen/fluff/lynn
display_name = "Lynn's Penlight"