From c860cc78df54a14e4947adff160b996ea4f52b7b Mon Sep 17 00:00:00 2001
From: MrJWhit <48370570+MrJWhit@users.noreply.github.com>
Date: Sun, 25 Oct 2020 09:15:01 -0400
Subject: [PATCH] Giving science a space loop on every map (#13611)

* Boxstation Fix

* DeltaStation and Boxstation Update

* Kilo fix and minor omegastation fix

* Lambda fixing

* Metastation update

* Second to last update

* Pubby and final touches
---
 _maps/map_files/BoxStation/BoxStation.dmm     | 179 ++++++++---
 .../map_files/Deltastation/DeltaStation2.dmm  | 179 +++++++----
 _maps/map_files/KiloStation/KiloStation.dmm   | 177 +++++++++--
 _maps/map_files/LambdaStation/lambda.dmm      | 264 ++++++++++++-----
 _maps/map_files/MetaStation/MetaStation.dmm   | 269 ++++++++++++-----
 _maps/map_files/OmegaStation/OmegaStation.dmm | 280 ++++++++++++++----
 _maps/map_files/PubbyStation/PubbyStation.dmm | 213 ++++++++-----
 7 files changed, 1141 insertions(+), 420 deletions(-)

diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index ce5539cee7..dfae5e0ad7 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -9502,6 +9502,9 @@
 	name = "Medbay";
 	req_access_txt = "5"
 	},
+/obj/effect/mapping_helpers/airlock/unres{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "asV" = (
@@ -9529,6 +9532,9 @@
 	name = "Medbay";
 	req_access_txt = "5"
 	},
+/obj/effect/mapping_helpers/airlock/unres{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "asY" = (
@@ -26752,7 +26758,6 @@
 /obj/structure/sign/warning/vacuum/external{
 	pixel_y = 32
 	},
-/obj/item/cigbutt,
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "blS" = (
@@ -28539,8 +28544,9 @@
 /turf/open/floor/plasteel/white,
 /area/science/lab)
 "bqg" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/atmospherics/components/binary/valve{
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "bqh" = (
@@ -29181,18 +29187,16 @@
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "brH" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 6
-	},
+/obj/item/cigbutt/cigarbutt,
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "brI" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 8
-	},
 /obj/machinery/light/small{
 	dir = 4
 	},
+/obj/machinery/atmospherics/components/binary/valve{
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "brJ" = (
@@ -29840,15 +29844,17 @@
 /turf/open/floor/plasteel/white,
 /area/medical/genetics)
 "btp" = (
+/obj/item/cigbutt,
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "btq" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 2;
-	name = "2maintenance loot spawner"
+/obj/machinery/atmospherics/components/binary/pump/on{
+	dir = 1;
+	name = "Space Loop Out"
+	},
+/turf/open/floor/plating{
+	icon_state = "platingdmg1"
 	},
-/turf/open/floor/plating,
 /area/maintenance/starboard)
 "btr" = (
 /obj/machinery/camera{
@@ -30971,15 +30977,13 @@
 /turf/open/floor/plasteel/white,
 /area/science/explab)
 "bvQ" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible{
-	dir = 8
-	},
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "bvR" = (
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
-	dir = 8
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 1
 	},
+/obj/effect/decal/cleanable/oil,
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "bvS" = (
@@ -31632,11 +31636,12 @@
 /turf/open/floor/plasteel/white,
 /area/science/explab)
 "bxt" = (
-/obj/machinery/meter,
-/obj/machinery/atmospherics/pipe/simple/general/visible,
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 6
+	},
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "bxu" = (
@@ -42935,6 +42940,9 @@
 /area/science/circuit)
 "bZi" = (
 /obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "bZj" = (
@@ -52756,6 +52764,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/components/binary/valve{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "cNS" = (
@@ -52768,15 +52779,19 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "cNT" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible{
-	dir = 8
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
+	dir = 8
+	},
+/obj/machinery/meter,
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "cNU" = (
@@ -54024,6 +54039,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/security/processing)
+"eXL" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 10
+	},
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "fbp" = (
 /obj/structure/tank_dispenser,
 /obj/effect/turf_decal/bot,
@@ -55608,6 +55630,13 @@
 	},
 /turf/open/space,
 /area/solar/starboard/fore)
+"jIy" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 6
+	},
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "jJF" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/structure/cable{
@@ -55780,6 +55809,11 @@
 	},
 /turf/closed/wall/r_wall,
 /area/engine/engine_smes)
+"kgk" = (
+/turf/open/floor/plating{
+	icon_state = "panelscorched"
+	},
+/area/maintenance/starboard)
 "kgr" = (
 /obj/machinery/light/small{
 	brightness = 3;
@@ -56930,6 +56964,13 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
+"nJP" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 5
+	},
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "nJQ" = (
 /obj/structure/lattice,
 /obj/machinery/atmospherics/pipe/simple/dark/visible,
@@ -57305,6 +57346,12 @@
 	},
 /turf/open/floor/carpet,
 /area/crew_quarters/dorms)
+"oBQ" = (
+/obj/machinery/atmospherics/components/binary/pump/on{
+	name = "Space Loop In"
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard)
 "oDm" = (
 /obj/machinery/gulag_teleporter,
 /turf/open/floor/plasteel,
@@ -57842,6 +57889,13 @@
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/crew_quarters/toilet)
+"qtH" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "qus" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
@@ -57956,6 +58010,13 @@
 /obj/structure/chair/sofa/left,
 /turf/open/floor/plasteel,
 /area/security/prison)
+"qXJ" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 9
+	},
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "rcD" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -59468,6 +59529,11 @@
 	},
 /turf/open/floor/plating,
 /area/security/range)
+"vdo" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "vdu" = (
 /obj/structure/table/wood,
 /obj/machinery/airalarm{
@@ -59980,6 +60046,15 @@
 /obj/item/instrument/recorder,
 /turf/open/floor/plating,
 /area/maintenance/fore)
+"wkc" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard)
 "wkN" = (
 /turf/closed/wall,
 /area/science/circuit)
@@ -60041,6 +60116,14 @@
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/dorms)
+"wqW" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 1
+	},
+/turf/open/floor/plating{
+	icon_state = "platingdmg1"
+	},
+/area/maintenance/starboard)
 "wrp" = (
 /obj/machinery/light{
 	dir = 8
@@ -93272,9 +93355,9 @@ aZV
 aZV
 aZV
 aZV
-bmx
-bmx
-bmx
+aZV
+aZV
+aZV
 bqH
 bqH
 btM
@@ -112032,14 +112115,14 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+gXs
+jIy
+nJP
+jIy
+nJP
+gXs
 bky
-btp
+kgk
 brH
 bvQ
 bxt
@@ -112290,15 +112373,15 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+qtH
+eXL
+qXJ
+eXL
+vdo
 bZi
 bqg
-brG
-brG
+oBQ
+wqW
 cNR
 brG
 brG
@@ -112547,18 +112630,18 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+eXL
+vdo
+vdo
+vdo
+vdo
 bZi
 btq
 brI
 bvR
 cNS
 byx
-brI
+wkc
 bky
 bky
 bEs
@@ -112808,7 +112891,7 @@ aaa
 aaa
 aaa
 aaa
-aaa
+gXs
 bky
 bky
 bky
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 943aa85efd..127b8b2241 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -110277,9 +110277,6 @@
 /turf/open/floor/plasteel/airless/solarpanel,
 /area/solar/starboard/aft)
 "dFz" = (
-/obj/structure/chair/office/dark{
-	dir = 8
-	},
 /obj/item/radio/intercom{
 	name = "Station Intercom";
 	pixel_x = -26;
@@ -110288,12 +110285,19 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/obj/machinery/computer/security/telescreen/toxins{
+	dir = 4
+	},
+/obj/structure/table/reinforced,
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "dFA" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/obj/structure/chair/office/dark{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "dFB" = (
@@ -110311,25 +110315,28 @@
 	network = list("ss13","rd")
 	},
 /obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "dFC" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
-	},
-/turf/open/floor/plasteel,
-/area/science/mixing)
-"dFD" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/machinery/light{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 5
 	},
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/science/mixing)
+"dFD" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/components/binary/pump/on{
+	name = "Space Loop Out";
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/science/mixing)
 "dFE" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
 /obj/machinery/newscaster{
 	pixel_y = 32
 	},
@@ -110337,9 +110344,10 @@
 	dir = 8;
 	pixel_x = 24
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 8
 	},
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "dFF" = (
@@ -111237,20 +111245,16 @@
 /turf/open/floor/plating,
 /area/science/test_area)
 "dGY" = (
-/obj/structure/table/reinforced,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/obj/machinery/computer/security/telescreen/toxins{
-	dir = 4
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 8
 	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "dGZ" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "dHa" = (
@@ -111267,9 +111271,6 @@
 	},
 /area/science/mixing)
 "dHb" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 5
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -111279,22 +111280,7 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
-"dHc" = (
-/obj/machinery/atmospherics/components/trinary/filter{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/science/mixing)
 "dHd" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 9
-	},
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -111995,16 +111981,12 @@
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "dIk" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "dIl" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 5
 	},
