From e0b522b93dc5624955ee00a67c32443736f1b6bd Mon Sep 17 00:00:00 2001
From: GySgtMurphy <79298976+GySgtMurphy@users.noreply.github.com>
Date: Wed, 30 Oct 2024 12:34:55 -0400
Subject: [PATCH] Nsv endeavour Fixes 1 (#6824)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Because of /course/ my last PR merge didn't include some updates, like
to areas and shuttle docking points...

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Added more areas, set up power nets, and fixed missing wires.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: AlphaM01 <AlphaaMachh@gmail.com>
Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com>
---
 maps/endeavour/endeavour.dm     |    2 +
 maps/endeavour/levels/deck1.dmm |  356 ++-
 maps/endeavour/levels/deck2.dmm |  700 ++---
 maps/endeavour/levels/deck3.dmm |  374 +--
 maps/endeavour/levels/deck4.dmm | 4676 ++++++++++++++-----------------
 5 files changed, 2741 insertions(+), 3367 deletions(-)

diff --git a/maps/endeavour/endeavour.dm b/maps/endeavour/endeavour.dm
index 043d995f8f37..576d2c23f649 100644
--- a/maps/endeavour/endeavour.dm
+++ b/maps/endeavour/endeavour.dm
@@ -30,6 +30,8 @@
 	// todo: remove after dev is done
 	allow_random_draw = FALSE
 
+	//* Mapping credits go to GySgtMurphy, Niezan, Washikarasu, APMK and LordME *//
+
 	//* LEGACY BELOW *//
 
 	legacy_assert_shuttle_datums = list(
diff --git a/maps/endeavour/levels/deck1.dmm b/maps/endeavour/levels/deck1.dmm
index 56c1c52fd3e9..492f95835564 100644
--- a/maps/endeavour/levels/deck1.dmm
+++ b/maps/endeavour/levels/deck1.dmm
@@ -608,8 +608,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/hallway/secondary/docking_hallway2)
@@ -858,7 +857,7 @@
 "aIl" = (
 /obj/machinery/light{
 	dir = 4;
-	pixel_x = 10
+	use_power = 0
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/hallway/secondary/docking_hallway)
@@ -1452,8 +1451,7 @@
 "bfO" = (
 /obj/machinery/camera/network/exploration,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/docking_hallway2)
@@ -2099,8 +2097,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
@@ -2400,8 +2397,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
@@ -2504,6 +2500,10 @@
 	dir = 8
 	},
 /obj/machinery/door/firedoor,
+/obj/machinery/light{
+	dir = 4;
+	use_power = 0
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1afthall)
 "ceP" = (
@@ -2582,8 +2582,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d1starboardafthall)
@@ -2860,6 +2859,14 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
+"cvv" = (
+/obj/machinery/door/firedoor,
+/obj/map_helper/access_helper/airlock/station/maintenance,
+/obj/machinery/door/airlock/maintenance/engi{
+	req_one_access = null
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/substation/command)
 "cvx" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
@@ -3208,6 +3215,14 @@
 /obj/item/flashlight/lamp/green,
 /turf/simulated/floor/carpet/bcarpet,
 /area/library)
+"cIt" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/palebottlegreen,
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/plating,
+/area/hydroponics/garden)
 "cIw" = (
 /obj/structure/table/wooden_reinforced,
 /obj/item/folder/blue{
@@ -3422,8 +3437,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -3444,8 +3458,7 @@
 "cSl" = (
 /obj/structure/catwalk,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1fwdmaint)
@@ -3485,7 +3498,7 @@
 /obj/structure/table/standard,
 /obj/machinery/light{
 	dir = 4;
-	pixel_x = 10
+	use_power = 0
 	},
 /obj/item/inflatable_duck,
 /obj/item/inflatable_duck,
@@ -3553,9 +3566,7 @@
 "cVc" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardforhall)
 "cVf" = (
@@ -3993,9 +4004,7 @@
 /area/chapel/main)
 "dqb" = (
 /obj/structure/dispenser/oxygen,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/dark,
 /area/hallway/secondary/docking_hallway)
 "dqm" = (
@@ -5112,8 +5121,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/air_alarm/north_mount,
 /obj/machinery/camera/network/civilian,
@@ -5219,7 +5227,7 @@
 	},
 /obj/machinery/light{
 	dir = 4;
-	pixel_x = 10
+	use_power = 0
 	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -5481,8 +5489,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
@@ -5797,9 +5804,6 @@
 "ePf" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1fwdhall)
 "ePo" = (
@@ -6886,7 +6890,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/light{
 	dir = 4;
-	pixel_x = 10
+	use_power = 0
 	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -7189,8 +7193,8 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/power/sensor{
-	name = "Powernet Sensor - Deck 3 Subgrid";
-	name_tag = "Deck 3 Subgrid"
+	name = "Powernet Sensor - Deck 1 Amidships Subgrid";
+	name_tag = "Deck 1 Amidships Subgrid"
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/exploration)
@@ -7612,8 +7616,7 @@
 /obj/item/clothing/glasses/omnihud,
 /obj/item/book/manual/standard_operating_procedure,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/spline/fancy/wood/three_quarters,
 /turf/simulated/floor/carpet,
@@ -7687,8 +7690,7 @@
 /area/endeavour/hallway/d1afthall)
 "gdn" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/lounge/kitchen_freezer)
@@ -7702,7 +7704,7 @@
 /turf/simulated/floor/wood,
 /area/vacant/vacant_bar)
 "geQ" = (
-/obj/effect/shuttle_landmark/endeavour/deck1,
+/obj/effect/shuttle_landmark/automatic/station_dockpoint2,
 /turf/space/basic,
 /area/space)
 "geU" = (
@@ -7761,8 +7763,8 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/power/sensor{
-	name = "Powernet Sensor - Deck 3 Subgrid";
-	name_tag = "Deck 3 Subgrid"
+	name = "Powernet Sensor - Deck 1 Fore Subgrid";
+	name_tag = "Deck 1 Fore Subgrid"
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/command)
@@ -7789,8 +7791,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1portforhall)
@@ -8282,8 +8283,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/bridge/hallway)
@@ -8849,8 +8849,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/bridge/hallway)
@@ -8971,8 +8970,7 @@
 /area/maintenance/substation/exploration)
 "hfR" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/effect/floor_decal/rust,
 /turf/simulated/floor/plating,
@@ -9280,9 +9278,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "hrH" = (
@@ -9844,8 +9840,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d1portforhall)
@@ -9906,8 +9901,8 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/power/sensor{
-	name = "Powernet Sensor - Deck 3 Subgrid";
-	name_tag = "Deck 3 Subgrid"
+	name = "Powernet Sensor - Deck 1 Aft Subgrid";
+	name_tag = "Deck 1 Aft Subgrid"
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/civilian)
@@ -10038,9 +10033,7 @@
 "hYM" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
@@ -10110,9 +10103,7 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/water/deep/pool,
 /area/endeavour/surfacebase/sauna)
 "ibU" = (
@@ -11444,8 +11435,7 @@
 /area/exploration/explorer_prep)
 "jhz" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/bridge/hallway)
@@ -12404,8 +12394,7 @@
 	dir = 10
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d1portforhall)
@@ -12494,9 +12483,7 @@
 "jQW" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
 "jRj" = (
@@ -12844,9 +12831,7 @@
 /turf/simulated/floor/tiled,
 /area/rnd/test_area)
 "kcJ" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/machinery/recharger/wallcharger{
 	pixel_x = 32;
 	pixel_y = 2
@@ -13326,8 +13311,7 @@
 	},
 /obj/effect/mist,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/water/deep/pool,
 /area/endeavour/surfacebase/sauna)
@@ -14091,9 +14075,7 @@
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/machinery/camera/network/civilian{
 	dir = 1
 	},
@@ -14110,8 +14092,7 @@
 /area/maintenance/chapel)
 "lhl" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/docking_hallway)
@@ -14120,15 +14101,13 @@
 /area/hallway/secondary/docking_hallway2)
 "lia" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/maintenance/tool_storage)
 "liT" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/machinery/light/small{
 	dir = 8
@@ -14516,9 +14495,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "lzf" = (
@@ -14582,7 +14559,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
 "lBc" = (
-/obj/machinery/power/breakerbox/activated{
+/obj/machinery/power/breakerbox{
 	RCon_tag = "DECK 1 AFT MAIN"
 	},
 /turf/simulated/floor/plating,
@@ -15016,8 +14993,7 @@
 	dir = 10
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d1portamidhall)
@@ -15201,9 +15177,7 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "mct" = (
@@ -15277,8 +15251,7 @@
 "meE" = (
 /obj/random/plushie,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/carpet/arcadecarpet,
 /area/endeavour/hallway/d1aftmaint)
@@ -15520,8 +15493,7 @@
 /area/endeavour/surfacebase/sauna)
 "mqa" = (
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1aftmaint)
@@ -15635,9 +15607,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
 "mve" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "mwp" = (
@@ -16617,8 +16587,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
@@ -16771,9 +16740,7 @@
 "nqO" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
@@ -16818,8 +16785,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portforhall)
@@ -17161,8 +17127,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/computer/ship/navigation/telescreen{
 	pixel_y = 27
@@ -17224,8 +17189,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
@@ -17515,8 +17479,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d1portamidhall)
@@ -18268,9 +18231,7 @@
 /turf/simulated/floor/tiled/monodark,
 /area/crew_quarters/lounge)
 "oAD" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/structure/table/rack,
 /obj/item/tank/jetpack/oxygen,
 /obj/item/tank/jetpack/oxygen,
@@ -18839,6 +18800,19 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/hallway/secondary/docking_hallway2)
+"pbZ" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/navblue/border{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4;
+	use_power = 0
+	},
+/turf/simulated/floor/tiled/steel_ridged,
+/area/endeavour/hallway/d1portamidhall)
 "pcv" = (
 /obj/machinery/atmospherics/pipe/simple/visible,
 /obj/spawner/window/borosillicate/reinforced/full/firelocks,
@@ -18889,7 +18863,7 @@
 "pdw" = (
 /obj/machinery/light{
 	dir = 4;
-	pixel_x = 10
+	use_power = 0
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -19185,6 +19159,13 @@
 	},
 /turf/simulated/floor/tiled/old_tile/green,
 /area/shuttle/civvie/cockpit)
+"pnA" = (
+/obj/machinery/light{
+	dir = 4;
+	use_power = 0
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1afthall)
 "pob" = (
 /obj/structure/catwalk,
 /obj/structure/cable/green{
@@ -19333,8 +19314,7 @@
 /obj/item/megaphone,
 /obj/machinery/camera/network/command,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hop)
@@ -19442,9 +19422,7 @@
 /turf/simulated/floor/lino,
 /area/crew_quarters/coffee_shop)
 "pzJ" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/machinery/camera/network/exploration{
 	dir = 1
 	},
@@ -19466,8 +19444,7 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
@@ -19603,7 +19580,7 @@
 	},
 /obj/machinery/light{
 	dir = 4;
-	pixel_x = 10
+	use_power = 0
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
@@ -19902,6 +19879,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
+/obj/machinery/light{
+	dir = 4;
+	use_power = 0
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardforhall)
 "qer" = (
@@ -20681,7 +20662,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/light{
 	dir = 4;
-	pixel_x = 10
+	use_power = 0
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/docking_hallway)
@@ -20987,8 +20968,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/fire_alarm/north_mount,
 /turf/simulated/floor/tiled/steel,
@@ -21414,8 +21394,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/computer/timeclock/premade/north,
 /turf/simulated/floor/tiled/steel,
@@ -22207,9 +22186,7 @@
 /area/maintenance/substation/dock)
 "sho" = (
 /obj/effect/floor_decal/techfloor/orange,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/dark,
 /area/hallway/secondary/docking_hallway2)
 "shJ" = (
@@ -22349,6 +22326,17 @@
 /obj/machinery/light,
 /turf/simulated/floor/carpet/purcarpet,
 /area/bridge)
+"smu" = (
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/light{
+	dir = 4;
+	use_power = 0
+	},
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d1afthall)
 "smS" = (
 /obj/structure/catwalk,
 /obj/structure/cable/green{
@@ -22886,9 +22874,7 @@
 "sOS" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navblue/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
 "sPy" = (
@@ -22939,8 +22925,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/newscaster{
 	pixel_y = 32
@@ -23606,9 +23591,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "tsf" = (
@@ -23807,8 +23790,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/camera/network/civilian,
 /turf/simulated/floor/tiled/steel,
@@ -23933,6 +23915,19 @@
 /obj/item/flashlight/lamp/green,
 /turf/simulated/floor/wood,
 /area/bridge/office)
+"tCb" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/navblue/border{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4;
+	use_power = 0
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1portamidhall)
 "tCc" = (
 /obj/machinery/atmospherics/pipe/simple/visible/red{
 	dir = 9
@@ -24272,8 +24267,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/camera/network/civilian,
 /turf/simulated/floor/tiled/steel_ridged,
@@ -24624,8 +24618,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
@@ -25171,9 +25164,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d1portforhall)
 "uxe" = (
@@ -25795,9 +25786,7 @@
 /obj/effect/floor_decal/corner/navgold/bordercorner2{
 	dir = 9
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardforhall)
 "uXz" = (
@@ -26086,9 +26075,7 @@
 "vik" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
@@ -26118,8 +26105,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/machinery/camera/network/civilian{
 	dir = 4
@@ -26546,8 +26532,7 @@
 	icon_state = "0-4"
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/item/radio/intercom{
 	dir = 1;
@@ -26575,8 +26560,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /obj/machinery/camera/network/civilian{
 	dir = 4
@@ -26713,8 +26697,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portforhall)
@@ -27219,7 +27202,7 @@
 	},
 /obj/machinery/light{
 	dir = 4;
-	pixel_x = 10
+	use_power = 0
 	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -27412,7 +27395,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "wmU" = (
-/obj/machinery/power/breakerbox/activated{
+/obj/machinery/power/breakerbox{
 	RCon_tag = "DECK 1 FORE MAIN"
 	},
 /turf/simulated/floor/plating,
@@ -28277,6 +28260,10 @@
 /obj/machinery/camera/network/civilian{
 	dir = 4
 	},
+/obj/machinery/light{
+	dir = 8;
+	light_range = 12
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1fwdhall)
 "wUs" = (
@@ -28513,6 +28500,9 @@
 /obj/machinery/door/firedoor{
 	dir = 1
 	},
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d1portforhall)
 "xft" = (
@@ -28768,9 +28758,7 @@
 /turf/simulated/floor/carpet,
 /area/endeavour/hallway/d1fwdmaint)
 "xrx" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/bridge/hallway)
 "xrL" = (
@@ -28905,8 +28893,7 @@
 	dir = 9
 	},
 /obj/machinery/light{
-	dir = 8;
-	pixel_x = -10
+	dir = 8
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d1afthall)
@@ -29551,6 +29538,10 @@
 	},
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
+/obj/machinery/light{
+	dir = 4;
+	use_power = 0
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1fwdhall)
 "xZn" = (
@@ -29587,7 +29578,7 @@
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d1starboardamidhall)
 "ybg" = (
-/obj/machinery/power/breakerbox/activated{
+/obj/machinery/power/breakerbox{
 	RCon_tag = "DECK 1 AMIDSHIPS MAIN"
 	},
 /turf/simulated/floor/plating,
@@ -29841,9 +29832,7 @@
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardamidhall)
 "yld" = (
@@ -29862,8 +29851,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/computer/timeclock/premade/north,
 /turf/simulated/floor/tiled/steel,
@@ -38779,7 +38767,7 @@ xRj
 xRj
 xRj
 xRj
-xRj
+geQ
 xRj
 xRj
 xRj
@@ -38973,7 +38961,7 @@ xRj
 xRj
 xRj
 xRj
-geQ
+xRj
 xRj
 xRj
 xRj
@@ -40664,7 +40652,7 @@ kHh
 kHh
 aBr
 kHh
-dNj
+jQW
 dZr
 xNI
 xNI
@@ -41626,12 +41614,12 @@ cGC
 ceM
 oYx
 oYx
-oYx
+smu
 oYx
 vEv
 vyI
 cGC
-kHh
+pnA
 oNV
 vpL
 ffU
@@ -50945,7 +50933,7 @@ kPs
 bLa
 sBk
 dmO
-nAf
+cIt
 vwv
 dkh
 ibq
@@ -51510,7 +51498,7 @@ xln
 eDR
 aau
 sSr
-gnm
+tCb
 hbb
 gnm
 jsq
@@ -55583,7 +55571,7 @@ wXu
 gnm
 gnm
 gnm
-wXu
+pbZ
 gnm
 gnm
 gnm
@@ -56375,7 +56363,7 @@ wmU
 aLV
 pIq
 uWI
-stV
+cvv
 uhY
 mRz
 kuZ
diff --git a/maps/endeavour/levels/deck2.dmm b/maps/endeavour/levels/deck2.dmm
index 2b739859d604..ccf927e5f4dc 100644
--- a/maps/endeavour/levels/deck2.dmm
+++ b/maps/endeavour/levels/deck2.dmm
@@ -173,9 +173,7 @@
 /obj/structure/morgue{
 	dir = 8
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/techfloor,
 /area/medical/morgue)
 "afR" = (
@@ -443,8 +441,7 @@
 "aqP" = (
 /obj/machinery/organ_printer/flesh,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 1
@@ -606,8 +603,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay4)
@@ -850,9 +846,7 @@
 /turf/simulated/floor/tiled,
 /area/medical/virology)
 "aFC" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/machinery/computer/ship/navigation/telescreen{
 	pixel_y = -37
 	},
@@ -1065,9 +1059,7 @@
 /turf/simulated/floor/wood,
 /area/medical/psych/psych_1)
 "aPb" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/machinery/mech_recharger,
 /turf/simulated/floor/bluegrid,
 /area/assembly/chargebay)
@@ -1326,8 +1318,7 @@
 /area/medical/medbay4)
 "bbD" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2fwdhall)
@@ -1948,9 +1939,6 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/black{
 	dir = 4
 	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /turf/simulated/floor/tiled,
 /area/medical/virology)
 "bDo" = (
@@ -2023,9 +2011,7 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_wing)
 "bFe" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardamidhall)
 "bFy" = (
@@ -2101,8 +2087,7 @@
 /area/medical/psych_ward)
 "bGy" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 5
@@ -2631,9 +2616,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
 "bYa" = (
@@ -2641,9 +2624,7 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 4
 	},
@@ -3242,9 +3223,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/effect/floor_decal/borderfloorwhite,
 /obj/effect/floor_decal/corner/paleblue/border,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -3341,8 +3320,7 @@
 "cvh" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portforhall)
@@ -3412,8 +3390,7 @@
 /area/endeavour/hallway/d1starboardamidhall)
 "cxk" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/cable/orange{
 	icon_state = "4-8"
@@ -3449,9 +3426,7 @@
 "cyt" = (
 /obj/machinery/iv_drip,
 /obj/effect/floor_decal/industrial/outline/blue,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/structure/sign/warning/nosmoking_1{
 	pixel_x = -28
 	},
@@ -3482,8 +3457,7 @@
 /area/medical/psych_ward)
 "czJ" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/air_alarm{
 	pixel_y = 22
@@ -3533,8 +3507,7 @@
 /area/rnd/research_restroom)
 "cBK" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -3826,8 +3799,7 @@
 /area/medical/exam_room/exam_1)
 "cNs" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 9
@@ -4031,8 +4003,8 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/power/sensor{
-	name = "Powernet Sensor - Deck 3 Subgrid";
-	name_tag = "Deck 3 Subgrid"
+	name = "Powernet Sensor - Deck 2 Amidships Subgrid";
+	name_tag = "Deck 2 Amidships Subgrid"
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/medical)
@@ -4339,9 +4311,7 @@
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/plating,
 /area/maintenance/substation/medical_science)
 "djF" = (
@@ -4356,14 +4326,15 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d2aftmaint)
 "dkr" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/structure/table/standard,
 /turf/simulated/floor/tiled,
 /area/holodeck_control)
 "dkw" = (
 /obj/machinery/atmospherics/component/binary/pump,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/rnd/testingroom)
 "dlc" = (
@@ -4395,8 +4366,7 @@
 /area/rnd/xenobiology)
 "dlw" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
@@ -4450,8 +4420,7 @@
 /area/endeavour/hallway/d2portafthall)
 "dnZ" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/cable/orange{
 	icon_state = "5-8"
@@ -4470,9 +4439,6 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d2fwdhall)
 "doR" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -4686,8 +4652,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/borderfloorwhite/corner2{
 	dir = 1
@@ -4860,9 +4825,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/robotics/morgue)
 "dCW" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/red{
 	dir = 8
 	},
@@ -4879,6 +4841,9 @@
 /obj/effect/floor_decal/corner/green/bordercorner2{
 	dir = 8
 	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
 "dEc" = (
@@ -4956,9 +4921,7 @@
 /obj/effect/floor_decal/corner/paleblue/border{
 	dir = 10
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
 "dHH" = (
@@ -5136,8 +5099,7 @@
 /obj/item/reagent_containers/glass/beaker/large,
 /obj/item/reagent_containers/dropper,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/chemistry_lab)
@@ -5378,8 +5340,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/borderfloorwhite/corner2{
 	dir = 4
@@ -5843,8 +5804,7 @@
 /area/rnd/hallway)
 "ejb" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/closet/crate/robotics,
 /obj/effect/floor_decal/borderfloor{
@@ -6035,9 +5995,7 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_aft_access)
 "eoT" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/structure/sign/department/operational{
 	pixel_y = -30
 	},
@@ -6056,9 +6014,7 @@
 /obj/item/radio/intercom{
 	pixel_y = -24
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora/lab_atmos)
 "epJ" = (
@@ -6550,8 +6506,7 @@
 	pixel_y = 2
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/medical/surgery)
@@ -6710,9 +6665,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay3)
 "eTX" = (
@@ -6847,9 +6800,7 @@
 /turf/simulated/floor/tiled,
 /area/medical/medbay_primary_storage)
 "eXe" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 10
 	},
@@ -6857,8 +6808,7 @@
 /area/endeavour/hallway/d2fwdhall)
 "eXh" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/air_alarm{
 	pixel_y = 22
@@ -6981,8 +6931,7 @@
 	},
 /obj/structure/closet/secure_closet/guncabinet/robotics,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/assembly/chargebay)
@@ -7256,8 +7205,7 @@
 	pixel_y = 22
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/assembly/chargebay)
@@ -7312,9 +7260,7 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
 "fpV" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2afthall)
 "fqf" = (
@@ -7438,9 +7384,7 @@
 "fsX" = (
 /obj/structure/table/glass,
 /obj/item/deskbell,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/wood/sif/indoors,
 /area/medical/reception)
 "fuk" = (
@@ -7611,9 +7555,6 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay4)
 "fBT" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /obj/machinery/door/airlock/glass,
 /obj/machinery/door/firedoor,
 /obj/map_helper/access_helper/airlock/station/science/department,
@@ -7684,8 +7625,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/button/remote/blast_door{
 	id = "xenobiovs4";
@@ -7732,8 +7672,7 @@
 	pixel_y = 24
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/steel,
 /area/rnd/testingroom)
@@ -7768,8 +7707,7 @@
 /area/medical/virology_aft_access)
 "fIs" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/sleeper{
 	dir = 8
@@ -7807,9 +7745,6 @@
 /obj/machinery/door/firedoor{
 	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /obj/machinery/camera/network/civilian{
 	dir = 1
 	},
@@ -7817,8 +7752,7 @@
 /area/endeavour/hallway/d1starboardafthall)
 "fIE" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2afthall)
