diff --git a/maps/endeavour/levels/deck1.dmm b/maps/endeavour/levels/deck1.dmm
index 5b8e9da9bb4..3245675dc49 100644
--- a/maps/endeavour/levels/deck1.dmm
+++ b/maps/endeavour/levels/deck1.dmm
@@ -5596,6 +5596,9 @@
 /obj/structure/bed/chair{
 	dir = 1
 	},
+/obj/machinery/fire_alarm/south_mount{
+	pixel_y = -24
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/surfacebase/tram)
 "ejN" = (
@@ -11612,15 +11615,6 @@
 	},
 /turf/simulated/floor/carpet/purcarpet,
 /area/exploration/meeting)
-"iqq" = (
-/obj/machinery/door/airlock/maintenance/common{
-	id_tag = "maint_dorm"
-	},
-/obj/machinery/door/firedoor,
-/obj/structure/catwalk,
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/endeavour/hallway/d1fwdmaint)
 "iqr" = (
 /obj/structure/table/standard,
 /obj/item/inflatable_duck,
@@ -20283,10 +20277,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1aftmaint)
-"ozV" = (
-/obj/structure/bed/chair,
-/turf/simulated/floor/tiled,
-/area/endeavour/surfacebase/tram)
 "ozZ" = (
 /turf/simulated/floor/tiled/dark,
 /area/gateway)
