diff --git a/code/game/objects/random/mapping_vr.dm b/code/game/objects/random/mapping_vr.dm
new file mode 100644
index 0000000000..43431a8b16
--- /dev/null
+++ b/code/game/objects/random/mapping_vr.dm
@@ -0,0 +1,10 @@
+/obj/random/empty_or_lootable_crate
+	name = "random crate"
+	desc = "Spawns a random crate which may or may not have contents. Sometimes spawns nothing."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "moneybag"
+	spawn_nothing_percentage = 20
+
+/obj/random/empty_or_lootable_crate/item_to_spawn()
+	return pick(/obj/random/crate,
+			/obj/random/multiple/corp_crate)
\ No newline at end of file
diff --git a/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm b/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm
index a1fced18ed..1e1616251f 100644
--- a/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm
+++ b/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm
@@ -130,7 +130,9 @@
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "dC" = (
-/obj/random/multiple/corp_crate,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 6
+	},
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "dE" = (
@@ -452,6 +454,7 @@
 	dir = 4
 	},
 /obj/item/weapon/material/shard/shrapnel,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "kd" = (
@@ -491,7 +494,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
-/obj/random/multiple/corp_crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "kx" = (
@@ -651,7 +654,7 @@
 /turf/template_noop,
 /area/shuttle/gecko_cr_engineering_wreck)
 "nj" = (
-/obj/random/crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "nm" = (
@@ -662,7 +665,7 @@
 /area/shuttle/gecko_cr_wreck)
 "nq" = (
 /obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/random/multiple/corp_crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "od" = (
@@ -785,7 +788,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 10
 	},
-/obj/random/multiple/corp_crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "pG" = (
@@ -1009,7 +1012,6 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 5
 	},
-/obj/random/crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "tP" = (
@@ -1101,7 +1103,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
-/obj/random/multiple/corp_crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "vP" = (
@@ -1149,7 +1151,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
 	},
-/obj/random/crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "wV" = (
@@ -1293,7 +1295,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/random/crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "AE" = (
@@ -1316,7 +1318,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 10
 	},
-/obj/random/crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "Bd" = (
@@ -1416,7 +1417,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/random/crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "Ck" = (
@@ -1511,6 +1512,12 @@
 	},
 /turf/simulated/floor/tiled/techmaint/airless,
 /area/shuttle/gecko_cr_engineering_wreck)
+"DK" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/shuttle/gecko_cr_wreck)
 "DM" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -1928,7 +1935,6 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 9
 	},
-/obj/random/crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "LU" = (
@@ -1991,17 +1997,17 @@
 /turf/simulated/wall/rshull,
 /area/shuttle/gecko_cr_wreck)
 "Nj" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
+/obj/effect/floor_decal/industrial/warning{
+	dir = 9
 	},
-/obj/random/multiple/corp_crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "Np" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 6
 	},
-/obj/random/crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "Nr" = (
@@ -2095,7 +2101,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/random/crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "Ol" = (
@@ -2124,7 +2130,6 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 6
 	},
-/obj/random/crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "Oz" = (
@@ -2133,7 +2138,7 @@
 /area/shuttle/gecko_cr_wreck)
 "OA" = (
 /obj/machinery/atmospherics/pipe/manifold4w/hidden,
-/obj/random/crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "OH" = (
@@ -2171,6 +2176,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
 	},
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "OU" = (
@@ -2222,7 +2228,7 @@
 /area/shuttle/gecko_cr_wreck)
 "Pn" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden,
-/obj/random/multiple/corp_crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "Pv" = (
@@ -2347,7 +2353,7 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 5
 	},
-/obj/random/crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "QX" = (
@@ -2505,7 +2511,7 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 10
 	},
-/obj/random/multiple/corp_crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "Tw" = (
@@ -2604,7 +2610,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
 	},
-/obj/random/crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "Vl" = (
@@ -2612,7 +2618,7 @@
 	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/random/crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "Vr" = (
@@ -2751,7 +2757,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/random/multiple/corp_crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "Xn" = (
@@ -2919,7 +2925,7 @@
 	dir = 9
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/random/multiple/corp_crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "Zo" = (
@@ -3268,7 +3274,7 @@ jo
 wU
 Wz
 pv
-OA
+jo
 OP
 vX
 Pv
@@ -3310,7 +3316,7 @@ WZ
 OA
 nq
 VJ
-VJ
+nq
 Pn
 NZ
 Va
@@ -3393,8 +3399,8 @@ kI
 qh
 Rp
 PJ
-nm
-oe
+Vi
+Tv
 Gx
 Zp
 Vi
@@ -3435,13 +3441,13 @@ tP
 FX
 Ti
 rA
-Aq
-nm
+gy
+Vi
 dE
 gA
-nj
+Wz
 lS
-NZ
+DK
 EK
 Wr
 ov
@@ -3480,7 +3486,7 @@ Ti
 aK
 tI
 lS
-Np
+dC
 Gx
 II
 nm
@@ -3611,9 +3617,9 @@ gy
 Vi
 dE
 th
-Wz
+nj
 Vi
-NZ
+DK
 ON
 Wr
 LW
@@ -3694,11 +3700,11 @@ Ey
 Wr
 yR
 Zn
-Vi
+nm
 Tv
 Wz
-Lu
 Nj
+nm
 kp
 Tl
 Wr
@@ -3738,10 +3744,10 @@ Wr
 Wz
 Aq
 es
-dC
+Wz
 ZL
-dC
-Vi
+Wz
+nm
 fv
 JV
 Wr
diff --git a/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm b/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm
index fa9b016a84..fa1ccb1128 100644
--- a/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm
+++ b/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm
@@ -119,7 +119,7 @@
 /obj/structure/railing/grey{
 	dir = 1
 	},
-/obj/random/crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc_wreck)
 "lC" = (
@@ -141,7 +141,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/random/crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc_wreck)
 "mf" = (
@@ -241,7 +241,7 @@
 /obj/structure/railing/grey{
 	dir = 1
 	},
-/obj/random/multiple/corp_crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc_wreck)
 "rr" = (
@@ -305,7 +305,7 @@
 /obj/effect/map_helper/airlock/sensor/int_sensor,
 /obj/effect/floor_decal/industrial/warning/corner,
 /obj/structure/railing/grey,
-/obj/random/multiple/corp_crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc_wreck)
 "sX" = (
@@ -374,7 +374,7 @@
 	dir = 8
 	},
 /obj/structure/railing/grey,
-/obj/random/multiple/corp_crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc_wreck)
 "wN" = (
@@ -467,7 +467,7 @@
 /obj/machinery/light/flicker{
 	dir = 8
 	},
-/obj/random/multiple/corp_crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc_wreck)
 "Da" = (
@@ -535,7 +535,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/random/multiple/corp_crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc_wreck)
 "FL" = (
@@ -584,7 +584,7 @@
 	},
 /obj/effect/floor_decal/industrial/warning/corner,
 /obj/structure/railing/grey,
-/obj/random/multiple/corp_crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc_wreck)
 "He" = (
@@ -599,10 +599,10 @@
 /obj/structure/railing/grey{
 	dir = 1
 	},
-/obj/random/crate,
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc_wreck)
 "Ib" = (
@@ -665,7 +665,7 @@
 /area/shuttle/mackerel_lc_wreck)
 "LW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/random/multiple/corp_crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc_wreck)
 "Mk" = (
@@ -726,7 +726,7 @@
 /area/shuttle/mackerel_lc_wreck)
 "Qu" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/random/crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc_wreck)
 "RB" = (
@@ -772,7 +772,7 @@
 /obj/machinery/light/flicker{
 	dir = 4
 	},
-/obj/random/crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc_wreck)
 "Td" = (
@@ -784,7 +784,7 @@
 	dir = 8
 	},
 /obj/structure/railing/grey,
-/obj/random/multiple/corp_crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc_wreck)
 "TC" = (
@@ -844,7 +844,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/random/multiple/corp_crate,
+/obj/random/empty_or_lootable_crate,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc_wreck)
 "Wv" = (
diff --git a/vorestation.dme b/vorestation.dme
index 9ef30323bc..1a4dcef99e 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1363,6 +1363,7 @@
 #include "code\game\objects\random\guns_and_ammo.dm"
 #include "code\game\objects\random\maintenance.dm"
 #include "code\game\objects\random\mapping.dm"
+#include "code\game\objects\random\mapping_vr.dm"
 #include "code\game\objects\random\mechs.dm"
 #include "code\game\objects\random\misc.dm"
 #include "code\game\objects\random\misc_vr.dm"