diff --git a/PentestModules/maps/v_outpost.dmm b/PentestModules/maps/v_outpost.dmm
index 211d68b733a3..50c046d0abf8 100644
--- a/PentestModules/maps/v_outpost.dmm
+++ b/PentestModules/maps/v_outpost.dmm
@@ -15,7 +15,6 @@
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/tank/toxins,
 /turf/open/floor/plasteel/tech,
 /area/outpost/engineering)
 "aw" = (
@@ -196,12 +195,12 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/plasteel/tech,
 /area/outpost/crew/dorm)
 "dI" = (
@@ -298,6 +297,9 @@
 /obj/machinery/camera/autoname{
 	dir = 9
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
 /turf/open/floor/plasteel/tech,
 /area/outpost/crew/dorm)
 "gk" = (
@@ -361,6 +363,9 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
+/obj/item/stack/sheet/mineral/uranium/fifty,
+/obj/structure/rack,
+/obj/item/stack/sheet/mineral/uranium/fifty,
 /turf/open/floor/plasteel/tech,
 /area/outpost/engineering)
 "ig" = (
@@ -389,6 +394,13 @@
 "iW" = (
 /turf/open/floor/plating/asteroid/icerock/smooth,
 /area/ruin/unpowered)
+"jo" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/tech,
+/area/outpost/crew/dorm)
 "jK" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -529,6 +541,7 @@
 	pixel_y = 1;
 	pixel_x = 12
 	},
+/obj/machinery/light/directional/south,
 /turf/open/floor/plasteel/tech/grid,
 /area/science/misc_lab)
 "nj" = (
@@ -760,13 +773,19 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
 /turf/open/floor/plasteel/tech,
 /area/outpost/crew/dorm)
 "rD" = (
 /turf/closed/mineral/random/snow,
 /area/ruin/unpowered)
 "rL" = (
-/obj/machinery/doomsday_device,
+/obj/machinery/power/ship_gravity,
 /turf/open/floor/plasteel/tech,
 /area/outpost/crew/dorm)
 "rQ" = (
@@ -846,6 +865,8 @@
 "um" = (
 /obj/structure/table/reinforced,
 /obj/item/paicard,
+/obj/item/hemostat/supermatter,
+/obj/item/nuke_core_container/supermatter,
 /turf/open/floor/plasteel/tech/grid,
 /area/science/misc_lab)
 "uD" = (
@@ -1167,7 +1188,6 @@
 	dir = 5
 	},
 /obj/machinery/light/directional/north,
-/obj/machinery/atmospherics/components/unary/tank/carbon_dioxide,
 /turf/open/floor/plasteel/tech,
 /area/outpost/engineering)
 "EJ" = (
@@ -1191,21 +1211,6 @@
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/plasteel/tech/grid,
 /area/outpost/engineering)
-"Ff" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/turf/open/floor/plasteel/tech,
-/area/science/misc_lab)
 "Fq" = (
 /obj/effect/turf_decal/techfloor/orange/corner{
 	dir = 1
@@ -1213,9 +1218,6 @@
 /turf/open/floor/plasteel/tech,
 /area/outpost/engineering)
 "Fu" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -1241,6 +1243,9 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/item/stack/sheet/mineral/plasma/fifty,
+/obj/structure/rack,
+/obj/item/stack/sheet/mineral/plasma/fifty,
 /turf/open/floor/plasteel/tech,
 /area/outpost/engineering)
 "FJ" = (
@@ -1411,9 +1416,6 @@
 "Kg" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/machinery/door/airlock/outpost{
 	assemblytype = /obj/structure/door_assembly/door_assembly_eng;
 	icon = 'icons/obj/doors/airlocks/station/engineering.dmi';
@@ -1423,7 +1425,6 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/tech,
 /area/outpost/engineering)
 "KB" = (
@@ -1498,21 +1499,18 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/plasteel/tech,
 /area/outpost/crew/dorm)
 "Mi" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -1522,9 +1520,6 @@
 	overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi';
 	assemblytype = /obj/structure/door_assembly/door_assembly_med
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
@@ -1536,6 +1531,7 @@
 /area/ruin/unpowered)
 "MG" = (
 /obj/structure/chair/comfy/grey/corpo/directional/north,
+/obj/machinery/light/directional/south,
 /turf/open/floor/plasteel/tech,
 /area/outpost/crew/dorm)
 "MS" = (
@@ -1825,17 +1821,14 @@
 /turf/open/floor/plating/asteroid/icerock/lit,
 /area/space/nearstation)
 "Vg" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
 /area/outpost/crew/dorm)
@@ -1900,6 +1893,8 @@
 /area/outpost/engineering)
 "Wb" = (
 /obj/machinery/door/airlock/outpost,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/closed/wall/r_wall,
 /area/outpost/crew/dorm)
 "Wi" = (
@@ -1941,12 +1936,8 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
-	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /turf/open/floor/plasteel/tech,
 /area/outpost/crew/dorm)
 "Zc" = (
@@ -4330,7 +4321,7 @@ dH
 Fu
 rv
 Wb
-Dq
+jo
 Dq
 MG
 NC
@@ -4711,7 +4702,7 @@ nd
 GY
 Rt
 fX
-Ff
+Rq
 pF
 pF
 pF