diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
index 802dcd91898..bd7e2a277e0 100644
--- a/_maps/map_files/stations/metastation.dmm
+++ b/_maps/map_files/stations/metastation.dmm
@@ -546,6 +546,19 @@
 /obj/structure/lattice/catwalk,
 /turf/space,
 /area/station/engineering/solar/fore_port)
+"agN" = (
+/obj/item/storage/box,
+/obj/item/radio{
+	pixel_x = 6
+	},
+/obj/structure/disposalpipe/segment,
+/obj/structure/shelf/engineering,
+/obj/item/storage/belt/utility,
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "yellow"
+	},
+/area/station/engineering/break_room)
 "agY" = (
 /obj/structure/closet/secure_closet/detective,
 /obj/item/restraints/handcuffs,
@@ -889,7 +902,7 @@
 	},
 /obj/effect/landmark/start/engineer,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "ajR" = (
 /obj/machinery/alarm/directional/south,
 /turf/simulated/floor/plasteel,
@@ -4560,7 +4573,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aCe" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock{
@@ -4582,7 +4595,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aCg" = (
 /turf/simulated/wall/r_wall,
 /area/station/engineering/control)
@@ -4708,7 +4721,7 @@
 /obj/effect/turf_decal/delivery,
 /obj/structure/closet/secure_closet/engineering_welding,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aCV" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -4770,7 +4783,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aDe" = (
 /obj/machinery/power/grounding_rod{
 	anchored = 1
@@ -4833,7 +4846,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aDx" = (
 /obj/structure/closet/wardrobe/miner,
 /turf/simulated/floor/plasteel{
@@ -5039,7 +5052,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aEp" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -5116,7 +5129,7 @@
 "aEy" = (
 /obj/effect/turf_decal/delivery,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aEz" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -5127,12 +5140,12 @@
 	},
 /obj/effect/turf_decal/delivery,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aEA" = (
 /obj/effect/turf_decal/delivery,
 /obj/machinery/economy/vending/tool/free,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aEB" = (
 /obj/structure/closet/crate,
 /obj/machinery/light/small{
@@ -5174,7 +5187,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aEH" = (
 /obj/machinery/firealarm/directional/east,
 /obj/effect/decal/cleanable/dirt,
@@ -5394,9 +5407,6 @@
 	icon_state = "brown"
 	},
 /area/station/supply/miningdock)
-"aFR" = (
-/turf/simulated/wall,
-/area/station/engineering/control)
 "aFT" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/wood,
@@ -5411,7 +5421,7 @@
 /obj/effect/turf_decal/delivery,
 /obj/structure/closet/firecloset,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aGb" = (
 /obj/effect/turf_decal/delivery/hollow,
 /obj/item/storage/belt/utility,
@@ -5422,14 +5432,14 @@
 /obj/item/clothing/glasses/meson,
 /obj/structure/shelf/engineering,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aGc" = (
 /obj/machinery/alarm/directional/west,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aGg" = (
 /obj/effect/landmark/start/shaft_miner,
 /turf/simulated/floor/plasteel,
@@ -5544,7 +5554,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aGE" = (
 /obj/machinery/atmospherics/unary/portables_connector{
 	dir = 1
@@ -5679,13 +5689,13 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aHg" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aHh" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -5922,7 +5932,7 @@
 /obj/effect/turf_decal/stripes/corner,
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aIk" = (
 /obj/machinery/light{
 	dir = 8
@@ -6050,7 +6060,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aIB" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -6060,7 +6070,7 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aID" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -6093,7 +6103,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aIH" = (
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -6880,7 +6890,6 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/item/crowbar/engineering,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/hardsuitstorage)
 "aLq" = (
@@ -7385,7 +7394,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aMS" = (
 /obj/structure/table,
 /obj/item/storage/belt/utility,
@@ -7442,7 +7451,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aMZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -7797,7 +7806,7 @@
 	pixel_x = 30
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aOk" = (
 /obj/machinery/alarm/directional/west,
 /turf/simulated/floor/plasteel,
@@ -7946,7 +7955,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aOZ" = (
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
@@ -8022,7 +8031,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aPp" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -8031,7 +8040,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aPq" = (
 /obj/machinery/computer/arcade/battle,
 /turf/simulated/floor/carpet/arcade,
@@ -8179,7 +8188,7 @@
 	},
 /obj/machinery/firealarm/directional/west,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aPS" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -8445,7 +8454,7 @@
 	pixel_x = 24
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aQS" = (
 /obj/machinery/power/emitter,
 /turf/simulated/floor/plating,
@@ -8464,7 +8473,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aQW" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -8481,7 +8490,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aRa" = (
 /obj/machinery/atmospherics/pipe/simple/visible/supply{
 	dir = 6
@@ -8828,8 +8837,14 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aSo" = (
 /turf/simulated/floor/engine,
 /area/station/engineering/engine/supermatter)
@@ -8897,7 +8912,7 @@
 /obj/item/stock_parts/cell/high,
 /obj/machinery/newscaster/directional/west,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aSF" = (
 /obj/machinery/door_control{
 	id = "QMLoaddoor";
@@ -9296,7 +9311,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aUi" = (
 /obj/machinery/door/airlock/command/glass{
 	name = "Bridge Access"
@@ -9586,7 +9601,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aUT" = (
 /obj/structure/table,
 /obj/machinery/camera{
@@ -9671,7 +9686,7 @@
 /obj/effect/turf_decal/delivery,
 /obj/machinery/economy/vending/engivend,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aVg" = (
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -9679,7 +9694,7 @@
 /obj/effect/turf_decal/delivery,
 /obj/machinery/economy/vending/engidrobe,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aVh" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -9688,7 +9703,7 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aVi" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -10033,7 +10048,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aWn" = (
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -10041,9 +10056,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/obj/machinery/power/apc/critical/directional/west,
+/obj/machinery/power/apc/important/directional/west,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aWq" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable{
@@ -10403,7 +10418,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aXz" = (
 /obj/structure/disposalpipe/segment,
 /turf/simulated/wall,
@@ -10538,7 +10553,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aXR" = (
 /obj/machinery/light{
 	dir = 8
@@ -10792,7 +10807,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aYS" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -10802,7 +10817,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aYT" = (
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -10859,7 +10874,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aYX" = (
 /obj/item/chair,
 /obj/machinery/firealarm/directional/north,
@@ -10882,7 +10897,7 @@
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
 /obj/effect/turf_decal/stripes/line,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aYZ" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -10900,7 +10915,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "aZe" = (
 /obj/structure/sign/radiation/rad_area,
 /turf/simulated/wall/r_wall,
@@ -11276,7 +11291,7 @@
 	},
 /obj/effect/turf_decal/stripes/line,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "bay" = (
 /obj/machinery/hologram/holopad,
 /obj/structure/cable{
@@ -11289,7 +11304,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "baC" = (
 /obj/structure/table,
 /obj/item/folder/yellow{
@@ -11431,7 +11446,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "baV" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -11700,12 +11715,12 @@
 	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "bbO" = (
 /obj/structure/closet/secure_closet/engineering_welding,
 /obj/effect/turf_decal/delivery,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "bbS" = (
 /obj/machinery/light{
 	dir = 1
@@ -11885,7 +11900,7 @@
 	pixel_y = -24
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "bcs" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/plasteel,
@@ -13060,7 +13075,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "bfu" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -13097,7 +13112,7 @@
 	pixel_x = -27
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "bfz" = (
 /obj/structure/showcase{
 	density = 0;
@@ -13730,7 +13745,7 @@
 	pixel_y = 28
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "bhp" = (
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
@@ -14071,7 +14086,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "bih" = (
 /obj/machinery/power/terminal{
 	dir = 1
@@ -14109,7 +14124,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "bil" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -14927,7 +14942,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "bku" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/effect/mapping_helpers/airlock/autoname,
@@ -14938,12 +14953,16 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "bky" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -15037,7 +15056,7 @@
 /obj/item/clothing/glasses/meson/engine,
 /obj/effect/turf_decal/delivery,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "bkU" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -15182,7 +15201,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/delivery/hollow,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "blu" = (
 /obj/machinery/camera{
 	c_tag = "Medbay Main Hallway- Aft";
@@ -15535,7 +15554,7 @@
 /obj/effect/turf_decal/delivery/hollow,
 /obj/effect/mapping_helpers/airlock/access/all/engineering/general,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "bmi" = (
 /obj/machinery/recharge_station,
 /obj/effect/turf_decal/stripes/end{
@@ -17966,7 +17985,7 @@
 	},
 /obj/machinery/economy/vending/wallmed/directional/north,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "btT" = (
 /obj/item/storage/firstaid/regular{
 	pixel_x = 3;
@@ -18606,24 +18625,6 @@
 	icon_state = "neutralcorner"
 	},
 /area/station/hallway/primary/central/ne)
-"bvt" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "caution"
-	},
-/area/station/engineering/controlroom)
 "bvw" = (
 /obj/machinery/alarm/directional/west,
 /obj/structure/showcase{
@@ -20921,7 +20922,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "bCk" = (
 /obj/structure/table/wood,
 /obj/item/nullrod/fedora,
@@ -21117,10 +21118,6 @@
 /obj/structure/grille,
 /turf/simulated/wall/r_wall,
 /area/space/nearstation)
-"bCY" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/station/engineering/equipmentstorage)
 "bDa" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -23622,21 +23619,17 @@
 /turf/simulated/floor/wood,
 /area/station/maintenance/apmaint)
 "bNg" = (
-/obj/machinery/door/firedoor,
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "yellow"
 	},
-/obj/machinery/door/airlock/engineering/glass,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/construction,
-/turf/simulated/floor/plasteel,
-/area/station/engineering/controlroom)
+/area/station/engineering/break_room)
 "bNh" = (
 /turf/simulated/wall/r_wall,
 /area/station/supply/expedition)
@@ -24567,10 +24560,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "yellow"
 	},
-/turf/simulated/floor/plasteel,
 /area/station/engineering/break_room)
 "bRk" = (
 /obj/machinery/atmospherics/portable/canister/sleeping_agent,
@@ -27607,7 +27600,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "ccB" = (
 /obj/machinery/door/airlock{
 	name = "Maintenance Bathroom"
@@ -27640,9 +27633,6 @@
 	icon_state = "neutralcorner"
 	},
 /area/station/hallway/primary/central/sw)
-"ccH" = (
-/turf/simulated/floor/plasteel,
-/area/station/engineering/control)
 "ccI" = (
 /obj/machinery/hologram/holopad,
 /obj/effect/turf_decal/delivery/blue/hollow,
@@ -28501,12 +28491,16 @@
 "cgn" = (
 /obj/structure/table,
 /obj/item/paper_bin{
-	pixel_x = -3;
-	pixel_y = 7
+	pixel_x = -5;
+	pixel_y = 5
 	},
 /obj/item/pen{
-	pixel_x = -3;
-	pixel_y = 10
+	pixel_x = -4;
+	pixel_y = 6
+	},
+/obj/item/phone{
+	pixel_x = 9;
+	pixel_y = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 9;
@@ -29280,7 +29274,7 @@
 "ciW" = (
 /obj/effect/landmark/start/engineer,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "cjh" = (
 /obj/machinery/atmospherics/unary/thermomachine/freezer{
 	dir = 1
@@ -40912,6 +40906,13 @@
 	icon_state = "redcorner"
 	},
 /area/station/hallway/primary/central/east)
+"dqL" = (
+/obj/item/kirbyplants,
+/turf/simulated/floor/plasteel{
+	dir = 6;
+	icon_state = "yellow"
+	},
+/area/station/engineering/break_room)
 "drp" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
@@ -41152,7 +41153,7 @@
 	pixel_y = 32
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "dxJ" = (
 /obj/structure/lattice/catwalk,
 /obj/machinery/atmospherics/unary/outlet_injector/on,
@@ -41199,15 +41200,20 @@
 	},
 /area/station/medical/storage)
 "dzI" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/stripes/corner{
-	dir = 4
+/obj/item/paper_bin{
+	pixel_x = -5;
+	pixel_y = 3
 	},
-/obj/item/storage/firstaid/regular,
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "yellow"
+/obj/structure/table/wood,
+/obj/item/pen{
+	pixel_x = -4;
+	pixel_y = 2
 	},
+/obj/item/book/manual/wiki/sop_engineering{
+	pixel_y = 2;
+	pixel_x = 9
+	},
+/turf/simulated/floor/plasteel,
 /area/station/engineering/break_room)
 "dAq" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
@@ -41937,7 +41943,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "dTW" = (
 /obj/machinery/atmospherics/pipe/simple/visible,
 /obj/machinery/atmospherics/meter{
@@ -42530,29 +42536,12 @@
 /turf/simulated/floor/wood,
 /area/station/service/library)
 "eht" = (
-/obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/hacking{
-	pixel_x = 2;
-	pixel_y = 6
-	},
-/obj/item/book/manual/wiki/engineering_guide{
-	pixel_x = -2;
-	pixel_y = 3
-	},
 /obj/machinery/firealarm/directional/south,
-/obj/structure/extinguisher_cabinet{
-	name = "east bump";
-	pixel_x = 27
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/universal{
-	dir = 4
-	},
-/obj/machinery/camera{
-	c_tag = "Engineering - Desk";
+/obj/structure/chair/sofa{
 	dir = 1
 	},
+/obj/effect/landmark/start/atmospheric,
 /turf/simulated/floor/plasteel{
-	dir = 6;
 	icon_state = "yellow"
 	},
 /area/station/engineering/break_room)
@@ -42642,8 +42631,8 @@
 	},
 /area/station/medical/medbay)
 "ejC" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
 	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/break_room)
@@ -44001,7 +43990,7 @@
 /obj/effect/turf_decal/delivery,
 /obj/structure/closet/emcloset,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "eSt" = (
 /obj/structure/chair/comfy/black{
 	dir = 4
@@ -44116,7 +44105,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "eUb" = (
 /obj/effect/spawner/window/reinforced/grilled,
 /obj/structure/cable,
@@ -44390,6 +44379,10 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
+"eZC" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel,
+/area/station/engineering/controlroom)
 "eZE" = (
 /obj/item/radio/intercom{
 	name = "south bump";
@@ -44447,15 +44440,6 @@
 	icon_state = "red"
 	},
 /area/station/security/main)
-"faQ" = (
-/obj/structure/chair/stool{
-	dir = 1
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel,
-/area/station/engineering/break_room)
 "fbr" = (
 /obj/machinery/ai_status_display{
 	pixel_y = 32
@@ -45297,20 +45281,16 @@
 /turf/simulated/floor/carpet,
 /area/station/public/vacant_office)
 "fth" = (
-/obj/structure/table/reinforced,
-/obj/machinery/kitchen_machine/microwave{
-	pixel_y = 6
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/effect/turf_decal/stripes/corner,
-/obj/machinery/power/apc/directional/west,
+/obj/machinery/recharge_station,
+/obj/effect/turf_decal/delivery,
 /turf/simulated/floor/plasteel{
-	dir = 10;
-	icon_state = "caution"
+	icon_state = "caution";
+	dir = 10
 	},
-/area/station/engineering/equipmentstorage)
+/area/station/engineering/controlroom)
 "ftm" = (
 /obj/machinery/atmospherics/binary/pump{
 	dir = 8;
@@ -45372,7 +45352,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+	icon_state = "yellow"
+	},
 /area/station/engineering/break_room)
 "fue" = (
 /obj/machinery/door/firedoor,
@@ -46342,17 +46324,18 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft)
 "fOv" = (
-/obj/machinery/computer/atmos_alert{
-	dir = 8
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+	dir = 1
 	},
 /obj/machinery/light{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	dir = 5;
-	icon_state = "caution"
+	dir = 4;
+	icon_state = "yellow"
 	},
-/area/station/engineering/controlroom)
+/area/station/engineering/break_room)
 "fOL" = (
 /obj/machinery/computer/security{
 	dir = 1
@@ -46414,15 +46397,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore)
-"fQi" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "yellow"
-	},
-/area/station/engineering/break_room)
 "fQl" = (
 /obj/item/kirbyplants/plant24,
 /turf/simulated/floor/plasteel{
@@ -46526,16 +46500,11 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/central/south)
 "fSW" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
+/obj/machinery/drone_fabricator,
 /turf/simulated/floor/plasteel{
 	icon_state = "caution"
 	},
-/area/station/engineering/equipmentstorage)
+/area/station/engineering/controlroom)
 "fTc" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -46733,11 +46702,9 @@
 	},
 /area/station/engineering/control)
 "fWH" = (
-/obj/machinery/atmospherics/pipe/simple/visible/purple{
-	dir = 10
-	},
+/obj/machinery/atmospherics/pipe/simple/visible/universal,
 /turf/simulated/wall/r_wall,
-/area/station/engineering/atmos/distribution)
+/area/station/engineering/break_room)
 "fWN" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -46759,7 +46726,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "fWW" = (
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
@@ -47367,6 +47334,9 @@
 	},
 /turf/space,
 /area/space/nearstation)
+"gkD" = (
+/turf/space,
+/area/station/engineering/controlroom)
 "gkF" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -47680,18 +47650,6 @@
 /obj/item/extinguisher,
 /turf/simulated/floor/plasteel,
 /area/station/science/xenobiology)
-"gsQ" = (
-/obj/machinery/door/airlock/engineering/glass,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/construction,
-/turf/simulated/floor/plasteel,
-/area/station/engineering/equipmentstorage)
 "gsR" = (
 /obj/structure/chair,
 /turf/simulated/floor/plasteel{
@@ -48781,17 +48739,23 @@
 /turf/simulated/floor/engine,
 /area/station/science/xenobiology)
 "gTn" = (
-/obj/structure/rack,
-/obj/item/lightreplacer{
+/obj/structure/table,
+/obj/machinery/recharger{
+	pixel_x = 6;
+	pixel_y = 4
+	},
+/obj/item/t_scanner{
+	pixel_x = -5;
 	pixel_y = 7
 	},
-/obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/delivery/hollow,
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "caution"
 	},
-/area/station/engineering/equipmentstorage)
+/area/station/engineering/controlroom)
 "gTp" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
@@ -49095,10 +49059,10 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/starboard)
 "gYM" = (
-/obj/structure/rack,
-/obj/item/storage/belt/utility,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/autolathe,
 /turf/simulated/floor/plasteel{
-	dir = 6;
+	dir = 4;
 	icon_state = "yellow"
 	},
 /area/station/engineering/break_room)
@@ -49422,7 +49386,7 @@
 	icon_state = "2-8"
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "hgU" = (
 /obj/machinery/power/tesla_coil{
 	anchored = 1
@@ -49547,6 +49511,12 @@
 	icon_state = "brown"
 	},
 /area/station/hallway/primary/fore/east)
+"hjt" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/turf/simulated/floor/plasteel,
+/area/station/engineering/controlroom)
 "hjx" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
@@ -49938,7 +49908,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "hsg" = (
 /obj/structure/table,
 /obj/item/cartridge/signal/toxins{
@@ -51109,6 +51079,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/break_room)
 "hRj" = (
@@ -51186,14 +51159,6 @@
 	},
 /area/station/command/bridge)
 "hSu" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "yellow"
@@ -51386,8 +51351,11 @@
 /turf/simulated/wall/r_wall,
 /area/station/engineering/engine/supermatter)
 "hWw" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/equipmentstorage)
+/area/station/engineering/controlroom)
 "hWO" = (
 /obj/item/stack/rods/ten,
 /turf/space,
@@ -51669,9 +51637,6 @@
 	},
 /area/station/science/break_room)
 "iet" = (
-/obj/effect/turf_decal/stripes/corner{
-	dir = 4
-	},
 /obj/machinery/light{
 	dir = 8
 	},
@@ -52035,13 +52000,6 @@
 	icon_state = "whitepurple"
 	},
 /area/station/maintenance/asmaint)
-"ims" = (
-/obj/effect/turf_decal/stripes/corner,
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "yellow"
-	},
-/area/station/engineering/break_room)
 "imw" = (
 /obj/structure/disposalpipe/junction/reversed{
 	dir = 4
@@ -52149,7 +52107,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "iot" = (
 /obj/effect/spawner/random/barrier/grille_maybe,
 /turf/simulated/floor/plating,
@@ -52335,12 +52293,12 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft)
 "itu" = (
-/obj/machinery/alarm/directional/east,
+/obj/machinery/firealarm/directional/east,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "caution"
 	},
-/area/station/engineering/equipmentstorage)
+/area/station/engineering/controlroom)
 "itH" = (
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -53251,7 +53209,7 @@
 "iOr" = (
 /obj/effect/turf_decal/stripes/line,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "iOO" = (
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/atmospherics/pipe/simple/visible/green,
@@ -53474,15 +53432,20 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/starboard)
 "iTB" = (
-/obj/machinery/power/apc/directional/east,
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
 	},
+/obj/structure/extinguisher_cabinet{
+	name = "east bump";
+	pixel_x = 27
+	},
+/obj/structure/table/reinforced,
+/obj/item/wrench,
 /turf/simulated/floor/plasteel{
 	dir = 4;
-	icon_state = "caution"
+	icon_state = "yellow"
 	},
-/area/station/engineering/controlroom)
+/area/station/engineering/break_room)
 "iTG" = (
 /obj/item/radio/intercom/department/security{
 	pixel_y = -28
@@ -53742,9 +53705,6 @@
 /turf/simulated/floor/plating,
 /area/station/command/bridge)
 "jby" = (
-/obj/structure/disposalpipe/segment/corner{
-	dir = 2
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -53754,7 +53714,12 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/plasteel,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "yellow"
+	},
 /area/station/engineering/break_room)
 "jbB" = (
 /obj/structure/transit_tube{
@@ -53999,7 +53964,7 @@
 	icon_state = "2-4"
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "jiR" = (
 /obj/structure/closet/firecloset,
 /obj/effect/spawner/random/maintenance,
@@ -54031,7 +53996,7 @@
 "jke" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "jkg" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -54408,14 +54373,9 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/port)
 "jvf" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
+/obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/equipmentstorage)
+/area/station/engineering/controlroom)
 "jvr" = (
 /obj/structure/sink{
 	dir = 4;
@@ -54557,6 +54517,11 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/science/robotics)
+"jAM" = (
+/obj/structure/table/glass/plasma,
+/obj/item/crowbar/engineering,
+/turf/simulated/floor/transparent/glass/plasma,
+/area/station/engineering/break_room)
 "jAR" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/effect/mapping_helpers/airlock/autoname,
@@ -55460,7 +55425,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "jPQ" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -56251,6 +56216,14 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/fore)
+"khH" = (
+/obj/structure/table/glass/plasma,
+/obj/item/book/manual/engineering_singularity_safety{
+	pixel_x = 0;
+	pixel_y = 3
+	},
+/turf/simulated/floor/transparent/glass/plasma,
+/area/station/engineering/break_room)
 "khI" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -56398,20 +56371,12 @@
 	},
 /area/station/science/xenobiology)
 "klS" = (
-/obj/structure/table,
-/obj/machinery/recharger{
-	pixel_x = 6;
-	pixel_y = 4
-	},
-/obj/item/t_scanner{
-	pixel_x = -5;
-	pixel_y = 7
-	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "caution"
+	dir = 8;
+	icon_state = "yellow"
 	},
-/area/station/engineering/controlroom)
+/area/station/engineering/break_room)
 "kmb" = (
 /obj/machinery/atmospherics/pipe/simple/visible/purple,
 /obj/effect/spawner/window/reinforced/grilled,
@@ -56641,7 +56606,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "ksz" = (
 /obj/machinery/light_construct/small{
 	dir = 4
@@ -56779,7 +56744,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "kxh" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -57063,6 +57028,9 @@
 	icon_state = "dark"
 	},
 /area/station/public/fitness)
+"kDF" = (
+/turf/simulated/floor/plasteel,
+/area/station/engineering/controlroom)
 "kDU" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/structure/cable{
@@ -57100,10 +57068,10 @@
 "kEv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
-	icon_state = "1-2"
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "yellow"
 	},
-/turf/simulated/floor/plasteel,
 /area/station/engineering/break_room)
 "kEw" = (
 /obj/effect/spawner/random/cobweb/left/frequent,
@@ -57747,6 +57715,10 @@
 	},
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/power/apc/directional/north,
+/obj/item/radio{
+	pixel_x = 7;
+	pixel_y = 4
+	},
 /turf/simulated/floor/plasteel{
 	dir = 9;
 	icon_state = "caution"
@@ -58253,6 +58225,15 @@
 	icon_state = "neutralcorner"
 	},
 /area/station/public/locker)
+"leG" = (
+/obj/structure/table/glass/plasma,
+/obj/structure/decorative_structures/metal/statue/tesla_monument{
+	pixel_x = 0;
+	pixel_y = 9;
+	anchored = 1
+	},
+/turf/simulated/floor/transparent/glass/plasma,
+/area/station/engineering/break_room)
 "leO" = (
 /obj/structure/sign/explosives,
 /turf/simulated/wall/r_wall,
@@ -58403,20 +58384,15 @@
 	},
 /area/station/medical/chemistry)
 "lho" = (
-/obj/machinery/light_switch{
-	dir = 8;
-	name = "custom placement";
-	pixel_x = 24;
-	pixel_y = 10
-	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/firealarm/directional/east,
+/obj/structure/table/reinforced,
+/obj/item/storage/firstaid/regular,
 /turf/simulated/floor/plasteel{
 	dir = 6;
-	icon_state = "caution"
+	icon_state = "yellow"
 	},
-/area/station/engineering/controlroom)
+/area/station/engineering/break_room)
 "lhs" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -58670,7 +58646,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "llW" = (
 /obj/machinery/requests_console/directional/west,
 /turf/simulated/floor/plasteel{
@@ -58679,17 +58655,12 @@
 	},
 /area/station/public/dorms)
 "lmi" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/controlroom)
+/area/station/engineering/break_room)
 "lmq" = (
 /obj/machinery/light,
 /obj/structure/disposalpipe/segment{
@@ -58747,12 +58718,12 @@
 /turf/simulated/floor/plasteel,
 /area/station/security/prison/cell_block/a)
 "lmJ" = (
-/obj/structure/chair/office/dark{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "yellow"
 	},
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/plasteel,
-/area/station/engineering/controlroom)
+/area/station/engineering/break_room)
 "lmP" = (
 /obj/item/seeds/amanita,
 /obj/machinery/hydroponics/constructable{
@@ -58930,6 +58901,10 @@
 /obj/effect/mapping_helpers/airlock/windoor/access/all/command/captain,
 /turf/simulated/floor/wood,
 /area/station/command/office/captain)
+"lrl" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/wall/r_wall,
+/area/station/engineering/ai_transit_tube)
 "lrA" = (
 /obj/structure/table,
 /obj/item/reagent_containers/condiment/peppermill{
@@ -59366,7 +59341,7 @@
 /obj/effect/turf_decal/delivery,
 /obj/machinery/economy/vending/assist/free,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "lCc" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/plasteel{
@@ -59414,12 +59389,14 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft2)
 "lCQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/equipmentstorage)
+/area/station/engineering/controlroom)
 "lCW" = (
 /obj/structure/table,
 /obj/item/folder/white,
@@ -60124,6 +60101,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment/corner{
+	dir = 2
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "yellowcorner"
 	},
@@ -60391,18 +60371,14 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft2)
 "lYI" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "caution"
 	},
-/area/station/engineering/equipmentstorage)
-"lZc" = (
-/obj/structure/table/glass,
-/obj/item/book/manual/wiki/sop_engineering{
-	pixel_y = 3
-	},
-/turf/simulated/floor/plasteel,
-/area/station/engineering/break_room)
+/area/station/engineering/controlroom)
 "lZz" = (
 /obj/structure/rack,
 /obj/item/scalpel,
@@ -60861,11 +60837,12 @@
 	},
 /area/station/medical/medbay)
 "miI" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
+/obj/structure/chair/office/dark{
+	dir = 1
 	},
+/obj/effect/landmark/start/engineer,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/equipmentstorage)
+/area/station/engineering/controlroom)
 "miO" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -61133,18 +61110,6 @@
 	icon_state = "red"
 	},
 /area/station/security/permabrig)