-/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "dIm" = (
@@ -112012,14 +111994,12 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "dIn" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "dIo" = (
@@ -112030,7 +112010,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "dIp" = (
@@ -112918,6 +112897,9 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "dJM" = (
@@ -112930,6 +112912,9 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "dJN" = (
@@ -112938,6 +112923,9 @@
 	},
 /obj/effect/turf_decal/bot,
 /obj/machinery/suit_storage_unit/rd,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "dJO" = (
@@ -112950,6 +112938,9 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "dJP" = (
@@ -125274,6 +125265,12 @@
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel,
 /area/hydroponics/garden/abandoned)
+"esD" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/turf/open/space/basic,
+/area/space/nearstation)
 "etO" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -125737,6 +125734,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/security/prison)
+"hLf" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/science/mixing)
 "hNZ" = (
 /obj/structure/chair/office/light{
 	dir = 8
@@ -125956,6 +125960,12 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/research)
+"jdR" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 5
+	},
+/turf/open/space/basic,
+/area/space/nearstation)
 "jeu" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -126547,6 +126557,13 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/engine/gravity_generator)
+"mtj" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/science/mixing)
 "mvm" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -126642,6 +126659,17 @@
 /obj/machinery/vending/kink,
 /turf/open/floor/plating,
 /area/crew_quarters/abandoned_gambling_den)
+"nMo" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 6
+	},
+/turf/open/space/basic,
+/area/space/nearstation)
+"nNN" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/space,
+/area/space/nearstation)
 "nOz" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -126911,6 +126939,13 @@
 	},
 /turf/open/floor/plating,
 /area/science/research/abandoned)
+"pwx" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/turf/open/space,
+/area/space/nearstation)
 "pxR" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
@@ -127233,6 +127268,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness/recreation)
+"tzM" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 10
+	},
+/turf/open/space,
+/area/space/nearstation)
 "tCh" = (
 /turf/closed/wall,
 /area/science/misc_lab)
@@ -127712,6 +127754,13 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/mixing)
+"xmL" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 9
+	},
+/turf/open/space,
+/area/space/nearstation)
 "xok" = (
 /obj/machinery/light{
 	dir = 1
@@ -155077,8 +155126,8 @@ dmy
 dAt
 djs
 dhQ
-aad
-aaa
+atI
+jdR
 aaa
 aaa
 aad
@@ -155334,8 +155383,8 @@ dAt
 dBX
 dDl
 dhQ
-aad
-aad
+pwx
+pwx
 aad
 aad
 abj
@@ -155591,8 +155640,8 @@ dhQ
 dhQ
 dhQ
 dhQ
-aad
-aaa
+pwx
+esD
 aaa
 aaa
 aad
@@ -155846,10 +155895,10 @@ djw
 fRT
 dAu
 caE
-aaa
-aad
-aad
-aad
+nMo
+nNN
+xmL
+pwx
 aad
 aad
 abj
@@ -156103,10 +156152,10 @@ drH
 dzn
 cLt
 caE
-aad
+pwx
 drP
 dEn
-dEn
+hLf
 drP
 dEn
 drP
@@ -156360,7 +156409,7 @@ djA
 cJT
 cLx
 cOj
-aaa
+esD
 dEn
 dFz
 dGY
@@ -156617,7 +156666,7 @@ djA
 cJS
 cLu
 cOj
-aad
+pwx
 dEn
 dFA
 dGZ
@@ -156874,7 +156923,7 @@ djA
 dzo
 cLt
 caE
-aaa
+esD
 drP
 dFB
 dHa
@@ -157131,8 +157180,8 @@ djA
 dzp
 cLy
 cOj
-aad
-dEn
+tzM
+mtj
 dFC
 dHb
 dIm
@@ -157391,7 +157440,7 @@ cOj
 aaa
 dEn
 dFD
-dHc
+dHd
 dIn
 dJN
 dEn
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 51bfe5038e..ffa75eb200 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -27414,10 +27414,8 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 8
-	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating{
 	icon_state = "platingdmg1"
 	},
@@ -27448,11 +27446,10 @@
 /turf/open/floor/plasteel/showroomfloor,
 /area/medical/medbay/central)
 "aSZ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 4
+	},
 /turf/open/floor/plating{
 	icon_state = "panelscorched"
 	},
@@ -73372,6 +73369,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/blobstart,
 /turf/open/floor/plating{
 	icon_state = "panelscorched"
 	},
@@ -84288,7 +84286,9 @@
 /area/maintenance/starboard)
 "cOo" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/blobstart,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "cOx" = (
@@ -84748,6 +84748,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/atmos)
+"gwE" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 9
+	},
+/turf/open/space/basic,
+/area/space/nearstation)
 "gxY" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
