diff --git a/code/game/objects/effects/spawners/random/food_or_drink.dm b/code/game/objects/effects/spawners/random/food_or_drink.dm
index db4b6a54c13..b2639b2df68 100644
--- a/code/game/objects/effects/spawners/random/food_or_drink.dm
+++ b/code/game/objects/effects/spawners/random/food_or_drink.dm
@@ -273,3 +273,53 @@
 	if(!HAS_TRAIT(SSstation, STATION_TRAIT_BIRTHDAY))
 		spawn_loot_chance = 0
 	return ..()
+
+/obj/effect/spawner/random/food_or_drink/donuts
+	name = "donut spawner"
+	icon_state = "donut"
+	loot = list(
+		/obj/item/food/donut/apple = 3,
+		/obj/item/food/donut/berry = 3,
+		/obj/item/food/donut/caramel = 3,
+		/obj/item/food/donut/choco = 3,
+		/obj/item/food/donut/plain = 3,
+		/obj/item/food/donut/blumpkin = 2,
+		/obj/item/food/donut/bungo = 2,
+		/obj/item/food/donut/laugh = 2,
+		/obj/item/food/donut/matcha = 2,
+		/obj/item/food/donut/trumpet = 2,
+		/obj/item/food/donut/chaos = 1,
+		/obj/item/food/donut/meat = 1,
+	)
+
+/obj/effect/spawner/random/food_or_drink/jelly_donuts
+	name = "jelly donut spawner"
+	icon_state = "jelly_donut"
+	loot = list(
+		/obj/item/food/donut/jelly/apple = 3,
+		/obj/item/food/donut/jelly/berry = 3,
+		/obj/item/food/donut/jelly/caramel = 3,
+		/obj/item/food/donut/jelly/choco = 3,
+		/obj/item/food/donut/jelly/plain = 3,
+		/obj/item/food/donut/jelly/blumpkin = 2,
+		/obj/item/food/donut/jelly/bungo = 2,
+		/obj/item/food/donut/jelly/laugh = 2,
+		/obj/item/food/donut/jelly/matcha = 2,
+		/obj/item/food/donut/jelly/trumpet = 2,
+	)
+
+/obj/effect/spawner/random/food_or_drink/slime_jelly_donuts
+	name = "slime jelly donut spawner"
+	icon_state = "slime_jelly_donut"
+	loot = list(
+		/obj/item/food/donut/jelly/slimejelly/apple = 3,
+		/obj/item/food/donut/jelly/slimejelly/berry = 3,
+		/obj/item/food/donut/jelly/slimejelly/caramel = 3,
+		/obj/item/food/donut/jelly/slimejelly/choco = 3,
+		/obj/item/food/donut/jelly/slimejelly/plain = 3,
+		/obj/item/food/donut/jelly/slimejelly/blumpkin = 2,
+		/obj/item/food/donut/jelly/slimejelly/bungo = 2,
+		/obj/item/food/donut/jelly/slimejelly/laugh = 2,
+		/obj/item/food/donut/jelly/slimejelly/matcha = 2,
+		/obj/item/food/donut/jelly/slimejelly/trumpet = 2,
+	)
diff --git a/code/game/objects/effects/spawners/random/structure.dm b/code/game/objects/effects/spawners/random/structure.dm
index bf8e77a9fcd..cf037b91b5c 100644
--- a/code/game/objects/effects/spawners/random/structure.dm
+++ b/code/game/objects/effects/spawners/random/structure.dm
@@ -235,3 +235,24 @@
 		/obj/structure/musician/piano,
 		/obj/structure/musician/piano/minimoog,
 	)
+
+/obj/effect/spawner/random/structure/shipping_container
+	name = "shipping container spawner"
+	icon = 'icons/obj/fluff/containers.dmi'
+	icon_state = "random_container"
+	loot = list(
+		/obj/structure/shipping_container/conarex = 3,
+		/obj/structure/shipping_container/deforest = 3,
+		/obj/structure/shipping_container/kahraman = 3,
+		/obj/structure/shipping_container/kahraman/alt = 3,
+		/obj/structure/shipping_container/kosmologistika = 3,
+		/obj/structure/shipping_container/interdyne = 3,
+		/obj/structure/shipping_container/nakamura = 3,
+		/obj/structure/shipping_container/nanotrasen = 3,
+		/obj/structure/shipping_container/nthi = 3,
+		/obj/structure/shipping_container/vitezstvi = 3,
+		/obj/structure/shipping_container/cybersun = 2,
+		/obj/structure/shipping_container/donk_co = 2,
+		/obj/structure/shipping_container/gorlex = 1,
+		/obj/structure/shipping_container/gorlex/red = 1,
+	)
diff --git a/code/game/objects/effects/spawners/random/trash.dm b/code/game/objects/effects/spawners/random/trash.dm
index 020724772dd..b10dbc1f7f8 100644
--- a/code/game/objects/effects/spawners/random/trash.dm
+++ b/code/game/objects/effects/spawners/random/trash.dm
@@ -266,3 +266,22 @@
 		/obj/item/food/breadslice/moldy/bacteria,
 		/obj/item/food/pizzaslice/moldy/bacteria,
 	)
+
+/obj/effect/spawner/random/trash/crushed_can
+	name = "crushed can spawner"
+	icon_state = "crushed_can"
+	loot = list(/obj/item/trash/can)
+	/// Whether the can will spawn with this spawner's icon_state instead of a random one (used for mapedits)
+	var/soda_icons = list(
+		"energy_drink", "monkey_energy", "thirteen_loko", "space_mountain_wind", "dr_gibb", "starkist",
+		"sodawater", "tonic", "cola", "purple_can", "ice_tea_can",
+		"sol_dry", "wellcheers", "space beer", "ebisu", "shimauma", "moonlabor",
+		"space_up", "lemon_lime", "shamblers", "shamblerseldritch", "air", "laughter",
+		"volt_energy", "melon_soda",
+	)
+
+/obj/effect/spawner/random/trash/crushed_can/make_item(spawn_loc, type_path_to_make)
+	var/obj/item/trash/can/crushed_can = .. ()
+	if(istype(crushed_can))
+		crushed_can.icon_state = pick(soda_icons)
+	return crushed_can
diff --git a/code/game/objects/structures/containers.dm b/code/game/objects/structures/containers.dm
index f8272c19de9..bf56f7850f8 100644
--- a/code/game/objects/structures/containers.dm
+++ b/code/game/objects/structures/containers.dm
@@ -53,6 +53,7 @@
 	name = "\improper Nanotrasen shipping container"
 	desc = "A standard-measure shipping container for bulk transport of goods. This one prominently features Nanotrasen's logo, and so presumably could be carrying anything."
 	icon_state = "nanotrasen"
+
 /obj/structure/shipping_container/nthi
 	name = "\improper Nanotrasen Heavy Industries shipping container"
 	desc = "A standard-measure shipping container for bulk transport of goods. This one is from NTHI: Nanotrasen's mining and refining subdivision."
diff --git a/icons/effects/random_spawners.dmi b/icons/effects/random_spawners.dmi
index f96676da097..c03b196a137 100644
Binary files a/icons/effects/random_spawners.dmi and b/icons/effects/random_spawners.dmi differ
diff --git a/icons/obj/fluff/containers.dmi b/icons/obj/fluff/containers.dmi
index af9abe7073e..8aed1ffbb9a 100644
Binary files a/icons/obj/fluff/containers.dmi and b/icons/obj/fluff/containers.dmi differ