diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm
index e3e0266c1820..1b0d709cb52e 100644
--- a/_maps/map_files220/cyberiad/cyberiad.dmm
+++ b/_maps/map_files220/cyberiad/cyberiad.dmm
@@ -33533,6 +33533,7 @@
 	layer = 2
 	},
 /obj/machinery/light/directional/north,
+/obj/machinery/atmospherics/portable/scrubber,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "yellow"
@@ -33546,6 +33547,7 @@
 	layer = 2
 	},
 /obj/machinery/light/directional/north,
+/obj/machinery/atmospherics/portable/pump,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "yellow"
@@ -33787,12 +33789,12 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/aft)
 "cGr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 9
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/visible{
+	dir = 9
+	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/aft)
 "cGs" = (
@@ -33905,6 +33907,7 @@
 	layer = 2
 	},
 /obj/machinery/ai_status_display/north,
+/obj/machinery/atmospherics/portable/pump,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "yellow"
@@ -34328,12 +34331,10 @@
 	},
 /area/station/engineering/hallway)
 "cHU" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold/visible,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/aft)
 "cHW" = (
@@ -37784,7 +37785,6 @@
 	},
 /area/station/engineering/atmos/control)
 "cTG" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -37794,6 +37794,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "yellowcorner"
@@ -43651,6 +43654,26 @@
 /obj/item/lighter/zippo/nt_rep,
 /turf/simulated/floor/carpet/royalblack,
 /area/station/command/office/ntrep)
+"dpr" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/unary/portables_connector{
+	layer = 2
+	},
+/obj/machinery/atmospherics/portable/pump,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/effect/decal/warning_stripes/yellow/hollow,
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "yellow"
+	},
+/area/station/engineering/atmos)
 "dpu" = (
 /obj/structure/rack,
 /obj/item/storage/box/donkpockets{
@@ -46944,6 +46967,19 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/security/brig)
+"ekD" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/item/kirbyplants,
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "yellow"
+	},
+/area/station/engineering/atmos)
 "ekQ" = (
 /obj/machinery/atmospherics/portable/canister/toxins,
 /obj/effect/decal/cleanable/dirt,
@@ -53935,6 +53971,14 @@
 /obj/machinery/light_construct/small/south,
 /turf/simulated/floor/plating,
 /area/station/maintenance/fsmaint)
+"gPm" = (
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+	dir = 9
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "yellow"
+	},
+/area/station/engineering/atmos)
 "gPM" = (
 /obj/structure/chair{
 	dir = 1
@@ -58254,6 +58298,7 @@
 	layer = 2
 	},
 /obj/machinery/status_display/directional/north,
+/obj/machinery/atmospherics/portable/scrubber,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "yellow"
@@ -58720,6 +58765,12 @@
 	icon_state = "freezerfloor"
 	},
 /area/station/public/toilet/lockerroom)
+"iDh" = (
+/obj/machinery/atmospherics/unary/thermomachine/heater{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel,
+/area/station/engineering/atmos)
 "iDk" = (
 /obj/machinery/airlock_controller/air_cycler{
 	ext_button_link_id = "secmaint_btn_ext";
@@ -60367,6 +60418,17 @@
 /obj/effect/decal/cleanable/ash,
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
+"jjy" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/binary/pump{
+	dir = 4;
+	target_pressure = 303;
+	name = "Air to connector"
+	},
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/aft)
 "jjD" = (
 /obj/structure/grille,
 /obj/structure/barricade/wooden{
@@ -60406,14 +60468,6 @@
 	icon_state = "whitegreen"
 	},
 /area/station/medical/medbay2)
-"jkZ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal,
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
-	},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/aft)
 "jlt" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/wire_splicing/thirty,
@@ -81015,6 +81069,26 @@
 	},
 /turf/simulated/floor/wood/fancy/oak,
 /area/station/command/meeting_room)
+"qNE" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/unary/portables_connector{
+	layer = 2
+	},
+/obj/machinery/atmospherics/portable/scrubber,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes/yellow/hollow,
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "yellow"
+	},
+/area/station/engineering/atmos)
 "qNM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel{
@@ -84280,6 +84354,18 @@
 	icon_state = "yellow"
 	},
 /area/station/hallway/primary/aft)
+"sim" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "yellowcorner"
+	},
+/area/station/hallway/primary/aft)
 "sir" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/chair{
@@ -89159,7 +89245,6 @@
 /area/station/medical/reception)
 "tTj" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
@@ -89169,6 +89254,9 @@
 	name = "Eng Chief Engineer's Office";
 	sort_type_txt = "5"
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/aft)
 "tTz" = (
@@ -90481,6 +90569,12 @@
 	icon_state = "arrival"
 	},
 /area/station/hallway/secondary/entry)
+"urL" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel,
+/area/station/engineering/atmos)
 "urU" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1;
@@ -130245,7 +130339,7 @@ cnA
 ciN
 csC
 cDA
-ecs
+sim
 ecs
 cHO
 dAq
@@ -130502,7 +130596,7 @@ chc
 chc
 chc
 cGJ
-cGq
+jjy
 cGq
 cHM
 dAq
@@ -130760,7 +130854,7 @@ dot
 chc
 cGN
 cHU
-jkZ
+cGs
 cTG
 cLM
 cUk
@@ -130798,7 +130892,7 @@ fXt
 deJ
 cSd
 dfF
-cSd
+iDh
 ufc
 nVh
 pMy
@@ -131055,7 +131149,7 @@ enG
 deI
 cSd
 cUQ
-dgg
+urL
 bAO
 wQr
 cXW
@@ -131310,7 +131404,7 @@ esG
 tDn
 uBJ
 sPg
-dgg
+yiy
 dfB
 fFY
 dec
@@ -131567,7 +131661,7 @@ qmX
 giQ
 rWB
 fwZ
-cSd
+dfF
 ehE
 dsx
 dqv
@@ -131824,7 +131918,7 @@ qmX
 nrS
 ctj
 deJ
-cSd
+dfF
 rHu
 cJD
 cJD
@@ -132081,7 +132175,7 @@ cGK
 cGK
 iEE
 deJ
-cSd
+dfF
 eLk
 mrw
 esT
@@ -132336,9 +132430,9 @@ euu
 rlm
 pUZ
 qmX
-dgI
-deJ
-dop
+dpr
+sPg
+gPm
 gru
 oWM
 dfF
@@ -132593,7 +132687,7 @@ cTA
 dmk
 cUo
 qmX
-dgI
+ekD
 deJ
 dop
 gru
@@ -132850,8 +132944,8 @@ cOW
 oDa
 fbT
 qmX
-dgI
-deJ
+qNE
+deI
 dop
 gru
 oWM