@@ -84854,6 +84861,13 @@
 	},
 /turf/open/floor/engine,
 /area/science/xenobiology)
+"iPI" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/turf/open/space/basic,
+/area/space/nearstation)
 "iSg" = (
 /obj/effect/turf_decal/tile/neutral,
 /obj/effect/turf_decal/tile/neutral{
@@ -84863,6 +84877,13 @@
 /mob/living/simple_animal/hostile/retaliate/ghost,
 /turf/open/floor/plasteel/dark,
 /area/maintenance/starboard/fore)
+"iXU" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/binary/valve{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard)
 "iZo" = (
 /turf/closed/wall/r_wall/rust,
 /area/medical/virology)
@@ -85117,6 +85138,10 @@
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall,
 /area/maintenance/port/fore)
+"kWO" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/closed/wall,
+/area/maintenance/starboard)
 "kXo" = (
 /obj/structure/table/wood/poker,
 /obj/item/toy/cards/deck,
@@ -85128,6 +85153,10 @@
 	icon_state = "wood-broken4"
 	},
 /area/maintenance/port/fore)
+"lht" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/space/basic,
+/area/space/nearstation)
 "llm" = (
 /obj/structure/sign/poster/ripped,
 /turf/closed/wall,
@@ -85154,6 +85183,14 @@
 /obj/machinery/status_display/evac,
 /turf/closed/wall,
 /area/security/warden)
+"lVT" = (
+/obj/structure/lattice,
+/obj/structure/grille/broken,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 9
+	},
+/turf/open/space/basic,
+/area/space/nearstation)
 "mbs" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
 /obj/item/pickaxe,
@@ -85217,6 +85254,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/closed/mineral/random/labormineral,
 /area/space/nearstation)
+"nHl" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 10
+	},
+/turf/open/space/basic,
+/area/space/nearstation)
 "nJw" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
@@ -85274,6 +85317,12 @@
 /obj/structure/table/wood,
 /turf/open/floor/wood,
 /area/security/vacantoffice)
+"oXQ" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 6
+	},
+/turf/open/space/basic,
+/area/space/nearstation)
 "ppP" = (
 /turf/open/floor/wood{
 	icon_state = "wood-broken7"
@@ -85309,6 +85358,13 @@
 	},
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/prison)
+"qlK" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "qvS" = (
 /obj/machinery/navbeacon{
 	codes_txt = "patrol;next_patrol=W CPH";
@@ -85375,6 +85431,13 @@
 /mob/living/carbon/monkey,
 /turf/open/floor/grass,
 /area/medical/virology)
+"rnD" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 6
+	},
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "ruL" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable{
@@ -85382,6 +85445,20 @@
 	},
 /turf/open/floor/plating,
 /area/security/prison)
+"rvN" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard)
+"rwy" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 10
+	},
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "rNm" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/lattice/catwalk,
@@ -85416,12 +85493,28 @@
 /obj/structure/sign/warning,
 /turf/closed/wall/rust,
 /area/space/nearstation)
+"tog" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/space/basic,
+/area/space/nearstation)
 "tCi" = (
 /obj/effect/decal/cleanable/glass,
 /turf/open/floor/wood{
 	icon_state = "wood-broken3"
 	},
 /area/maintenance/port/fore)
+"tJC" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/atmospherics/components/binary/pump/on{
+	name = "Space Loop Out";
+	dir = 8
+	},
+/turf/open/floor/plating{
+	icon_state = "panelscorched"
+	},
+/area/maintenance/starboard)
 "uda" = (
 /turf/closed/wall/rust,
 /area/security/warden)
@@ -85430,6 +85523,13 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
+"uhv" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 5
+	},
+/turf/open/space/basic,
+/area/space/nearstation)
 "ukP" = (
 /obj/effect/decal/cleanable/dirt,
 /mob/living/simple_animal/bot/cleanbot{
@@ -85478,6 +85578,13 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/wood,
 /area/security/vacantoffice)
+"uOT" = (
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 9
+	},
+/turf/open/space/basic,
+/area/space/nearstation)
 "uRM" = (
 /turf/open/floor/wood,
 /area/security/vacantoffice)
@@ -85595,6 +85702,14 @@
 /obj/effect/turf_decal/tile/neutral,
 /turf/open/floor/plasteel/dark,
 /area/security/prison)
+"ygZ" = (
+/obj/structure/lattice,
+/obj/structure/grille/broken,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/turf/open/space/basic,
+/area/space/nearstation)
 "ykB" = (
 /obj/structure/chair/stool,
 /turf/open/floor/wood,
@@ -128901,9 +129016,9 @@ ava
 bkd
 bkd
 bkd
-avA
-avA
-bkd
+tJC
+iXU
+kWO
 bBX
 bkd
 cwC
@@ -129157,10 +129272,10 @@ avA
 bkd
 aeu
 aeu
-aeu
-acm
-aaa
-acm
+bkd
+rvN
+rvN
+bkd
 aaa
 bkd
 cwD
@@ -129415,8 +129530,8 @@ bkd
 aeu
 alm
 acm
-aaQ
-aeo
+iPI
+ygZ
 aeo
 acm
 bkd
@@ -129672,9 +129787,9 @@ bkd
 aeu
 aeU
 aaa
-acm
-aaa
-acm
+iPI
+rwy
+uhv
 aaa
 acm
 acK
@@ -129928,10 +130043,10 @@ aaa
 bhq
 aeu
 aUz
-aaa
-aaQ
-aaa
-acm
+oXQ
+lVT
+rnD
+gwE
 aaa
 acm
 aaa
@@ -130185,10 +130300,10 @@ aaa
 akA
 aeu
 aeU
-aaa
+qlK
 aeo
-aaa
-acm
+rwy
+uhv
 aaa
 acm
 aaa
@@ -130442,10 +130557,10 @@ aaa
 cko
 aeu
 aeu
-aeU
-acm
-aaa
-acK
+nHl
+tog
+lht
+uOT
 acm
 acK
 aaa
diff --git a/_maps/map_files/LambdaStation/lambda.dmm b/_maps/map_files/LambdaStation/lambda.dmm
index a0d54edb91..b87c755979 100644
--- a/_maps/map_files/LambdaStation/lambda.dmm
+++ b/_maps/map_files/LambdaStation/lambda.dmm
@@ -391,8 +391,12 @@
 /turf/open/space,
 /area/solar/port/fore)
 "abk" = (
-/turf/closed/wall/r_wall,
-/area/asteroid/nearstation)
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 6
+	},
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
 "abl" = (
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /obj/machinery/door/airlock/external{
@@ -720,9 +724,6 @@
 /obj/machinery/doppler_array/research/science{
 	dir = 1
 	},
-/obj/machinery/status_display/ai{
-	pixel_y = 32
-	},
 /obj/item/radio/intercom{
 	dir = 8;
 	pixel_x = -28
@@ -742,14 +743,17 @@
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "acf" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
-	},
 /obj/machinery/button/massdriver{
 	id = "toxinsdriver";
 	pixel_x = 24;
 	pixel_y = 24
 	},
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "acg" = (
@@ -1137,13 +1141,13 @@
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "adb" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
-	},
 /obj/machinery/airalarm{
 	dir = 1;
 	pixel_y = -22
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "adc" = (
@@ -1153,13 +1157,9 @@
 "add" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "ade" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
 /obj/machinery/light,
 /turf/open/floor/plasteel,
 /area/science/mixing)
@@ -4424,7 +4424,6 @@
 /turf/open/floor/plasteel,
 /area/science/robotics/lab)
 "ajC" = (
-/obj/effect/turf_decal/stripes/line,
 /obj/machinery/camera/autoname{
 	dir = 1
 	},
@@ -10504,6 +10503,10 @@
 "atH" = (
 /turf/closed/wall/r_wall,
 /area/science/server)
+"atI" = (
+/obj/machinery/atmospherics/pipe/simple/dark/visible,
+/turf/open/floor/plating/asteroid/airless,
+/area/asteroid/nearstation)
 "atJ" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 4
@@ -63631,10 +63634,26 @@
 	},
 /turf/open/space/basic,
 /area/solar/starboard/aft)
+"egV" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 9
+	},
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
 "ehl" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/medical/paramedic)
