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

Fixes Fluff and ITG ID cards, refactors event/fluff IDs a lil', also fixes for digested id icons

Browse Source
This commit is contained in:
Chompstation Bot
2021-03-24 18:51:25 +00:00
parent 679f2bc1ae
commit f825d5ca9f
9 changed files with 504 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+17 -1
View File
@@ -506,7 +506,7 @@
character_name = list("Ketrai")
/datum/gear/fluff/amaya_id
path = /obj/item/weapon/card/id/fluff/amaya
path = /obj/item/weapon/card/id/event/fluff/amaya
display_name = "Amaya's ID"
ckeywhitelist = list("kiraalitruss")
character_name = list("Amaya Rahl")
@@ -1046,6 +1046,22 @@
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