diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
index 94e564a1a42..eb56b6746b1 100644
--- a/_maps/map_files/stations/boxstation.dmm
+++ b/_maps/map_files/stations/boxstation.dmm
@@ -31407,12 +31407,12 @@
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "cqj" = (
-/obj/machinery/atmospherics/portable/pump,
 /obj/machinery/atmospherics/unary/portables_connector{
 	name = "Portable Air Pump Connector";
 	dir = 4
 	},
 /obj/effect/turf_decal/tiles/department/medical,
+/obj/machinery/atmospherics/portable/pump/empty,
 /turf/simulated/floor/plasteel,
 /area/station/science/toxins/mixing)
 "cqk" = (
@@ -31975,10 +31975,11 @@
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "csr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 4
-	},
 /obj/effect/turf_decal/tiles/department/science/side,
+/obj/machinery/atmospherics/binary/valve{
+	dir = 4;
+	name = "Distro to Air Pump"
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "csw" = (
@@ -32689,11 +32690,11 @@
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "cvb" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/purple,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tiles/department/science/side{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/manifold/visible/purple,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "cvf" = (
@@ -49912,11 +49913,11 @@
 /turf/simulated/floor/plasteel/dark,
 /area/station/hallway/secondary/entry/north)
 "fMa" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tiles/department/science/side{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/manifold/visible/cyan,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "fMi" = (
@@ -50843,7 +50844,7 @@
 /area/station/maintenance/aft)
 "gkx" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/purple{
+/obj/machinery/atmospherics/pipe/simple/visible/purple{
 	dir = 5
 	},
 /turf/simulated/floor/plasteel/white,
@@ -52685,7 +52686,7 @@
 /turf/simulated/floor/plasteel/dark,
 /area/station/security/brig)
 "hhf" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/purple{
+/obj/machinery/atmospherics/pipe/simple/visible/purple{
 	dir = 10
 	},
 /turf/simulated/floor/plasteel/white,
@@ -53111,12 +53112,12 @@
 /turf/simulated/floor/wood,
 /area/station/maintenance/apmaint2)
 "hsQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal{
-	dir = 4
-	},
 /obj/effect/turf_decal/tiles/department/science/corner{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/visible/universal{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "htR" = (
@@ -55682,13 +55683,13 @@
 	dir = 4;
 	network = list("Research","SS13")
 	},
-/obj/machinery/atmospherics/portable/pump,
 /obj/machinery/atmospherics/unary/portables_connector{
 	name = "Portable Air Pump Connector";
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tiles/department/medical,
+/obj/machinery/atmospherics/portable/pump/empty,
 /turf/simulated/floor/plasteel,
 /area/station/science/toxins/mixing)
 "iJi" = (
@@ -71901,13 +71902,13 @@
 /turf/simulated/floor/plasteel,
 /area/station/engineering/hardsuitstorage)
 "qAE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 10
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tiles/department/science/side{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+	dir = 10
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "qAH" = (
@@ -83891,7 +83892,7 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint2)
 "wCw" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+/obj/machinery/atmospherics/pipe/simple/visible/universal{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel/white,
@@ -86793,12 +86794,12 @@
 /turf/simulated/floor/plating,
 /area/station/engineering/control)
 "xWg" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/purple{
-	dir = 10
-	},
 /obj/effect/turf_decal/tiles/department/science/side{
 	dir = 9
 	},
+/obj/machinery/atmospherics/pipe/simple/visible/purple{
+	dir = 10
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "xWj" = (
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
index 396b16d82a5..19d64781f6c 100644
--- a/_maps/map_files/stations/cerestation.dmm
+++ b/_maps/map_files/stations/cerestation.dmm
@@ -2099,12 +2099,12 @@
 /turf/simulated/floor/plating,
 /area/station/turret_protected/aisat/interior/secondary)
 "aqh" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/purple{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/visible/purple{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "aqk" = (
@@ -67039,7 +67039,7 @@
 /turf/simulated/floor/plasteel,
 /area/station/public/dorms)
 "nxf" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+/obj/machinery/atmospherics/pipe/simple/visible/universal{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel/white,
@@ -92092,10 +92092,10 @@
 	dir = 8;
 	name = "Portable Air Pump Connector"
 	},
-/obj/machinery/atmospherics/portable/pump,
 /obj/effect/turf_decal/tiles/department/science/side{
 	dir = 4
 	},
+/obj/machinery/atmospherics/portable/pump/empty,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "tbC" = (
@@ -108071,12 +108071,13 @@
 	},
 /area/station/public/quantum/docking)
 "wzE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 8
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/binary/valve{
+	dir = 4;
+	name = "Distro to Air Pump"
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "wzF" = (
diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
index b7f4b96a32d..2e302615fa5 100644
--- a/_maps/map_files/stations/emeraldstation.dmm
+++ b/_maps/map_files/stations/emeraldstation.dmm
@@ -17255,11 +17255,11 @@
 /turf/simulated/floor/plasteel,
 /area/station/service/janitor)
 "dxG" = (
-/obj/machinery/atmospherics/portable/pump,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
 /obj/effect/turf_decal/tiles/department/science/side,
+/obj/machinery/atmospherics/portable/pump/empty,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "dxH" = (
@@ -90472,7 +90472,6 @@
 /turf/simulated/floor/plating,
 /area/station/medical/patients_rooms_secondary)
 "sgN" = (
-/obj/machinery/atmospherics/portable/pump,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
@@ -90480,6 +90479,7 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/machinery/atmospherics/portable/pump/empty,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/storage)
 "sgP" = (
diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
index f47f6ad26a3..f8b232fcbda 100644
--- a/_maps/map_files/stations/metastation.dmm
+++ b/_maps/map_files/stations/metastation.dmm
@@ -29485,14 +29485,14 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/solar_maintenance/aft_starboard)
 "ddG" = (
-/obj/machinery/atmospherics/unary/portables_connector{
-	name = "Portable Air Pump Connector";
-	dir = 8
-	},
-/obj/machinery/atmospherics/portable/pump,
 /obj/effect/turf_decal/tiles/department/science/side{
 	dir = 6
 	},
+/obj/machinery/atmospherics/unary/portables_connector{
+	dir = 8;
+	name = "Portable Scrubber Connector"
+	},
+/obj/machinery/atmospherics/portable/scrubber,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "ddQ" = (
@@ -36240,14 +36240,14 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/starboard)
 "foV" = (
-/obj/machinery/atmospherics/unary/portables_connector{
-	dir = 8;
-	name = "Portable Scrubber Connector"
-	},
-/obj/machinery/atmospherics/portable/scrubber,
 /obj/effect/turf_decal/tiles/department/science/side{
 	dir = 4
 	},
+/obj/machinery/atmospherics/unary/portables_connector{
+	name = "Portable Air Pump Connector";
+	dir = 8
+	},
+/obj/machinery/atmospherics/portable/pump/empty,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "fpl" = (
@@ -40428,6 +40428,13 @@
 /obj/effect/spawner/random/dirt/frequent,
 /turf/simulated/floor/plating,
 /area/station/maintenance/abandonedservers)
+"gPo" = (
+/obj/effect/turf_decal/tiles/department/science/side{
+	dir = 8
+	},
+/obj/structure/closet/bombcloset,
+/turf/simulated/floor/plasteel/white,
+/area/station/science/toxins/mixing)
 "gPU" = (
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -47637,10 +47644,10 @@
 /turf/simulated/floor/plasteel/dark,
 /area/station/science/toxins/launch)
 "jwi" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+/obj/effect/turf_decal/tiles/department/science/side,
+/obj/machinery/atmospherics/pipe/simple/visible/purple{
 	dir = 5
 	},
-/obj/effect/turf_decal/tiles/department/science/side,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "jwo" = (
@@ -49091,16 +49098,16 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/apmaint)
 "jSe" = (
-/obj/machinery/atmospherics/unary/portables_connector{
-	dir = 8;
-	name = "Portable Scrubber Connector"
-	},
-/obj/machinery/atmospherics/portable/scrubber,
 /obj/effect/spawner/random/cobweb/right/rare,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tiles/department/science/side{
 	dir = 5
 	},
+/obj/machinery/atmospherics/unary/portables_connector{
+	name = "Portable Air Pump Connector";
+	dir = 8
+	},
+/obj/machinery/atmospherics/portable/pump/empty,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "jSo" = (
@@ -49831,7 +49838,6 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft)
 "keu" = (
-/obj/structure/closet/firecloset/full,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light{
 	dir = 1
@@ -49839,6 +49845,10 @@
 /obj/effect/turf_decal/tiles/department/science/side{
 	dir = 1
 	},
+/obj/machinery/atmospherics/binary/valve{
+	dir = 4;
+	name = "Distro to Air Pump"
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "kez" = (
@@ -67142,17 +67152,17 @@
 /turf/simulated/floor/plasteel/dark,
 /area/station/engineering/ai_transit_tube)
 "qkD" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 4
-	},
 /obj/structure/disposalpipe/segment/corner,
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
 /obj/machinery/hologram/holopad,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "qkK" = (
@@ -73138,14 +73148,14 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/abandonedbar)
 "stj" = (
-/obj/machinery/atmospherics/unary/portables_connector{
-	name = "Portable Air Pump Connector";
-	dir = 8
-	},
-/obj/machinery/atmospherics/portable/pump,
 /obj/effect/turf_decal/tiles/department/science/side{
 	dir = 4
 	},
+/obj/machinery/atmospherics/unary/portables_connector{
+	dir = 8;
+	name = "Portable Scrubber Connector"
+	},
+/obj/machinery/atmospherics/portable/scrubber,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "stW" = (
@@ -74154,7 +74164,7 @@
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/medbay)
 "sMf" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+/obj/machinery/atmospherics/pipe/manifold/visible/purple{
 	dir = 1
 	},
 /turf/simulated/floor/plasteel/white,
@@ -77619,12 +77629,12 @@
 /turf/simulated/floor/plasteel/dark,
 /area/station/security/armory/secure)
 "ubf" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/purple{
-	dir = 6
-	},
 /obj/effect/turf_decal/tiles/department/science/side{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
+	dir = 1
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "ubu" = (
@@ -83605,6 +83615,7 @@
 /obj/effect/turf_decal/tiles/department/science/side{
 	dir = 8
 	},
+/obj/structure/closet/l3closet/scientist,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "whI" = (
@@ -84803,7 +84814,9 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/central/ne)
 "wBV" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/purple,
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+	dir = 5
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "wBW" = (
@@ -87218,10 +87231,8 @@
 /turf/simulated/floor/plating,
 /area/station/engineering/break_room)
 "xrA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/visible/universal,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "xrD" = (
@@ -88103,7 +88114,7 @@
 /turf/simulated/floor/plasteel/dark,
 /area/station/security/execution)
 "xIl" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+/obj/machinery/atmospherics/pipe/simple/visible/universal{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel/white,
@@ -89315,11 +89326,13 @@
 /turf/space,
 /area/space/nearstation)
 "yed" = (
-/obj/structure/closet/bombcloset,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tiles/department/science/side{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+	dir = 6
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "yee" = (
@@ -89390,11 +89403,11 @@
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "yeU" = (
-/obj/structure/closet/l3closet/scientist,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tiles/department/science/side{
 	dir = 9
 	},
+/obj/structure/closet/firecloset/full,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "yeW" = (
@@ -123258,7 +123271,7 @@ fyt
 ikU
 xCY
 lhF
-whx
+gPo
 whx
 rOc
 gUo
@@ -123766,7 +123779,7 @@ qEh
 aAO
 bdN
 keu
-xIl
+kgx
 xIl
 rgX
 wtQ