+"ehs" = (
+/obj/machinery/atmospherics/components/binary/valve{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/science/mixing)
 "eia" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 1
@@ -64004,6 +64023,12 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/aft)
+"eLb" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/science/mixing)
 "eMH" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -64435,6 +64460,9 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
+"fvD" = (
+/turf/open/floor/plasteel,
+/area/science/mixing)
 "fvI" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/binary/pump{
@@ -65459,6 +65487,15 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
+"hbf" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/maintenance/fore)
 "hbS" = (
 /obj/machinery/button/door{
 	id = "engstorage";
@@ -66197,6 +66234,13 @@
 	icon_state = "platingdmg2"
 	},
 /area/maintenance/aft)
+"iIs" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 5
+	},
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
 "iJd" = (
 /obj/structure/table/reinforced,
 /obj/machinery/light_switch{
@@ -66614,6 +66658,12 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/engine/atmos)
+"jwN" = (
+/obj/machinery/atmospherics/pipe/simple/dark/visible{
+	dir = 10
+	},
+/turf/open/floor/plating/asteroid/airless,
+/area/asteroid/nearstation)
 "jEf" = (
 /obj/effect/landmark/carpspawn,
 /turf/open/space/basic,
@@ -67109,6 +67159,11 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/heads/chief)
+"krP" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
 "krZ" = (
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -67214,6 +67269,15 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/secondary/command)
+"kFO" = (
+/obj/machinery/atmospherics/components/binary/valve{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/turf/open/floor/plasteel,
+/area/science/mixing)
 "kJN" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
 /obj/structure/table,
@@ -68138,6 +68202,15 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/fore)
+"mkV" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/science/mixing)
 "mmA" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
@@ -70166,6 +70239,13 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/electrical)
+"qPP" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+	dir = 1
+	},
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
 "qSJ" = (
 /obj/effect/turf_decal/delivery,
 /obj/structure/cable{
@@ -70410,6 +70490,13 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/cargo)
+"rsU" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 10
+	},
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
 "rtC" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
 	dir = 4
@@ -71613,6 +71700,12 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/plating,
 /area/maintenance/aft)
+"ucV" = (
+/obj/machinery/atmospherics/pipe/simple/dark/visible{
+	dir = 5
+	},
+/turf/open/floor/plating/asteroid/airless,
+/area/asteroid/nearstation)
 "ufs" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -72684,6 +72777,15 @@
 	},
 /turf/open/space,
 /area/space/nearstation)
+"wgn" = (
+/obj/machinery/atmospherics/components/binary/pump/on{
+	name = "Space Loop In"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/plasteel,
+/area/science/mixing)
 "wgU" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxins_mixing_output,
 /turf/open/floor/engine/vacuum,
@@ -72988,6 +73090,15 @@
 "wPh" = (
 /turf/closed/wall,
 /area/hallway/secondary/entry)
+"wPU" = (
+/obj/structure/chair/office/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/science/mixing)
 "wQP" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -73270,6 +73381,11 @@
 /obj/structure/lattice,
 /turf/open/space,
 /area/space/nearstation)
+"xzG" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/dark/visible,
+/turf/open/floor/plating,
+/area/science/mixing)
 "xAN" = (
 /turf/closed/wall,
 /area/maintenance/department/electrical)
@@ -99141,7 +99257,7 @@ aaA
 aaA
 aaA
 abY
-aUL
+hbf
 afP
 afB
 acw
@@ -100418,11 +100534,11 @@ aaA
 aaA
 aaA
 aaA
-abk
-abk
-abk
-abk
-abk
+aaQ
+aaQ
+aaQ
+aaQ
+aaQ
 aaA
 aaA
 abY
@@ -103763,8 +103879,8 @@ aAY
 aAY
 aAY
 aAY
-aAY
-aAY
+aaA
+aaA
 abJ
 acb
 acF
@@ -104009,20 +104125,20 @@ aab
 aab
 aab
 aab
-aab
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
+aaa
+aaa
+aaa
+abk
+krP
+krP
+krP
+qPP
+atI
+ucV
 aAY
 abK
+abK
+abJ
 acc
 acG
 adb
@@ -104268,19 +104384,19 @@ aab
 aab
 aab
 aaa
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-abK
-ace
+aaa
+rsU
+krP
+krP
+krP
+iIs
+aac
+jwN
+atI
+xzG
+kFO
+mkV
+eLb
 acH
 ajC
 abJ
@@ -104525,19 +104641,19 @@ aab
 aab
 aab
 aaa
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
+aac
+abk
+krP
+krP
+krP
+egV
+aac
 aAY
 aAY
 abK
-ace
+wPU
+fvD
+fvD
 acI
 add
 adv
@@ -104781,19 +104897,19 @@ aab
 aab
 aab
 aab
-aaa
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-aAY
-abK
+aac
+aac
+rsU
+krP
+krP
+krP
+qPP
+atI
+atI
+atI
+xzG
+wgn
+ehs
 acf
 adH
 ade
@@ -105048,8 +105164,8 @@ aaA
 aaA
 aaA
 aaA
-aaA
-aaA
+abJ
+abJ
 abJ
 abK
 abK
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 218044c6c2..64af02437d 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -76185,6 +76185,14 @@
 	},
 /turf/open/floor/plasteel,
 /area/construction/mining/aux_base)
