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

Fixes conflicts

Browse Source
This commit is contained in:
Stobarico
2022-05-24 19:46:22 -03:00
parent 07330fefc5
commit b84c17254e
5 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+4 -4
View File
@@ -1062,11 +1062,11 @@
ckeywhitelist = list("swat43")
character_name = list("Fortune Bloise")
/datum/gear/fluff/alexis_cane
path = /obj/item/weapon/cane/wand
display_name = "Alexis' Cane"
/datum/gear/fluff/kyutar
path = /obj/item/instrument/piano_synth/fluff/kyutar
display_name = "Kyu's Holotar"
ckeywhitelist = list("stobarico")
character_name = list("Alexis Bloise")
character_name = list("Kyu Comet")
/datum/gear/fluff/roiz_coat
path = /obj/item/clothing/suit/storage/hooded/wintercoat/roiz