@@ -26971,9 +26961,6 @@
 /area/library)
 "tCP" = (
 /obj/machinery/light,
-/obj/machinery/fire_alarm/south_mount{
-	pixel_y = -24
-	},
 /obj/structure/bed/chair{
 	dir = 1
 	},
@@ -41845,7 +41832,7 @@ rTZ
 rTZ
 rTZ
 rTZ
-ozV
+gjY
 cMJ
 nTt
 tAk
@@ -42039,7 +42026,7 @@ eFW
 cMJ
 rTZ
 rTZ
-ozV
+gjY
 cMJ
 tAk
 tAk
@@ -42233,7 +42220,7 @@ eNz
 cMJ
 rTZ
 rTZ
-ozV
+gjY
 cMJ
 tAk
 tAk
@@ -61830,7 +61817,7 @@ wSl
 tHJ
 tHJ
 ivO
-iqq
+uKO
 byt
 byt
 ris
diff --git a/maps/endeavour/levels/deck2.dmm b/maps/endeavour/levels/deck2.dmm
index 10601e1729b..9e0b1a5665a 100644
--- a/maps/endeavour/levels/deck2.dmm
+++ b/maps/endeavour/levels/deck2.dmm
@@ -784,7 +784,7 @@
 /area/maintenance/research/xenobio)
 "ayx" = (
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "ayB" = (
 /obj/structure/shuttle/engine/heater{
 	dir = 8
@@ -995,9 +995,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/rnd/research/testingrange)
 "aFn" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /obj/machinery/air_alarm{
 	pixel_y = 22
 	},
@@ -1011,7 +1008,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/wood,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "aFv" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 5
@@ -1824,7 +1821,7 @@
 "biu" = (
 /obj/structure/sign/deck/second,
 /turf/simulated/wall/r_wall/prepainted,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "bix" = (
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 1
@@ -4222,7 +4219,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "cxJ" = (
 /turf/simulated/floor/plating,
 /area/maintenance/substation/medical_science)
@@ -4972,7 +4969,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "cTK" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -6877,7 +6874,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/wood,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "ecE" = (
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora)
@@ -7798,7 +7795,7 @@
 	dir = 8
 	},
 /obj/structure/bed/chair/bay/comfy/black,
-/obj/machinery/camera/network/civilian{
+/obj/machinery/camera/network/exploration{
 	dir = 4
 	},
 /turf/simulated/floor/wood,
@@ -7992,7 +7989,7 @@
 /obj/fiftyspawner/steel,
 /obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "eKJ" = (
 /obj/machinery/door/firedoor/glass{
 	dir = 4
@@ -8223,7 +8220,7 @@
 "eTf" = (
 /obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
 /turf/simulated/floor/plating,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "eTk" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -8912,9 +8909,6 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_d)
 "fnA" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /obj/machinery/door/airlock/maintenance/common{
 	name = "Flight Ops Support"
 	},
@@ -8927,7 +8921,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "fnS" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -8962,7 +8956,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "fpq" = (
 /obj/effect/floor_decal/steeldecal/steel_decals_central7,
 /obj/structure/cable/green{
@@ -11801,12 +11795,12 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
 "hbR" = (
-/obj/machinery/ion_engine,
 /obj/machinery/light/small{
 	dir = 4
 	},
+/obj/machinery/camera/network/exploration,
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "hbZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -13333,7 +13327,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/wood,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "hSv" = (
 /obj/item/storage/firstaid/surgery,
 /obj/item/robotanalyzer,
@@ -14110,10 +14104,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/medical/surgeryobs)
 "iur" = (
-/obj/machinery/power/apc/east_mount,
-/obj/structure/cable/green{
-	icon_state = "0-8"
-	},
 /obj/structure/closet/secure_closet/pilot,
 /obj/effect/floor_decal/spline/fancy/wood/cee{
 	dir = 4
@@ -14122,7 +14112,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/wood,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "iuJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -14410,7 +14400,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "iAl" = (
 /obj/structure/table/glass,
 /obj/machinery/door/window/westleft{
@@ -14989,7 +14979,7 @@
 "iVM" = (
 /obj/effect/floor_decal/spline/fancy/wood/corner,
 /turf/simulated/floor/wood,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "iVW" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/box/donkpockets,
@@ -17532,7 +17522,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "kCt" = (
 /turf/simulated/wall/prepainted/science,
 /area/rnd/research/researchdivision)
@@ -17720,10 +17710,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
-"kKk" = (
-/obj/machinery/atmospherics/component/unary/engine,
-/turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
 "kKI" = (
 /obj/machinery/light{
 	dir = 8
@@ -17849,7 +17835,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "kNM" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -18269,15 +18255,12 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "kYY" = (
 /obj/structure/sink{
 	dir = 4;
@@ -19033,7 +19016,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/plating,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "lwb" = (
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk,
@@ -19272,11 +19255,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/research_foyer)
-"lCS" = (
-/obj/structure/catwalk,
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/research)
 "lDf" = (
 /obj/machinery/air_alarm{
 	dir = 8;
@@ -20127,7 +20105,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "miA" = (
 /obj/machinery/air_alarm/monitor/isolation{
 	alarm_id = "isolation_one";
@@ -20292,7 +20270,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/wood,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "mpP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/black{
 	dir = 5
@@ -20515,9 +20493,6 @@
 /turf/simulated/floor/tiled/monotile,
 /area/rnd/xenobiology/xenoflora/lab_atmos)
 "mwB" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /obj/machinery/air_alarm{
 	pixel_y = 22
 	},
@@ -20527,8 +20502,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/camera/network/exploration,
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "mwF" = (
 /obj/machinery/light{
 	dir = 4
@@ -21470,7 +21446,7 @@
 	},
 /obj/structure/closet/emcloset,
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "nbe" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -21757,9 +21733,6 @@
 /obj/item/book/manual/medical_diagnostics_manual,
 /turf/simulated/floor/carpet/blucarpet,
 /area/crew_quarters/medbreak)
-"nhq" = (
-/turf/simulated/wall/r_wall/prepainted,
-/area/tether/surfacebase/shuttle_pad)
 "nhX" = (
 /obj/effect/floor_decal/corner_techfloor_grid/full{
 	dir = 8
@@ -22580,11 +22553,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/medical/virologymaint)
-"nJI" = (
-/obj/structure/catwalk,
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/medbay/aft)
 "nJM" = (
 /obj/machinery/power/apc/north_mount,
 /obj/structure/cable/green{
@@ -23504,7 +23472,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/wood,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "olB" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -23586,7 +23554,7 @@
 /obj/fiftyspawner/phoronrglass,
 /obj/machinery/light/small,
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "onN" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -25833,9 +25801,6 @@
 /turf/simulated/wall/r_wall/prepainted/medical,
 /area/medical/virology_aft_access)
 "pyb" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 1
 	},
@@ -25843,8 +25808,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/camera/network/exploration,
 /turf/simulated/floor/wood,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "pyk" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -27682,7 +27648,7 @@
 "qxd" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "qxs" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -28500,9 +28466,6 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
 "qUP" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 9
 	},
@@ -28513,7 +28476,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/wood,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "qVs" = (
 /obj/structure/curtain/medical,
 /obj/structure/cable/green{
@@ -28841,7 +28804,7 @@
 	pixel_x = -24
 	},
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "rdl" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -29032,7 +28995,7 @@
 /obj/random/tech_supply,
 /obj/random/tool,
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "rig" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/black{
 	dir = 4
@@ -30280,7 +30243,7 @@
 /obj/machinery/holopad,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/wood,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "rYp" = (
 /obj/structure/bed/roller,
 /obj/effect/floor_decal/borderfloorwhite{
@@ -30359,7 +30322,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/wood,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "scE" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -31254,7 +31217,7 @@
 	},
 /obj/structure/closet/firecloset,
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "sFY" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -33124,7 +33087,7 @@
 "tNI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/wood,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "tNZ" = (
 /obj/effect/floor_decal/borderfloorwhite,
 /obj/effect/floor_decal/corner/paleblue/border,
@@ -35571,7 +35534,7 @@
 /obj/item/tank/phoron,
 /obj/machinery/light/small,
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "vtM" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -36086,7 +36049,7 @@
 	},
 /obj/structure/closet/firecloset,
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "vMn" = (
 /obj/machinery/camera/network/research{
 	dir = 1
@@ -37422,7 +37385,7 @@
 /obj/item/clothing/glasses/welding,
 /obj/item/weldingtool,
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "wvW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -37565,7 +37528,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/wood,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "wAn" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -37600,7 +37563,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/wood,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "wBq" = (
 /obj/machinery/power/apc/north_mount,
 /obj/structure/cable/green{
@@ -37762,7 +37725,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "wGq" = (
 /obj/machinery/fire_alarm/west_mount,
 /turf/simulated/floor/plating,
@@ -38236,7 +38199,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/plating,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "wTM" = (
 /obj/machinery/floodlight,
 /turf/simulated/floor/plating,
@@ -39072,9 +39035,6 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 1
 	},
@@ -39082,7 +39042,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/wood,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "xug" = (
 /obj/structure/cable/green{
 	icon_state = "2-4"
@@ -39702,7 +39662,7 @@
 "xLo" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "xLu" = (
 /obj/structure/bed/chair/sofa/beige{
 	dir = 8
@@ -39785,7 +39745,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/techmaint,
-/area/tether/surfacebase/shuttle_pad)
+/area/exploration/pilot_Office)
 "xOt" = (
 /obj/machinery/camera/network/medbay{
 	dir = 1;
@@ -50005,7 +49965,7 @@ aXm
 dyL
 aXm
 fPz
-nJI
+iec
 ukr
 ctj
 ogg
@@ -68620,7 +68580,7 @@ pRW
 pRW
 pRW
 xVe
-lCS
+neh
 neh
 xIf
 xIf
@@ -68815,7 +68775,7 @@ pRW
 pRW
 xVe
 gUD
-lCS
+neh
 neh
 neh
 svm
@@ -69036,14 +68996,14 @@ gfI
 vWh
 bgF
 fDK
-nhq
-nhq
+scX
+scX
 iAd
-nhq
-nhq
-nhq
-nhq
-nhq
+scX
+scX
+scX
+scX
+scX
 lmG
 qBd
 pRW
@@ -69233,11 +69193,11 @@ oYE
 biu
 sFS
 kNG
-nhq
+scX
 kCh
 rdi
 rif
-nhq
+scX
 qBd
 jRE
 pRW
@@ -69424,14 +69384,14 @@ vWh
 vWh
 fKA
 xcG
-nhq
+scX
 naZ
 kNG
-nhq
+scX
 vMh
 ayx
 vtx
-nhq
+scX
 pRW
 pRW
 pRW
@@ -69618,14 +69578,14 @@ vWh
 vWh
 pXE
 ana
-nhq
+scX
 wFI
 kNG
 luU
 qxd
 cxF
 eKl
-nhq
+scX
 pRW
 pRW
 pRW
@@ -69819,7 +69779,7 @@ wTK
 xLo
 fpp
 wvk
-nhq
+scX
 pRW
 pRW
 pRW
@@ -70006,14 +69966,14 @@ uFQ
 cwT
 bgF
 vsM
-nhq
+scX
 mwB
 xOh
-nhq
+scX
 hbR
-kKk
+ayx
 onF
-nhq
+scX
 pRW
 pRW
 pRW
@@ -70200,14 +70160,14 @@ xIg
 hkf
 bkX
 plL
-nhq
+scX
 fnA
-nhq
-nhq
-nhq
-nhq
-nhq
-nhq
+scX
+scX
+scX
+scX
+scX
+scX
 lIp
 pRW
 pRW
@@ -70394,14 +70354,14 @@ tYH
 nrD
 lbX
 fCt
-nhq
+scX
 qUP
 mpL
 wAN
 hSn
-nhq
-nhq
-nhq
+scX
+scX
+scX
 pRW
 pRW
 pRW
@@ -70588,12 +70548,12 @@ cCF
 hGF
 wDK
 qaO
-nhq
+scX
 aFn
 tNI
 rYl
 ecg
-nhq
+scX
 pRW
 pRW
 pRW
@@ -70782,12 +70742,12 @@ qIz
 fOr
 wqT
 qEo
-nhq
+scX
 xuc
 iVM
 wzT
 scw
-nhq
+scX
 lIp
 pRW
 pRW
@@ -70976,7 +70936,7 @@ yiM
 pic
 oCg
 oIp
-nhq
+scX
 pyb
 oli
 eTf
@@ -71170,9 +71130,9 @@ yiM
 pic
 oCg
 oIp
-nhq
+scX
 iur
-nhq
+scX
 eTf
 pRW
 pRW
@@ -71364,9 +71324,9 @@ sBd
 pic
 oCg
 vUJ
-nhq
-nhq
-nhq
+scX
+scX
+scX
 pRW
 pRW
 pRW
diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm
index 1a2e302b88d..cd9ebe43b10 100644
--- a/maps/endeavour/levels/deck3.dmm
+++ b/maps/endeavour/levels/deck3.dmm
@@ -535,7 +535,7 @@
 /area/quartermaster/warehouse)
 "atU" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/beastybrown,
 /turf/simulated/floor/plating,
 /area/quartermaster/foyer)
 "aup" = (
@@ -4369,12 +4369,18 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar/lounge)
 "cUi" = (
-/obj/structure/closet/secure_closet/freezer/kitchen,
-/obj/machinery/light{
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/map_helper/access_helper/airlock/station/maintenance,
+/obj/machinery/door/airlock/maintenance,
+/obj/structure/catwalk,
+/obj/machinery/door/firedoor{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/freezer,
-/area/crew_quarters/kitchen)
+/turf/simulated/floor/plating,
+/area/maintenance/bar/lower)
 "cUA" = (
 /obj/machinery/newscaster{
 	pixel_x = 30
@@ -4930,8 +4936,9 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)
 "dia" = (
-/obj/landmark/spawnpoint/job/chef,
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/structure/table/marble,
+/obj/machinery/microwave,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "diG" = (
@@ -6017,12 +6024,11 @@
 /turf/simulated/floor,
 /area/security/hallway)
 "dSJ" = (
-/obj/structure/table/marble,
-/obj/item/storage/box/donkpockets,
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 1
 	},
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/landmark/spawnpoint/job/chef,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "dTf" = (
@@ -8106,12 +8112,6 @@
 "fcJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/table/marble,
-/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/glass/beaker{
-	pixel_x = 5
-	},
-/obj/item/hand_labeler,
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
@@ -9386,6 +9386,9 @@
 	dir = 5
 	},
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/structure/table/marble,
+/obj/item/material/kitchen/rollingpin,
+/obj/item/material/knife/butch,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "fPG" = (
@@ -9395,6 +9398,9 @@
 /obj/machinery/door/airlock/maintenance,
 /obj/map_helper/access_helper/airlock/station/maintenance,
 /obj/structure/catwalk,
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/bar/lower)
 "fPZ" = (
@@ -9613,12 +9619,11 @@
 /area/shuttle/belter)
 "fTU" = (
 /obj/structure/disposalpipe/segment,
-/obj/machinery/door/airlock/maintenance,
-/obj/map_helper/access_helper/airlock/station/maintenance,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
 /area/maintenance/bar/lower)
 "fUc" = (
 /obj/structure/bed/chair/sofa,
@@ -11975,6 +11980,7 @@
 	},
 /obj/machinery/door/airlock/maintenance,
 /obj/machinery/door/firedoor,
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
 "hEc" = (
@@ -12367,6 +12373,11 @@
 "hRx" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/ore_box,
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	frequency = 1380;
+	id_tag = "belter_docking";
+	pixel_y = 27;
+	},
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/belter)
 "hSq" = (
@@ -12578,11 +12589,6 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_6)
 "hYD" = (
-/obj/machinery/door/airlock{
-	name = "Kitchen";
-	req_one_access = list(28)
-	},
-/obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -12592,8 +12598,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/map_helper/access_helper/airlock/station/service/kitchen,
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/machinery/door/airlock{
+	name = "Kitchen";
+	req_one_access = list(28)
+	},
+/obj/map_helper/access_helper/airlock/station/service/kitchen,
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "hYL" = (
@@ -12670,9 +12681,6 @@
 /turf/simulated/wall/prepainted/civilian,
 /area/maintenance/bar/catwalk)
 "ibm" = (
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 1
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -13499,6 +13507,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/bar/lower)
 "iIU" = (
@@ -14605,11 +14614,6 @@
 /obj/random/maintenance/security,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
-"jwx" = (
-/obj/effect/paint/beastybrown,
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/quartermaster/warehouse)
 "jwQ" = (
 /obj/structure/table/rack/shelf,
 /obj/item/radio{
@@ -14726,12 +14730,10 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
 "jBD" = (
-/obj/structure/table/marble,
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 1
+/obj/machinery/light{
+	dir = 8
 	},
-/obj/effect/floor_decal/corner_oldtile/white/diagonal,
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/kitchen)
 "jCu" = (
 /obj/structure/cable/green{
@@ -15861,7 +15863,6 @@
 	dir = 1
 	},
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
-/obj/item/barrier_tape_segment/engineering,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "ksW" = (
@@ -16319,8 +16320,8 @@
 	pixel_x = 13
 	},
 /obj/machinery/fire_alarm/east_mount,
-/obj/item/reagent_containers/glass/rag/sponge,
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/item/reagent_containers/glass/rag/sponge,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "kKO" = (
@@ -18558,8 +18559,11 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/belterdock)
 "mmZ" = (
-/obj/machinery/appliance/mixer/cereal,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/landmark/spawnpoint/job/chef,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "mne" = (
@@ -20920,8 +20924,6 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
 "nTj" = (
-/obj/structure/table/marble,
-/obj/item/storage/box/donkpockets,
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 1
 	},
@@ -22255,8 +22257,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/foyer)
 "oHM" = (
-/obj/machinery/appliance/mixer/candy,
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/structure/table/marble,
+/obj/item/storage/box/donkpockets,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "oIu" = (
@@ -22327,10 +22330,10 @@
 /turf/simulated/floor/carpet,
 /area/crew_quarters/sleep/Dorm_10)
 "oLu" = (
-/obj/structure/table/marble,
 /obj/item/material/kitchen/rollingpin,
 /obj/item/material/knife/butch,
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/structure/table/marble,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "oMi" = (
@@ -23230,12 +23233,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardforhall)
-"pqk" = (
-/obj/structure/lattice,
-/obj/structure/lattice,
-/obj/structure/grille,
-/turf/space/basic,
-/area/space)
 "pqE" = (
 /obj/machinery/vending/hydroseeds,
 /obj/effect/floor_decal/corner/green{
@@ -23387,11 +23384,10 @@
 /turf/simulated/floor/carpet/tealcarpet,
 /area/crew_quarters/sleep/Dorm_8)
 "puP" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/bar/lower)
+/obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/structure/table/marble,
+/turf/simulated/floor/tiled/dark,
+/area/crew_quarters/kitchen)
 "puT" = (
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/airlock/glass/security{
@@ -23596,6 +23592,9 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/computer/security/telescreen{
+	pixel_x = 32
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)
 "pEk" = (
@@ -24150,6 +24149,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/bar/lower)
 "pXE" = (
@@ -24624,9 +24624,9 @@
 /turf/simulated/floor/tiled/old_tile/gray,
 /area/security/range)
 "qmQ" = (
-/obj/machinery/door/firedoor,
-/obj/effect/paint/beastybrown,
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/beastybrown,
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/quartermaster/warehouse)
 "qmV" = (
@@ -26653,12 +26653,15 @@
 /turf/simulated/floor/tiled/old_cargo/gray,
 /area/security/hanger)
 "rGw" = (
-/obj/structure/table/marble,
-/obj/item/material/knife/butch,
-/obj/item/material/kitchen/rollingpin,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/table/marble,
+/obj/item/hand_labeler,
+/obj/item/reagent_containers/glass/beaker{
+	pixel_x = 5
+	},
+/obj/item/reagent_containers/dropper,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "rHk" = (
@@ -27238,9 +27241,9 @@
 /turf/simulated/floor/plating,
 /area/security/warden)
 "saz" = (
-/obj/structure/table/marble,
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
-/turf/simulated/floor/tiled,
+/obj/machinery/appliance/mixer/cereal,
+/turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "saB" = (
 /obj/machinery/atmospherics/pipe/manifold/visible{
@@ -27738,9 +27741,6 @@
 /obj/machinery/air_alarm{
 	pixel_y = 22
 	},
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 8
-	},
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
 	},
@@ -28214,9 +28214,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
-"sCx" = (
-/turf/space/basic,
-/area/security/range)
 "sDb" = (
 /obj/structure/catwalk,
 /obj/machinery/door/airlock/maintenance,
@@ -28529,21 +28526,19 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
 "sNC" = (
-/obj/machinery/computer/security/telescreen{
-	pixel_x = 32
-	},
 /obj/machinery/chemical_dispenser/catering/bar_soft{
 	pixel_y = 8
 	},
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/structure/table/marble,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "sNE" = (
-/obj/landmark/spawnpoint/job/chef,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/structure/table/marble,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "sOt" = (
@@ -28601,12 +28596,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/security_lockerroom)
-"sRJ" = (
-/obj/structure/closet/secure_closet/freezer/meat{
-	anchored = 1
-	},
-/turf/simulated/floor/tiled/freezer,
-/area/crew_quarters/kitchen)
 "sSl" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 6
@@ -29299,6 +29288,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/bar/lower)
 "tos" = (
@@ -30353,6 +30343,7 @@
 /obj/random/cigarettes,
 /obj/random/maintenance/security,
 /obj/random/coin,
+/obj/item/orion_ship,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
 "tZY" = (
@@ -30386,16 +30377,11 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardforhall)
 "uaL" = (
-/obj/structure/table/marble,
-/obj/machinery/reagentgrinder,
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 8
 	},
-/obj/item/reagent_containers/glass/beaker{
-	pixel_x = 5
-	},
-/obj/item/reagent_containers/dropper,
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/machinery/appliance/mixer/candy,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "ubc" = (
@@ -33508,7 +33494,6 @@
 /turf/simulated/floor/plating,
 /area/security/breakroom)
 "vNN" = (
-/obj/machinery/holopad,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
@@ -33516,6 +33501,12 @@
 	dir = 10
 	},
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/structure/table/marble,
+/obj/item/reagent_containers/glass/beaker{
+	pixel_x = 5
+	},
+/obj/machinery/reagentgrinder,
+/obj/item/reagent_containers/dropper,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "vOz" = (
@@ -33630,6 +33621,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/bar/lower)
 "vSl" = (
@@ -35030,9 +35022,8 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/nuke_storage)
 "wMW" = (
-/obj/structure/table/marble,
-/obj/machinery/microwave,
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
+/obj/machinery/holopad,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "wNi" = (
@@ -36063,9 +36054,6 @@
 /obj/machinery/air_alarm{
 	pixel_y = 22
 	},
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 8
-	},
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
 	},
@@ -36106,6 +36094,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/bar/lower)
 "xzh" = (
@@ -36542,9 +36531,8 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/brig)
 "xNI" = (
-/obj/random/toy,
-/turf/simulated/floor/plating,
-/area/endeavour/hallway/d3aftmaint)
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/barrestroom)
 "xPj" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -43976,7 +43964,7 @@ qCs
 dFB
 eLv
 eLv
-qCs
+xNI
 uGk
 uPC
 fgL
@@ -45341,9 +45329,9 @@ dIR
 fcJ
 rGw
 fPF
-wMW
+mup
 dia
-hCa
+mmZ
 lgT
 iSj
 gWa
@@ -45532,11 +45520,11 @@ leL
 pir
 ksT
 eCE
-oHM
+mup
 uaL
 vNN
 nTj
-mup
+oHM
 hCa
 lgT
 iSj
@@ -45572,7 +45560,7 @@ fJN
 fJN
 lPz
 lPz
-sCx
+pRW
 pRW
 pRW
 pRW
@@ -45726,11 +45714,11 @@ leL
 pir
 igX
 pYC
-mmZ
+mup
 saz
 sNE
 dSJ
-mup
+oHM
 hCa
 lgT
 iyq
@@ -45920,11 +45908,11 @@ leL
 pir
 opV
 lmD
-jBD
+nTj
 oLu
-mup
+puP
 wMW
-mup
+dia
 hCa
 lgT
 bhQ
@@ -46106,7 +46094,7 @@ hkm
 jPs
 xhN
 sGw
-xNI
+kSn
 jwr
 xhN
 gwe
@@ -46692,16 +46680,16 @@ cZa
 nay
 xhN
 xZH
-puP
+leL
+xZH
 pir
-cUi
 apJ
 bKL
 dgB
 hOP
 aVW
 aVW
-aVW
+jBD
 pir
 fbH
 uhA
@@ -46887,8 +46875,8 @@ rQs
 hDH
 iIN
 vRK
+xZH
 pir
-goX
 sEE
 raR
 iNY
@@ -47081,13 +47069,13 @@ kSn
 xhN
 fSt
 xzc
+xZH
 pir
-sRJ
 xMC
 kyF
 jfy
 aVW
-aVW
+goX
 aVW
 lxd
 pir
@@ -47275,13 +47263,13 @@ acO
 xhN
 xZH
 tol
+xZH
 pir
-sRJ
 aHs
 kyF
 jfy
 aHs
-aHs
+goX
 aHs
 dhd
 pir
@@ -47469,7 +47457,7 @@ kow
 xhN
 sDq
 tol
-pir
+xZH
 pir
 pir
 pir
@@ -47663,10 +47651,10 @@ kSn
 xhN
 kgM
 xzc
-xbH
 xZH
-qXh
 xZH
+xbH
+qXh
 xZH
 xZH
 bWK
@@ -47858,8 +47846,8 @@ acO
 kgM
 pXt
 fTU
-fYy
-fYy
+fTU
+cUi
 fYy
 lIR
 hXA
@@ -48020,7 +48008,7 @@ pRW
 pRW
 pRW
 pRW
-pqk
+dlE
 pRW
 wuh
 gmZ
@@ -55217,7 +55205,7 @@ txc
 txc
 txc
 txc
-jwx
+jon
 vvO
 ciU
 agT
diff --git a/maps/endeavour/levels/deck4.dmm b/maps/endeavour/levels/deck4.dmm
index b10228deb65..a3ea58fdf64 100644
--- a/maps/endeavour/levels/deck4.dmm
+++ b/maps/endeavour/levels/deck4.dmm
@@ -7681,16 +7681,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/engineering/break_room)
-"ixk" = (
-/obj/effect/floor_decal/spline/fancy{
-	dir = 5
-	},
-/obj/item/paper/crumpled{
-	name = "Hastily crumpled schematics";
-	info = "Right - the equipment's all set and ready to go - as long as you can keep the ship in the drydock for another few days, we can get in, get out, and be gone before we're missed. Map's attached. Burn this if you think you're about to get pinched-"
-	},
-/turf/simulated/floor/carpet/oracarpet,
-/area/engineering/engineering_monitoring)
 "ixG" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 1
@@ -9623,11 +9613,6 @@
 /obj/item/barrier_tape_segment/engineering,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/engine_eva)
-"kDd" = (
-/obj/structure/catwalk,
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/endeavour/hallway/d4fwdmaint)
 "kDR" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -12080,7 +12065,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardafthall)
 "nsO" = (
-/obj/map_helper/access_helper/airlock/station/engineering/atmospherics,
+/obj/map_helper/access_helper/airlock/station/engineering/department,
 /obj/machinery/door/firedoor/glass{
 	dir = 8
 	},
@@ -16576,14 +16561,6 @@
 /obj/machinery/air_alarm/north_mount,
 /turf/simulated/floor/tiled/steel,
 /area/tcommsat/computer)
-"sZO" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
-/obj/structure/catwalk,
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/endeavour/hallway/d4fwdmaint)
 "tax" = (
 /obj/structure/sign/fire,
 /turf/simulated/wall/r_wall/prepainted/engineering,
@@ -18377,7 +18354,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/storage/tech)
 "vkX" = (
-/obj/map_helper/access_helper/airlock/station/engineering/atmospherics,
+/obj/map_helper/access_helper/airlock/station/engineering/department,
 /obj/machinery/door/firedoor/glass{
 	dir = 8
 	},
@@ -19000,7 +18977,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/map_helper/access_helper/airlock/station/engineering/atmospherics,
+/obj/map_helper/access_helper/airlock/station/engineering/department,
 /obj/machinery/door/firedoor/glass{
 	dir = 8
 	},
@@ -21035,7 +21012,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/command/turrets)
 "ycR" = (
-/obj/map_helper/access_helper/airlock/station/engineering/atmospherics,
+/obj/map_helper/access_helper/airlock/station/engineering/department,
 /obj/machinery/door/firedoor/glass{
 	dir = 8
 	},
@@ -35110,7 +35087,7 @@ oCj
 bHY
 cQR
 bHY
-ixk
+inf
 lNQ
 jlM
 wpR
@@ -38768,10 +38745,10 @@ dvY
 xXL
 xXL
 xXL
-kDd
+xXL
 lHm
 xXL
-kDd
+xXL
 dvY
 wiw
 szc
@@ -39350,7 +39327,7 @@ qBz
 qBz
 qBz
 qBz
-sZO
+pku
 xXL
 xXL
 lHm
@@ -50444,7 +50421,7 @@ pbx
 pXA
 eDQ
 dvY
-kDd
+xXL
 xXL
 fwR
 jNg