+"cYI" = (
+/obj/machinery/camera{
+	c_tag = "Research Division Circuitry Lab";
+	dir = 1;
+	network = list("ss13","rd")
+	},
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
 "cYJ" = (
 /obj/docking_port/stationary{
 	dir = 2;
@@ -79847,12 +79855,12 @@
 /turf/open/floor/plating,
 /area/chapel/main)
 "dka" = (
-/obj/structure/noticeboard{
-	dir = 1;
-	pixel_y = -32
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 6
 	},
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
+/turf/open/space,
+/area/space/nearstation)
 "dlI" = (
 /turf/closed/wall/r_wall,
 /area/engine/supermatter)
@@ -81295,6 +81303,14 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/circuit)
+"etb" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 9
+	},
+/obj/structure/lattice,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "etr" = (
 /obj/machinery/vr_sleeper,
 /turf/open/floor/plasteel,
@@ -81335,6 +81351,11 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
+"faU" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/space/basic,
+/area/space/nearstation)
 "fdr" = (
 /obj/structure/closet/firecloset,
 /turf/open/floor/plating,
@@ -81515,6 +81536,11 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
+"idz" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "ioI" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -81532,6 +81558,12 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/cryopod)
+"izh" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
 "izu" = (
 /obj/machinery/autolathe{
 	name = "public autolathe"
@@ -81674,6 +81706,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/port)
+"jDS" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 9
+	},
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "jKK" = (
 /obj/machinery/door/airlock/external{
 	req_access_txt = "13"
@@ -81907,6 +81946,16 @@
 /obj/effect/landmark/start/roboticist,
 /turf/open/floor/plasteel,
 /area/science/robotics/lab)
+"lUv" = (
+/obj/structure/noticeboard{
+	dir = 1;
+	pixel_y = -32
+	},
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
 "lWL" = (
 /obj/machinery/smartfridge/organ/preloaded,
 /turf/closed/wall,
@@ -82010,6 +82059,13 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port)
+"mIJ" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 5
+	},
+/turf/open/space,
+/area/space/nearstation)
 "mSd" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -82105,6 +82161,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/construction/storage/wing)
+"nKU" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/science/circuit)
 "nLT" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -82325,6 +82388,13 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard)
+"pDn" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 6
+	},
+/turf/open/space/basic,
+/area/space/nearstation)
 "pEv" = (
 /obj/machinery/airalarm{
 	dir = 8;
@@ -82397,6 +82467,12 @@
 	},
 /turf/open/floor/wood,
 /area/security/vacantoffice)
+"qaK" = (
+/obj/machinery/atmospherics/pipe/simple/dark/visible{
+	dir = 10
+	},
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
 "qhe" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -82442,6 +82518,11 @@
 "qBq" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/hallway/secondary/entry)
+"qEc" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction,
+/turf/open/floor/plating,
+/area/science/circuit)
 "qJZ" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
@@ -82459,13 +82540,12 @@
 /turf/open/floor/plating,
 /area/crew_quarters/cryopod)
 "qRM" = (
-/obj/machinery/camera{
-	c_tag = "Research Division Circuitry Lab";
-	dir = 1;
-	network = list("ss13","rd")
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
 	},
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
+/turf/open/space,
+/area/space/nearstation)
 "qVR" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 5
@@ -82623,6 +82703,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness/recreation)
+"sqe" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/space/basic,
+/area/space/nearstation)
 "stP" = (
 /obj/machinery/atmospherics/components/binary/pump{
 	name = "Port to Fuel Pipe"
@@ -82708,6 +82792,13 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/cryopod)
+"tfs" = (
+/obj/machinery/light,
+/obj/machinery/atmospherics/components/binary/valve{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
 "tre" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -82756,6 +82847,13 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/medical/morgue)
+"tID" = (
+/obj/machinery/atmospherics/components/binary/pump/on{
+	name = "Space Loop Out";
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
 "tUa" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
 	dir = 1
@@ -82871,6 +82969,13 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
+"vda" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 9
+	},
+/turf/open/space,
+/area/space/nearstation)
 "vgd" = (
 /obj/item/taperecorder,
 /obj/item/camera,
@@ -82935,6 +83040,11 @@
 /obj/structure/lattice,
 /turf/open/space/basic,
 /area/space)
+"vYs" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/space,
+/area/space/nearstation)
 "wdu" = (
 /obj/structure/grille,
 /obj/structure/lattice,
@@ -83006,6 +83116,13 @@
 /obj/effect/turf_decal/stripes/line,
 /turf/closed/wall,
 /area/science/circuit)
+"wNQ" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 10
+	},
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "wOE" = (
 /obj/machinery/door/airlock/external{
 	name = "Atmospherics External Airlock";
@@ -83135,6 +83252,13 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
+"xHA" = (
+/obj/machinery/atmospherics/components/binary/pump/on{
+	name = "Space Loop In";
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
 "xIi" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -83161,6 +83285,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall,
 /area/security/vacantoffice)
+"xUO" = (
+/turf/open/space,
+/area/space/nearstation)
 "xVl" = (
 /turf/closed/wall,
 /area/hallway/secondary/service)
@@ -83186,6 +83313,13 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
+"yfk" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 6
+	},
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "yfW" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -83209,9 +83343,12 @@
 /turf/open/floor/plasteel,
 /area/science/circuit)
 "ykE" = (
-/obj/machinery/light,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 10
+	},
+/turf/open/space,
+/area/space/nearstation)
 
 (1,1,1) = {"
 oRp
@@ -120387,11 +120524,11 @@ kOt
 gRS
 oUA
 cxO
-qRM
+cxO
+cYI
 krD
 aaf
 aaf
-aaf
 anS
 anS
 anS
@@ -120644,9 +120781,9 @@ oLW
 gGT
 wPk
 dGH
-dka
+cxO
+lUv
 krD
-aaf
 aaa
 aaf
 aaf
@@ -120901,12 +121038,12 @@ ocT
 xkG
 uTS
 cxO
-ykE
+cxO
+tfs
 krD
 aaa
 aaa
 aaa
-aaa
 aaf
 aaa
 aaf
@@ -121159,9 +121296,9 @@ llb
 uTS
 cxO
 cxO
-krD
-aaa
-aaa
+tID
+noG
+lMJ
 aaa
 aaa
 aaf
@@ -121415,13 +121552,13 @@ lsv
 txj
 eEe
 cxO
-cxO
-krD
-aaa
-aaa
-aaa
-aaf
-aaf
+izh
+qaK
+qEc
+idz
+idz
+vYs
+mIJ
 aaa
 anT
 aaf
@@ -121672,13 +121809,13 @@ jyv
 ohj
 nnK
 cxO
+xHA
 cxO
 krD
 aaa
 aaa
 aaa
-aaa
-aaf
+qRM
 aaa
 anT
 aaf
@@ -121929,13 +122066,13 @@ krD
 noG
 krD
 noG
+nKU
 krD
 krD
-aaa
-aaa
-aaa
-aaa
-aaf
+yfk
+idz
+idz
+vda
 aaa
 aqB
 aaa
@@ -122181,18 +122318,18 @@ dvY
 dvY
 dvY
 aaf
-aaf
-aaf
+dka
+vYs
+idz
+idz
+idz
+jDS
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaf
-aaf
+wNQ
+idz
+vYs
+mIJ
 aaf
 anT
 aaa
@@ -122438,18 +122575,18 @@ crc
 aaf
 ctl
 aaa
-aaf
-aaf
+qRM
+xUO
 anT
 anT
 anT
-aaf
-aaf
-aaf
-lMJ
-lMJ
-aaf
-aaa
+ake
+ake
+ake
+pDn
+faU
+vYs
+jDS
 aaf
 anT
 aaf
@@ -122695,17 +122832,17 @@ crd
 ack
 ack
 aaf
-aaf
+ykE
+idz
+sqe
+sqe
+idz
+idz
+idz
+idz
+etb
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaf
+ake
 aaf
 aaf
 anT
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index 5149033cb4..eabbdbb656 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -1741,7 +1741,7 @@
 	pixel_x = 12
 	},
 /obj/machinery/shower{
-	pixel_y = 26
+	pixel_y = 16
 	},
 /turf/open/floor/plasteel/freezer,
 /area/security/prison)
