Merge branch 'master' into glassware

This commit is contained in:
Trilbyspaceclone
2020-01-06 23:55:44 -05:00
committed by GitHub
188 changed files with 18706 additions and 12705 deletions
+1 -2
View File
@@ -288,8 +288,7 @@
/obj/item/storage/book/bible/booze,
/obj/item/storage/book/bible/booze,
/obj/item/clothing/suit/hooded/chaplain_hoodie,
/obj/item/clothing/suit/hooded/chaplain_hoodie
)
/obj/item/clothing/suit/hooded/chaplain_hoodie)
crate_name = "religious supplies crate"
/datum/supply_pack/misc/shower