diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm
index c0c64008c9..98438fb949 100644
--- a/code/modules/admin/verbs/striketeam.dm
+++ b/code/modules/admin/verbs/striketeam.dm
@@ -47,6 +47,7 @@ var/const/commandos_possible = 6 //if more Commandos are needed in the future
 		if(!choice)
 			if(alert("Error, no mission set. Do you want to exit the setup process?",,"Yes","No")=="Yes")
 				return
+	consider_ert_load() //VOREStation Add
 
 	if(team.deployed)
 		to_chat(usr, "Looks like someone beat you to it.")
diff --git a/maps/offmap_vr/om_ships/cruiser.dmm b/maps/offmap_vr/om_ships/cruiser.dmm
index b7eed73db0..63d5369669 100644
--- a/maps/offmap_vr/om_ships/cruiser.dmm
+++ b/maps/offmap_vr/om_ships/cruiser.dmm
@@ -2589,9 +2589,6 @@
 	dir = 4
 	},
 /obj/structure/table/bench/steel,
-/obj/effect/landmark{
-	name = "Commando"
-	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/mothership/security)
 "fk" = (
@@ -2599,9 +2596,6 @@
 	dir = 8
 	},
 /obj/structure/table/bench/steel,
-/obj/effect/landmark{
-	name = "Commando"
-	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/mothership/security)
 "fl" = (
@@ -2767,9 +2761,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/effect/landmark{
-	name = "Commando"
-	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/mothership/security)
 "fF" = (
@@ -2780,9 +2771,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/effect/landmark{
-	name = "Commando"
-	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/mothership/security)
 "fG" = (
@@ -2988,9 +2976,6 @@
 /area/mothership/security)
 "fZ" = (
 /obj/structure/table/bench/steel,
-/obj/effect/landmark{
-	name = "Commando"
-	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/mothership/security)
 "ga" = (
@@ -3199,18 +3184,6 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
-/obj/effect/landmark{
-	name = "Commando"
-	},
-/turf/simulated/floor/tiled/steel_grid,
-/area/mothership/security)
-"gA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/effect/landmark{
-	name = "Commando"
-	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/mothership/security)
 "gB" = (
@@ -8925,7 +8898,7 @@
 /obj/machinery/atmospherics/pipe/simple/visible/black{
 	dir = 4
 	},
-/obj/machinery/portable_atmospherics/canister/empty/sleeping_agent,
+/obj/machinery/portable_atmospherics/canister/empty/nitrous_oxide,
 /turf/simulated/floor/tiled/steel_grid,
 /area/mothership/engineering)
 "sj" = (
@@ -21633,7 +21606,7 @@ fh
 fD
 fX
 gn
-gA
+gB
 fY
 hi
 TE
diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm
index 12d81f9c2c..193550f2c1 100644
--- a/maps/submaps/admin_use_vr/ert.dmm
+++ b/maps/submaps/admin_use_vr/ert.dmm
@@ -1458,12 +1458,18 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
+/obj/effect/landmark{
+	name = "Commando"
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/barracks)
 "mq" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
+/obj/effect/landmark{
+	name = "Commando"
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/barracks)
 "mr" = (
@@ -2023,6 +2029,12 @@
 /obj/effect/landmark/map_data/ert_ship,
 /turf/space,
 /area/space)
+"pg" = (
+/obj/effect/landmark{
+	name = "Commando"
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/ert/barracks)
 "pm" = (
 /obj/effect/floor_decal/corner/yellow{
 	dir = 9
@@ -5851,6 +5863,18 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/bridge)
+"OU" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/effect/landmark{
+	name = "Commando"
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/ship/ert/barracks)
 "OW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -6022,6 +6046,13 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/ert/teleporter)
+"PZ" = (
+/obj/structure/table/bench/steel,
+/obj/effect/landmark{
+	name = "Commando"
+	},
+/turf/simulated/floor/tiled/steel_grid,
+/area/space)
 "Qc" = (
 /obj/machinery/power/apc/hyper{
 	alarms_hidden = 1;
@@ -6836,6 +6867,9 @@
 	dir = 1
 	},
 /obj/effect/catwalk_plated,
+/obj/effect/landmark{
+	name = "Commando"
+	},
 /turf/simulated/floor/plating,
 /area/ship/ert/barracks)
 "Xg" = (
@@ -15877,7 +15911,7 @@ Zo
 Bo
 ia
 ip
-WH
+pg
 Kk
 lv
 ZM
@@ -16302,8 +16336,8 @@ Ye
 Zo
 Gw
 Kk
-Jd
-WH
+OU
+pg
 Kk
 lv
 ZM
@@ -16444,8 +16478,8 @@ Ye
 yY
 lv
 Kk
-Jd
-WH
+OU
+pg
 Kk
 sz
 ZM
@@ -16586,8 +16620,8 @@ Ye
 yY
 lv
 Kk
-Jd
-WH
+OU
+pg
 Kk
 lv
 ZM
@@ -16612,7 +16646,7 @@ Ci
 yz
 yz
 yz
-yz
+PZ
 yz
 yz
 yz
@@ -16728,7 +16762,7 @@ Ye
 yY
 lv
 Kk
-Jd
+OU
 mr
 WH
 sF
@@ -17012,7 +17046,7 @@ ab
 Zo
 Gw
 Kk
-Jd
+OU
 mF
 ip
 ip