@@ -8264,8 +8198,7 @@
 /area/rnd/chemistry_lab)
 "fVs" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portforhall)
@@ -8367,6 +8300,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/rdoffice)
+"fZx" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/wood/sif/indoors,
+/area/medical/reception)
 "gao" = (
 /obj/structure/table/reinforced,
 /turf/simulated/floor/tiled,
@@ -8537,6 +8476,16 @@
 "gii" = (
 /turf/simulated/floor/tiled,
 /area/teleporter/departing)
+"gir" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/structure/catwalk,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "giU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/green{
@@ -8943,8 +8892,7 @@
 /area/endeavour/hallway/d2fwdmaint)
 "gzk" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -8976,9 +8924,7 @@
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "gzO" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/structure/bed/roller,
 /obj/effect/floor_decal/borderfloorwhite,
 /obj/effect/floor_decal/corner/paleblue/border,
@@ -9111,8 +9057,7 @@
 	pixel_y = 2
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/medical/surgery2)
@@ -9191,8 +9136,7 @@
 	dir = 9
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
@@ -9832,6 +9776,15 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/medical/virology_fore_access)
+"hfW" = (
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d1starboardafthall)
 "hfZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
@@ -9882,8 +9835,7 @@
 /area/rnd/xenobiology/xenoflora)
 "hiw" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/machinery/power/apc/north_mount,
@@ -10000,6 +9952,9 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/rnd/testingroom)
 "hlC" = (
@@ -10130,8 +10085,7 @@
 	req_access = list(5)
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/medical/morgue)
@@ -10223,9 +10177,7 @@
 /obj/random/plushie,
 /obj/random/plushie,
 /obj/random/plushie,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/effect/floor_decal/corner/beige{
 	dir = 10
 	},
@@ -10392,9 +10344,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/white,
 /area/holodeck_control)
 "hyb" = (
@@ -10441,8 +10391,7 @@
 /area/medical/psych_ward)
 "hzW" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -10478,7 +10427,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/medical/morgue)
 "hBp" = (
-/obj/machinery/power/breakerbox/activated{
+/obj/machinery/power/breakerbox{
 	RCon_tag = "DECK 2 AMIDSHIPS MAIN"
 	},
 /turf/simulated/floor/plating,
@@ -10505,9 +10454,6 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay4)
 "hBV" = (
-/obj/structure/cable/green{
-	icon_state = "1-4"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
@@ -10779,7 +10725,7 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/chemistry)
 "hMz" = (
-/obj/machinery/power/breakerbox/activated{
+/obj/machinery/power/breakerbox{
 	RCon_tag = "DECK 2 FORE MAIN"
 	},
 /turf/simulated/floor/plating,
@@ -10930,9 +10876,7 @@
 /turf/simulated/floor/carpet/blucarpet,
 /area/crew_quarters/medbreak)
 "hRV" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/effect/floor_decal/borderfloorwhite,
 /obj/effect/floor_decal/corner/paleblue/border,
 /turf/simulated/floor/tiled/white,
@@ -11008,9 +10952,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /turf/simulated/floor/tiled,
 /area/medical/virology)
 "hXy" = (
@@ -11146,8 +11087,7 @@
 /area/rnd/workshop)
 "idf" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -11208,8 +11148,7 @@
 /area/rnd/xenobiology/xenoflora/lab_atmos)
 "iev" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 9
@@ -11261,6 +11200,9 @@
 /turf/simulated/wall/prepainted/medical,
 /area/maintenance/substation/medical_science)
 "igl" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/testingroom)
 "igr" = (
@@ -11475,8 +11417,7 @@
 	pixel_y = 26
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/computer/card,
 /turf/simulated/floor/tiled,
@@ -11985,8 +11926,7 @@
 "iFB" = (
 /obj/machinery/suspension_gen,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/anomaly_lab)
@@ -12007,8 +11947,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
@@ -12206,6 +12145,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay4)
+"iPG" = (
+/obj/machinery/power/breakerbox{
+	RCon_tag = "DECK 2 AFT MAIN"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/substation/medical_science)
 "iPU" = (
 /obj/structure/table/woodentable,
 /obj/item/toy/plushie/kitten,
@@ -12503,8 +12448,7 @@
 /area/rnd/workshop)
 "jdn" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/borderfloorwhite/corner{
 	dir = 4
@@ -12554,8 +12498,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/flora/ausbushes/fullgrass,
 /turf/simulated/floor/grass,
@@ -12633,9 +12576,7 @@
 /turf/simulated/floor/wood,
 /area/rnd/research/researchdivision)
 "jjG" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
@@ -12658,8 +12599,7 @@
 "jkJ" = (
 /obj/machinery/atmospherics/portables_connector,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/air_alarm{
 	pixel_y = 22
@@ -12717,8 +12657,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay3)
@@ -12732,9 +12671,7 @@
 /obj/machinery/computer/ship/navigation/telescreen{
 	pixel_y = -37
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
 "jnq" = (
@@ -12886,9 +12823,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/rdoffice)
 "jsQ" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -12917,6 +12852,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "jtH" = (
@@ -13149,8 +13087,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/red{
 	dir = 8
@@ -13437,8 +13374,7 @@
 	dir = 2
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/robotics/morgue)
@@ -13476,8 +13412,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
@@ -13572,9 +13507,7 @@
 /obj/machinery/camera/network/research{
 	dir = 1
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora/lab_atmos)
 "jUt" = (
@@ -13631,9 +13564,6 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/red,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /turf/simulated/floor/tiled,
 /area/medical/virology)
 "jWf" = (
@@ -13661,9 +13591,7 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
 "jWy" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -13782,7 +13710,7 @@
 /area/rnd/xenobiology)
 "kdl" = (
 /turf/simulated/wall/prepainted/medical,
-/area/space)
+/area/endeavour/hallway/d1starboardafthall)
 "kdL" = (
 /obj/structure/table/glass,
 /obj/item/paper_bin,
@@ -14288,9 +14216,7 @@
 /obj/structure/bed/chair{
 	dir = 1
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/machinery/power/apc/south_mount,
 /obj/structure/cable/green{
 	icon_state = "0-8"
@@ -14528,8 +14454,7 @@
 "kJt" = (
 /obj/structure/bed/chair,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 1
@@ -14619,9 +14544,7 @@
 	pixel_x = 1
 	},
 /obj/effect/floor_decal/industrial/outline/blue,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
 "kMD" = (
@@ -14664,8 +14587,7 @@
 /area/medical/medbay3)
 "kNW" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/disposal{
 	pixel_y = -2
@@ -14794,9 +14716,7 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
 "kUk" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
 "kUn" = (
@@ -14905,9 +14825,7 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2fwdmaint)
 "kWR" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 1
 	},
@@ -14998,9 +14916,6 @@
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "lad" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -15041,8 +14956,7 @@
 /area/medical/sleeper)
 "lay" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/power/apc/west_mount{
 	cell_type = /obj/item/cell/super;
@@ -16085,9 +15999,6 @@
 /area/medical/patient_c)
 "lRT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/black,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /turf/simulated/floor/tiled,
 /area/medical/virology)
 "lSb" = (
@@ -16190,9 +16101,7 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay3)
 "lUe" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/reinforced,
 /area/rnd/testingroom)
 "lVq" = (
@@ -16259,8 +16168,7 @@
 /obj/structure/table/woodentable,
 /obj/item/storage/box/cups,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/wood/sif/indoors,
 /area/medical/reception)
@@ -16542,8 +16450,7 @@
 /area/endeavour/hallway/d1starboardforhall)
 "mnx" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay_primary_storage)
@@ -17150,8 +17057,7 @@
 /area/medical/medbay_primary_storage)
 "mIs" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -17344,8 +17250,7 @@
 /area/endeavour/hallway/d2portamidhall)
 "mQh" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -17495,9 +17400,7 @@
 /turf/simulated/floor/plating,
 /area/medical/psych/psych_2)
 "mWa" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
@@ -17557,8 +17460,7 @@
 "mYS" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
