diff --git a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm
index 92d0902564..cdb337df98 100644
--- a/_maps/map_files/Cerestation/cerestation.dmm
+++ b/_maps/map_files/Cerestation/cerestation.dmm
@@ -79805,12 +79805,10 @@
 	},
 /area/crew_quarters/theatre)
 "cNT" = (
-/obj/structure/table,
-/obj/item/clothing/mask/facehugger/toy,
-/obj/item/clothing/mask/fakemoustache,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/structure/closet/crate/wooden/toy,
 /turf/open/floor/plasteel/redyellow{
 	baseturf = /turf/open/floor/plating/asteroid/airless
 	},
@@ -79826,6 +79824,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/item/clothing/mask/facehugger/toy,
+/obj/item/clothing/mask/fakemoustache,
 /turf/open/floor/plasteel/redyellow{
 	baseturf = /turf/open/floor/plating/asteroid/airless
 	},
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index df3d53cf31..4f21155136 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -17346,6 +17346,8 @@
 	name = "Station Intercom";
 	pixel_y = 26
 	},
+/obj/item/toy/figure/clown,
+/obj/item/weapon/clipboard,
 /turf/open/floor/plasteel/redblue,
 /area/crew_quarters/theatre)
 "aKQ" = (
@@ -103470,12 +103472,10 @@
 /turf/open/floor/plasteel/redblue,
 /area/crew_quarters/theatre)
 "efc" = (
-/obj/structure/table/wood,
-/obj/item/weapon/clipboard,
-/obj/item/toy/figure/clown,
 /obj/structure/sign/poster/contraband/random{
 	pixel_y = 32
 	},
+/obj/structure/closet/crate/wooden/toy,
 /turf/open/floor/plasteel/redblue,
 /area/crew_quarters/theatre)
 "efd" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 25c6618a75..d7c5dd0506 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -87202,20 +87202,20 @@
 /obj/structure/sign/poster/contraband/random{
 	pixel_x = -32
 	},
