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
@@ -1259,12 +1259,3 @@
 	var/obj/item/stack/sheet/cardboard/I = new(user.drop_location())
 	qdel(src)
 	user.put_in_hands(I)
-
-/obj/item/storage/box/marshmallow
-	name = "box of marshmallows"
-	desc = "A box of marshmallows."
-	illustration = "marshmallow"
-
-/obj/item/storage/box/marshmallow/PopulateContents()
-	for (var/i in 1 to 5)
-		new /obj/item/reagent_containers/food/snacks/marshmallow(src)