Revert "Merge branch 'master' into Yeehaw"

This reverts commit 30e3edaac1, reversing changes made to 62c8fce043.
2020-01-02 22:06:31 +13:00
parent 30e3edaac1
commit aabb39a364
309 changed files with 1577 additions and 3108 deletions
@@ -115,6 +115,5 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/clothing/shoes/kindleKicks = 1,
 	/obj/item/autosurgeon/penis = 1,
 	/obj/item/autosurgeon/testicles = 1,
-	/obj/item/storage/box/marshmallow = 2,
 	"" = 3
 	))