diff --git a/_maps/map_files/vonneumann/vnmk3.dmm b/_maps/map_files/vonneumann/vnmk3.dmm
index d7f94a834da..92597043158 100644
--- a/_maps/map_files/vonneumann/vnmk3.dmm
+++ b/_maps/map_files/vonneumann/vnmk3.dmm
@@ -518,6 +518,12 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/security/brig)
+"bj" = (
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/turf/open/floor/carpet/ship/purple_carpet,
+/area/science/lab)
 "bk" = (
 /obj/machinery/camera/autoname{
 	dir = 5
@@ -2586,6 +2592,13 @@
 /obj/machinery/light,
 /turf/open/floor/circuit/telecomms/server,
 /area/maintenance/aft/secondary)
+"fV" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/monotile/light,
+/area/medical/medbay)
 "fW" = (
 /obj/machinery/replicator,
 /turf/closed/wall/r_wall/ship,
@@ -2911,9 +2924,7 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
 "gK" = (
@@ -4368,13 +4379,14 @@
 /turf/open/floor/carpet/ship,
 /area/hallway/nsv/deck1/frame1/central)
 "jX" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/effect/landmark/start/paramedic,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /turf/open/floor/monotile/light,
 /area/crew_quarters/heads/cmo)
 "jZ" = (
@@ -5577,12 +5589,6 @@
 	name = "nanoweave carpet (bluer)"
 	},
 /area/crew_quarters/heads/captain/private)
-"mJ" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/turf/open/floor/carpet/ship/purple_carpet,
-/area/science/lab)
 "mK" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/carpet/ship/blue,
@@ -6753,11 +6759,11 @@
 /turf/open/floor/carpet/ship/red_carpet,
 /area/security/brig)
 "pw" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
 	},
-/turf/open/floor/carpet/ship/red_carpet,
-/area/security/detectives_office)
+/turf/open/floor/carpet/ship/purple_carpet,
+/area/science/lab)
 "px" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -6900,6 +6906,12 @@
 	},
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
+"pO" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/carpet/ship/red_carpet,
+/area/security/detectives_office)
 "pP" = (
 /obj/structure/closet/secure_closet/engineering_chief,
 /obj/item/gun/energy/e_gun/mini/heads,
@@ -7678,15 +7690,11 @@
 /turf/closed/wall/r_wall/ship,
 /area/engine/engineering/reactor_control)
 "rF" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/machinery/door/airlock/ship/station{
-	name = "Metahuman Research";
-	req_one_access_txt = "7;9;29;47"
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
 	},
-/turf/open/floor/monotile/light,
-/area/medical/medbay)
+/turf/open/floor/carpet/ship/purple_carpet,
+/area/science/lab)
 "rG" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
@@ -8398,16 +8406,9 @@
 /turf/open/floor/carpet/ship/beige_carpet,
 /area/nsv/weapons/port)
 "tr" = (
-/obj/structure/sign/solgov_seal{
-	pixel_y = 26
-	},
-/obj/machinery/dna_scannernew,
-/obj/machinery/light{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/blue/flat_side{
-	dir = 6
-	},
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
 "ts" = (
@@ -8582,9 +8583,8 @@
 /turf/open/floor/circuit,
 /area/space)
 "tK" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-8"
-	},
+/obj/structure/table/glass/plasma,
+/obj/item/clothing/glasses/science,
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/science/lab)
 "tL" = (
@@ -8961,12 +8961,6 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/turret_protected/ai)
-"uz" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
-	},
-/turf/open/floor/carpet/ship/purple_carpet,
-/area/science/lab)
 "uA" = (
 /obj/structure/table/reinforced,
 /obj/machinery/microwave,
@@ -9511,11 +9505,6 @@
 	},
 /turf/open/floor/durasteel/techfloor_grid,
 /area/engine/gravity_generator)