@@ -39574,10 +39574,21 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/hallway/secondary/exit)
+"boE" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/dark/visible{
+	dir = 5
+	},
+/turf/open/floor/plasteel,
+/area/science/mixing)
 "bpj" = (
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
+/obj/machinery/camera{
+	c_tag = "Toxins Launch Room Access";
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "bpn" = (
@@ -39586,6 +39597,12 @@
 	},
 /turf/closed/wall/r_wall,
 /area/maintenance/disposal/incinerator)
+"bpo" = (
+/obj/machinery/atmospherics/pipe/simple/dark/visible{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/science/mixing)
 "bpB" = (
 /obj/machinery/atmospherics/pipe/simple/yellow/visible{
 	dir = 10
@@ -40604,10 +40621,6 @@
 	},
 /area/engine/atmos)
 "bOJ" = (
-/obj/machinery/camera{
-	c_tag = "Toxins Launch Room Access";
-	dir = 1
-	},
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
@@ -41121,6 +41134,12 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /turf/closed/wall/r_wall,
 /area/science/mixing)
+"eXV" = (
+/obj/machinery/atmospherics/pipe/simple/dark/visible{
+	dir = 4
+	},
+/turf/open/floor/plating/asteroid/airless,
+/area/asteroid/nearstation)
 "eYe" = (
 /obj/effect/mapping_helpers/airlock/locked,
 /obj/machinery/door/airlock/public/glass{
@@ -41233,6 +41252,10 @@
 /obj/item/wrench,
 /turf/open/space,
 /area/space/nearstation)
+"foz" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/turf/open/floor/plasteel,
+/area/science/mixing)
 "fsl" = (
 /obj/docking_port/stationary{
 	dir = 2;
@@ -41526,6 +41549,12 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/engine/atmos)
+"gZk" = (
+/obj/machinery/atmospherics/pipe/simple/dark/visible{
+	dir = 10
+	},
+/turf/open/floor/plating/asteroid/airless,
+/area/asteroid/nearstation)
 "heQ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/navbeacon{
@@ -41580,6 +41609,13 @@
 	},
 /turf/closed/wall/r_wall/rust,
 /area/engine/atmos)
+"hyX" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 5
+	},
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "hAy" = (
 /obj/machinery/power/apc{
 	areastring = "/area/science/mixing";
@@ -41820,6 +41856,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
+"iOL" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 9
+	},
+/obj/structure/lattice/catwalk,
+/turf/open/space/basic,
+/area/space/nearstation)
 "iUq" = (
 /obj/machinery/status_display,
 /turf/closed/wall,
@@ -42031,6 +42074,13 @@
 	},
 /turf/closed/wall/r_wall/rust,
 /area/engine/atmos)
+"jEK" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/obj/structure/lattice/catwalk,
+/turf/open/space/basic,
+/area/space/nearstation)
 "jFP" = (
 /turf/open/space/basic,
 /area/space/station_ruins)
@@ -42045,6 +42095,11 @@
 /obj/structure/table/reinforced,
 /turf/open/floor/plasteel,
 /area/science/mixing)
+"jIu" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/dark/visible,
+/turf/open/floor/plasteel,
+/area/science/mixing)
 "jLF" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -42065,8 +42120,16 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/obj/machinery/portable_atmospherics/canister,
 /turf/open/floor/plasteel,
 /area/science/mixing)
+"jYq" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 10
+	},
+/obj/structure/lattice/catwalk,
+/turf/open/space/basic,
+/area/space/nearstation)
 "kaA" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
 	dir = 1
@@ -42078,6 +42141,12 @@
 	},
 /turf/open/floor/plasteel/cafeteria,
 /area/engine/atmos)
+"kcN" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+	dir = 4
+	},
+/turf/open/floor/plating/asteroid/airless,
+/area/asteroid/nearstation)
 "kit" = (
 /obj/machinery/portable_atmospherics/canister/toxins,
 /obj/machinery/light/small{
@@ -42096,6 +42165,11 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/atmos)
+"kpi" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/structure/lattice/catwalk,
+/turf/open/space/basic,
+/area/space/nearstation)
 "kqH" = (
 /obj/machinery/atmospherics/components/binary/valve{
 	dir = 4;
@@ -42107,6 +42181,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel,
 /area/science/mixing)
+"kuK" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plasteel,
+/area/science/mixing)
 "kwF" = (
 /obj/machinery/atmospherics/pipe/simple/green/visible{
 	dir = 4
@@ -42209,7 +42287,7 @@
 /turf/closed/wall/r_wall/rust,
 /area/science/storage)
 "lmq" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
 /turf/open/floor/plating,
 /area/science/storage)
 "low" = (
@@ -42379,6 +42457,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/atmos)
+"mdx" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 5
+	},
+/obj/structure/lattice/catwalk,
+/turf/open/space/basic,
+/area/space/nearstation)
 "meo" = (
 /turf/closed/wall/r_wall/rust,
 /area/science/mixing)
@@ -42513,10 +42598,27 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
+"nbT" = (
+/obj/machinery/atmospherics/components/binary/pump/on{
+	dir = 1;
+	name = "Space Loop Out"
+	},
+/turf/open/floor/plasteel,
+/area/science/mixing)
 "ndg" = (
 /obj/effect/turf_decal/tile/neutral,
 /turf/open/floor/plasteel,
 /area/hallway/primary/fore)
+"nfS" = (
+/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+/turf/open/floor/plating,
+/area/science/storage)
+"ngY" = (
+/obj/machinery/atmospherics/components/binary/valve{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/science/mixing)
 "nhU" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -42708,6 +42810,10 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/engine/vacuum,
 /area/maintenance/disposal/incinerator)