-"mnV" = (
-/obj/machinery/computer/station_alert{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "caution"
-	},
-/area/station/engineering/controlroom)
 "moE" = (
 /obj/structure/chair/comfy/beige{
 	dir = 8
@@ -61156,6 +61121,12 @@
 /obj/effect/landmark/spawner/nukedisc_respawn,
 /turf/simulated/floor/plating,
 /area/station/engineering/secure_storage)
+"mph" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel,
+/area/station/engineering/break_room)
 "mpr" = (
 /obj/structure/table,
 /obj/machinery/chem_dispenser/beer{
@@ -61720,15 +61691,18 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "yellow"
 	},
-/turf/simulated/floor/plasteel,
 /area/station/engineering/break_room)
 "mDT" = (
 /obj/structure/disposalpipe/segment,
@@ -62934,16 +62908,9 @@
 	},
 /area/station/legal/lawoffice)
 "ndp" = (
-/obj/machinery/light,
-/obj/machinery/status_display{
-	dir = 4;
-	pixel_y = -32
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
+/obj/effect/landmark/start/engineer,
+/obj/structure/chair/sofa/left{
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "yellow"
@@ -63585,11 +63552,6 @@
 	},
 /area/station/science/toxins/mixing)
 "nqJ" = (
-/obj/structure/table,
-/obj/item/phone{
-	pixel_x = -3;
-	pixel_y = 3
-	},
 /obj/structure/sign/double/map/right{
 	desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown).";
 	icon_state = "map-right-MS";
@@ -63598,10 +63560,8 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/item/radio{
-	pixel_x = 7;
-	pixel_y = 4
-	},
+/obj/machinery/recharge_station,
+/obj/effect/turf_decal/delivery,
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "caution"
@@ -63992,7 +63952,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "nzP" = (
 /obj/structure/lattice/catwalk,
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
@@ -64366,8 +64326,14 @@
 /turf/simulated/floor/plating,
 /area/station/engineering/gravitygenerator)
 "nHB" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
+/obj/structure/table/wood,
+/obj/item/reagent_containers/drinks/cans/thirteenloko{
+	pixel_x = -8;
+	pixel_y = 11
+	},
+/obj/item/storage/box/donkpockets{
+	pixel_x = 4;
+	pixel_y = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/break_room)
@@ -65465,12 +65431,6 @@
 	icon_state = "white"
 	},
 /area/station/security/permabrig)