-"vL" = (
-/obj/structure/table/glass/plasma,
-/obj/item/clothing/glasses/science,
-/turf/open/floor/carpet/ship/purple_carpet,
-/area/science/lab)
 "vM" = (
 /obj/machinery/computer/squad_manager{
 	dir = 1
@@ -10171,8 +10160,8 @@
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/science/lab)
 "xp" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
 	},
 /turf/open/floor/carpet/ship/red_carpet,
 /area/security/detectives_office)
@@ -12957,6 +12946,19 @@
 	},
 /turf/open/floor/carpet/ship/beige_carpet,
 /area/nsv/weapons/port)
+"DL" = (
+/obj/structure/sign/solgov_seal{
+	pixel_y = 26
+	},
+/obj/machinery/dna_scannernew,
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue/flat_side{
+	dir = 6
+	},
+/turf/open/floor/monotile/light,
+/area/medical/medbay)
 "DM" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
@@ -13437,6 +13439,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
 "EM" = (
@@ -16198,6 +16203,7 @@
 /turf/open/floor/carpet/ship/red_carpet,
 /area/ai_monitored/security/armory)
 "Lh" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /turf/open/floor/monotile/light,
 /area/crew_quarters/heads/cmo)
 "Li" = (
@@ -16801,27 +16807,15 @@
 /turf/open/floor/carpet/ship,
 /area/tcommsat/computer)
 "MD" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/structure/table/glass,
-/obj/item/storage/box/monkeycubes{
-	pixel_x = 4;
-	pixel_y = 4
-	},
-/obj/item/reagent_containers/glass/beaker,
-/obj/item/storage/box/pillbottles{
-	pixel_x = 4;
-	pixel_y = 8
-	},
-/obj/item/storage/box/rxglasses{
-	pixel_y = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 1
 	},
-/obj/item/storage/box/disks{
-	pixel_x = -4
+/obj/machinery/door/airlock/ship/station{
+	name = "Metahuman Research";
+	req_one_access_txt = "7;9;29;47"
 	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
 	},
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
@@ -17245,6 +17239,9 @@
 /area/ai_monitored/turret_protected/aisat_interior)
 "Ny" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
 "Nz" = (
@@ -18913,8 +18910,8 @@
 /turf/open/floor/engine/light,
 /area/tcommsat/server)
 "Rf" = (
-/obj/structure/cable/yellow{
-	icon_state = "2-4"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
 	},
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/science/lab)
@@ -21462,6 +21459,25 @@
 /turf/open/floor/carpet/ship,
 /area/hallway/upper/primary/starboard)
 "WN" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/structure/table/glass,
+/obj/item/storage/box/monkeycubes{
+	pixel_x = 4;
+	pixel_y = 4
+	},
+/obj/item/reagent_containers/glass/beaker,
+/obj/item/storage/box/pillbottles{
+	pixel_x = 4;
+	pixel_y = 8
+	},
+/obj/item/storage/box/rxglasses{
+	pixel_y = 4
+	},
+/obj/item/storage/box/disks{
+	pixel_x = -4
+	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
@@ -37593,7 +37609,7 @@ KZ
 Qq
 lx
 jS
-vL
+tK
 kU
 VQ
 pK
@@ -37797,7 +37813,7 @@ lx
 MG
 mg
 zN
-uz
+Rf
 PZ
 aK
 IK
@@ -38201,7 +38217,7 @@ wX
 Tq
 EJ
 zN
-Rf
+bj
 En
 vf
 Za
@@ -38403,7 +38419,7 @@ QB
 Om
 RU
 zN
-mJ
+pw
 WL
 vq
 Sa
@@ -38605,7 +38621,7 @@ eS
 wN
 NJ
 aS
-tK
+rF
 IN
 je
 XT
@@ -40401,7 +40417,7 @@ tw
 dd
 kH
 wJ
-MD
+WN
 xf
 kA
 hz
@@ -41007,11 +41023,11 @@ xk
 sZ
 dd
 dd
+DL
+fV
 tr
-WN
-cG
 Ny
-rF
+MD
 gJ
 Ni
 yN
@@ -47078,8 +47094,8 @@ AD
 Fn
 nw
 AG
-pw
 xp
+pO
 Cc
 QO
 pS