@@ -17692,8 +17594,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
@@ -18092,9 +17993,7 @@
 "nwe" = (
 /obj/effect/floor_decal/borderfloorwhite,
 /obj/effect/floor_decal/corner/green/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_aft_access)
 "nwm" = (
@@ -18102,6 +18001,9 @@
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 8
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/rnd/testingroom)
 "nwz" = (
@@ -18449,14 +18351,43 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
 "nKL" = (
-/obj/structure/cable/green{
-	icon_state = "0-4"
+/obj/machinery/door/blast/shutters{
+	density = 0;
+	dir = 2;
+	icon_state = "shutter0";
+	id = "medbayquar";
+	name = "Medbay Emergency Lockdown Shutters";
+	opacity = 0
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/black{
-	dir = 4
+/obj/machinery/door/firedoor,
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 8
 	},
-/turf/simulated/floor/tiled,
-/area/medical/virology)
+/obj/effect/floor_decal/corner/paleblue/border{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/paleblue/border{
+	dir = 8
+	},
+/obj/effect/floor_decal/spline/plain{
+	dir = 8
+	},
+/obj/machinery/door/airlock/multi_tile/glass/medical{
+	name = "Medbay Lobby"
+	},
+/obj/machinery/door/blast/shutters{
+	density = 0;
+	dir = 2;
+	icon_state = "shutter0";
+	id = "medbayquar";
+	name = "Medbay Emergency Lockdown Shutters";
+	opacity = 0
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/reception)
 "nKY" = (
 /obj/machinery/fire_alarm/north_mount,
 /turf/simulated/floor/tiled,
@@ -18737,8 +18668,8 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/power/sensor{
-	name = "Powernet Sensor - Deck 3 Subgrid";
-	name_tag = "Deck 3 Subgrid"
+	name = "Powernet Sensor - Deck 2 Fore Subgrid";
+	name_tag = "Deck 2 Fore Subgrid"
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/research)
@@ -18805,6 +18736,9 @@
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/wood/sif/indoors,
 /area/medical/reception)
 "nWQ" = (
@@ -18899,9 +18833,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/black{
 	dir = 10
 	},
-/obj/structure/cable/green{
-	icon_state = "2-8"
-	},
 /turf/simulated/floor/tiled,
 /area/medical/virology)
 "oaU" = (
@@ -19094,9 +19025,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/medical_restroom)
 "oke" = (
@@ -19259,8 +19188,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/camera/network/research,
 /turf/simulated/floor/tiled,
@@ -19333,8 +19261,7 @@
 	volume_rate = 700
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 1
@@ -19475,12 +19402,13 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
 "ozA" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
 "ozS" = (
@@ -19510,17 +19438,13 @@
 	},
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/mauve/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora/lab_atmos)
 "oBk" = (
 /obj/effect/floor_decal/borderfloorwhite,
 /obj/effect/floor_decal/corner/paleblue/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/effect/floor_decal/borderfloorwhite/corner2,
 /obj/effect/floor_decal/corner/paleblue/bordercorner2,
 /turf/simulated/floor/tiled/white,
@@ -20129,8 +20053,7 @@
 "oWH" = (
 /obj/structure/table/reinforced,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -20410,9 +20333,7 @@
 "pca" = (
 /obj/effect/floor_decal/borderfloorwhite,
 /obj/effect/floor_decal/corner/paleblue/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay3)
 "pds" = (
@@ -20806,8 +20727,7 @@
 	volume_rate = 700
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
@@ -20934,8 +20854,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/borderfloorwhite/corner2{
@@ -21016,6 +20935,9 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -27
 	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/rnd/testingroom)
 "pvs" = (
@@ -21219,8 +21141,7 @@
 	dir = 5
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/sign/department/anomaly{
 	pixel_y = 34
@@ -21460,6 +21381,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_aft_access)
+"pJM" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/rnd/research/researchdivision)
 "pKn" = (
 /obj/machinery/atmospherics/portables_connector,
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide{
@@ -21771,9 +21698,7 @@
 /area/endeavour/hallway/d1starboardamidhall)
 "pVw" = (
 /obj/structure/table/woodentable,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/wood,
 /area/medical/medbay4)
 "pVB" = (
@@ -22092,9 +22017,7 @@
 /turf/simulated/floor/tiled,
 /area/medical/morgue)
 "qaO" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2fwdhall)
 "qbE" = (
@@ -22260,9 +22183,7 @@
 	},
 /obj/item/storage/box/masks,
 /obj/item/storage/box/masks,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/effect/floor_decal/borderfloorwhite,
 /obj/effect/floor_decal/corner/green/border,
 /obj/item/radio/intercom{
@@ -22365,9 +22286,7 @@
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/plating,
 /area/maintenance/substation/medical)
 "qnn" = (
@@ -23784,9 +23703,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
@@ -23896,6 +23813,9 @@
 /obj/effect/floor_decal/corner/green/bordercorner2{
 	dir = 10
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
 "rnw" = (
@@ -24120,8 +24040,7 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/item/radio/intercom{
 	dir = 1;
@@ -24154,8 +24073,8 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/power/sensor{
-	name = "Powernet Sensor - Deck 3 Subgrid";
-	name_tag = "Deck 3 Subgrid"
+	name = "Powernet Sensor - Deck 2 Aft Subgrid";
+	name_tag = "Deck 2 Aft Subgrid"
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/medical_science)
@@ -24183,9 +24102,7 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2fwdhall)
 "ryO" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/medical/medbay_primary_storage)
 "rzi" = (
@@ -24451,8 +24368,7 @@
 /area/medical/reception)
 "rLI" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -24688,6 +24604,9 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "rRX" = (
@@ -24964,9 +24883,7 @@
 /obj/machinery/newscaster{
 	pixel_y = -31
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/machinery/button/windowtint{
 	id = "rnd1";
 	pixel_x = -25;
@@ -25389,7 +25306,6 @@
 /obj/effect/floor_decal/corner/green/border{
 	dir = 10
 	},
-/obj/machinery/power/apc/west_mount,
 /obj/structure/table/glass,
 /obj/item/storage/box/syringes,
 /obj/item/reagent_containers/dropper,
@@ -25439,9 +25355,7 @@
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 1
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2fwdhall)
 "szg" = (
@@ -25564,8 +25478,7 @@
 	pixel_y = 22
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/research/testingrange)
@@ -25614,8 +25527,7 @@
 	dir = 5
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
@@ -25695,8 +25607,7 @@
 /area/rnd/research/researchdivision)
 "sKw" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/power/apc/west_mount{
 	cell_type = /obj/item/cell/super;
@@ -25871,8 +25782,7 @@
 /area/rnd/xenobiology)
 "sRh" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/hallway/station/docks)
@@ -25892,6 +25802,9 @@
 /obj/structure/cable/green{
 	icon_state = "2-4"
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/medical)
 "sTt" = (
@@ -25983,6 +25896,12 @@
 /obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay3)
+"sVb" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "sVt" = (
 /obj/machinery/smartfridge/drying_rack,
 /obj/machinery/camera/network/research{
@@ -26186,8 +26105,7 @@
 /area/medical/virology_aft_access)
 "tcX" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
@@ -26926,6 +26844,9 @@
 /obj/structure/cable/green{
 	icon_state = "2-4"
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/research)
 "tEs" = (
@@ -26944,8 +26865,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora/lab_atmos)
@@ -27111,9 +27031,7 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portforhall)
 "tMG" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/white,
 /area/rnd/research_restroom)
 "tNe" = (
@@ -27314,6 +27232,10 @@
 	name = "Virology Isolation Room One";
 	req_access = list(39)
 	},
+/obj/machinery/power/apc/west_mount,
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virologyisolation)
 "tSj" = (
@@ -27365,9 +27287,7 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
 "tUN" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portforhall)
 "tVG" = (
@@ -27415,8 +27335,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled,
@@ -27765,9 +27684,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay3)
 "ukW" = (
@@ -28292,8 +28209,7 @@
 /area/medical/sleeper)
 "uJM" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/cable/orange{
 	icon_state = "4-8"
@@ -28324,9 +28240,7 @@
 /turf/simulated/floor/tiled/steel_ridged,
 /area/medical/medbay_emt_bay)
 "uKJ" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
 "uLo" = (
@@ -28491,9 +28405,7 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_d)
 "uQD" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/effect/floor_decal/borderfloorwhite,
 /obj/effect/floor_decal/corner/paleblue/border,
 /obj/structure/bed/roller,
@@ -28596,8 +28508,7 @@
 "uTM" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -28858,8 +28769,7 @@
 	dir = 5
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay4)
@@ -29079,8 +28989,7 @@
 "vqH" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/cable/orange{
 	icon_state = "4-8"
@@ -29355,9 +29264,7 @@
 "vDl" = (
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/mauve/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "vEl" = (
@@ -29525,8 +29432,7 @@
 /area/rnd/xenobiology)
 "vLl" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
@@ -29890,8 +29796,7 @@
 /area/assembly/robotics)
 "vZs" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/air_alarm{
 	pixel_y = 22
@@ -29906,8 +29811,7 @@
 /area/endeavour/hallway/d1starboardafthall)
 "vZv" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/noticeboard{
 	pixel_y = 32
@@ -30130,8 +30034,7 @@
 /area/endeavour/hallway/d2fwdhall)
 "weJ" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/cable/orange{
 	icon_state = "6-9"
@@ -30188,8 +30091,7 @@
 /area/maintenance/research)
 "wgg" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/noticeboard{
 	pixel_y = 32
@@ -30797,8 +30699,7 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/carpet/purcarpet,
 /area/rnd/breakroom)
@@ -30880,15 +30781,15 @@
 /turf/simulated/floor/wood/sif/indoors,
 /area/medical/reception)
 "wDR" = (
-/obj/machinery/power/apc/east_mount,
-/obj/effect/floor_decal/borderfloor{
-	dir = 5
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/obj/effect/floor_decal/corner/mauve/border{
-	dir = 5
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "2-8"
 	},
-/turf/simulated/floor/tiled,
-/area/rnd/hallway)
+/turf/simulated/floor/plating,
+/area/maintenance/research)
 "wDV" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /turf/simulated/floor/plating,
@@ -31116,9 +31017,7 @@
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora/lab_atmos)
 "wNE" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/mauve/border,
 /obj/structure/extinguisher_cabinet{
@@ -31142,8 +31041,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
@@ -31548,6 +31446,9 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portforhall)
+"xda" = (
+/turf/simulated/floor/plating,
+/area/maintenance/substation/medical)
 "xdd" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -31980,6 +31881,9 @@
 /obj/structure/cable/green{
 	icon_state = "2-4"
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/medical_science)
 "xsC" = (
@@ -32024,8 +31928,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
@@ -32044,8 +31947,7 @@
 "xvd" = (
 /obj/machinery/washing_machine,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/medical/resleeving)
@@ -32240,6 +32142,18 @@
 	},
 /turf/simulated/floor/wood,
 /area/rnd/research/researchdivision)
+"xEp" = (
+/obj/effect/floor_decal/corner/paleblue/border{
+	dir = 8
+	},
+/obj/effect/floor_decal/spline/plain{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/reception)
 "xEA" = (
 /obj/machinery/camera/network/research{
 	dir = 1
@@ -32370,8 +32284,7 @@
 /area/medical/virology_fore_access)
 "xHy" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 1
@@ -32929,8 +32842,7 @@
 /area/holodeck_control)
 "yeL" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/cable/orange{
 	icon_state = "4-8"
@@ -33102,9 +33014,7 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_c)
 "ymb" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/machinery/atmospherics/component/unary/outlet_injector{
 	frequency = 1445;
 	id = "burn_in";
@@ -38823,7 +38733,7 @@ jMj
 eZZ
 xIf
 xIf
-xIf
+mUB
 xIf
 xVe
 feQ
@@ -39411,7 +39321,7 @@ tcy
 xIf
 xIf
 xIf
-xIf
+mUB
 xIf
 qpq
 pTU
@@ -43867,7 +43777,7 @@ jVn
 bOa
 kCt
 hqT
-hqT
+pJM
 hqT
 dKQ
 gIV
@@ -44240,7 +44150,7 @@ xIf
 ppB
 xIf
 dgT
-xIf
+sVb
 xIf
 xIf
 ppB
@@ -44434,8 +44344,8 @@ neh
 neh
 neh
 tCF
-bzY
-bzY
+wDR
+gir
 bzY
 bzY
 bzY
@@ -45250,7 +45160,7 @@ fIx
 jkz
 ijd
 sNP
-iGC
+fZx
 wGQ
 qTx
 tpZ
@@ -45440,7 +45350,7 @@ bZX
 oaU
 cxk
 phe
-wuj
+jPR
 cOC
 ijd
 wDr
@@ -45634,9 +45544,9 @@ gao
 oaU
 imb
 tnk
-mdU
-pHO
-fqm
+hfW
+nKL
+xEp
 jth
 rRJ
 tdK
@@ -49311,7 +49221,7 @@ oDd
 cHC
 eEE
 fPm
-kyR
+iPG
 eEE
 qPc
 djp
@@ -50056,7 +49966,7 @@ xIf
 xIf
 xnR
 fBT
-wDR
+rGZ
 gzA
 eiO
 gzA
@@ -53001,7 +52911,7 @@ qPa
 pZh
 chD
 mKc
-chD
+xda
 oDd
 heR
 vEl
@@ -53010,7 +52920,7 @@ vYN
 kzb
 vYN
 hmG
-nKL
+cgs
 swx
 wlz
 wlz
diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm
index be98fad36741..49b47df96091 100644
--- a/maps/endeavour/levels/deck3.dmm
+++ b/maps/endeavour/levels/deck3.dmm
@@ -735,8 +735,7 @@
 	dir = 5
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/warden)
@@ -804,16 +803,14 @@
 /area/hydroponics)
 "aKK" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/bed/chair/shuttle,
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/belter)
 "aKZ" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -884,8 +881,7 @@
 "aOs" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/fire_alarm/north_mount,
 /obj/effect/floor_decal/steeldecal/steel_decals9,
@@ -1101,8 +1097,7 @@
 /area/hydroponics)
 "aXy" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/fitness/punching_bag,
 /turf/simulated/floor/wood,
@@ -1173,13 +1168,6 @@
 /turf/simulated/wall/r_wall/prepainted,
 /area/crew_quarters/sleep/Dorm_8)
 "bbW" = (
-/obj/machinery/button/remote/blast_door{
-	id = "armorytactical";
-	name = "Tactical Armory Access";
-	pixel_x = -25;
-	pixel_y = -6;
-	req_access = list(3)
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -1318,8 +1306,7 @@
 "bfY" = (
 /obj/effect/paint/darkred,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/plating,
 /area/security/hanger)
@@ -1602,9 +1589,6 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/surfacebase/mining_main/refinery)
 "boM" = (
-/obj/effect/floor_decal/techfloor/corner{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/green{
@@ -1733,8 +1717,7 @@
 	pixel_y = 32
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/hydroponics)
@@ -2099,8 +2082,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
@@ -2381,9 +2363,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3fwdhall)
 "cce" = (
@@ -2453,8 +2433,7 @@
 /obj/item/target,
 /obj/item/target,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/fire_alarm/north_mount,
 /turf/simulated/floor/tiled/old_tile/gray,
@@ -2527,8 +2506,7 @@
 	pixel_y = 32
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/random/bedsheet,
 /turf/simulated/floor/wood,
@@ -2609,8 +2587,7 @@
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/structure/closet/wardrobe,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_11)
@@ -2672,8 +2649,7 @@
 /area/security/forensics)
 "ctz" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portamidhall)
@@ -3628,8 +3604,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/camera/network/security,
 /turf/simulated/floor/tiled/dark,
@@ -4703,8 +4678,7 @@
 /area/security/armoury)
 "efY" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_2)
@@ -4892,8 +4866,7 @@
 "enu" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -5184,8 +5157,7 @@
 "exc" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3portamidhall)
@@ -5306,9 +5278,7 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
 "eBi" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3fwdhall)
 "eBl" = (
@@ -5470,8 +5440,7 @@
 /area/security/brig)
 "eDS" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -5731,8 +5700,7 @@
 "eMa" = (
 /obj/structure/bed/chair,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/security/hallway)
@@ -6211,8 +6179,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardamidhall)
@@ -6503,8 +6470,7 @@
 	pixel_x = -22
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/corner/red{
 	dir = 9
@@ -6564,8 +6530,7 @@
 	pixel_y = 32
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/random/bedsheet,
 /turf/simulated/floor/wood,
@@ -6711,8 +6676,7 @@
 /area/quartermaster/office)
 "fJn" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/table/woodentable,
 /obj/item/paper_bin,
@@ -7189,8 +7153,7 @@
 "fUc" = (
 /obj/structure/bed/chair/sofa,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
@@ -7476,8 +7439,7 @@
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
 /obj/item/stool/padded,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/vacant/vacant_shop)
@@ -7680,6 +7642,9 @@
 	dir = 8;
 	pixel_x = -10
 	},
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/civilian)
 "gqw" = (
@@ -7786,9 +7751,6 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
 "guu" = (
-/obj/effect/floor_decal/techfloor/corner{
-	dir = 1
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -8744,6 +8706,9 @@
 /obj/structure/cable/green{
 	icon_state = "2-4"
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/security)
 "hvh" = (
@@ -8861,8 +8826,7 @@
 "hzs" = (
 /obj/machinery/computer/secure_data,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/old_cargo/red,
 /area/security/security_processing)
@@ -9198,8 +9162,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/hanger)
@@ -9747,8 +9710,7 @@
 "iqw" = (
 /obj/structure/bed/padded,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/old_cargo/gray,
 /area/prison/cell_block)
@@ -9779,13 +9741,6 @@
 /obj/effect/floor_decal/corner/red{
 	dir = 4
 	},
-/obj/machinery/button/remote/blast_door{
-	id = "armorytactical";
-	name = "Tactical Armory Access";
-	pixel_x = 25;
-	pixel_y = -6;
-	req_access = list(3)
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
 	},
@@ -9866,8 +9821,7 @@
 	pixel_x = -22
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 9
@@ -10058,8 +10012,8 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/power/sensor{
-	name = "Powernet Sensor - Deck 3 Subgrid";
-	name_tag = "Deck 3 Subgrid"
+	name = "Powernet Sensor - Deck 3 Fore Subgrid";
+	name_tag = "Deck 3 Fore Subgrid"
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/civilian)
@@ -10221,9 +10175,6 @@
 	pixel_y = 32
 	},
 /obj/machinery/vending/loadout,
-/obj/effect/floor_decal/techfloor/corner{
-	dir = 1
-	},
 /turf/simulated/floor/tiled/dark,
 /area/vacant/vacant_shop)
 "iPK" = (
@@ -11350,8 +11301,7 @@
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/structure/closet/wardrobe,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_5)
@@ -11456,9 +11406,7 @@
 /obj/machinery/fire_alarm/south_mount{
 	pixel_y = -24
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3afthall)
 "jZR" = (
@@ -11772,8 +11720,7 @@
 /obj/machinery/portable_atmospherics/canister/air/airlock,
 /obj/machinery/atmospherics/portables_connector,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/hallwayaux)
@@ -11811,8 +11758,7 @@
 /obj/effect/floor_decal/industrial/warning/full,
 /obj/structure/disposalpipe/trunk,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
 /obj/item/barrier_tape_segment/engineering,
@@ -12072,8 +12018,7 @@
 /area/station/stairs_two)
 "kEF" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -12327,8 +12272,7 @@
 	pixel_y = 32
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/warehouse)
@@ -12346,14 +12290,6 @@
 /obj/map_helper/access_helper/airlock/station/security/brig,
 /turf/simulated/floor/tiled,
 /area/security/hanger)
-"kRY" = (
-/obj/effect/floor_decal/techfloor/corner{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d3afthall)
 "kSc" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -12664,8 +12600,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardafthall)
@@ -12715,8 +12650,7 @@
 /area/security/hallway)
 "lhR" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/endeavour/hallway/d3afthall)
@@ -12826,8 +12760,7 @@
 /area/security/lobby)
 "lot" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/status_display{
 	pixel_y = 32
@@ -13300,8 +13233,7 @@
 /area/endeavour/hallway/d3starboardamidhall)
 "lJp" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardforhall)
@@ -13500,6 +13432,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
+"lSK" = (
+/obj/machinery/power/breakerbox{
+	RCon_tag = "DECK 3 AMIDSHIPS MAIN"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/substation/security)
 "lTj" = (
 /turf/simulated/wall/r_wall/prepainted,
 /area/crew_quarters/sleep/Dorm_5)
@@ -13599,8 +13537,7 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/corner/red,
 /obj/structure/cable/green{
@@ -13621,8 +13558,7 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
@@ -13739,8 +13675,7 @@
 "mbt" = (
 /obj/structure/undies_wardrobe,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_3)
@@ -13766,9 +13701,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/warden)
 "mcn" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/reinforced,
 /area/quartermaster/miningdock)
 "mcv" = (
@@ -13991,8 +13924,7 @@
 /area/quartermaster/delivery)
 "mll" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
 /turf/simulated/floor/tiled/dark,
@@ -14124,8 +14056,7 @@
 /area/endeavour/hallway/d3aftmaint)
 "mqp" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3fwdmaint)
@@ -14170,8 +14101,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/old_cargo/gray,
 /area/prison/cell_block)
@@ -14337,7 +14267,7 @@
 /turf/simulated/floor/carpet,
 /area/security/brig)
 "mBj" = (
-/obj/machinery/power/breakerbox/activated{
+/obj/machinery/power/breakerbox{
 	RCon_tag = "DECK 3 FORE MAIN"
 	},
 /turf/simulated/floor/plating,
@@ -14632,8 +14562,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
@@ -14916,8 +14845,7 @@
 	},
 /obj/machinery/vending/loadout/accessory,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/vacant/vacant_shop)
@@ -14998,8 +14926,7 @@
 	dir = 5
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/wood,
 /area/endeavour/hallway/d3fwdhall)
@@ -15182,8 +15109,7 @@
 /area/quartermaster/qm)
 "npW" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/dormitory)
@@ -15608,8 +15534,7 @@
 	pixel_y = 30
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardforhall)
@@ -16427,9 +16352,7 @@
 "orr" = (
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/lime/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "orP" = (
@@ -16899,9 +16822,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/janitor)
 "oIN" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/machinery/fire_alarm/south_mount{
 	pixel_y = -24
 	},
@@ -17155,8 +17076,7 @@
 	},
 /obj/machinery/holopad,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/old_cargo/white,
 /area/security/forensics)
@@ -17285,8 +17205,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardforhall)
@@ -17468,12 +17387,6 @@
 /obj/map_helper/access_helper/airlock/station/security/equipment,
 /turf/simulated/floor/tiled/dark,
 /area/security/security_lockerroom)
-"phj" = (
-/obj/machinery/light{
-	pixel_y = -24
-	},
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d3portforhall)
 "pht" = (
 /obj/structure/table/rack/shelf/steel,
 /obj/machinery/light,
@@ -17549,8 +17462,7 @@
 /area/crew_quarters/kitchen)
 "piH" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3fwdhall)
@@ -17791,6 +17703,13 @@
 	dir = 4
 	},
 /obj/machinery/fire_alarm/east_mount,
+/obj/machinery/button/remote/blast_door{
+	id = "armorytactical";
+	name = "Tactical Armory Access";
+	pixel_x = 25;
+	pixel_y = -6;
+	req_access = list(3)
+	},
 /turf/simulated/floor/tiled/dark,
 /area/security/riot_control)
 "prg" = (
@@ -17810,8 +17729,7 @@
 	pixel_y = 22
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/security/brig)
@@ -17921,9 +17839,6 @@
 /turf/simulated/wall/prepainted,
 /area/crew_quarters/recreation_area)
 "pwu" = (
-/obj/effect/floor_decal/techfloor/corner{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/monotile,
@@ -17984,6 +17899,9 @@
 /obj/structure/cable/green{
 	icon_state = "2-4"
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/civilian)
 "pzo" = (
@@ -18704,6 +18622,9 @@
 	dir = 8;
 	pixel_x = -10
 	},
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/security)
 "qeX" = (
@@ -19423,9 +19344,6 @@
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/hos)
 "qJx" = (
-/obj/effect/floor_decal/techfloor/corner{
-	dir = 1
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -20007,8 +19925,7 @@
 	pixel_y = 26
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/suit_storage_unit/mining,
 /turf/simulated/floor/tiled,
@@ -20215,8 +20132,7 @@
 /area/security/warden)
 "rub" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
@@ -20232,8 +20148,7 @@
 "ruB" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -20362,8 +20277,7 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/table/rack,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/nuke_storage)
@@ -20794,8 +20708,7 @@
 /area/crew_quarters/sleep/Dorm_11)
 "rWA" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/security/nuke_storage)
@@ -20812,7 +20725,7 @@
 /turf/simulated/wall/prepainted,
 /area/maintenance/substation/cargo)
 "rXl" = (
-/obj/machinery/power/breakerbox/activated{
+/obj/machinery/power/breakerbox{
 	RCon_tag = "DECK 3 AFT MAIN"
 	},
 /turf/simulated/floor/plating,
@@ -21191,8 +21104,7 @@
 	},
 /obj/machinery/camera/network/security,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/security/hanger)
@@ -21554,12 +21466,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_3)
-"syh" = (
-/obj/effect/floor_decal/techfloor/corner{
-	dir = 1
-	},
-/turf/simulated/floor/tiled,
-/area/crew_quarters/bar)
 "syD" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 1
