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

Update loadout_fluffitems_vr.dm

Browse Source
This commit is contained in:
Nadyr
2021-03-27 23:22:55 -04:00
committed by GitHub
parent f6049a256a
commit 5222f4f1b1
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
-10
View File
@@ -1046,22 +1046,12 @@
ckeywhitelist = list("vitoras")
character_name = list("Roanna Ti'Rox")
<<<<<<< HEAD
||||||| parent of a39a93b1b4... Merge pull request #10007 from Heroman3003/idfix3
/datum/gear/fluff/harmony_id
path = /obj/item/weapon/card/id/fluff/harmony
display_name = "Harmony's ITG-ID card"
ckeywhitelist = list("verysoft")
character_name = list("Harmony")
=======
/datum/gear/fluff/harmony_id
path = /obj/item/weapon/card/id/event/fluff/harmony
display_name = "Harmony's ITG-ID card"
ckeywhitelist = list("verysoft")
character_name = list("Harmony")
>>>>>>> a39a93b1b4... Merge pull request #10007 from Heroman3003/idfix3
// W CKEYS
/datum/gear/fluff/sthasha_bracer
path = /obj/item/clothing/accessory/bracer/fluff/xander_sthasha