Merge branch 'master' into upstream-merge-12164

This commit is contained in:
Nadyr
2022-02-06 21:38:32 -05:00
committed by GitHub
37 changed files with 50102 additions and 50247 deletions

View File

@@ -1216,3 +1216,9 @@
display_name = "Nehi's Radio"
ckeywhitelist = list("zodiacshadow")
character_name = list("Nehi Maximus")
/datum/gear/fluff/lucky_amour
path = /obj/item/device/modkit_conversion/crusader_luck
display_name = "Lucky's amour"
ckeywhitelist = list ("thedavestdave")
character_name = list("Lucky")