@@ -21608,8 +21514,7 @@
 /area/crew_quarters/bar)
 "sAQ" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/cable/green{
 	icon_state = "2-4"
@@ -21780,8 +21685,7 @@
 /area/endeavour/surfacebase/mining_main/refinery)
 "sHr" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/bed/chair/shuttle,
 /turf/simulated/floor/tiled/steel,
@@ -22070,8 +21974,7 @@
 /area/quartermaster/storage)
 "sXK" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3portforhall)
@@ -22315,8 +22218,7 @@
 /area/security/nuke_storage)
 "tiR" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/corner/red{
 	dir = 9
@@ -23296,8 +23198,7 @@
 	},
 /obj/machinery/camera/network/security,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
@@ -23363,8 +23264,7 @@
 	},
 /obj/machinery/camera/network/security,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
@@ -23459,8 +23359,8 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/power/sensor{
-	name = "Powernet Sensor - Deck 3 Subgrid";
-	name_tag = "Deck 3 Subgrid"
+	name = "Powernet Sensor - Deck 3 Aft Subgrid";
+	name_tag = "Deck 3 Aft Subgrid"
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/security)
@@ -23483,6 +23383,9 @@
 	dir = 8;
 	pixel_x = -10
 	},
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/cargo)
 "ujB" = (
@@ -23544,8 +23447,7 @@
 	dir = 5
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -23768,6 +23670,9 @@
 /obj/structure/cable/green{
 	icon_state = "2-4"
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/cargo)
 "uwg" = (
@@ -23845,9 +23750,7 @@
 /obj/structure/bed/chair/sofa{
 	dir = 1
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
 "uzl" = (
@@ -24048,8 +23951,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3fwdhall)
@@ -24163,9 +24065,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/station/stairs_two)
 "uMF" = (
@@ -24261,6 +24161,9 @@
 	},
 /obj/machinery/door/airlock/maintenance,
 /obj/map_helper/access_helper/airlock/station/engineering/department,
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/hallway/d3aftmaint)
 "uSv" = (
@@ -24278,8 +24181,7 @@
 /area/maintenance/dormitory)
 "uTh" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/computer/arcade,
 /obj/structure/cable/green{
@@ -24323,8 +24225,7 @@
 /obj/structure/table/steel,
 /obj/item/storage/toolbox/electrical,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/security/lobby)
@@ -25076,8 +24977,7 @@
 	pixel_y = 22
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/security/range)
@@ -25904,8 +25804,7 @@
 /area/endeavour/hallway/d3starboardforhall)
 "vXj" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/corner/black/full{
 	dir = 1
@@ -25924,6 +25823,13 @@
 /obj/item/ammo_magazine/a5_56mm/ext,
 /obj/item/ammo_magazine/a5_56mm/ext,
 /obj/item/ammo_magazine/a5_56mm/ext,
+/obj/machinery/button/remote/blast_door{
+	id = "armorytactical";
+	name = "Tactical Armory Access";
+	pixel_x = -25;
+	pixel_y = -6;
+	req_access = list(3)
+	},
 /turf/simulated/floor/tiled/dark,
 /area/security/tactical)
 "vXB" = (
@@ -26200,8 +26106,7 @@
 "wmU" = (
 /obj/machinery/fire_alarm/north_mount,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/air_alarm{
 	pixel_y = 27
@@ -26614,8 +26519,7 @@
 /area/crew_quarters/fitness)
 "wHF" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/closet/jcloset,
 /obj/random/soap,
@@ -27350,8 +27254,7 @@
 "xtI" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3portforhall)
@@ -27701,8 +27604,7 @@
 "xJC" = (
 /obj/machinery/holopad,
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/security/hanger)
@@ -28029,8 +27931,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/effect/floor_decal/corner/red{
 	dir = 5
@@ -28220,8 +28121,7 @@
 /area/endeavour/hallway/d3fwdhall)
 "yjd" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -34247,7 +34147,7 @@ pRW
 pRW
 tUu
 bzE
-syh
+kbt
 rnj
 uGk
 uGk
@@ -40092,7 +39992,7 @@ jdI
 wTk
 jGq
 wTk
-kRY
+wTk
 prg
 wTk
 ayc
@@ -41639,7 +41539,7 @@ uzP
 dbK
 gxU
 gum
-phj
+qvY
 syH
 kSn
 kSn
@@ -42997,7 +42897,7 @@ ays
 iDE
 tBY
 xiG
-phj
+qvY
 syH
 kSn
 kSn
@@ -46684,7 +46584,7 @@ dlI
 sTd
 emK
 fPA
-phj
+qvY
 bWK
 bWK
 bWK
@@ -48629,7 +48529,7 @@ lTw
 lTw
 mhY
 nfG
-xfl
+lSK
 mhY
 jkU
 nuP
diff --git a/maps/endeavour/levels/deck4.dmm b/maps/endeavour/levels/deck4.dmm
index 688bcf412b97..3b22dc12ffbc 100644
--- a/maps/endeavour/levels/deck4.dmm
+++ b/maps/endeavour/levels/deck4.dmm
@@ -40,6 +40,7 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
+/obj/machinery/air_alarm/north_mount,
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/command/turrets)
 "acl" = (
@@ -72,45 +73,6 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4porthall)
-"aeU" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/table/rack{
-	dir = 8;
-	layer = 2.6
-	},
-/obj/machinery/door/window/northleft{
-	name = "Engineering Hardsuits";
-	req_access = list(11)
-	},
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/engineering,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/head/helmet/space/void/engineering,
-/obj/item/clothing/head/helmet/space/void/engineering,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/suit/space/void/engineering,
-/obj/item/clothing/shoes/magboots,
-/obj/machinery/light,
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
-"agm" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "agu" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -230,8 +192,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4portforhall)
@@ -243,8 +204,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/steel_grid,
@@ -263,13 +223,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos)
-"aoD" = (
-/obj/structure/table/standard,
-/obj/item/multitool,
-/obj/effect/floor_decal/techfloor/orange,
-/obj/random/powercell,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "aoU" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -278,8 +231,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4portamidhall)
@@ -553,14 +505,6 @@
 /obj/machinery/power/apc/west_mount,
 /turf/simulated/floor/plating,
 /area/maintenance/substation/engineering)
-"aBO" = (
-/obj/machinery/camera/network/engineering,
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/machinery/vending/tool,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "aCh" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -590,6 +534,9 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4portafthall)
 "aEm" = (
@@ -615,16 +562,6 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/steel,
 /area/tcommsat/computer)
-"aFL" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 6
-	},
-/obj/machinery/recharge_station,
-/obj/structure/cable/green{
-	icon_state = "1-8"
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "aFT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/black,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
@@ -731,6 +668,14 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/structure/window/reinforced,
+/turf/simulated/floor/tiled/techmaint,
+/area/engineering/atmos)
+"aMU" = (
+/obj/machinery/atmospherics/pipe/simple/visible/yellow,
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
 "aMW" = (
@@ -757,13 +702,6 @@
 	},
 /turf/simulated/wall/r_wall/prepainted/engineering,
 /area/engineering/starboardnacelle)
-"aPd" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "aQf" = (
 /turf/simulated/wall/prepainted/engineering,
 /area/endeavour/hallway/d4starboardamidhall)
@@ -798,6 +736,9 @@
 /obj/machinery/door/firedoor{
 	dir = 8
 	},
+/obj/structure/cable{
+	icon_state = "5-9"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4portafthall)
 "aQW" = (
@@ -892,6 +833,12 @@
 	},
 /turf/simulated/floor/tiled/monowhite,
 /area/engineering/drone_fabrication)
+"aXZ" = (
+/obj/structure/cable{
+	icon_state = "1-6"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d4aftmaint)
 "aYc" = (
 /turf/simulated/shuttle/wall/voidcraft/blue,
 /area/engineering/hallway/lower)
@@ -959,6 +906,22 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/engineering/engine_monitoring)
+"bfk" = (
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/obj/machinery/door/airlock/maintenance/engi{
+	name = "Secondary PSU room"
+	},
+/obj/map_helper/access_helper/airlock/station/maintenance,
+/obj/structure/cable{
+	icon_state = "9-10"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d4aftmaint)
 "bfx" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -1052,6 +1015,13 @@
 "bmK" = (
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d4porthall)
+"bmP" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4starboardforhall)
 "bne" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/lightorange/border,
@@ -1128,6 +1098,18 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4portamidhall)
+"bqC" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/lightorange/border{
+	dir = 1
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/steel_ridged,
+/area/endeavour/hallway/d4porthall)
 "brS" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 1
@@ -1168,7 +1150,7 @@
 /turf/simulated/wall/prepainted,
 /area/station/stairs_one)
 "bxh" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -1305,26 +1287,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/storage/tech)
-"bGf" = (
-/obj/structure/table/rack{
-	dir = 8;
-	layer = 2.6
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/item/tank/jetpack/carbondioxide,
-/obj/machinery/door/window/southright{
-	name = "Jetpack Storage";
-	req_one_access = list(11,24)
-	},
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "bGC" = (
 /turf/simulated/floor/reinforced/n20,
 /area/engineering/atmos)
@@ -1403,6 +1365,15 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/starboardnacelle)
+"bJi" = (
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/lightorange/border,
+/obj/machinery/light,
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/steel_grid,
+/area/endeavour/hallway/d4portafthall)
 "bKR" = (
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -1426,10 +1397,6 @@
 /obj/structure/sign/deck/fourth,
 /turf/simulated/wall/r_wall/prepainted/engineering,
 /area/maintenance/substation)
-"bMq" = (
-/obj/structure/closet/radiation,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "bMD" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -1471,6 +1438,20 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
+"bPj" = (
+/obj/structure/sign/electricshock{
+	pixel_y = 31
+	},
+/obj/machinery/button/remote/airlock{
+	id = "engineSmesRoom";
+	name = "Door Bolt Control";
+	req_access = list(10);
+	specialfunctions = 4;
+	pixel_y = 23;
+	pixel_x = -9
+	},
+/turf/simulated/floor/tiled/monotile,
+/area/endeavour/hallway/d4starboardhall)
 "bPr" = (
 /obj/structure/bed/chair/bay/comfy,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -1486,6 +1467,9 @@
 /obj/machinery/atmospherics/pipe/simple/visible/yellow{
 	dir = 4
 	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
 "bQo" = (
@@ -1521,17 +1505,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4fwdhall)
-"bRc" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "bRD" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -1632,6 +1605,9 @@
 /obj/effect/floor_decal/corner/lightorange/border{
 	dir = 9
 	},
+/obj/structure/cable{
+	icon_state = "4-10"
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4portafthall)
 "bYQ" = (
@@ -1782,9 +1758,7 @@
 "coa" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/lightorange/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4porthall)
 "coI" = (
@@ -1794,6 +1768,19 @@
 	},
 /turf/simulated/floor/bluegrid,
 /area/ai)
+"coP" = (
+/obj/structure/cable/orange{
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d4aftmaint)
+"coT" = (
+/obj/machinery/atmospherics/pipe/simple/visible/black,
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/engineering/atmos)
 "coV" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -1848,30 +1835,15 @@
 	},
 /turf/simulated/floor/carpet/oracarpet,
 /area/crew_quarters/heads/chief)
-"crd" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "cry" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4portafthall)
 "crB" = (
@@ -2024,6 +1996,9 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/structure/cable{
+	icon_state = "5-6"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4aftmaint)
 "cyR" = (
@@ -2058,7 +2033,7 @@
 	dir = 6
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-4"
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/command/turrets)
@@ -2097,34 +2072,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos)
-"cDz" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/table/reinforced,
-/obj/item/radio/off,
-/obj/item/radio/off{
-	pixel_x = -6;
-	pixel_y = 4
-	},
-/obj/item/radio/off{
-	pixel_y = 6
-	},
-/obj/item/radio/off{
-	pixel_x = 6;
-	pixel_y = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "cDX" = (
 /obj/structure/table/rack{
 	dir = 8;
@@ -2153,11 +2100,21 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/engineering/engineering_monitoring)
-"cGn" = (
-/obj/machinery/shieldgen,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
+"cGp" = (
+/obj/machinery/atmospherics/component/binary/pump{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/engineering/atmos/workshop)
+"cGP" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d4aftmaint)
 "cGQ" = (
 /obj/effect/floor_decal/corner/blue/diagonal,
 /obj/machinery/light/small{
@@ -2187,6 +2144,18 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4portamidhall)
+"cJh" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/lightorange/border{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/steel_ridged,
+/area/endeavour/hallway/d4portafthall)
 "cJz" = (
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4porthall)
@@ -2204,6 +2173,9 @@
 /obj/effect/floor_decal/corner/lightorange/bordercorner2{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-9"
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4portafthall)
 "cLO" = (
@@ -2237,9 +2209,7 @@
 "cMJ" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/lightorange/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4starboardafthall)
 "cNE" = (
@@ -2310,7 +2280,8 @@
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/steel,
@@ -2350,35 +2321,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/tcommsat/powercontrol)
-"cUn" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/cable_coil{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/stack/cable_coil{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/stack/cable_coil{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/stack/cable_coil{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/storage/briefcase/inflatable,
-/obj/item/storage/briefcase/inflatable,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
-"cVC" = (
-/obj/machinery/atmospherics/pipe/simple/visible/yellow,
-/obj/machinery/atmospherics/pipe/simple/visible/cyan{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/engineering/atmos)
 "cWi" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -2389,15 +2331,19 @@
 /obj/structure/sign/fire,
 /turf/simulated/wall/r_wall/prepainted/engineering,
 /area/engineering/starboardnacelle)
-"cXr" = (
-/obj/structure/table/reinforced,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "cXX" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/lightorange/border,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardafthall)
+"cYd" = (
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/lightorange/border,
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/steel_ridged,
+/area/endeavour/hallway/d4portafthall)
 "dbo" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled,
@@ -2543,6 +2489,19 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4portamidhall)
+"dlD" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/lightorange/border{
+	dir = 1
+	},
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/steel_ridged,
+/area/endeavour/hallway/d4portafthall)
 "dlI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -2587,11 +2546,16 @@
 	initial_gas_mix = "n2=100;TEMP=80"
 	},
 /area/tcommsat/chamber)
+"dpt" = (
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4portafthall)
 "dpZ" = (
 /turf/simulated/wall/r_wall/prepainted/engineering,
 /area/engineering/storage)
 "drD" = (
-/obj/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
 /area/engineering/atmos)
@@ -2730,8 +2694,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/camera/network/engineering,
 /turf/simulated/floor/tiled/steel_grid,
@@ -2744,6 +2707,18 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/portnacelle)
+"dCl" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/lightorange/border{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/steel_grid,
+/area/endeavour/hallway/d4portafthall)
 "dCG" = (
 /obj/machinery/light{
 	dir = 4;
@@ -2873,31 +2848,12 @@
 	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/techmaint,
-/area/engineering/atmos)
-"dKV" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/obj/effect/floor_decal/techfloor/orange{
+/obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /turf/simulated/floor/tiled/techmaint,
-/area/space)
+/area/engineering/atmos)
 "dNZ" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/machinery/door/window/northright,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 8
 	},
@@ -2906,11 +2862,6 @@
 "dOL" = (
 /turf/simulated/wall/r_wall/prepainted/engineering,
 /area/engineering/engine_smes)
-"dPN" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/vehicle_old/train/trolley,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "dQP" = (
 /obj/structure/table/steel,
 /obj/machinery/cell_charger{
@@ -2919,6 +2870,18 @@
 /obj/item/multitool,
 /turf/simulated/floor,
 /area/storage/tech)
+"dRg" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/lightorange/border{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "6-8"
+	},
+/turf/simulated/floor/tiled/steel_grid,
+/area/endeavour/hallway/d4portafthall)
 "dRx" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -3098,10 +3061,6 @@
 	},
 /turf/simulated/floor/reinforced/nitrogen,
 /area/engineering/atmos)
-"efU" = (
-/obj/machinery/computer/atmos_alert,
-/turf/simulated/floor/tiled,
-/area/space)
 "ege" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
@@ -3147,12 +3106,6 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos/eva)
-"eie" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "eki" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -3167,10 +3120,9 @@
 /turf/simulated/floor/plating,
 /area/tcommsat/powercontrol)
 "ekS" = (
-/obj/structure/window/reinforced{
-	dir = 1
+/obj/machinery/atmospherics/pipe/manifold/visible/black{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/visible/black,
 /turf/simulated/floor/plating,
 /area/engineering/atmos)
 "elg" = (
@@ -3234,19 +3186,9 @@
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d4aftmaint)
-"elM" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "emb" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d4aftmaint)
@@ -3472,9 +3414,12 @@
 /obj/map_helper/airlock/atmos/chamber_pump,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/atmos/eva)
-"eCQ" = (
-/turf/simulated/wall/r_wall/prepainted/engineering,
-/area/space)
+"eDe" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d4aftmaint)
 "eDC" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -3483,6 +3428,9 @@
 	dir = 1
 	},
 /obj/machinery/camera/network/engineering,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4portafthall)
 "eDQ" = (
@@ -3561,15 +3509,13 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4portafthall)
 "eKh" = (
@@ -3630,13 +3576,6 @@
 /obj/machinery/atmospherics/pipe/tank/phoron,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/portnacelle)
-"eMa" = (
-/obj/machinery/atmospherics/pipe/simple/visible/red,
-/obj/machinery/atmospherics/pipe/simple/visible/cyan{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/engineering/atmos)
 "eMg" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/lightorange/border,
@@ -3658,9 +3597,6 @@
 /turf/simulated/floor/tiled/monotile,
 /area/engineering/engineering_monitoring)
 "eMH" = (
-/obj/structure/window/reinforced{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/visible/universal{
 	dir = 4
 	},
@@ -3721,7 +3657,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/steel,
@@ -3730,31 +3667,6 @@
 /obj/machinery/vending/assist,
 /turf/simulated/floor,
 /area/storage/tech)
-"eRo" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/spray/cleaner,
-/obj/item/multitool{
-	pixel_x = 5
-	},
-/obj/item/t_scanner,
-/obj/item/floor_painter,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/structure/cable/green{
-	icon_state = "1-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "eRL" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
@@ -3796,6 +3708,22 @@
 /obj/machinery/atmospherics/pipe/simple/visible/red,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
+"eUr" = (
+/obj/machinery/power/terminal{
+	dir = 4
+	},
+/obj/structure/cable/orange{
+	icon_state = "0-8"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d4aftmaint)
+"eWw" = (
+/obj/machinery/atmospherics/pipe/simple/visible/red,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/engineering/atmos)
 "eXx" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -3837,6 +3765,18 @@
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4starboardforhall)
+"eYL" = (
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/command/turrets)
 "eZW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/black{
 	dir = 4
@@ -3932,18 +3872,6 @@
 /obj/structure/sign/deck/fourth,
 /turf/simulated/wall/r_wall/prepainted/engineering,
 /area/engineering/engine_room)
-"fgc" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
-/turf/simulated/floor/tiled,
-/area/space)
 "fgn" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -4093,21 +4021,6 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/maintenance/substation)