-"omI" = (
-/obj/machinery/atmospherics/pipe/simple/visible/purple{
-	dir = 4
-	},
-/turf/simulated/wall/r_wall,
-/area/station/engineering/atmos/distribution)
 "omK" = (
 /obj/structure/chair/stool{
 	dir = 8
@@ -66265,23 +66225,6 @@
 /obj/structure/sign/greencross,
 /turf/simulated/wall,
 /area/station/medical/reception)
-"oIb" = (
-/obj/machinery/computer/drone_control{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/obj/item/radio/intercom{
-	name = "west bump";
-	pixel_x = -28
-	},
-/obj/machinery/alarm/directional/south,
-/turf/simulated/floor/plasteel{
-	dir = 10;
-	icon_state = "caution"
-	},
-/area/station/engineering/controlroom)
 "oIs" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan,
 /obj/effect/spawner/random/maintenance,
@@ -67939,13 +67882,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/chair/stool,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/break_room)
 "ptc" = (
@@ -69612,16 +69551,12 @@
 	},
 /area/station/science/research)
 "qeD" = (
-/obj/structure/closet/toolcloset,
-/obj/effect/turf_decal/delivery/hollow,
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
+/obj/machinery/computer/station_alert,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "caution"
 	},
-/area/station/engineering/equipmentstorage)
+/area/station/engineering/controlroom)
 "qeF" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable{
@@ -70064,8 +69999,8 @@
 /turf/simulated/floor/plasteel,
 /area/station/public/locker)
 "qpO" = (
-/turf/simulated/wall,
-/area/station/engineering/equipmentstorage)
+/turf/simulated/wall/r_wall,
+/area/station/engineering/controlroom)
 "qqk" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