+"oys" = (
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/open/floor/plasteel,
+/area/science/mixing)
 "oyD" = (
 /turf/closed/wall,
 /area/crew_quarters/toilet/restrooms)
@@ -42785,6 +42891,12 @@
 /obj/effect/turf_decal/tile/neutral,
 /turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
+"oXz" = (
+/obj/machinery/atmospherics/pipe/simple/dark/visible{
+	dir = 5
+	},
+/turf/open/floor/plasteel,
+/area/science/mixing)
 "pbT" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 10
@@ -42976,6 +43088,12 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
+"pMh" = (
+/obj/machinery/atmospherics/components/binary/valve{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/science/mixing)
 "pNE" = (
 /obj/structure/grille,
 /obj/machinery/atmospherics/pipe/simple/cyan/hidden{
@@ -44007,6 +44125,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit)
+"sIm" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/dark/visible{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/science/mixing)
 "sIu" = (
 /turf/closed/wall/r_wall/rust,
 /area/engine/gravity_generator)
@@ -46249,6 +46374,9 @@
 /obj/machinery/atmospherics/components/unary/thermomachine/freezer{
 	dir = 4
 	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "ujg" = (
@@ -46377,6 +46505,19 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/engine/gravity_generator)
+"uDp" = (
+/obj/machinery/atmospherics/pipe/simple/dark/visible{
+	dir = 5
+	},
+/turf/open/floor/plating/asteroid/airless,
+/area/asteroid/nearstation)
+"uEu" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 6
+	},
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "uGq" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/effect/turf_decal/tile/red{
@@ -46635,6 +46776,10 @@
 	dir = 1
 	},
 /area/engine/atmos)
+"vKE" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction,
+/turf/open/floor/plating/asteroid/airless,
+/area/asteroid/nearstation)
 "vMb" = (
 /turf/open/floor/engine/n2o,
 /area/engine/atmos)
@@ -46779,6 +46924,13 @@
 /obj/structure/table/reinforced,
 /turf/open/floor/plasteel,
 /area/science/mixing)
+"wRY" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "wUF" = (
 /obj/machinery/door/airlock/atmos/glass/critical{
 	heat_proof = 1;
@@ -97368,7 +97520,7 @@ meo
 sVt
 sVt
 sVt
-aad
+iio
 aad
 aad
 aad
@@ -97620,13 +97772,13 @@ meo
 uiT
 bfq
 bpj
+oys
+oys
+oys
+oys
+fjN
 iio
 aad
-aad
-aad
-aad
-aad
-aad
 aaa
 aaa
 aaa
@@ -97877,12 +98029,12 @@ sVt
 kQn
 lFm
 fjN
-iio
-aad
-aad
-aad
-aad
-aad
+hVE
+hVE
+hVE
+hVE
+pMh
+kuK
 aac
 aaa
 aaa
@@ -98134,15 +98286,15 @@ ucd
 vZb
 iiW
 bOJ
-iio
-aad
-aad
-aad
-aad
-aad
-aac
-aaa
-aaa
+foz
+nbT
+ngY
+oXz
+bpo
+jIu
+vKE
+kpi
+mdx
 aaa
 aaa
 aaa
@@ -98386,20 +98538,20 @@ aac
 aad
 eGm
 lmq
-lmq
+nfS
 sVt
 iio
 upN
 iio
 iio
 iio
-aad
-aad
-aad
+iio
+sIm
+boE
+iio
 aac
-aac
-aaa
-aaa
+sdX
+jEK
 aaa
 aaa
 aaa
@@ -98651,12 +98803,12 @@ uTF
 gGq
 iio
 aad
-aad
-aad
 aac
-aaa
-aaa
-aaa
+gZk
+uDp
+uEu
+hyX
+jEK
 jFP
 jFP
 jFP
@@ -98908,12 +99060,12 @@ msG
 ogL
 iio
 aad
-aad
-aad
 aac
-aaa
-aaa
-aaa
+aac
+eXV
+wRY
+wRY
+jEK
 jFP
 jFP
 jFP
@@ -99165,12 +99317,12 @@ msG
 diQ
 iio
 aad
-aad
 aac
 aac
-aaa
-aaa
-aaa
+kcN
+wRY
+wRY
+jEK
 jFP
 jFP
 jFP
@@ -99424,10 +99576,10 @@ iio
 aac
 aac
 aac
-aaa
-aaa
-aaa
-aaa
+jEK
+wRY
+wRY
+jEK
 jFP
 jFP
 jFP
@@ -99681,10 +99833,10 @@ sdX
 aac
 aac
 aac
-aaa
-aaa
-aaa
-aaa
+jEK
+wRY
+wRY
+jEK
 jFP
 jFP
 jFP
@@ -99938,10 +100090,10 @@ sdX
 aaa
 aac
 aaa
-aaa
-aaa
-aaa
-aaa
+jEK
+wRY
+wRY
+jEK
 jFP
 jFP
 jFP
@@ -100195,10 +100347,10 @@ sdX
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
+jYq
+iOL
+jYq
+iOL
 jFP
 jFP
 jFP
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 3e79030b78..0f77d35dd5 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -34077,9 +34077,13 @@
 /turf/closed/wall,
 /area/science/mixing)
 "bAG" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/closed/wall,
-/area/science/mixing)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plating{
+	icon_state = "platingdmg3"
+	},
+/area/maintenance/department/science)
 "bAH" = (
 /obj/structure/disposaloutlet,
 /obj/structure/disposalpipe/trunk{
@@ -37242,12 +37246,15 @@
 	req_access_txt = "8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 10
+	dir = 4
 	},
 /turf/open/floor/plating,
 /area/science/mixing)
 "bGB" = (
 /obj/machinery/light/small,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/maintenance/department/science)
 "bGD" = (
@@ -37753,13 +37760,13 @@
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "bHD" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
 /obj/effect/turf_decal/tile/purple,
 /obj/effect/turf_decal/tile/purple{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "bHE" = (
@@ -38317,11 +38324,12 @@
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "bIP" = (
-/obj/structure/grille,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plating{
+	icon_state = "panelscorched"
+	},
 /area/maintenance/department/science)
 "bIQ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -38331,11 +38339,9 @@
 /area/maintenance/department/science)
 "bIR" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plating{
-	icon_state = "platingdmg3"
+	dir = 10
 	},
+/turf/open/floor/plating,
 /area/maintenance/department/science)
 "bIT" = (
 /obj/structure/window/reinforced{
@@ -39403,7 +39409,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
+	dir = 8
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -40359,11 +40365,12 @@
 /turf/open/floor/engine/vacuum,
 /area/science/mixing)
 "bNq" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
-	dir = 1
+/obj/machinery/door/airlock/maintenance{
+	name = "Toxins Launch Maintenance";
+	req_access_txt = "8"
 	},
-/turf/open/floor/plating/airless,
-/area/science/mixing)
+/turf/open/floor/plating,
+/area/maintenance/department/science)
 "bNr" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -40798,11 +40805,10 @@
 /turf/open/floor/engine/vacuum,
 /area/science/mixing)
 "bOu" = (
-/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
-	dir = 6
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+	dir = 4
 	},