-"fnt" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "fod" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -4137,15 +4050,9 @@
 /obj/effect/floor_decal/corner/lightorange/border{
 	dir = 1
 	},
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 1
-	},
+/obj/machinery/atmospherics/component/unary/vent_pump/on,
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4starboardforhall)
-"fpc" = (
-/obj/machinery/computer/power_monitor,
-/turf/simulated/floor/tiled,
-/area/space)
 "fqb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 6
@@ -4155,12 +4062,6 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos/workshop)
-"ftf" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/electrical,
-/obj/item/storage/toolbox/electrical,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "ftt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 8
@@ -4231,13 +4132,6 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardamidhall)
-"fyf" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/machinery/vending/assist,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "fyk" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -4364,15 +4258,6 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
-"fHd" = (
-/obj/structure/cable/green{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "fHA" = (
 /obj/structure/bed/chair/bay/comfy/yellow{
 	dir = 8
@@ -4403,15 +4288,6 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/locker_room)
-"fHW" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "fIw" = (
 /obj/effect/floor_decal/borderfloorblack/corner{
 	dir = 1
@@ -4484,13 +4360,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4portforhall)
-"fMn" = (
-/obj/effect/floor_decal/techfloor/orange,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "fMD" = (
 /obj/machinery/light{
 	dir = 4;
@@ -4535,11 +4404,6 @@
 	name = "Mainframe Base"
 	},
 /area/tcommsat/chamber)
-"fPA" = (
-/obj/machinery/computer/security/engineering,
-/obj/machinery/camera/network/engineering,
-/turf/simulated/floor/tiled,
-/area/space)
 "fRo" = (
 /obj/effect/floor_decal/borderfloorblack/corner,
 /obj/effect/floor_decal/corner/lightorange/bordercorner,
@@ -4585,14 +4449,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/engineering/shield_gen)
-"fVf" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/machinery/suit_cycler/engineering,
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "fVo" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/yellow{
 	dir = 1
@@ -4741,14 +4597,6 @@
 "ghc" = (
 /turf/simulated/floor/holofloor/tiled/dark,
 /area/engineering/hallway/lower)
-"ghk" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/closet/crate,
-/obj/item/stack/material/phoron{
-	amount = 25
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "ghy" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 9
@@ -4756,6 +4604,9 @@
 /obj/machinery/atmospherics/pipe/simple/visible/purple{
 	dir = 4
 	},
+/obj/structure/window/reinforced{
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos)
 "ghz" = (
@@ -4811,6 +4662,9 @@
 /obj/structure/cable/orange{
 	icon_state = "2-8"
 	},
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardhall)
 "gnX" = (
@@ -5228,6 +5082,15 @@
 	initial_gas_mix = "n2=100;TEMP=80"
 	},
 /area/tcommsat/chamber)
+"gNN" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/command/turrets)
 "gOm" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -5458,6 +5321,9 @@
 /obj/effect/floor_decal/corner/lightorange/border{
 	dir = 6
 	},
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
+	dir = 9
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardafthall)
 "gZX" = (
@@ -5513,32 +5379,17 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ai_upload)
-"hfW" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
+"hfS" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 9
+	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
+/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4starboardforhall)
 "hfY" = (
 /turf/simulated/floor/airless/ceiling,
 /area/space)
-"hge" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "hhb" = (
 /obj/machinery/camera/network/command{
 	dir = 9
@@ -5603,15 +5454,6 @@
 	},
 /turf/simulated/floor/carpet/oracarpet,
 /area/crew_quarters/heads/chief)
-"hjQ" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "hld" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -5622,8 +5464,8 @@
 /obj/effect/floor_decal/corner/lightorange/border{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
-	dir = 9
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
+	dir = 1
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardafthall)
@@ -5712,12 +5554,6 @@
 	},
 /turf/simulated/floor/bluegrid,
 /area/ai)
-"hpq" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/storage/toolbox/mechanical,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "hqa" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 4
@@ -5860,6 +5696,21 @@
 	},
 /turf/simulated/floor/reinforced/phoron,
 /area/engineering/atmos)
+"hBl" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/lightorange/border{
+	dir = 1
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/steel_ridged,
+/area/endeavour/hallway/d4porthall)
 "hBH" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -6062,12 +5913,13 @@
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4starboardforhall)
 "hLB" = (
-/obj/structure/window/reinforced{
-	dir = 8
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/lightorange/border,
+/obj/structure/cable/orange{
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/visible/universal,
-/turf/simulated/floor/plating,
-/area/engineering/atmos)
+/turf/simulated/floor/tiled/steel_grid,
+/area/endeavour/hallway/d4portafthall)
 "hMd" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -6159,13 +6011,6 @@
 /obj/item/storage/toolbox/mechanical,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/locker_room)
-"hPs" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 9
-	},
-/obj/machinery/vending/engivend,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "hPQ" = (
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 8
@@ -6207,12 +6052,18 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d4fwdmaint)
 "hSO" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d4starboardforhall)
+/obj/effect/floor_decal/corner/lightorange/border{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4;
+	use_power = 0
+	},
+/turf/simulated/floor/tiled/steel_grid,
+/area/endeavour/hallway/d4starboardamidhall)
 "hSY" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -6296,9 +6147,7 @@
 "iar" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/lightorange/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4starboardamidhall)
 "ici" = (
@@ -6321,21 +6170,11 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_smes)
 "ico" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos)
-"idT" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "ieH" = (
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -6356,6 +6195,12 @@
 /obj/map_helper/access_helper/airlock/station/external_airlock,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/atmos/eva)
+"igI" = (
+/turf/simulated/floor/plating{
+	name = "Lucas' plating";
+	desc = "Unfinished flooring. Somehow, it's even MORE ordinary than the rest."
+	},
+/area/engineering/portnacelle)
 "ihs" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -6468,10 +6313,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d4aftmaint)
-"ioo" = (
-/obj/structure/closet/firecloset,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "ipB" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -6614,6 +6455,12 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4portafthall)
+"iCe" = (
+/obj/machinery/power/breakerbox{
+	RCon_tag = "SECONDARY CROSSOVER"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d4aftmaint)
 "iCO" = (
 /obj/machinery/camera/network/engineering,
 /obj/machinery/atmospherics/valve/digital{
@@ -6645,7 +6492,9 @@
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 5
 	},
-/obj/machinery/air_alarm/north_mount,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/command/turrets)
 "iFc" = (
@@ -6671,6 +6520,9 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
+/obj/structure/cable/orange{
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4porthall)
 "iGw" = (
@@ -6689,19 +6541,6 @@
 /obj/structure/sign/warning,
 /turf/simulated/wall/r_wall,
 /area/space)
-"iIN" = (
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "iJa" = (
 /obj/effect/floor_decal/borderfloorblack/corner{
 	alpha = 255;
@@ -6735,8 +6574,20 @@
 /obj/effect/floor_decal/corner/lightorange/bordercorner2{
 	dir = 10
 	},
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4starboardhall)
+"iLQ" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 1
+	},
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/engineering/atmos)
 "iOw" = (
 /obj/structure/cable/green{
 	icon_state = "0-2"
@@ -6812,6 +6663,9 @@
 	},
 /obj/machinery/door/airlock/glass/atmos,
 /obj/map_helper/access_helper/airlock/station/engineering/department,
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
 "iSB" = (
@@ -6953,11 +6807,6 @@
 	},
 /turf/simulated/floor/reinforced/airless,
 /area/engineering/starboardnacelle)
-"jew" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/power/shield_generator,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "jfd" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 5
@@ -7027,6 +6876,12 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/command/turrets)
+"jiL" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/command/turrets)
 "jiQ" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -7077,6 +6932,12 @@
 	},
 /turf/simulated/floor/carpet/oracarpet,
 /area/engineering/engineering_monitoring)
+"jmD" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d4aftmaint)
 "jnl" = (
 /obj/structure/closet/secure_closet/engineering_personal,
 /obj/effect/floor_decal/techfloor/orange{
@@ -7167,6 +7028,15 @@
 /obj/machinery/atmospherics/pipe/simple/visible/cyan,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
+"jse" = (
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
+	dir = 1
+	},
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/engineering/atmos)
 "jsv" = (
 /obj/machinery/door/airlock/glass/engineering{
 	name = "Engineering Hallway";
@@ -7210,12 +7080,6 @@
 	},
 /turf/simulated/floor/carpet/oracarpet,
 /area/engineering/engineering_monitoring)
-"juL" = (
-/obj/structure/table/standard,
-/obj/item/storage/box/lights/mixed,
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "jwe" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 8
@@ -7270,24 +7134,12 @@
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardafthall)
-"jym" = (
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "jyo" = (
 /obj/structure/stairs/spawner/north,
 /turf/simulated/floor/tiled,
@@ -7296,13 +7148,6 @@
 /obj/effect/shuttle_landmark/endeavour/deck1/starboard,
 /turf/space,
 /area/space)
-"jyw" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/power/port_gen/pacman{
-	anchored = 1
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "jyT" = (
 /obj/machinery/air_alarm/west_mount,
 /turf/simulated/floor/tiled,
@@ -7406,7 +7251,9 @@
 "jFf" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/lightorange/border,
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4portforhall)
 "jFB" = (
@@ -7443,9 +7290,7 @@
 "jGV" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/lightorange/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 1
 	},
@@ -7468,6 +7313,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4portafthall)
 "jIH" = (
@@ -7578,6 +7426,9 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/structure/window/reinforced{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
 "jOC" = (
@@ -7596,6 +7447,13 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
+"jPu" = (
+/obj/machinery/atmospherics/pipe/simple/visible/red,
+/obj/machinery/door/window/northright{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/engineering/atmos)
 "jPA" = (
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
@@ -7640,15 +7498,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/engineering/engine_airlock)
-"jSl" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/closet/crate,
-/obj/item/inducer,
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "jSq" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -7672,22 +7521,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d4fwdmaint)
-"jUI" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/table/reinforced,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "jUK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/wood,
@@ -7724,6 +7557,9 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 8
 	},
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardhall)
 "jYW" = (
@@ -7762,10 +7598,6 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/plating,
 /area/maintenance/substation)
-"kbY" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/aux,
-/turf/simulated/floor/tiled/techmaint,
-/area/engineering/atmos)
 "kcE" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/plating,
@@ -7791,11 +7623,9 @@
 /obj/effect/floor_decal/corner/lightorange/bordercorner2{
 	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
+	dir = 6
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardafthall)
@@ -7898,6 +7728,11 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/engineering/shield_gen)
+"klt" = (
+/obj/machinery/atmospherics/component/quaternary/atmos_filter,
+/obj/structure/window/reinforced,
+/turf/simulated/floor/tiled/techmaint,
+/area/engineering/atmos)
 "kng" = (
 /obj/machinery/message_server,
 /turf/simulated/floor/tiled/techfloor,
@@ -8085,6 +7920,21 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/starboardnacelle)
+"kAL" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/lightorange/border{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/steel_grid,
+/area/endeavour/hallway/d4starboardhall)
 "kAO" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -8180,6 +8030,7 @@
 /obj/machinery/door/firedoor{
 	dir = 8
 	},
+/obj/map_helper/access_helper/airlock/station/engineering/department,
 /turf/simulated/floor/wood,
 /area/engineering/hallway/lower)
 "kJR" = (
@@ -8261,7 +8112,7 @@
 "kRf" = (
 /obj/machinery/holopad,
 /obj/structure/cable{
-	icon_state = "4-10"
+	icon_state = "1-10"
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/command/turrets)
@@ -8289,6 +8140,18 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardhall)
+"kSz" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/lightorange/border{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/steel_ridged,
+/area/endeavour/hallway/d4portamidhall)
 "kTN" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/lightorange/border,
@@ -8361,6 +8224,9 @@
 /obj/effect/floor_decal/corner/lightorange/bordercorner2{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4portafthall)
 "kXu" = (
@@ -8421,6 +8287,9 @@
 /area/endeavour/hallway/d4starboardforhall)
 "lbY" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/cyan,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
 "lcb" = (
@@ -8439,29 +8308,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d4aftmaint)
-"lck" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/table/rack{
-	dir = 8;
-	layer = 2.6
-	},
-/obj/machinery/door/window/northright{
-	name = "Engineering Hardsuits";
-	req_access = list(11)
-	},
-/obj/item/clothing/head/helmet/space/void/atmos,
-/obj/item/clothing/head/helmet/space/void/atmos,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/suit/space/void/atmos,
-/obj/item/clothing/suit/space/void/atmos,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/shoes/magboots,
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "lcM" = (
 /turf/simulated/wall/r_wall/prepainted/engineering,
 /area/tcommsat/computer)
@@ -8474,6 +8320,9 @@
 	icon_state = "pipe-c"
 	},
 /obj/structure/catwalk,
+/obj/structure/cable/orange{
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation)
 "lfw" = (
@@ -8526,11 +8375,17 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation)
 "liC" = (
-/obj/machinery/atmospherics/pipe/simple/visible/cyan{
-	dir = 10
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/techmaint,
-/area/engineering/atmos)
+/obj/effect/floor_decal/corner/lightorange/border{
+	dir = 1
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/steel_grid,
+/area/endeavour/hallway/d4porthall)
 "liM" = (
 /turf/simulated/wall/r_wall/prepainted/engineering,
 /area/endeavour/hallway/d4starboardamidhall)
@@ -8566,13 +8421,17 @@
 /turf/simulated/floor/tiled/white,
 /area/engineering/shield_gen)
 "lmh" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 10
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
-/obj/item/barrier_tape_segment/engineering,
-/turf/simulated/floor/tiled/techfloor,
-/area/engineering/atmos/workshop)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4portforhall)
 "lnb" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -8586,15 +8445,6 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4portforhall)
-"lps" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "lqz" = (
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4starboardamidhall)
@@ -8615,7 +8465,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/ai_upload_foyer)
 "lrz" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
 	dir = 6
 	},
 /turf/simulated/floor/tiled/steel,
@@ -8808,14 +8658,11 @@
 /turf/simulated/floor/tiled,
 /area/engineering/break_room)
 "lEE" = (
-/obj/structure/window/reinforced{
+/obj/machinery/atmospherics/pipe/simple/visible/black{
 	dir = 4
 	},
 /obj/structure/window/reinforced,
-/obj/machinery/atmospherics/component/binary/pump{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
 "lFs" = (
 /obj/item/toy/plushie/carp/nebula,
@@ -8914,18 +8761,6 @@
 /obj/item/tank/jetpack/carbondioxide,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos/eva)
-"lQo" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "2-8"
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "lQw" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -9141,6 +8976,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
 "lZV" = (
@@ -9304,6 +9142,9 @@
 /obj/effect/floor_decal/corner/lightorange/bordercorner2{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4portafthall)
 "miH" = (
@@ -9321,6 +9162,13 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/tcommsat/computer)
+"mjh" = (
+/obj/structure/sign/atmosplaque{
+	name = "NSV Endeavour Builder's Plate";
+	desc = "NSV Endeavour - Built by Armstrong-Hawker Shipbuilding LTD, New Glasgow Yards, New Glasgow, Eridani Alliance - Laid Down 16 May 2566 - Launched 18 October 2568"
+	},
+/turf/simulated/wall/r_wall/prepainted/engineering,
+/area/engineering/engine_smes)
 "mkd" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 9
@@ -9337,12 +9185,6 @@
 /obj/structure/lattice,
 /turf/space,
 /area/space)
-"mlq" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 10
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "mnN" = (
 /obj/machinery/telecomms/server/presets/science,
 /turf/simulated/floor/tiled/dark{
@@ -9575,12 +9417,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/starboardnacelle)
-"mEn" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "mEo" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -9612,6 +9448,9 @@
 	dir = 8
 	},
 /obj/machinery/door/firedoor,
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4starboardhall)
 "mES" = (
@@ -9632,6 +9471,9 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4portafthall)
 "mFn" = (
@@ -9644,9 +9486,7 @@
 "mFR" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/lightorange/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4starboardforhall)
 "mGf" = (
@@ -9655,18 +9495,6 @@
 	},
 /turf/simulated/wall/r_wall/prepainted/engineering,
 /area/engineering/portnacelle)
-"mGz" = (
-/obj/structure/closet/crate,
-/obj/item/circuitboard/smes,
-/obj/item/smes_coil,
-/obj/item/smes_coil,
-/obj/item/smes_coil/super_capacity,
-/obj/item/smes_coil/super_capacity,
-/obj/item/smes_coil/super_io,
-/obj/item/smes_coil/super_io,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "mHc" = (
 /turf/simulated/floor/reinforced/carbon_dioxide,
 /area/engineering/atmos)
@@ -9821,10 +9649,10 @@
 /turf/simulated/floor/plating,
 /area/engineering/atmos)
 "mOl" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardforhall)
 "mOt" = (
@@ -9850,12 +9678,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/portnacelle)
-"mPt" = (
-/obj/machinery/shieldgen,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/camera/network/engineering,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "mPA" = (
 /obj/effect/floor_decal/borderfloorblack/corner,
 /obj/effect/floor_decal/corner/lightorange/bordercorner,
@@ -9940,13 +9762,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/command/turrets)
-"mUP" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/power/emitter{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "mVv" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -9986,28 +9801,11 @@
 /turf/simulated/wall/r_wall/prepainted,
 /area/endeavour/hallway/d4portforhall)
 "nat" = (
-/obj/structure/window/reinforced{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
+	dir = 1
 	},
-/obj/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/hidden/aux,
 /turf/simulated/floor/plating,
 /area/engineering/atmos)
-"naJ" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "naO" = (
 /obj/effect/floor_decal/corner/navgold/full,
 /turf/simulated/floor/tiled/techfloor,
@@ -10066,12 +9864,6 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4porthall)
-"nfZ" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "ngK" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/purple{
 	dir = 8
@@ -10107,9 +9899,6 @@
 /turf/simulated/floor/tiled/monotile,
 /area/engineering/engineering_monitoring)
 "njb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
@@ -10136,17 +9925,13 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/portnacelle)
-"nlS" = (
-/obj/machinery/camera/network/engineering,
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "nmh" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/catwalk,
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation)
 "nmp" = (
@@ -10202,6 +9987,9 @@
 	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/red,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos)
 "nny" = (
@@ -10250,10 +10038,6 @@
 "nqa" = (
 /turf/simulated/wall/r_wall/prepainted/engineering,
 /area/engineering/engine_gas)
-"nqd" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/space)
 "nqw" = (
 /obj/effect/floor_decal/techfloor/orange,
 /turf/simulated/floor/tiled/techmaint,
@@ -10301,6 +10085,17 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardafthall)
+"nsO" = (
+/obj/map_helper/access_helper/airlock/station/engineering/atmospherics,
+/obj/machinery/door/firedoor/glass{
+	dir = 8
+	},
+/obj/machinery/door/airlock/glass/atmos,
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/engineering/atmos)
 "ntj" = (
 /obj/machinery/door/firedoor/glass{
 	dir = 8
@@ -10342,19 +10137,6 @@
 	name = "Mainframe Base"
 	},
 /area/tcommsat/chamber)