@@ -70753,22 +70688,15 @@
 	},
 /area/station/hallway/secondary/bridge)
 "qEn" = (
-/obj/machinery/economy/vending/tool/free,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/light_switch{
-	dir = 4;
-	name = "custom placement";
-	pixel_x = -24;
-	pixel_y = -6
-	},
-/obj/structure/sign/poster/official/random{
-	pixel_y = 32
+/obj/machinery/computer/general_air_control{
+	name = "Tank Monitor";
+	autolink_sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank")
 	},
 /turf/simulated/floor/plasteel{
 	dir = 9;
 	icon_state = "caution"
 	},
-/area/station/engineering/equipmentstorage)
+/area/station/engineering/controlroom)
 "qEA" = (
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
@@ -70860,10 +70788,10 @@
 	},
 /area/station/security/permabrig)
 "qJz" = (
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "yellow"
-	},
+/obj/structure/table/glass/plasma,
+/obj/item/weldingtool/hugetank,
+/obj/item/clothing/glasses/welding,
+/turf/simulated/floor/transparent/glass/plasma,
 /area/station/engineering/break_room)
 "qJA" = (
 /obj/structure/table,
@@ -71154,20 +71082,15 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/central/se)
 "qQw" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
+/obj/machinery/computer/security/telescreen/entertainment/television,
 /turf/simulated/floor/plasteel{
-	dir = 4;
+	dir = 1;
 	icon_state = "yellow"
 	},
 /area/station/engineering/break_room)