-/turf/open/space,
+/turf/open/floor/plating/airless,
 /area/science/mixing)
 "bOv" = (
 /obj/structure/window/reinforced{
@@ -54165,11 +54171,10 @@
 /turf/open/floor/plasteel,
 /area/quartermaster/sorting)
 "fwr" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 8
-	},
-/turf/closed/wall,
-/area/science/mixing)
+/obj/machinery/door/airlock/maintenance/abandoned,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plating,
+/area/maintenance/department/science)
 "fwI" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/cable{
@@ -54258,6 +54263,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/dark,
 /area/science/mixing)
 "fBZ" = (
@@ -54461,6 +54467,13 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/security/brig)
+"gjv" = (
+/obj/machinery/atmospherics/components/binary/pump/on{
+	name = "Space Loop In";
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/maintenance/department/science)
 "gjN" = (
 /obj/item/weldingtool,
 /obj/effect/spawner/lootdrop/maintenance,
@@ -54810,10 +54823,11 @@
 /turf/open/floor/plasteel/dark,
 /area/hallway/secondary/exit/departure_lounge)
 "gMm" = (
+/obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 9
+	dir = 5
 	},
-/turf/closed/wall,
+/turf/open/floor/plating,
 /area/science/mixing)
 "gMO" = (
 /obj/structure/plasticflaps/opaque,
@@ -55085,6 +55099,13 @@
 /obj/item/clothing/glasses/regular,
 /turf/open/floor/plating,
 /area/maintenance/department/science)
+"hxI" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 5
+	},
+/obj/structure/lattice/catwalk,
+/turf/open/space,
+/area/space/nearstation)
 "hyh" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 9
@@ -55189,6 +55210,12 @@
 /obj/machinery/power/rad_collector/anchored,
 /turf/open/floor/engine,
 /area/engine/supermatter)
+"hMx" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/turf/open/floor/plating{
+	icon_state = "panelscorched"
+	},
+/area/maintenance/department/science)
 "hOx" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -55450,6 +55477,13 @@
 /obj/machinery/processor/slime,
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
+"ilE" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/obj/structure/lattice/catwalk,
+/turf/open/space/basic,
+/area/space/nearstation)
 "imE" = (
 /obj/effect/turf_decal/tile/purple,
 /obj/effect/turf_decal/tile/purple{
@@ -57131,6 +57165,11 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
+"mhK" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/space/basic,
+/area/space/nearstation)
 "miw" = (
 /obj/machinery/atmospherics/pipe/manifold/cyan/visible,
 /obj/structure/cable/yellow{
@@ -57383,6 +57422,13 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/engine)
+"mJp" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 9
+	},
+/turf/open/space/basic,
+/area/space/nearstation)
 "mKc" = (
 /obj/structure/bookcase/random/nonfiction,
 /turf/open/floor/plasteel/dark,
@@ -59579,12 +59625,10 @@
 /turf/open/floor/plating,
 /area/chapel/asteroid/monastery)
 "rBh" = (
-/obj/structure/mopbucket,
-/obj/item/mop,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/turf/open/floor/plating{
+	icon_state = "platingdmg1"
 	},
-/turf/open/floor/plating,
 /area/maintenance/department/science)
 "rEh" = (
 /obj/structure/table/glass,
@@ -60153,6 +60197,12 @@
 	},
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
+"tfx" = (
+/obj/machinery/atmospherics/components/binary/valve{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/maintenance/department/science)
 "tfP" = (
 /obj/item/beacon,
 /turf/open/floor/engine,
@@ -60207,6 +60257,13 @@
 /obj/structure/table,
 /turf/open/floor/plating,
 /area/maintenance/department/security/brig)
+"tlp" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 9
+	},
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "tlw" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel,
@@ -61929,6 +61986,11 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/science/xenobiology)
+"xlg" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction,
+/turf/open/floor/plating,
+/area/maintenance/department/science)
 "xlA" = (
 /obj/machinery/door/airlock/maintenance/abandoned,
 /turf/open/floor/plating,
@@ -62181,6 +62243,13 @@
 /obj/effect/mapping_helpers/airlock/unres,
 /turf/open/floor/plasteel/freezer,
 /area/storage/emergency/port)
+"xQk" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 6
+	},
+/obj/structure/lattice/catwalk,
+/turf/open/space,
+/area/space/nearstation)
 "xSd" = (
 /obj/machinery/light/small,
 /turf/open/floor/plating,
@@ -105349,7 +105418,7 @@ bHy
 bHy
 bHy
 bOs
-aht
+mZE
 aaa
 aaa
 aaa
@@ -105606,7 +105675,7 @@ bCV
 bCV
 bCV
 bOu
-bNq
+aht
 aaa
 aaa
 aaa
@@ -106115,7 +106184,7 @@ bFt
 bGy
 bHD
 fBz
-bCV
+gMm
 bCV
 bCV
 bCV
@@ -106627,17 +106696,17 @@ bwm
 bAF
 bAF
 bGA
-bAG
-fwr
-gMm
 bAF
 bAF
-aht
-aht
-abI
-abI
-abI
-abI
+bAF
+bAF
+bAF
+uaO
+dsz
+xQk
+hxI
+xQk
+hxI
 abI
 abI
 abI
@@ -106883,18 +106952,18 @@ cDB
 lWy
 tSL
 lWy
-cDB
+bAG
 bwm
 rBh
-bwm
-aht
-aht
-aht
-aaa
-aht
-aaa
-aaa
-aaa
+gjv
+tfx
+xlg
+mJp
+nqu
+mJp
+nqu
+tlp
+ilE
 aaa
 aaa
 aaa
@@ -107140,18 +107209,18 @@ cDB
 hxn
 uvq
 bFx
-tSL
-bwm
 bIP
-bwm
-aht
-aaa
-aht
-aaa
-aht
-aht
-aht
-aht
+bNq
+tSL
+hMx
+tfx
+xlg
+mhK
+wIo
+mhK
+mhK
+mhK
+hyh
 aht
 aaa
 aaa
@@ -107399,16 +107468,16 @@ obP
 bFy
 bGB
 bwm
-bIQ
 bwm
-aht
+bwm
+rNB
 bwm
 bwm
 rNB
 bwm
 rNB
 bwm
-aaa
+cdm
 aby
 aaa
 aaa
@@ -107654,9 +107723,9 @@ rKL
 lWy
 lWy
 bFz
-lWy
-xlA
 bIR
+fwr
+eMC
 bwm
 aht
 bwm