+/obj/item/clothing/mask/cigarette/pipe,
+/obj/item/clothing/mask/fakemoustache,
 /turf/open/floor/wood,
 /area/crew_quarters/theatre)
 "dir" = (
-/obj/item/clothing/mask/fakemoustache,
-/obj/item/clothing/mask/cigarette/pipe,
 /obj/machinery/camera{
 	c_tag = "Theatre - Backstage";
 	dir = 1;
 	network = list("SS13")
 	},
-/obj/structure/table/wood,
 /obj/structure/sign/poster/contraband/random{
 	pixel_y = -32
 	},
+/obj/structure/closet/crate/wooden/toy,
 /turf/open/floor/wood,
 /area/crew_quarters/theatre)
 "dis" = (
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index f732a4dc79..0fbd9da7e4 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -19030,7 +19030,6 @@
 "aET" = (
 /obj/structure/table/wood,
 /obj/item/weapon/storage/crayons,
-/obj/item/weapon/storage/crayons,
 /obj/item/device/flashlight/lamp/bananalamp{
 	pixel_y = 5
 	},
@@ -19051,6 +19050,7 @@
 /obj/structure/sign/poster/contraband/random{
 	pixel_y = -32
 	},
+/obj/structure/closet/crate/wooden/toy,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 8937961188..11a21f3b60 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -21762,19 +21762,11 @@
 /obj/item/weapon/soap,
 /obj/structure/table/wood,
 /obj/item/weapon/bikehorn,
+/obj/item/toy/cattoy,
 /turf/open/floor/plasteel/black,
 /area/crew_quarters/theatre)
 "aSY" = (
-/obj/structure/table/wood,
-/obj/item/weapon/storage/crayons{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/weapon/reagent_containers/food/snacks/pie/cream{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/item/toy/cattoy,
+/obj/structure/closet/crate/wooden/toy,
 /turf/open/floor/plasteel/black,
 /area/crew_quarters/theatre)
 "aSZ" = (
diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej b/_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej
new file mode 100644
index 0000000000..5f4ca8b829
--- /dev/null
+++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej
@@ -0,0 +1,23 @@
+diff a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm	(rejected hunks)
+@@ -15614,20 +15614,12 @@
+ /turf/open/floor/plating,
+ /area/maintenance/starboard/fore)
+ "aHZ" = (
+-/obj/structure/table/wood,
+ /obj/machinery/airalarm{
+ 	dir = 4;
+ 	icon_state = "alarm0";
+ 	pixel_x = -22
+ 	},
+-/obj/item/weapon/storage/crayons{
+-	pixel_x = 3;
+-	pixel_y = 3
+-	},
+-/obj/item/weapon/reagent_containers/food/snacks/pie/cream{
+-	pixel_x = -3;
+-	pixel_y = -3
+-	},
++/obj/structure/closet/crate/wooden/toy,
+ /turf/open/floor/plasteel/redblue,
+ /area/crew_quarters/theatre)
+ "aIa" = (
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 61abe97859..dad2a8179d 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -148,6 +148,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	new/datum/stack_recipe("tiki mask", /obj/item/clothing/mask/gas/tiki_mask, 2), \
 	new/datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),\
 	new/datum/stack_recipe("ore box", /obj/structure/ore_box, 4, time = 50, one_per_turf = 1, on_floor = 1),\
+	new/datum/stack_recipe("wooden crate", /obj/structure/closet/crate/wooden, 6, time = 50, one_per_turf = 1, on_floor = 1),\
 	new/datum/stack_recipe("baseball bat", /obj/item/weapon/melee/baseball_bat, 5, time = 15),\
 	))
 
diff --git a/code/game/objects/structures/crates_lockers/crates/wooden.dm b/code/game/objects/structures/crates_lockers/crates/wooden.dm
new file mode 100644
index 0000000000..7272bd4e24
--- /dev/null
+++ b/code/game/objects/structures/crates_lockers/crates/wooden.dm
@@ -0,0 +1,18 @@
+/obj/structure/closet/crate/wooden
+	name = "wooden crate"
+	desc = "Works just as well as a metal one."
+	material_drop = /obj/item/stack/sheet/mineral/wood
+	material_drop_amount = 6
+	icon_state = "wooden"
+
+/obj/structure/closet/crate/wooden/toy
+	name = "toy box"
+	desc = "It has the words \"Clown + Mime\" written underneath of it with marker."
+
+/obj/structure/closet/crate/wooden/toy/PopulateContents()
+	. = ..()
+	new	/obj/item/device/megaphone/clown(src)
+	new	/obj/item/weapon/reagent_containers/food/drinks/soda_cans/canned_laughter(src)
+	new /obj/item/weapon/pneumatic_cannon/pie(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/pie/cream(src)
+	new /obj/item/weapon/storage/crayons(src)
\ No newline at end of file
diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm
index f1555cebcd..f0b04386fa 100644
--- a/code/modules/cargo/exports/large_objects.dm
+++ b/code/modules/cargo/exports/large_objects.dm
@@ -14,7 +14,7 @@
 
 /datum/export/large/crate/wooden
 	cost = 100
-	unit_name = "wooden crate"
+	unit_name = "large wooden crate"
 	export_types = list(/obj/structure/closet/crate/large)
 	exclude_types = list()
 
@@ -22,6 +22,13 @@
 	unit_name = "ore box"
 	export_types = list(/obj/structure/ore_box)
 
+/datum/export/large/crate/wood
+	cost = 240
+	unit_name = "wooden crate"
+	export_types = list(/obj/structure/closet/crate/wooden)
+	exclude_types = list()
+
+
 
 // Reagent dispensers.
 /datum/export/large/reagent_dispenser
diff --git a/code/modules/cargo/exports/large_objects.dm.rej b/code/modules/cargo/exports/large_objects.dm.rej
new file mode 100644
index 0000000000..333f6aeacf
--- /dev/null
+++ b/code/modules/cargo/exports/large_objects.dm.rej
@@ -0,0 +1,10 @@
+diff a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm	(rejected hunks)
+@@ -6,7 +6,7 @@
+ 	k_elasticity = 0
+ 	unit_name = "crate"
+ 	export_types = list(/obj/structure/closet/crate)
+-	exclude_types = list(/obj/structure/closet/crate/large)
++	exclude_types = list(/obj/structure/closet/crate/large, /obj/structure/closet/crate/wooden)
+ 
+ /datum/export/large/crate/total_printout() // That's why a goddamn metal crate costs that much.
+ 	. = ..()
diff --git a/code/modules/jobs/job_types/civilian.dm b/code/modules/jobs/job_types/civilian.dm
index fd01846467..b6e5955108 100644
--- a/code/modules/jobs/job_types/civilian.dm
+++ b/code/modules/jobs/job_types/civilian.dm
@@ -34,9 +34,6 @@ Clown
 		/obj/item/weapon/stamp/clown = 1,
 		/obj/item/weapon/reagent_containers/spray/waterflower = 1,
 		/obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1,
-		/obj/item/device/megaphone/clown = 1,
-		/obj/item/weapon/reagent_containers/food/drinks/soda_cans/canned_laughter = 1,
-		/obj/item/weapon/pneumatic_cannon/pie = 1
 		)
 
 	implants = list(/obj/item/weapon/implant/sad_trombone)
diff --git a/icons/obj/crates.dmi b/icons/obj/crates.dmi
index 35414eeb3d..69bf29e33c 100644
Binary files a/icons/obj/crates.dmi and b/icons/obj/crates.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 0d035a36f3..fd1a5437eb 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -983,6 +983,7 @@
 #include "code\game\objects\structures\crates_lockers\crates\critter.dm"
 #include "code\game\objects\structures\crates_lockers\crates\large.dm"
 #include "code\game\objects\structures\crates_lockers\crates\secure.dm"
+#include "code\game\objects\structures\crates_lockers\crates\wooden.dm"
 #include "code\game\objects\structures\transit_tubes\station.dm"
 #include "code\game\objects\structures\transit_tubes\transit_tube.dm"
 #include "code\game\objects\structures\transit_tubes\transit_tube_construction.dm"