@@ -71970,7 +71893,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "riN" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -72336,6 +72259,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/power/apc/critical/directional/south,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
 /turf/simulated/floor/engine,
 /area/station/engineering/control)
 "rqW" = (
@@ -72395,18 +72323,17 @@
 	},
 /area/station/science/break_room)
 "rsq" = (
-/obj/machinery/drone_fabricator,
-/obj/machinery/camera{
-	c_tag = "Atmospherics Monitoring";
+/obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+/obj/machinery/camera{
+	c_tag = "Engineering - Desk";
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "caution"
+	icon_state = "yellow"
 	},
-/area/station/engineering/controlroom)
+/area/station/engineering/break_room)
 "rsv" = (
 /obj/machinery/door/airlock/external/glass{
 	id_tag = "aisat_door_int";
@@ -72670,13 +72597,20 @@
 	},
 /area/station/science/storage)
 "rxV" = (
-/obj/structure/table/reinforced,
-/obj/effect/spawner/random/trash,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "caution"
 	},
-/area/station/engineering/equipmentstorage)
+/area/station/engineering/controlroom)
 "ryc" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
@@ -73132,9 +73066,6 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/break_room)
 "rGT" = (
@@ -73160,7 +73091,7 @@
 /obj/item/geiger_counter,
 /obj/item/clothing/glasses/meson,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "rHl" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -73439,7 +73370,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "rNy" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
@@ -73541,7 +73472,7 @@
 /obj/effect/turf_decal/delivery,
 /obj/structure/closet/secure_closet/engineering_electrical,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "rOD" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -75602,21 +75533,12 @@
 	},
 /area/station/maintenance/aft2)
 "sMo" = (
-/obj/machinery/computer/monitor{
-	name = "Grid Power Monitoring Computer"
-	},
-/obj/effect/turf_decal/delivery/hollow,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/light{
-	dir = 1
-	},
+/obj/machinery/computer/atmos_alert,
 /turf/simulated/floor/plasteel{
-	dir = 1;
+	dir = 5;
 	icon_state = "caution"
 	},
-/area/station/engineering/equipmentstorage)
+/area/station/engineering/controlroom)
 "sMM" = (
 /mob/living/simple_animal/pet/sloth/paperwork,
 /turf/simulated/floor/carpet,
@@ -75814,11 +75736,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/science/testrange)
-"sQg" = (
-/obj/structure/table/glass,
-/obj/item/storage/box/donkpockets,
-/turf/simulated/floor/plasteel,
-/area/station/engineering/break_room)
 "sQh" = (
 /obj/structure/disposalpipe/segment/corner{
 	dir = 2
@@ -76396,7 +76313,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "tdA" = (
 /obj/machinery/atmospherics/portable/canister/sleeping_agent,
 /obj/machinery/atmospherics/pipe/simple/hidden/purple{
@@ -76556,7 +76473,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "thC" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -76790,7 +76707,7 @@
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/requests_console/directional/south,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "tmZ" = (
 /obj/machinery/door_timer/cell_2{
 	pixel_x = 32
@@ -77130,18 +77047,17 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/fpmaint)
 "tuY" = (
-/obj/structure/rack,
-/obj/item/storage/belt/utility,
-/obj/structure/extinguisher_cabinet{
-	name = "east bump";
-	pixel_x = 27
+/obj/machinery/light_switch{
+	dir = 8;
+	name = "custom placement";
+	pixel_x = 24;
+	pixel_y = 10
 	},
-/obj/effect/turf_decal/delivery/hollow,
 /turf/simulated/floor/plasteel{
 	dir = 6;
 	icon_state = "caution"
 	},
-/area/station/engineering/equipmentstorage)
+/area/station/engineering/controlroom)
 "tvd" = (
 /obj/structure/table/wood,
 /obj/machinery/photocopier/faxmachine{
@@ -77462,11 +77378,12 @@
 "tDM" = (
 /obj/structure/table/glass,
 /obj/item/book/manual/wiki/engineering_construction{
-	pixel_y = 4
+	pixel_y = 2;
+	pixel_x = 6
 	},
 /obj/item/book/manual/supermatter_engine{
-	pixel_x = -2;
-	pixel_y = 1
+	pixel_x = -6;
+	pixel_y = 2
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -77730,13 +77647,18 @@
 /turf/simulated/floor/mineral/titanium/blue,
 /area/shuttle/pod_2)
 "tMS" = (
-/obj/effect/spawner/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
-	id_tag = "Engineering";
-	name = "Engineering Security Doors"
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
-/turf/simulated/floor/plating,
-/area/station/engineering/equipmentstorage)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/door/airlock/engineering/glass,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/turf/simulated/floor/plasteel,
+/area/station/engineering/controlroom)
 "tMV" = (
 /obj/structure/rack,
 /obj/item/hand_labeler,
@@ -77922,16 +77844,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/carpet/arcade,
 /area/station/maintenance/fore)
-"tSh" = (
-/obj/structure/rack,
-/obj/item/storage/box,
-/obj/item/radio{
-	pixel_x = 6
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "yellow"
-	},
-/area/station/engineering/break_room)
 "tSj" = (
 /obj/machinery/computer/operating{
 	dir = 4
@@ -78007,6 +77919,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
+"tUX" = (
+/turf/simulated/floor/transparent/glass/plasma,
+/area/station/engineering/break_room)
 "tVa" = (
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -78745,17 +78660,14 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft)
 "uka" = (
-/obj/structure/chair/stool{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "yellow"
 	},
-/turf/simulated/floor/plasteel,
 /area/station/engineering/break_room)
 "ukl" = (
 /obj/machinery/light_switch{
@@ -79193,11 +79105,15 @@
 	},
 /area/station/maintenance/asmaint)
 "uxU" = (
-/obj/machinery/atmospherics/pipe/simple/visible/purple{
-	dir = 4
+/obj/machinery/light,
+/obj/structure/chair/sofa/right{
+	dir = 1
 	},
-/turf/simulated/wall,
-/area/station/engineering/controlroom)
+/obj/effect/landmark/start/engineer,
+/turf/simulated/floor/plasteel{
+	icon_state = "yellow"
+	},
+/area/station/engineering/break_room)
 "uxV" = (
 /obj/structure/disposalpipe/sortjunction{
 	dir = 1;
@@ -79230,7 +79146,7 @@
 "uyC" = (
 /obj/effect/turf_decal/stripes/corner,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "uyN" = (
 /obj/machinery/atmospherics/pipe/manifold4w/visible,
 /turf/simulated/floor/plasteel,
@@ -79546,19 +79462,11 @@
 	},
 /area/station/medical/exam_room)
 "uHC" = (
-/obj/machinery/camera{
-	c_tag = "Engineering - Foyer - Shared Storage";
-	dir = 4
-	},
-/obj/item/radio/intercom{
-	name = "west bump";
-	pixel_x = -28
-	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "caution"
 	},
-/area/station/engineering/equipmentstorage)
+/area/station/engineering/controlroom)
 "uHX" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
@@ -79598,16 +79506,19 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/engimaint)
 "uIX" = (
-/obj/machinery/computer/security/engineering,
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/status_display{
-	pixel_x = 32
+/obj/machinery/computer/general_air_control{
+	level = 3;
+	name = "Distribution and Waste Monitor";
+	autolink_sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop")
+	},
+/obj/structure/sign/poster/random{
+	pixel_y = 32
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "caution"
 	},
-/area/station/engineering/equipmentstorage)
+/area/station/engineering/controlroom)
 "uJn" = (
 /obj/effect/spawner/airlock/w_to_e,
 /turf/simulated/wall/r_wall,
@@ -79878,9 +79789,6 @@
 /area/station/engineering/control)
 "uNL" = (
 /obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
 /turf/simulated/floor/plasteel{
 	icon_state = "yellow"
 	},
@@ -80575,6 +80483,13 @@
 /obj/effect/spawner/random/fungus/frequent,
 /turf/simulated/wall,
 /area/station/maintenance/asmaint)
+"vcb" = (
+/obj/structure/closet/toolcloset,
+/obj/item/clothing/glasses/meson/engine,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/firealarm/directional/south,
+/turf/simulated/floor/plasteel,
+/area/station/engineering/controlroom)
 "vcF" = (
 /obj/structure/table,
 /obj/item/paper_bin{
@@ -80902,7 +80817,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "vkL" = (
 /obj/effect/turf_decal/stripes/line,
 /turf/simulated/floor/plating,
@@ -81288,6 +81203,12 @@
 	icon_state = "whiteblue"
 	},
 /area/station/medical/exam_room)
+"vte" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel,
+/area/station/engineering/break_room)
 "vtf" = (
 /obj/machinery/atmospherics/unary/outlet_injector/on{
 	dir = 1;
@@ -81337,12 +81258,6 @@
 /obj/machinery/atmospherics/portable/canister/air,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos/control)
-"vug" = (
-/obj/machinery/autolathe,
-/turf/simulated/floor/plasteel{
-	icon_state = "yellow"
-	},
-/area/station/engineering/break_room)
 "vui" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -81419,22 +81334,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
-"vwA" = (
-/obj/structure/table/glass,
-/obj/item/food/chips{
-	pixel_x = 8
-	},
-/obj/item/reagent_containers/drinks/cans/thirteenloko{
-	pixel_x = -6;
-	pixel_y = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/plasteel,
-/area/station/engineering/break_room)
 "vwD" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/reagent_dispensers/fueltank,
@@ -82134,7 +82033,7 @@
 /obj/effect/turf_decal/delivery,
 /obj/structure/closet/secure_closet/engineering_personal,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "vSm" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -82683,23 +82582,6 @@
 	},
 /turf/simulated/floor/engine,
 /area/station/maintenance/xenobio_south)
-"wgE" = (
-/obj/structure/table/glass,
-/obj/item/paper_bin{
-	pixel_x = -5;
-	pixel_y = 3
-	},
-/obj/item/pen{
-	pixel_x = -5;
-	pixel_y = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/plasteel,
-/area/station/engineering/break_room)
 "wgT" = (
 /mob/living/simple_animal/cow/betsy,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -83676,8 +83558,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/chair/stool,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+	icon_state = "yellow"
+	},
 /area/station/engineering/break_room)
 "wEM" = (
 /obj/structure/table,
@@ -83707,6 +83590,18 @@
 	icon_state = "darkbluecorners"
 	},
 /area/station/medical/surgery/observation)
+"wFg" = (
+/obj/structure/table/wood,
+/obj/item/book/manual/wiki/engineering_guide{
+	pixel_x = -9;
+	pixel_y = 2
+	},
+/obj/item/book/manual/wiki/hacking{
+	pixel_x = 5;
+	pixel_y = 2
+	},
+/turf/simulated/floor/plasteel,
+/area/station/engineering/break_room)
 "wFq" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -84803,18 +84698,12 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/starboard/east)
 "xfG" = (
-/obj/machinery/firealarm/directional/east,
-/obj/machinery/computer/general_air_control{
-	dir = 8;
-	level = 3;
-	name = "Distribution and Waste Monitor";
-	autolink_sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop")
-	},
+/obj/effect/spawner/random/food_trash,
 /turf/simulated/floor/plasteel{
 	dir = 4;
-	icon_state = "caution"
+	icon_state = "yellow"
 	},
-/area/station/engineering/controlroom)
+/area/station/engineering/break_room)
 "xgb" = (
 /obj/structure/closet/firecloset,
 /turf/simulated/floor/plating,
@@ -85313,7 +85202,6 @@
 /area/station/maintenance/disposal)
 "xrx" = (
 /obj/structure/table/glass,
-/obj/item/folder/yellow,
 /obj/structure/sign/securearea{
 	pixel_y = 32
 	},
@@ -85321,6 +85209,10 @@
 	c_tag = "Engineering - Foyer - Starboard";
 	dir = 6
 	},
+/obj/item/folder/yellow{
+	pixel_x = 1;
+	pixel_y = 2
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "yellow"
@@ -85653,21 +85545,15 @@
 /turf/space,
 /area/space/nearstation)
 "xAl" = (
-/obj/structure/rack,
-/obj/item/storage/briefcase/inflatable{
-	pixel_x = -2;
-	pixel_y = 4
-	},
-/obj/item/storage/briefcase/inflatable,
-/obj/effect/turf_decal/delivery/hollow,
-/obj/structure/sign/poster/official/random{
-	pixel_x = 32
+/obj/machinery/camera{
+	c_tag = "Captain's Quarters";
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "caution"
 	},
-/area/station/engineering/equipmentstorage)
+/area/station/engineering/controlroom)
 "xAz" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
@@ -85748,21 +85634,13 @@
 /turf/simulated/floor/plating,
 /area/station/command/office/hop)
 "xCv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
+/obj/machinery/computer/drone_control{
+	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/stripes/line,
 /turf/simulated/floor/plasteel{
 	icon_state = "caution"
 	},
-/area/station/engineering/equipmentstorage)
+/area/station/engineering/controlroom)
 "xCC" = (
 /obj/structure/closet/secure_closet/brig,
 /obj/machinery/camera{
@@ -85811,7 +85689,7 @@
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/control)
+/area/station/engineering/controlroom)
 "xCP" = (
 /obj/structure/flora/ausbushes/fullgrass,
 /obj/item/radio/intercom{
@@ -86335,17 +86213,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft)
-"xPv" = (
-/obj/machinery/computer/general_air_control{
-	dir = 4;
-	name = "Tank Monitor";
-	autolink_sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank")
-	},
-/turf/simulated/floor/plasteel{
-	dir = 9;
-	icon_state = "caution"
-	},
-/area/station/engineering/controlroom)
 "xPC" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -86373,14 +86240,11 @@
 /obj/structure/table/glass,
 /obj/item/paper_bin{
 	pixel_x = -3;
-	pixel_y = 7
+	pixel_y = 3
 	},
 /obj/item/pen{
-	pixel_x = -3;
-	pixel_y = 10
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
+	pixel_x = 3;
+	pixel_y = 2
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -127441,12 +127305,12 @@ izY
 aJR
 izY
 bIf
-aFR
+bCN
 aPK
 aHc
 riM
 aSC
-aFR
+bCN
 aVf
 nzO
 aXy
@@ -127706,9 +127570,9 @@ aIA
 aWn
 aIA
 aWm
-ccH
+kDF
 tmI
-aFR
+bCN
 bam
 bam
 bam
@@ -127953,25 +127817,25 @@ lCb
 aHg
 jke
 aIB
-ccH
+kDF
 ciW
-ccH
-ccH
+kDF
+kDF
 aPo
-ccH
-ccH
+kDF
+kDF
 aQY
-ccH
+kDF
 aYS
-ccH
+kDF
 xCJ
 bbO
-aFR
+bCN
 bfy
 big
 bkt
 bkT
-aFR
+bCN
 knq
 xsF
 dVL
@@ -128234,10 +128098,10 @@ kVO
 dOA
 bpn
 bpn
+mph
 bpn
 bpn
-bpn
-bpn
+vte
 mZZ
 ceF
 ceF
@@ -128478,19 +128342,19 @@ aVh
 aVh
 aYW
 vkG
-aSn
+hjt
 bcq
-aFR
+bCN
 bho
 bfs
 aSn
-bkT
-aFR
+vcb
+bCN
 bmu
 ezm
 psV
-vwA
-wgE
+kEv
+kEv
 uka
 kEv
 rGJ
@@ -128737,19 +128601,19 @@ aZe
 aHi
 aHi
 aCg
-aCg
 qpO
+hHE
+hHE
 tMS
-tMS
-qpO
+hHE
 qpO
 bjN
 hRS
 wEx
-sQg
-lZc
-faQ
-bpn
+tUX
+tUX
+tUX
+tUX
 bRi
 nHB
 ndp
@@ -128993,20 +128857,20 @@ nRh
 pcW
 pcW
 pcW
-aCg
+aHi
 qEn
 uHC
 lYI
 rxV
 fth
-bCY
+hHE
 iet
 fDS
 ftQ
-sSj
+tUX
+leG
 qJz
-qJz
-ims
+tUX
 qQw
 dzI
 eht
@@ -129236,7 +129100,7 @@ aDc
 ajO
 aGC
 aIi
-aSn
+hjt
 vRY
 aHi
 srS
@@ -129250,22 +129114,22 @@ nRh
 nRh
 nRh
 nRh
-aCg
+aHi
 qeD
 jvf
-lCQ
+eZC
 lCQ
 xCv
-gsQ
+hHE
 hSu
-kEv
+bpn
 mDR
-vug
-hHE
-hHE
-hHE
+tUX
+jAM
+khH
+tUX
 bNg
-bCN
+wFg
 uxU
 ceF
 ezp
@@ -129491,7 +129355,7 @@ azn
 amk
 aCf
 aDw
-ccH
+kDF
 fWS
 aCg
 aCg
@@ -129510,20 +129374,20 @@ aHi
 aCg
 sMo
 miI
-hWw
+kDF
 hWw
 fSW
-bCY
+qpO
 xPR
 bpn
 jby
-fQi
-hHE
-xPv
-mnV
-bvt
-oIb
-uxU
+tUX
+tUX
+tUX
+tUX
+bNg
+sSj
+dqL
 ceF
 oCX
 oGB
@@ -129749,7 +129613,7 @@ aBZ
 btR
 aEn
 llU
-aSn
+hjt
 aHi
 kcU
 kWg
@@ -129770,17 +129634,17 @@ itu
 gTn
 xAl
 tuY
-bCY
+qpO
 tDM
 wvO
 hRb
-tSh
-hHE
+jnD
+jnD
 klS
 lmJ
 lmi
 rsq
-omI
+bnt
 iRu
 bvk
 bvk
@@ -130022,17 +129886,17 @@ owQ
 vUb
 rqN
 aCg
-aFR
-aFR
-aFR
-bjN
-bjN
+aCg
+aCg
+aCg
+bnt
+bnt
 bnt
 xrx
 nVA
 lQJ
 gYM
-hHE
+agN
 fOv
 xfG
 iTB
@@ -130291,8 +130155,8 @@ aiE
 jKj
 jKj
 jKj
-jKj
-jKj
+lrl
+lrl
 jKj
 iRu
 mpP
@@ -130519,7 +130383,7 @@ dxe
 aBZ
 aCD
 ksf
-aSn
+hjt
 rOu
 aHi
 pFo
@@ -134405,7 +134269,7 @@ fiT
 aaa
 aaa
 aaa
-aaa
+gkD
 aaa
 aaa
 aaa