Merge branch 'master' into upstream-merge-14976

This commit is contained in:
Raeschen
2023-06-17 14:47:37 +02:00
committed by GitHub
147 changed files with 1521 additions and 593 deletions
@@ -396,6 +396,34 @@
ckeywhitelist = list("flintlockdafox")
character_name = list("Flintlock Sharpsman")
/datum/gear/fluff/zera_weldmask
path = /obj/item/clothing/head/welding/fluff/zera
display_name = "Zera's Welding Mask"
slot = slot_head
ckeywhitelist = list("fuackwit422")
character_name = list("Zera Livanne")
/datum/gear/fluff/zera_labcloak
path = /obj/item/clothing/suit/storage/toggle/labcoat/fluff/zera
display_name = "Zera's Labcloak"
slot = slot_wear_suit
ckeywhitelist = list("fuackwit422")
character_name = list("Zera Livanne")
/datum/gear/fluff/zera_cloak
path = /obj/item/clothing/head/fluff/zerahat
display_name = "Grand Purple Hat"
slot = slot_head
ckeywhitelist = list("fuackwit422")
character_name = list("Zera Livanne")
/datum/gear/fluff/zera_hat
path = /obj/item/clothing/suit/storage/toggle/labcoat/fluff/zeracloak
display_name = "Grand Purple Cloak"
slot = slot_wear_suit
ckeywhitelist = list("fuackwit422")
character_name = list("Zera Livanne")
// G CKEYS