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

Fixes typo in Fifi's fluff loadout

Browse Source
This commit is contained in:
Casey
2022-05-22 18:17:22 +00:00
committed by CHOMPStation2
parent 7e9b5e592f
commit 360c2f6308
1 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+39
View File
@@ -60,6 +60,45 @@
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"
ckeywhitelist = list("alfalah")
character_name = list("Charlotte Graves")
/datum/gear/fluff/charlotte_medal_2
path = /obj/item/clothing/accessory/medal/conduct
display_name = "Charlotte's Medal of Conduct"
ckeywhitelist = list("alfalah")
character_name = list("Charlotte Graves")
/datum/gear/fluff/charlotte_cigarettes
path = /obj/item/weapon/storage/fancy/fluff/charlotte
display_name = "Charlotte's cigarette case"
ckeywhitelist = list("alfalah")
character_name = list("Charlotte Graves")
/datum/gear/fluff/fifi_hat
path = /obj/item/clothing/head/fluff/fifi_hat
display_name = "Fifi's hat"
ckeywhitelist = list("allweek")
character_name = list("Fifi The Magnificent")
/datum/gear/fluff/fifi_jumpsuit
path = /obj/item/clothing/under/fluff/fifi_jumpsuit
display_name = "Fifi's jumpsuit"
ckeywhitelist = list("allweek")
character_name = list("Fifi The Magnificent")
/datum/gear/fluff/fifi_hat
path = /obj/item/clothing/shoes/fluff/fifi_socks
display_name = "Fifi's socks"
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"