-"nvH" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "nvN" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -10367,16 +10149,6 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardafthall)
-"nwk" = (
-/obj/effect/floor_decal/techfloor/orange,
-/obj/structure/table/rack{
-	dir = 8;
-	layer = 2.6
-	},
-/obj/item/suit_cooling_unit,
-/obj/item/suit_cooling_unit,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "nwn" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -10475,7 +10247,9 @@
 "nAP" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/lightorange/border,
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4portforhall)
 "nAS" = (
@@ -10522,12 +10296,18 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d4fwdmaint)
 "nDu" = (
-/obj/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/visible/universal{
-	dir = 4
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
 	},
-/turf/simulated/floor/plating,
-/area/engineering/atmos)
+/obj/effect/floor_decal/corner/lightorange/border{
+	dir = 1
+	},
+/obj/machinery/camera/network/engineering,
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/steel_grid,
+/area/endeavour/hallway/d4porthall)
 "nEe" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -10540,36 +10320,14 @@
 	req_one_access = null
 	},
 /obj/map_helper/access_helper/airlock/station/engineering/department,
-/obj/item/barrier_tape_segment/engineering,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos/workshop)
-"nEg" = (
-/obj/structure/table/standard,
-/obj/item/stack/cable_coil{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/stack/cable_coil{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/stack/cable_coil{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/effect/floor_decal/techfloor/orange,
-/obj/item/stack/cable_coil{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "nEk" = (
 /obj/machinery/atmospherics/pipe/simple/visible/red{
 	dir = 6
@@ -10582,6 +10340,18 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
+"nEC" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/lightorange/border{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/steel_ridged,
+/area/endeavour/hallway/d4starboardamidhall)
 "nEQ" = (
 /obj/structure/cable/cyan{
 	icon_state = "4-8"
@@ -10809,17 +10579,6 @@
 /obj/effect/floor_decal/corner/lightorange/border,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4portforhall)
-"nSP" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk,
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
-"nSR" = (
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "nTQ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -10847,6 +10606,19 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/engineering/engineering_monitoring)
+"nUo" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/lightorange/border{
+	dir = 1
+	},
+/obj/machinery/air_alarm/north_mount,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/steel_grid,
+/area/endeavour/hallway/d4portafthall)
 "nUM" = (
 /obj/structure/sink{
 	pixel_y = 22
@@ -11089,8 +10861,10 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4portafthall)
@@ -11141,12 +10915,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/wood,
 /area/engineering/break_room)
-"oqN" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/effect/floor_decal/rust,
-/obj/machinery/shield_capacitor,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "oqU" = (
 /obj/machinery/camera/network/engineering,
 /obj/landmark/spawnpoint/job/atmospheric_technician,
@@ -11156,13 +10924,6 @@
 /obj/machinery/fire_alarm/north_mount,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/sleep/engi_wash)
-"osU" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/obj/structure/table/reinforced,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "otK" = (
 /obj/machinery/power/apc/west_mount,
 /obj/structure/cable/green{
@@ -11174,26 +10935,20 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d4starboardhall)
 "ouE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/effect/floor_decal/borderfloorblack{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/effect/floor_decal/corner/lightorange/border{
 	dir = 4
 	},
-/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 8
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/door/airlock/glass/engineering{
-	name = "Engineering Equipment";
-	req_one_access = null
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
+	dir = 1
 	},
-/obj/map_helper/access_helper/airlock/station/engineering/equipment,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4starboardafthall)
 "ouR" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 4
@@ -11210,7 +10965,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
-/turf/simulated/wall/r_wall/prepainted/engineering,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4portamidhall)
 "oxm" = (
@@ -11319,7 +11073,12 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/obj/machinery/power/smes/buildable/main,
+/obj/machinery/power/smes/buildable/main{
+	capacity = 8000;
+	charge = 21600;
+	output_level = 1500;
+	output_level_max = 1500
+	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_smes)
 "oIC" = (
@@ -11358,6 +11117,19 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
+"oLT" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/lightorange/border{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4;
+	use_power = 0
+	},
+/turf/simulated/floor/tiled/steel_ridged,
+/area/endeavour/hallway/d4portamidhall)
 "oNF" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 9
@@ -11465,9 +11237,7 @@
 "oSP" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/lightorange/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4portafthall)
 "oSZ" = (
@@ -11624,8 +11394,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4portamidhall)
@@ -11745,23 +11514,9 @@
 /obj/machinery/door/firedoor{
 	dir = 8
 	},
+/obj/map_helper/access_helper/airlock/station/engineering/department,
 /turf/simulated/floor/wood,
 /area/engineering/break_room)
-"poh" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "ppa" = (
 /turf/simulated/wall/prepainted/engineering,
 /area/engineering/storage)
@@ -11928,8 +11683,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4porthall)
@@ -12007,23 +11761,12 @@
 /obj/item/storage/box/snakesnackbox,
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/chief)
-"pKm" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/vehicle_old/train/engine{
-	dir = 8;
-	key_type = /obj/item/key
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "pLM" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
+/obj/structure/cable/orange{
+	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/visible/cyan,
 /turf/simulated/floor/plating,
-/area/engineering/atmos)
+/area/endeavour/hallway/d4aftmaint)
 "pLX" = (
 /obj/structure/cable/green{
 	icon_state = "1-4"
@@ -12098,6 +11841,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4porthall)
 "pTw" = (
@@ -12124,6 +11870,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/monowhite,
 /area/engineering/drone_fabrication)
+"pTX" = (
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/lightorange/border,
+/obj/structure/cable/orange{
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/tiled/steel_ridged,
+/area/endeavour/hallway/d4portafthall)
 "pUe" = (
 /obj/structure/catwalk,
 /obj/machinery/light/small/emergency{
@@ -12169,12 +11923,6 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardamidhall)
-"pXk" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/engineering/atmos/workshop)
 "pXB" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -12266,20 +12014,11 @@
 	},
 /obj/machinery/camera/network/engineering,
 /obj/machinery/air_alarm/north_mount,
-/turf/simulated/floor/tiled/steel_ridged,
-/area/endeavour/hallway/d4portafthall)
-"qiv" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 8
-	},
-/obj/structure/bed/chair/office/dark{
-	dir = 1
-	},
-/obj/structure/cable/green{
+/obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled,
-/area/space)
+/turf/simulated/floor/tiled/steel_ridged,
+/area/endeavour/hallway/d4portafthall)
 "qiC" = (
 /obj/machinery/power/terminal{
 	dir = 8
@@ -12339,8 +12078,10 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	dir = 4;
-	pixel_x = 10
+	dir = 4
+	},
+/obj/structure/cable/orange{
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4porthall)
@@ -12354,12 +12095,6 @@
 /turf/simulated/wall/prepainted/engineering/atmos,
 /area/engineering/atmos/workshop)
 "qqA" = (
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
 /obj/machinery/atmospherics/component/binary/pump{
 	dir = 8
 	},
@@ -12400,18 +12135,6 @@
 	},
 /turf/simulated/floor/reinforced/carbon_dioxide,
 /area/engineering/atmos)
-"quu" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
-	dir = 4
-	},
-/obj/structure/bed/chair/office/dark{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled,
-/area/space)
 "quw" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
 	frequency = 2346;
@@ -12424,20 +12147,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/portnacelle)
-"qvr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	icon_state = "1-4"
-	},
-/obj/structure/cable/green{
-	icon_state = "1-8"
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "qwj" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -12528,28 +12237,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_smes)
-"qyt" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/structure/table/rack{
-	dir = 8;
-	layer = 2.6
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/machinery/door/window/northleft{
-	dir = 2;
-	name = "Jetpack Storage";
-	req_access = list(24)
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "qyK" = (
 /obj/machinery/door/airlock/multi_tile/glass,
 /obj/map_helper/access_helper/airlock/station/engineering/department,
@@ -12575,6 +12262,9 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4porthall)
 "qzY" = (
@@ -12938,11 +12628,15 @@
 "rbo" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/lightorange/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4starboardforhall)
+"ren" = (
+/obj/structure/cable/orange{
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d4aftmaint)
 "rep" = (
 /obj/effect/floor_decal/corner/lightorange/bordercee{
 	dir = 4
@@ -12953,8 +12647,22 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/portnacelle)
+"reV" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/airlock/highsecurity{
+	name = "Aux Bridge";
+	req_one_access = list()
+	},
+/obj/map_helper/access_helper/airlock/station/command/bridge,
+/turf/simulated/floor/plating,
+/area/endeavour/command/turrets)
 "rfg" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
 "rfo" = (
@@ -12985,24 +12693,6 @@
 	},
 /turf/simulated/floor/reinforced/airless,
 /area/engineering/portnacelle)
-"rio" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/table/rack{
-	dir = 8;
-	layer = 2.6
-	},
-/obj/machinery/door/window/northright{
-	name = "Engineering Hardsuits";
-	req_access = list(11)
-	},
-/obj/item/hardsuit/eva/equipped,
-/obj/item/hardsuit/eva/equipped,
-/obj/item/hardsuit/eva/equipped,
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "riD" = (
 /obj/landmark/spawnpoint/job/cyborg,
 /obj/machinery/light{
@@ -13010,13 +12700,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ai_upload_foyer)
-"rjx" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 6
-	},
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "rkB" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -13032,22 +12715,6 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4porthall)
-"rkG" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/table/reinforced,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "rlQ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
@@ -13055,9 +12722,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
-	dir = 4
-	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardafthall)
 "rmA" = (
@@ -13116,19 +12780,6 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
-"rri" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/table/rack/shelf/steel,
-/obj/item/book/manual/evaguide,
-/obj/item/book/manual/atmospipes,
-/obj/item/book/manual/engineering_guide,
-/obj/item/book/manual/engineering_construction,
-/obj/item/book/manual/supermatter_engine,
-/obj/item/book/manual/rust_engine,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "rru" = (
 /obj/machinery/requests_console/preset/engineering{
 	pixel_x = -31
@@ -13192,21 +12843,11 @@
 /obj/effect/floor_decal/corner/lightorange/border{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardafthall)
-"rxH" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "rxP" = (
 /obj/machinery/light{
 	dir = 4
@@ -13229,21 +12870,21 @@
 /obj/machinery/air_alarm/east_mount,
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/chief)
-"ryQ" = (
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/obj/structure/table/reinforced,
-/obj/item/storage/box/lights/mixed,
-/obj/item/clothing/gloves/black,
-/obj/item/tool/crowbar,
-/obj/structure/cable/green{
-	icon_state = "4-8"
+"ryU" = (
+/obj/structure/cable/orange{
+	icon_state = "0-2"
 	},
-/obj/structure/disposalpipe/junction/yjunction{
-	dir = 1
+/obj/machinery/power/smes/buildable/tcomms{
+	RCon_tag = "SECONDARY SUPPLY";
+	name = "Secondary Supply PSU";
+	desc = "A high-capacity superconducting magnetic energy storage (SMES) unit. This is the one dedicated to the secondary power net.";
+	capacity = 8000;
+	charge = 19200;
+	output_level_max = 1500;
+	output_level = 1000
 	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d4aftmaint)
 "ryY" = (
 /obj/structure/table/woodentable,
 /turf/simulated/floor/wood,
@@ -13267,6 +12908,9 @@
 "rAt" = (
 /obj/effect/floor_decal/borderfloorblack/corner,
 /obj/effect/floor_decal/corner/lightorange/bordercorner,
+/obj/structure/cable/orange{
+	icon_state = "2-8"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4portafthall)
 "rAC" = (
@@ -13297,6 +12941,21 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4porthall)
+"rCS" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/lightorange/border{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4starboardafthall)
 "rEl" = (
 /obj/map_helper/airlock/door/int_door,
 /obj/machinery/atmospherics/pipe/simple/hidden{
@@ -13406,17 +13065,18 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/command/turrets)
 "rQt" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/effect/floor_decal/borderfloorblack{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/effect/floor_decal/corner/lightorange/border{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4starboardafthall)
 "rQW" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -13508,7 +13168,6 @@
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 10
 	},
-/obj/item/barrier_tape_segment/engineering,
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/atmos/workshop)
 "rZB" = (
@@ -13538,6 +13197,15 @@
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d4aftmaint)
+"saz" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4portforhall)
 "sdP" = (
 /obj/machinery/atmospherics/portables_connector,
 /obj/effect/floor_decal/industrial/outline/red,
@@ -13593,6 +13261,21 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
+"shN" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/lightorange/border{
+	dir = 1
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4porthall)
 "sjY" = (
 /obj/spawner/window/reinforced/full/firelocks,
 /obj/structure/cable/green{
@@ -13659,10 +13342,6 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/plating,
 /area/maintenance/substation)
-"sqt" = (
-/obj/machinery/computer/rcon,
-/turf/simulated/floor/tiled,
-/area/space)
 "srp" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/lightorange/border,
@@ -13755,6 +13434,16 @@
 	},
 /turf/simulated/floor/wood,
 /area/engineering/break_room)
+"szc" = (
+/obj/machinery/power/smes/buildable{
+	RCon_tag = "Point Defense Grid";
+	cur_coils = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/command/turrets)
 "szp" = (
 /obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
 /obj/machinery/atmospherics/pipe/simple/visible/blue{
@@ -13837,8 +13526,7 @@
 /area/engineering/atmos)
 "sDN" = (
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /obj/machinery/light/small{
 	dir = 1
@@ -13867,13 +13555,9 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/sleep/engi_wash)
 "sFd" = (
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/machinery/door/window/northright{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/visible/black{
+	dir = 6
 	},
-/obj/machinery/atmospherics/component/binary/pump,
 /turf/simulated/floor/plating,
 /area/engineering/atmos)
 "sGf" = (
@@ -13886,7 +13570,9 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4portforhall)
 "sHl" = (
@@ -13922,6 +13608,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/dark,
 /area/engineering/engine_gas)
+"sIE" = (
+/obj/machinery/light/small,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d4aftmaint)
 "sJm" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/lightorange/border,
@@ -13988,27 +13681,6 @@
 	},
 /turf/simulated/floor/reinforced/oxygen,
 /area/engineering/atmos)
-"sOG" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/structure/cable/green{
-	icon_state = "2-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "sPn" = (
 /obj/machinery/atmospherics/pipe/simple/visible/purple,
 /turf/simulated/floor/tiled/techmaint,
@@ -14092,19 +13764,6 @@
 /obj/machinery/vending/tool,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/storage)
-"sWC" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/structure/table/rack{
-	dir = 8;
-	layer = 2.6
-	},
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "sXt" = (
 /obj/structure/bed/chair/comfy/beige{
 	dir = 8
@@ -14150,12 +13809,6 @@
 /obj/structure/sign/fire,
 /turf/simulated/wall/r_wall/prepainted/engineering,
 /area/engineering/engine_gas)
-"tbj" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/simulated/wall/prepainted/engineering,
-/area/space)
 "tcK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -14190,13 +13843,11 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/sleep/engi_wash)
 "tdV" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 5
+/obj/machinery/light{
+	dir = 1
 	},
-/obj/item/barrier_tape_segment/engineering,
-/turf/simulated/floor/tiled/techfloor,
-/area/engineering/atmos/workshop)
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d4starboardforhall)
 "tem" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/green,
 /turf/simulated/floor/tiled/techmaint,
@@ -14211,6 +13862,12 @@
 	},
 /turf/simulated/floor/tiled/steel_dirty,
 /area/engineering/atmos/workshop)
+"tfb" = (
+/obj/structure/cable{
+	icon_state = "4-10"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d4aftmaint)
 "tfL" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /turf/simulated/floor/plating,
@@ -14324,13 +13981,16 @@
 /area/endeavour/command/turrets)
 "trF" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4portafthall)
 "tsN" = (
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/machinery/power/breakerbox/activated{
+/obj/machinery/power/breakerbox{
 	RCon_tag = "ENGINEERING MAIN"
 	},
 /turf/simulated/floor/plating,
@@ -14404,10 +14064,6 @@
 	},
 /turf/simulated/floor/carpet/oracarpet,
 /area/engineering/engineering_monitoring)
-"tCb" = (
-/obj/structure/sign/department/ass,
-/turf/simulated/wall/prepainted/engineering,
-/area/space)
 "tDc" = (
 /obj/machinery/power/apc/south_mount,
 /obj/structure/cable,
@@ -14496,14 +14152,6 @@
 "tHy" = (
 /turf/simulated/wall/r_wall/prepainted/engineering,
 /area/engineering/engine_eva)
-"tIz" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 10
-	},
-/obj/structure/cable/green,
-/obj/machinery/lathe/autolathe,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "tIM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 8
@@ -14584,6 +14232,9 @@
 /obj/effect/floor_decal/corner/lightorange/border{
 	dir = 4
 	},
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4porthall)
 "tNZ" = (
@@ -14621,6 +14272,14 @@
 "tRe" = (
 /turf/simulated/floor/tiled/steel,
 /area/tcommsat/computer)
+"tRm" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4starboardafthall)
 "tRo" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -14633,6 +14292,13 @@
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4portamidhall)
+"tRp" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/blue,
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/engineering/atmos)
 "tRQ" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 8
@@ -14701,18 +14367,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ai/foyer)
-"tUk" = (
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "tUr" = (
 /obj/effect/floor_decal/borderfloorblack/corner{
 	alpha = 255;
@@ -14821,7 +14475,6 @@
 	req_one_access = null
 	},
 /obj/map_helper/access_helper/airlock/station/engineering/department,
-/obj/item/barrier_tape_segment/engineering,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -14876,6 +14529,9 @@
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
+/obj/structure/cable{
+	icon_state = "4-9"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4portafthall)
 "ujN" = (
@@ -14939,16 +14595,6 @@
 	name = "Mainframe Base"
 	},
 /area/tcommsat/chamber)
-"upT" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
-	dir = 4
-	},
-/obj/effect/floor_decal/techfloor/orange,
-/obj/machinery/power/crypto_miner{
-	anchored = 0
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "upV" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -15016,24 +14662,18 @@
 	},
 /area/tcommsat/chamber)
 "uus" = (
-/obj/structure/cable/green{
-	icon_state = "0-4"
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/structure/cable/orange{
+	icon_state = "0-8"
 	},
-/obj/effect/floor_decal/techfloor/orange,
-/obj/machinery/light,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
+/turf/simulated/floor/plating,
+/area/maintenance/substation)
 "uvQ" = (
 /obj/machinery/atmospherics/pipe/simple/visible/yellow{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/starboardnacelle)
-"uwG" = (
-/obj/machinery/shieldwallgen,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "uxm" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/yellow{
 	dir = 4
@@ -15146,6 +14786,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
 /obj/machinery/door/airlock/multi_tile/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4aftmaint)
@@ -15159,7 +14802,7 @@
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/steel,
@@ -15194,6 +14837,12 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardafthall)
+"uEt" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d4aftmaint)
 "uEC" = (
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4portamidhall)
@@ -15236,15 +14885,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos)
-"uHI" = (
-/obj/structure/cable/green{
-	icon_state = "0-4"
-	},
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "uIx" = (
 /obj/machinery/atmospherics/pipe/simple/visible/black,
 /obj/structure/disposalpipe/segment{
@@ -15337,6 +14977,15 @@
 	name = "Mainframe Base"
 	},
 /area/tcommsat/chamber)
+"uPX" = (
+/obj/machinery/atmospherics/pipe/simple/visible/black{
+	dir = 4
+	},
+/obj/machinery/door/window/northright{
+	dir = 2
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/engineering/atmos)
 "uSQ" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
 	dir = 8
@@ -15455,13 +15104,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
-"vaQ" = (
-/obj/machinery/computer/fission_monitor,
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
-/area/space)
 "vbk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -15652,18 +15294,6 @@
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/tcommsat/powercontrol)
-"vkt" = (
-/obj/structure/table/standard,
-/obj/machinery/recharger,
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
-"vky" = (
-/obj/structure/dispenser{
-	phorontanks = 0
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "vkW" = (
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -15744,20 +15374,6 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
-"vnN" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/effect/floor_decal/techfloor/orange,
-/obj/machinery/computer/general_air_control/supermatter_core{
-	dir = 1;
-	input_tag = "cooling_in";
-	name = "Engine Cooling Control";
-	output_tag = "cooling_out";
-	sensors = list("engine_sensor"="Engine Core")
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "voa" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -15869,8 +15485,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4porthall)
@@ -15907,22 +15522,6 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4porthall)
-"vuX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/holopad,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "vvE" = (
 /obj/effect/floor_decal/techfloor/orange,
 /obj/structure/table/reinforced,
@@ -15976,16 +15575,6 @@
 	},
 /turf/space,
 /area/space)
-"vBC" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/effect/floor_decal/techfloor/orange,
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "vBK" = (
 /obj/machinery/atmospherics/pipe/tank,
 /turf/simulated/floor/tiled/techmaint,
@@ -16000,6 +15589,9 @@
 /obj/machinery/door/firedoor{
 	dir = 8
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4portafthall)
 "vDs" = (
@@ -16115,12 +15707,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d4fwdmaint)
-"vIA" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "vJm" = (
 /obj/machinery/turretid/stun{
 	control_area = "\improper AI Upload Chamber";
@@ -16153,7 +15739,7 @@
 /area/engineering/atmos)
 "vLd" = (
 /obj/structure/sign/warning/fire,
-/turf/simulated/wall/r_wall/prepainted,
+/turf/simulated/wall/r_wall/prepainted/engineering,
 /area/engineering/portnacelle)
 "vLj" = (
 /obj/machinery/door/firedoor/glass{
@@ -16187,6 +15773,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos)
+"vMK" = (
+/obj/machinery/power/breakerbox/activated{
+	RCon_tag = "POINT DEFENSE"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/command/turrets)
 "vOO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -16209,35 +15801,6 @@
 /obj/structure/closet/firecloset,
 /turf/simulated/floor/tiled/steel_dirty,
 /area/engineering/atmos/workshop)
-"vQM" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
-/obj/structure/table/standard,
-/obj/machinery/button/remote/emitter{
-	desc = "A remote control-switch for the engine emitter.";
-	id = "EngineEmitter";
-	name = "Engine Emitter";
-	pixel_x = 6;
-	pixel_y = 7;
-	req_access = list(10)
-	},
-/obj/machinery/button/remote/blast_door{
-	desc = "A remote control-switch for the engine charging port.";
-	id = "SupermatterPort";
-	name = "Reactor Blast Doors";
-	pixel_x = -6;
-	pixel_y = 7;
-	req_access = list(10)
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled,
-/area/space)
 "vQT" = (
 /obj/machinery/atmospherics/component/unary/outlet_injector{
 	dir = 8;
@@ -16275,12 +15838,17 @@
 /turf/space,
 /area/space)
 "vTS" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/lightorange/border{
+	dir = 1
+	},
 /obj/structure/cable/orange{
-	icon_state = "0-4"
+	icon_state = "2-8"
 	},
-/obj/machinery/power/smes,
-/turf/simulated/floor/plating,
-/area/endeavour/hallway/d4aftmaint)
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4porthall)
 "vUP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -16309,6 +15877,13 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/sleep/engi_wash)
+"vVB" = (
+/obj/machinery/atmospherics/pipe/simple/visible/red,
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/engineering/atmos)
 "vVK" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -16458,6 +16033,9 @@
 /obj/machinery/camera/network/command{
 	dir = 9
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/command/turrets)
 "wbp" = (
@@ -16558,6 +16136,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 5
 	},
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardhall)
 "whe" = (
@@ -16661,12 +16242,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d4aftmaint)
-"wpo" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "wpK" = (
 /obj/effect/floor_decal/corner/navgold/full{
 	dir = 8
@@ -16684,16 +16259,10 @@
 /obj/structure/cable/orange{
 	icon_state = "1-2"
 	},
-/obj/structure/catwalk,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
-/obj/structure/cable/orange{
-	icon_state = "2-8"
-	},
-/obj/structure/cable/orange{
-	icon_state = "1-8"
-	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d4aftmaint)
 "wqb" = (
@@ -16745,12 +16314,12 @@
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4starboardamidhall)
 "wrG" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
-	dir = 5
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/blue{
 	dir = 6
 	},
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
 "wsk" = (
@@ -16765,13 +16334,15 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/starboardnacelle)
 "wsO" = (
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/lightorange/border,
-/obj/machinery/light{
-	pixel_y = -24
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/steel_grid,
-/area/endeavour/hallway/d4starboardhall)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/light,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4starboardforhall)
 "wtL" = (
 /turf/space,
 /area/endeavour/hallway/d4fwdmaint)
@@ -16781,10 +16352,31 @@
 	},
 /turf/simulated/wall/r_wall/prepainted/engineering/atmos,
 /area/engineering/atmos/workshop)
+"wvc" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4portforhall)
 "wvS" = (
 /obj/machinery/atmospherics/pipe/simple/visible,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
+"wxj" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/lightorange/border{
+	dir = 4
+	},
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4porthall)
 "wyf" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 6
@@ -16875,12 +16467,6 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
-"wDK" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "wDL" = (
 /obj/structure/catwalk,
 /obj/structure/cable/green{
@@ -16891,6 +16477,15 @@
 "wEN" = (
 /turf/simulated/wall/r_wall/prepainted/engineering,
 /area/engineering/portnacelle)
+"wGc" = (
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d4aftmaint)
 "wGk" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -16936,14 +16531,6 @@
 /obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/storage)
-"wKs" = (
-/obj/structure/table/standard,
-/obj/machinery/recharger,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled,
-/area/space)
 "wLT" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/lightorange/border,
@@ -17098,6 +16685,20 @@
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4portamidhall)
+"wVA" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/lightorange/border{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4starboardafthall)
 "wWe" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -17205,21 +16806,27 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden,
 /turf/simulated/wall/r_wall/prepainted/engineering/atmos,
 /area/engineering/atmos/eva)
-"xcl" = (
-/turf/simulated/wall/prepainted/engineering,
-/area/space)
-"xdC" = (
+"xeb" = (
 /obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
+	dir = 4
 	},
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/cell/high{
-	maxcharge = 15000
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+	dir = 8
+	},
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4portafthall)
 "xeH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel,
@@ -17284,15 +16891,6 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
-"xjH" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "xjV" = (
 /obj/machinery/door/firedoor{
 	dir = 8
@@ -17367,6 +16965,9 @@
 /obj/effect/floor_decal/corner/lightorange/border{
 	dir = 5
 	},
+/obj/structure/cable{
+	icon_state = "6-8"
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4portafthall)
 "xmZ" = (
@@ -17377,8 +16978,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1;
-	pixel_y = 29
+	dir = 1
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4portforhall)
@@ -17393,23 +16993,11 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardhall)
-"xnQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/space)
 "xnV" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/lightorange/border,
@@ -17430,9 +17018,7 @@
 /obj/effect/floor_decal/corner/lightorange/bordercorner2{
 	dir = 9
 	},
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
@@ -17613,13 +17199,6 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4portamidhall)
-"xyY" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/machinery/mineral/equipment_vendor/engineering,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "xzg" = (
 /obj/machinery/light{
 	dir = 4
@@ -17675,12 +17254,6 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4starboardafthall)
-"xBR" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "xCw" = (
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 9
@@ -17754,6 +17327,9 @@
 	alpha = 255
 	},
 /obj/effect/floor_decal/corner/lightorange/bordercorner2,
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardafthall)
 "xFQ" = (
@@ -17801,6 +17377,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardhall)
 "xGZ" = (
@@ -17816,6 +17395,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/sleep/engi_wash)
+"xHf" = (
+/obj/structure/cable{
+	icon_state = "2-5"
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d4aftmaint)
 "xHG" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -17834,12 +17419,6 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardafthall)
-"xHP" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/techmaint,
-/area/space)
 "xJp" = (
 /obj/structure/cable/cyan{
 	icon_state = "1-2"
@@ -18034,7 +17613,7 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d4starboardforhall)
 "yfR" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
 	dir = 4
 	},
 /turf/simulated/wall/prepainted/engineering/atmos,
@@ -18056,9 +17635,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/starboardnacelle)
-"yhh" = (
-/turf/simulated/wall/prepainted/engineering,
-/area/endeavour/hallway/d4starboardhall)
 "yhr" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -18151,9 +17727,7 @@
 "ylX" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/lightorange/border,
