diff --git a/code/game/objects/storage/crates.dm b/code/game/objects/storage/crates.dm
index b6a11094741..1fe9f2c7ad3 100644
--- a/code/game/objects/storage/crates.dm
+++ b/code/game/objects/storage/crates.dm
@@ -129,6 +129,27 @@
 		new /obj/item/weapon/pestspray(src)
 		new /obj/item/weapon/pestspray(src) */
 
+/obj/crate/hydroponics/prespawned
+	//This exists so the prespawned hydro crates spawn with their contents.
+/*	name = "Hydroponics crate"
+	desc = "All you need to destroy those pesky weeds and pests."
+	icon = 'storage.dmi'
+	icon_state = "hydrocrate"
+	openicon = "hydrocrateopen"
+	closedicon = "hydrocrate"
+	density = 1*/
+	New()
+		..()
+		new /obj/item/weapon/plantbgone(src)
+		new /obj/item/weapon/plantbgone(src)
+		new /obj/item/weapon/plantbgone(src)
+		new /obj/item/weapon/minihoe(src)
+		new /obj/item/weapon/weedspray(src)
+		new /obj/item/weapon/weedspray(src)
+		new /obj/item/weapon/pestspray(src)
+		new /obj/item/weapon/pestspray(src)
+		new /obj/item/weapon/pestspray(src)
+
 /obj/crate/New()
 	..()
 	spawn(1)
diff --git a/maps/trunkmap.dmm b/maps/trunkmap.dmm
index 45ff31b5e52..64950d9b10e 100644
--- a/maps/trunkmap.dmm
+++ b/maps/trunkmap.dmm
@@ -2379,8 +2379,8 @@
 "aTM" = (/obj/cable{icon_state = "4-8"; d1 = 4; d2 = 8},/obj/machinery/vending/hydronutrients,/turf/simulated/floor,/area/hydroponics)
 "aTN" = (/obj/machinery/light{dir = 1},/obj/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/apc{dir = 1; name = "Hydroponics APC"; pixel_y = 24},/obj/cable{icon_state = "2-4"; d1 = 2; d2 = 4},/obj/cable{icon_state = "2-8"; d1 = 2; d2 = 8},/turf/simulated/floor,/area/hydroponics)
 "aTO" = (/obj/machinery/seed_extractor,/obj/cable{icon_state = "4-8"; d1 = 4; d2 = 8},/turf/simulated/floor,/area/hydroponics)
-"aTP" = (/obj/crate/hydroponics,/turf/simulated/floor{tag = "icon-hydrofloor"; icon_state = "hydrofloor"},/area/hydroponics)
-"aTQ" = (/obj/machinery/light/small{dir = 1},/obj/crate/hydroponics,/turf/simulated/floor{tag = "icon-hydrofloor"; icon_state = "hydrofloor"},/area/hydroponics)
+"aTP" = (/obj/crate/hydroponics/prespawned,/turf/simulated/floor{tag = "icon-hydrofloor"; icon_state = "hydrofloor"},/area/hydroponics)
+"aTQ" = (/obj/machinery/light/small{dir = 1},/obj/crate/hydroponics/prespawned,/turf/simulated/floor{tag = "icon-hydrofloor"; icon_state = "hydrofloor"},/area/hydroponics)
 "aTR" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1},/turf/simulated/floor{tag = "icon-hydrofloor"; icon_state = "hydrofloor"},/area/hydroponics)
 "aTS" = (/obj/window/reinforced/south,/turf/simulated/floor{tag = "icon-hydrofloor"; icon_state = "hydrofloor"},/area/hydroponics)
 "aTT" = (/obj/grille,/obj/window/reinforced/west,/obj/window/reinforced/east,/obj/window/reinforced/north,/obj/window/reinforced/south,/turf/simulated/floor/plating,/area/hallway/primary/central)
@@ -3919,7 +3919,7 @@
 "bxs" = (/obj/secure_closet/engineering_welding,/turf/simulated/floor,/area/engine/engine_hallway)
 "bxt" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/turf/simulated/floor/plating/airless,/area/engine/engine_hallway{name = "External Engine Hallway"; requires_power = 0})
 "bxu" = (/turf/simulated/floor/plating/airless,/area/engine/engine_hallway{name = "External Engine Hallway"; requires_power = 0})
-"bxv" = (/obj/table{icon_state = "tabledir"; dir = 9},/obj/machinery/light/small{dir = 4},/obj/item/device/analyzer,/obj/item/weapon/storage/utilitybelt,/obj/item/weapon/storage/utilitybelt,/obj/item/weapon/storage/utilitybelt,/mob,/turf/simulated/floor,/area/engine/engine_hallway)
+"bxv" = (/obj/table{icon_state = "tabledir"; dir = 9},/obj/machinery/light/small{dir = 4},/obj/item/device/analyzer,/obj/item/weapon/storage/utilitybelt,/obj/item/weapon/storage/utilitybelt,/obj/item/weapon/storage/utilitybelt,/turf/simulated/floor,/area/engine/engine_hallway)
 "bxw" = (/obj/cable{icon_state = "0-2"; d2 = 2},/obj/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/solar{id = "starboardsolar"; name = "East Solar Array"},/turf/simulated/floor/airless{tag = "icon-solarpanel"; icon_state = "solarpanel"},/area/solar/starboard)
 "bxx" = (/turf/simulated/floor/airless{tag = "icon-solarpanel"; icon_state = "solarpanel"},/area/engine/engine_hallway{name = "External Engine Hallway"; requires_power = 0})
 "bxy" = (/turf/simulated/wall/r_wall,/area/engine/combustion)