Reapply "Merge branch 'master' into trash-eat-Mk2"

This reverts commit d638582401.
This commit is contained in:
MrSky12
2024-05-15 23:28:30 +02:00
parent d638582401
commit 6ba955d90c
82 changed files with 1090 additions and 218 deletions
@@ -182,7 +182,7 @@ datum/gear/lyricalpawsring
name = "GATO Badge - Correspondent"
category = SLOT_IN_BACKPACK
path = /obj/item/clothing/accessory/medal/gato_badge/middleman
ckeywhitelist = list("johnjimjim", "sonoida", "yeeny")
ckeywhitelist = list("johnjimjim", "sonoida", "yeeny", "not number")
/datum/gear/halsey_overcoat
name = "Halsey's Commander Overcoat"
category = SLOT_IN_BACKPACK
@@ -259,16 +259,16 @@ datum/gear/lyricalpawsring
name = "Weight Gain Spellbook"
category = SLOT_IN_BACKPACK
path = /obj/item/book/granter/spell/fattening
ckeywhitelist = list("sonoida", "themrsky")
ckeywhitelist = list("sonoida", "themrsky", "not number")
/datum/gear/wgspell_transfer
name = "Weight Transfer Spellbook"
category = SLOT_IN_BACKPACK
path = /obj/item/book/granter/spell/fattening/transfer
ckeywhitelist = list("sonoida", "themrsky")
ckeywhitelist = list("sonoida", "themrsky", "not number")
/datum/gear/wgspell_take
name = "Weight Steal Spellbook"
category = SLOT_IN_BACKPACK
path = /obj/item/book/granter/spell/fattening/steal
ckeywhitelist = list("sonoida", "themrsky")
ckeywhitelist = list("sonoida", "themrsky", "not number")