-/obj/machinery/light{
-	pixel_y = -24
-	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4starboardamidhall)
 
@@ -21474,6 +21048,38 @@ jNg
 jNg
 jNg
 jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+jNg
+jNg
 jNg
 jNg
 jNg
@@ -21493,13 +21099,18 @@ jNg
 jNg
 jNg
 jNg
+psc
+jNg
+psc
 jNg
 jNg
 jNg
 jNg
 jNg
 jNg
+psc
 jNg
+psc
 jNg
 jNg
 jNg
@@ -21510,11 +21121,17 @@ jNg
 jNg
 jNg
 jNg
+gtA
+gPd
+gtA
 jNg
 jNg
 jNg
 jNg
 jNg
+gtA
+gPd
+gtA
 jNg
 jNg
 jNg
@@ -21547,17 +21164,11 @@ jNg
 jNg
 jNg
 jNg
-gtA
-gPd
-gtA
 jNg
 jNg
 jNg
 jNg
 jNg
-gtA
-gPd
-gtA
 jNg
 jNg
 jNg
@@ -21568,15 +21179,129 @@ jNg
 jNg
 jNg
 jNg
-psc
 jNg
-psc
 jNg
 jNg
 jNg
 jNg
 jNg
 jNg
+xRj
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+"}
+(19,1,1) = {"
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+psc
+bXA
+psc
+dyB
+dyB
+rAR
+dyB
+dyB
+rAR
 psc
 jNg
 psc
@@ -21587,13 +21312,20 @@ jNg
 jNg
 jNg
 jNg
+vTv
 jNg
 jNg
+gPd
+usY
+gPd
 jNg
 jNg
 jNg
 jNg
 jNg
+gPd
+usY
+gPd
 jNg
 jNg
 jNg
@@ -21604,15 +21336,24 @@ jNg
 jNg
 jNg
 jNg
+psc
 jNg
+psc
+dyB
+dyB
+rAR
+dyB
+dyB
+rAR
+psc
 jNg
+vAC
 jNg
 jNg
 jNg
 jNg
 jNg
 jNg
-xRj
 jNg
 jNg
 jNg
@@ -21637,176 +21378,9 @@ jNg
 jNg
 jNg
 jNg
-xRj
-xRj
-xRj
-xRj
-xRj
-xRj
-xRj
-xRj
-xRj
-xRj
-xRj
-"}
-(19,1,1) = {"
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-psc
-bXA
-psc
-dyB
-dyB
-rAR
-dyB
-dyB
-rAR
-psc
-jNg
-psc
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-vTv
-jNg
-jNg
-gPd
-usY
-gPd
-jNg
-jNg
-jNg
-jNg
-jNg
-gPd
-usY
-gPd
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-psc
-jNg
-psc
-dyB
-dyB
-rAR
-dyB
-dyB
-rAR
-psc
-jNg
-vAC
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
 jNg
 jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-xRj
+xRj
 jNg
 jNg
 jNg
@@ -21862,36 +21436,36 @@ jNg
 jNg
 jNg
 jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -22056,36 +21630,36 @@ jNg
 jNg
 jNg
 jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -22250,36 +21824,36 @@ jNg
 jNg
 jNg
 jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -22384,68 +21958,23 @@ jNg
 jNg
 jNg
 jNg
-xRj
-xRj
-xRj
-xRj
-xRj
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-xRj
-xRj
-xRj
-xRj
-xRj
-xRj
-xRj
-xRj
-xRj
-xRj
-xRj
-"}
-(23,1,1) = {"
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
 jNg
 jNg
 jNg
@@ -22458,15 +21987,28 @@ jNg
 jNg
 jNg
 jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+"}
+(23,1,1) = {"
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
 jNg
 jNg
 jNg
-xcl
-xcl
-xcl
-xcl
-xcl
-xcl
 jNg
 jNg
 jNg
@@ -22476,6 +22018,38 @@ jNg
 jNg
 jNg
 jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+jNg
+jNg
 jNg
 jNg
 jNg
@@ -22638,36 +22212,36 @@ jNg
 jNg
 jNg
 jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-xcl
-vaQ
-fgc
-crd
-mlq
-xcl
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -22832,36 +22406,36 @@ jNg
 jNg
 jNg
 jNg
-jNg
-jNg
-jNg
-xcl
-xcl
-xcl
-xcl
-xcl
-xcl
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-xcl
-sqt
-quu
-xnQ
-vkt
-xcl
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -23026,36 +22600,36 @@ jNg
 jNg
 jNg
 jNg
-jNg
-xcl
-xcl
-xcl
-nSP
-xdC
-uHI
-xHP
-xcl
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-xcl
-efU
-vQM
-bRc
-aoD
-xcl
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -23204,52 +22778,52 @@ xRj
 (27,1,1) = {"
 jNg
 jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-xcl
-jew
-oqN
-nSR
-wDK
-nfZ
-nSR
-xcl
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-xcl
-fpc
-qiv
-xnQ
-nEg
-xcl
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -23414,36 +22988,36 @@ jNg
 jNg
 jNg
 jNg
-jNg
-xcl
-mUP
-xBR
-nSR
-hjQ
-fHd
-nSR
-xcl
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-xcl
-fPA
-wKs
-vuX
-juL
-eCQ
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -23608,36 +23182,36 @@ jNg
 jNg
 jNg
 jNg
-jNg
-xcl
-mPt
-elM
-pKm
-naJ
-xjH
-ghk
-tCb
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-xcl
-ioo
-idT
-xnQ
-uus
-eCQ
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -23802,36 +23376,36 @@ jNg
 jNg
 jNg
 jNg
-jNg
-xcl
-cGn
-wpo
-dPN
-agm
-wpo
-jyw
-xcl
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-xcl
-bMq
-idT
-xnQ
-vnN
-eCQ
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -23996,36 +23570,36 @@ jNg
 jNg
 jNg
 jNg
-jNg
-xcl
-uwG
-nSR
-dPN
-agm
-nSR
-mGz
-xcl
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-tbj
-rri
-rxH
-nvH
-vBC
-eCQ
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -24190,36 +23764,36 @@ jNg
 jNg
 jNg
 jNg
-jNg
-xcl
-uwG
-nSR
-jSl
-agm
-nSR
-mGz
-xcl
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-xcl
-tUk
-qvr
-hfW
-fMn
-eCQ
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -24384,36 +23958,36 @@ jNg
 jNg
 jNg
 jNg
-jNg
-xcl
-xcl
-nqd
-xcl
-ouE
-xcl
-xcl
-xcl
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-xcl
-fHW
-lQo
-vIA
-aFL
-eCQ
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -24578,36 +24152,36 @@ jNg
 jNg
 jNg
 jNg
-jNg
-xcl
-hPs
-eie
-eie
-sOG
-eie
-tIz
-xcl
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-xcl
-xcl
-xcl
-xcl
-xcl
-xcl
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -24772,36 +24346,36 @@ jNg
 jNg
 jNg
 jNg
-jNg
-xcl
-aBO
-nSR
-nSR
-fnt
-nSR
-nwk
-xcl
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -24966,21 +24540,6 @@ jNg
 jNg
 jNg
 jNg
-jNg
-xcl
-fyf
-nSR
-ftf
-rkG
-nSR
-aeU
-xcl
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
 xRj
 xRj
 xRj
@@ -24993,9 +24552,24 @@ xRj
 xRj
 xRj
 xRj
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -25027,7 +24601,7 @@ kPC
 cCF
 ePf
 wEN
-dFy
+igI
 mPc
 dFy
 dFy
@@ -25160,21 +24734,6 @@ jNg
 jNg
 jNg
 jNg
-jNg
-xcl
-lps
-iIN
-hpq
-eRo
-nSR
-lck
-xcl
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
 xRj
 xRj
 xRj
@@ -25187,9 +24746,24 @@ xRj
 xRj
 xRj
 xRj
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -25354,21 +24928,6 @@ jNg
 jNg
 jNg
 jNg
-jNg
-xcl
-xyY
-rQt
-cUn
-cDz
-nSR
-rio
-xcl
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
 xRj
 xRj
 xRj
@@ -25381,9 +24940,24 @@ xRj
 xRj
 xRj
 xRj
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -25548,21 +25122,10 @@ jNg
 jNg
 jNg
 jNg
-jNg
-xcl
-qyt
-hge
-cXr
-jUI
-xBR
-upT
-xcl
 xRj
 xRj
 xRj
 xRj
-jNg
-jNg
 xRj
 xRj
 xRj
@@ -25575,9 +25138,20 @@ xRj
 xRj
 xRj
 xRj
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -25742,21 +25316,10 @@ jNg
 jNg
 jNg
 jNg
-jNg
-xcl
-bGf
-jym
-osU
-ryQ
-aPd
-fVf
-xcl
 xRj
 xRj
 xRj
 xRj
-jNg
-jNg
 xRj
 xRj
 xRj
@@ -25769,9 +25332,20 @@ xRj
 xRj
 xRj
 xRj
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -25936,21 +25510,10 @@ jNg
 jNg
 jNg
 jNg
-jNg
-xcl
-sWC
-nSR
-nSR
-poh
-nSR
-vky
-xcl
 xRj
 xRj
 xRj
 xRj
-jNg
-jNg
 xRj
 xRj
 xRj
@@ -25963,9 +25526,20 @@ xRj
 xRj
 xRj
 xRj
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -26130,21 +25704,10 @@ jNg
 jNg
 jNg
 jNg
-jNg
-xcl
-nlS
-mEn
-mEn
-dKV
-mEn
-rjx
-xcl
 xRj
 xRj
 xRj
 xRj
-jNg
-jNg
 xRj
 xRj
 xRj
@@ -26157,9 +25720,20 @@ xRj
 xRj
 xRj
 xRj
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -26324,21 +25898,10 @@ jNg
 jNg
 jNg
 jNg
-jNg
-xcl
-xcl
-xcl
-xcl
-xcl
-xcl
-xcl
-xcl
 xRj
 xRj
 xRj
 xRj
-jNg
-jNg
 xRj
 xRj
 xRj
@@ -26351,9 +25914,20 @@ xRj
 xRj
 xRj
 xRj
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -26416,16 +25990,209 @@ twj
 twj
 yex
 jBO
-lcb
+lcb
+jBO
+jBO
+jBO
+jBO
+gyT
+jBO
+jBO
+jBO
+ikp
+ikp
+ikp
+ikp
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+xRj
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+"}
+(44,1,1) = {"
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+jNg
+ikp
+ikp
+ikp
+wom
+jBO
+jBO
+jBO
+ikp
+iAM
+xwJ
+oSP
+nTU
+eBM
+rZu
+efo
+asu
+lTa
+twj
+twj
+twj
+twj
+twj
+twj
+twj
+twj
+twj
+twj
+twj
+twj
+twj
+twj
+twj
+twj
+twj
+twj
+twj
+twj
+yex
+jBO
+tIM
+jBO
 jBO
 jBO
 jBO
 jBO
-gyT
 jBO
 jBO
 jBO
-ikp
 ikp
 ikp
 ikp
@@ -26458,6 +26225,7 @@ jNg
 jNg
 jNg
 jNg
+jNg
 xRj
 xRj
 xRj
@@ -26499,12 +26267,7 @@ xRj
 xRj
 xRj
 "}
-(44,1,1) = {"
-jNg
-jNg
-jNg
-jNg
-jNg
+(45,1,1) = {"
 jNg
 jNg
 jNg
@@ -26524,15 +26287,23 @@ jNg
 jNg
 jNg
 xRj
-jNg
-jNg
-jNg
 xRj
 xRj
 xRj
 xRj
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 xRj
 xRj
 xRj
@@ -26570,22 +26341,19 @@ jNg
 jNg
 jNg
 jNg
-jNg
-ikp
 ikp
-ikp
-wom
+jBO
 jBO
 jBO
 jBO
 ikp
-iAM
+kqk
 xwJ
-oSP
+mHH
 nTU
-eBM
-rZu
-efo
+dwi
+gCw
+qJp
 asu
 lTa
 twj
@@ -26620,8 +26388,8 @@ jBO
 jBO
 jBO
 ikp
-ikp
-ikp
+jNg
+jNg
 jNg
 jNg
 jNg
@@ -26693,22 +26461,7 @@ xRj
 xRj
 xRj
 "}
-(45,1,1) = {"
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+(46,1,1) = {"
 jNg
 jNg
 jNg
@@ -26739,9 +26492,24 @@ xRj
 xRj
 xRj
 xRj
-jNg
-jNg
-jNg
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
+xRj
 jNg
 jNg
 jNg
@@ -26768,18 +26536,18 @@ jNg
 jNg
 jNg
 ikp
-jBO
+ikp
 jBO
 jBO
 jBO
 ikp
-kqk
+iAM
 xwJ
-mHH
+kab
 nTU
-dwi
-gCw
-qJp
+aLx
+wNi
+rLq
 asu
 lTa
 twj
@@ -26803,10 +26571,8 @@ twj
 twj
 twj
 yex
-jBO
-tIM
-jBO
-jBO
+pVu
+jwe
 jBO
 jBO
 jBO
@@ -26814,7 +26580,9 @@ jBO
 jBO
 jBO
 ikp
-jNg
+ikp
+ikp
+mKs
 jNg
 jNg
 jNg
@@ -26887,22 +26655,7 @@ xRj
 xRj
 xRj
 "}
-(46,1,1) = {"
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+(47,1,1) = {"
 jNg
 jNg
 jNg
@@ -26933,142 +26686,12 @@ xRj
 xRj
 xRj
 xRj
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-ikp
-ikp
-jBO
-jBO
-jBO
-ikp
-iAM
-xwJ
-kab
-nTU
-aLx
-wNi
-rLq
-asu
-lTa
-twj
-twj
-twj
-twj
-twj
-twj
-twj
-twj
-twj
-twj
-twj
-twj
-twj
-twj
-twj
-twj
-twj
-twj
-twj
-twj
-yex
-pVu
-jwe
-jBO
-jBO
-jBO
-jBO
-jBO
-jBO
-ikp
-ikp
-ikp
-mKs
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
 xRj
 xRj
 xRj
 xRj
 xRj
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
 xRj
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
 xRj
 xRj
 xRj
@@ -27080,56 +26703,7 @@ xRj
 xRj
 xRj
 xRj
-"}
-(47,1,1) = {"
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
-jNg
+xRj
 jNg
 jNg
 jNg
@@ -27934,12 +27508,12 @@ jNg
 jNg
 ikp
 jBO
-jBO
-jBO
+ren
+pLM
 uBe
-mSm
-xwJ
-mHH
+dpt
+xeb
+pTX
 nqa
 eGc
 gaf
@@ -28128,12 +27702,12 @@ gtA
 gPd
 ikp
 sgN
-jhP
+cGP
 jhP
 cyd
 kLQ
 jzg
-oSP
+bJi
 nqa
 eGc
 szz
@@ -28322,12 +27896,12 @@ gPd
 usY
 ikp
 dWT
-jBO
-jBO
+tFm
+tfb
 ikp
 cLC
 xwJ
-mHH
+cYd
 nqa
 pNL
 jEy
@@ -28516,12 +28090,12 @@ gtA
 gPd
 ikp
 dWT
-jBO
-jBO
+tFm
+eDe
 ikp
-iAM
+cJh
 xwJ
-kab
+hLB
 nqa
 fZZ
 xJp
@@ -28710,12 +28284,12 @@ jNg
 jNg
 ikp
 aSY
-jBO
-jBO
+tFm
+eDe
 ikp
-kqk
+nUo
 xwJ
-mHH
+cYd
 nqa
 crO
 gnX
@@ -28904,12 +28478,12 @@ jNg
 jNg
 ikp
 wom
-jBO
-jBO
+tFm
+eDe
 ikp
-iAM
+cJh
 xwJ
-kab
+hLB
 nqa
 crO
 asr
@@ -29098,12 +28672,12 @@ jNg
 jNg
 ikp
 jBO
-jBO
-jBO
+tFm
+eDe
 ikp
 okY
 xwJ
-mHH
+cYd
 nqa
 nqa
 nqa
@@ -29292,8 +28866,8 @@ jNg
 ikp
 ikp
 jBO
-jBO
-wsk
+tFm
+sIE
 ikp
 eDC
 agu
@@ -29486,17 +29060,17 @@ ikp
 ikp
 jBO
 jBO
-jBO
-jBO
+tFm
+eDe
 ikp
 xmz
 fod
 rAt
-ufU
-ufU
+wxj
+wxj
 qpf
-ufU
-ufU
+wxj
+wxj
 tNG
 iFZ
 paZ
@@ -29675,13 +29249,13 @@ ikp
 ikp
 ikp
 ikp
+ikp
 jBO
 jBO
 jBO
 jBO
-jBO
-jBO
-jBO
+tFm
+eDe
 ikp
 gIr
 aQr
@@ -29692,7 +29266,7 @@ dpZ
 dpZ
 dpZ
 vXT
-pEq
+hBl
 hER
 wNX
 caF
@@ -29867,15 +29441,15 @@ nrt
 nrt
 ukW
 emb
-jBO
-jBO
-jBO
-jBO
-jBO
-jBO
-jBO
-jBO
-jBO
+iCe
+aXZ
+ikp
+xHf
+uEt
+uEt
+uEt
+wGc
+jmD
 ikp
 bXW
 yeG
@@ -29886,7 +29460,7 @@ hcL
 wjK
 qMC
 dpZ
-nzY
+nDu
 hER
 pgh
 tWf
@@ -29910,7 +29484,7 @@ spY
 fdU
 hvj
 dkO
-kbM
+uus
 gDP
 rtK
 jBO
@@ -29919,7 +29493,7 @@ jBO
 jBO
 jBO
 jBO
-vTS
+jBO
 jBO
 ikp
 ikp
@@ -30061,17 +29635,17 @@ usH
 usH
 ukW
 wom
-jBO
-jBO
-jBO
-jBO
-jBO
-jBO
-jBO
-jBO
+eUr
+ren
+bfk
+pLM
+pLM
+pLM
+pLM
+coP
 jBO
 ikp
-iAM
+cJh
 hEI
 bSj
 vGs
@@ -30080,7 +29654,7 @@ iTI
 jZF
 jZF
 dpZ
-vVK
+bqC
 hER
 wNX
 tWf
@@ -30113,7 +29687,7 @@ jBO
 jBO
 jBO
 jBO
-tFm
+jBO
 jBO
 jBO
 jBO
@@ -30255,9 +29829,9 @@ myq
 kAf
 ukW
 jBO
-jBO
-jBO
-jBO
+ryU
+coP
+ikp
 jBO
 jBO
 jBO
@@ -30265,7 +29839,7 @@ jBO
 jBO
 jBO
 ikp
-ihs
+dCl
 pfR
 tmS
 ppa
@@ -30274,7 +29848,7 @@ jZF
 jZF
 cQd
 dpZ
-azJ
+liC
 hER
 pgh
 tWf
@@ -30307,7 +29881,7 @@ jBO
 jBO
 jBO
 jBO
-tFm
+jBO
 jBO
 jBO
 jBO
@@ -30459,7 +30033,7 @@ gMW
 gMW
 gMW
 gMW
-iAM
+cJh
 kiI
 oSP
 ppa
@@ -30468,7 +30042,7 @@ jZF
 jZF
 sWB
 dpZ
-vVK
+bqC
 hER
 wNX
 tWf
@@ -30501,7 +30075,7 @@ jBO
 jBO
 jBO
 jBO
-tFm
+jBO
 jBO
 jBO
 jBO
@@ -30653,7 +30227,7 @@ gMW
 gMW
 gMW
 gMW
-ihs
+dCl
 kiI
 mHH
 ppa
@@ -30662,7 +30236,7 @@ jZF
 jZF
 xSM
 dpZ
-azJ
+liC
 hER
 pgh
 tWf
@@ -30670,10 +30244,10 @@ tWf
 tWf
 dOL
 dOL
+mjh
 dOL
 dOL
-dOL
-dkU
+bPj
 rJJ
 rJJ
 uzA
@@ -30847,7 +30421,7 @@ uPE
 glO
 gMW
 gMW
-uYJ
+dlD
 eIN
 xnV
 sHl
@@ -30856,7 +30430,7 @@ jZF
 jZF
 ycn
 dpZ
-vtI
+shN
 lTq
 rBG
 bUI
@@ -31041,7 +30615,7 @@ uPE
 bYZ
 gMW
 gMW
-ihs
+dCl
 kiI
 mHH
 sHl
@@ -31050,7 +30624,7 @@ jZF
 jZF
 ohO
 dpZ
-ogm
+vTS
 qzJ
 pTs
 pTs
@@ -31429,7 +31003,7 @@ uPE
 tTc
 gMW
 gMW
-ihs
+dCl
 kiI
 mHH
 ppa
@@ -31458,7 +31032,7 @@ mPA
 bMD
 gDt
 nJl
-gDt
+kAL
 nJl
 vdL
 xwZ
@@ -31623,7 +31197,7 @@ uPE
 uPE
 gMW
 gMW
-iAM
+cJh
 kiI
 oSP
 ppa
@@ -32011,7 +31585,7 @@ hZm
 irv
 gMW
 gMW
-iAM
+cJh
 kiI
 qjJ
 jQA
@@ -32205,7 +31779,7 @@ uPE
 xvh
 gMW
 gMW
-ihs
+dCl
 kiI
 mSm
 qyK
@@ -33369,7 +32943,7 @@ lcM
 lcM
 lcM
 lcM
-ihs
+dCl
 kiI
 mHH
 gGK
@@ -33563,7 +33137,7 @@ hmF
 tDD
 vLC
 xwk
-iAM
+cJh
 kiI
 oSP
 jQA
@@ -33607,7 +33181,7 @@ xjs
 sgO
 bBE
 jPA
-pfc
+uPX
 dNZ
 ico
 ghy
@@ -33757,7 +33331,7 @@ qUQ
 fWC
 fWC
 xwk
-ihs
+dRg
 kiI
 ecY
 jQA
@@ -33801,10 +33375,10 @@ mxs
 pOI
 hOo
 mxs
-ful
+klt
 eMH
-nDu
-fVN
+eMH
+iLQ
 xKs
 xKs
 xKs
@@ -33995,10 +33569,10 @@ gPo
 kwy
 bBE
 jPA
-pfc
-qqA
 lEE
-fVN
+qqA
+qqA
+iLQ
 xKs
 xKs
 xKs
@@ -34364,7 +33938,7 @@ lFs
 bAs
 omb
 xAC
-wsO
+mzf
 xsV
 tqm
 dvY
@@ -34579,8 +34153,8 @@ ful
 qRw
 pfc
 sgO
-liC
-pLM
+jPA
+fVN
 xKs
 xKs
 xKs
@@ -34770,7 +34344,7 @@ nEk
 gPo
 fBC
 mMX
-cVC
+aMU
 jLt
 fBC
 vdE
@@ -34964,10 +34538,10 @@ fxi
 ezp
 ezp
 fxi
-eMa
+vVB
 eUp
-ezp
-ezp
+jPu
+eWw
 nmZ
 cWi
 cWi
@@ -35118,25 +34692,25 @@ qDt
 evL
 cIU
 cIU
-bSY
+kSz
 tRo
 bSY
 rAC
-bSY
+kSz
 knM
 sew
 gDf
 tFW
-bSY
+oLT
 dkm
 bSY
 rAC
-bSY
+oLT
 gPH
 xbS
 goM
 xbS
-gPH
+hSO
 xbS
 gXC
 ufH
@@ -35158,14 +34732,14 @@ gPo
 xjs
 fHc
 qwn
-liC
-kkK
+qRw
+lEE
 sFd
-hLB
+gFL
 nat
-kbY
+jse
 wrG
-pwL
+tRp
 pwL
 vKu
 vsf
@@ -35352,7 +34926,7 @@ gRU
 eOy
 lTK
 wCy
-mxs
+coT
 aMT
 ekS
 gFL
@@ -35499,10 +35073,10 @@ dvY
 dvY
 dvY
 dvY
-dvY
-dvY
-dvY
-dvY
+wiw
+wiw
+wiw
+wiw
 wiw
 wiw
 acg
@@ -35553,7 +35127,7 @@ vsf
 vsf
 vsf
 vUP
-ycR
+nsO
 vsf
 vsf
 usY
@@ -35693,12 +35267,12 @@ dvY
 dvY
 dvY
 dvY
-dvY
-dvY
-dvY
-dvY
-wiw
 wiw
+szc
+eYL
+jiL
+gNN
+reV
 iDM
 kRf
 nRc
@@ -35734,13 +35308,13 @@ uLe
 nMA
 nAf
 sNg
-nAf
+wVA
 xHG
 mEo
 nAf
 sME
 pvC
-xkf
+tRm
 elm
 pZs
 cGV
@@ -35887,12 +35461,12 @@ dvY
 dvY
 dvY
 dvY
-dvY
-dvY
-dvY
-dvY
-wiw
 wiw
+vMK
+jiL
+jiL
+jiL
+reV
 waS
 cBj
 btv
@@ -35932,12 +35506,12 @@ kcN
 eQz
 cQY
 jxR
+rQt
+rQt
+rCS
 rxy
 rxy
-rxy
-rxy
-rxy
-jxR
+ouE
 uCd
 rxy
 hld
@@ -36081,9 +35655,9 @@ dvY
 dvY
 dvY
 dvY
-dvY
-dvY
-dvY
+wiw
+wiw
+wiw
 wiw
 wiw
 wiw
@@ -36315,7 +35889,7 @@ jOs
 cgT
 tAP
 qqz
-pXk
+cGp
 yfR
 gRy
 eid
@@ -37670,8 +37244,8 @@ nXi
 buV
 vJJ
 voa
-tdV
-lmh
+lby
+bab
 sdP
 wZV
 ahp
@@ -38446,7 +38020,7 @@ qqz
 exs
 vGM
 voa
-tdV
+lby
 rZv
 sdP
 kOp
@@ -39409,7 +38983,7 @@ hHC
 suA
 kGS
 uNt
-yhh
+xsV
 dvY
 dvY
 dvY
@@ -39603,7 +39177,7 @@ hHC
 aqU
 kGS
 uXi
-yhh
+xsV
 dvY
 dvY
 dvY
@@ -39797,7 +39371,7 @@ hHC
 suA
 kGS
 uNt
-yhh
+xsV
 dvY
 dvY
 dvY
@@ -39991,7 +39565,7 @@ whe
 wrb
 kGS
 wCu
-yhh
+xsV
 sDN
 dvY
 dvY
@@ -40185,7 +39759,7 @@ lrh
 bhh
 gOm
 uXi
-yhh
+xsV
 dvY
 dvY
 dvY
@@ -40371,7 +39945,7 @@ bSY
 rAC
 wMc
 gPH
-xbS
+nEC
 gPH
 gTj
 gPH
@@ -40379,7 +39953,7 @@ xbS
 lqz
 kGS
 iar
-yhh
+xsV
 dvY
 dvY
 dvY
@@ -45989,7 +45563,7 @@ dvY
 dvY
 dvY
 mZZ
-wii
+wvc
 nAP
 tmr
 tmr
@@ -46377,7 +45951,7 @@ wqH
 qDt
 qDt
 mZZ
-wii
+lmh
 nSo
 tmr
 tmr
@@ -46585,7 +46159,7 @@ tmr
 tmr
 tmr
 xNn
-pMX
+wsO
 xos
 dvY
 dvY
@@ -46779,7 +46353,7 @@ yfO
 mel
 djL
 fow
-pMX
+bmP
 lbF
 dvY
 dvY
@@ -47541,7 +47115,7 @@ cRV
 ciZ
 dvY
 mZZ
-wii
+lmh
 nSo
 qBz
 hic
@@ -47735,7 +47309,7 @@ cRV
 ciZ
 dvY
 mZZ
-wii
+saz
 jFf
 qBz
 hic
@@ -47749,7 +47323,7 @@ djL
 djL
 djL
 xNn
-pMX
+wsO
 xos
 dvY
 gRl
@@ -47939,7 +47513,7 @@ hic
 hic
 hic
 qBz
-djL
+tdV
 djL
 djL
 xNn
@@ -48511,7 +48085,7 @@ jUm
 ciZ
 dvY
 mZZ
-wii
+lmh
 nSo
 qBz
 qBz
@@ -48521,11 +48095,11 @@ qBz
 qBz
 qBz
 qBz
-djL
+tdV
 djL
 djL
 fow
-pMX
+hfS
 xos
 dvY
 gRl
@@ -48719,7 +48293,7 @@ djL
 djL
 djL
 kMd
-hSO
+mOl
 xos
 dvY
 dvY