From 1a4a7b1e0cdc596121143fddceba7e86459f85a4 Mon Sep 17 00:00:00 2001
From: GySgtMurphy <79298976+GySgtMurphy@users.noreply.github.com>
Date: Sun, 8 Dec 2024 16:49:30 -0500
Subject: [PATCH] aaa fuck me, i'm not that good at this. Multiple fixes.
 (#6907)

<!-- 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! -->

A lot of small fixes

## 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. -->

Because I should have caught them earlier

## 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: Explo sci door helper
add: missing wires in Sec prep
add: door to Detective's office to front lobby
fix: needless doors in maints
fix: many bad doors and paths in maints, multiple decks
fix: lack of airlocks in hallways, added them to aid
compartmentalization
fix: added more vents and scrubbers in areas where needed
fix: wonky disposals issue on deck two, fixed dorms disposals
fix: started beautifying the sec lobby.
fix: added door switch to sec fighter hanger
/: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: LordME <58342752+TheLordME@users.noreply.github.com>
---
 .../map_helpers/access_helper/airlock.dm      |   8 +
 maps/endeavour/levels/deck1.dmm               | 230 +++--
 maps/endeavour/levels/deck2.dmm               | 430 ++++++---
 maps/endeavour/levels/deck3.dmm               | 888 +++++++++++-------
 maps/endeavour/levels/deck4.dmm               | 114 ++-
 5 files changed, 1105 insertions(+), 565 deletions(-)

diff --git a/code/modules/mapping/map_helpers/access_helper/airlock.dm b/code/modules/mapping/map_helpers/access_helper/airlock.dm
index 3e99bbdf5044..da078692e719 100644
--- a/code/modules/mapping/map_helpers/access_helper/airlock.dm
+++ b/code/modules/mapping/map_helpers/access_helper/airlock.dm
@@ -528,6 +528,14 @@
 		ACCESS_GENERAL_EXPLORER,
 	)
 
+/obj/map_helper/access_helper/airlock/station/exploration/auxillerysci
+	req_one_access = list(
+		ACCESS_GENERAL_EXPLORER,
+		ACCESS_SCIENCE_ROBOTICS,
+		ACCESS_SCIENCE_MAIN,
+	)
+
+
 /obj/map_helper/access_helper/airlock/station/exploration/shuttle
 	req_one_access = list(
 		ACCESS_GENERAL_PILOT,
diff --git a/maps/endeavour/levels/deck1.dmm b/maps/endeavour/levels/deck1.dmm
index 4163c11949cc..e08e51229e09 100644
--- a/maps/endeavour/levels/deck1.dmm
+++ b/maps/endeavour/levels/deck1.dmm
@@ -71,6 +71,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
 "adZ" = (
@@ -716,7 +717,7 @@
 "aEK" = (
 /obj/machinery/door/airlock/maintenance/common,
 /turf/simulated/floor/plating,
-/area/endeavour/hallway/d1portamidhall)
+/area/endeavour/hallway/d1fwdmaint)
 "aEU" = (
 /turf/simulated/wall/prepainted,
 /area/station/stairs_one)
@@ -2549,6 +2550,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "cdx" = (
@@ -3575,13 +3577,6 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
-"cSl" = (
-/obj/structure/catwalk,
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/endeavour/hallway/d1fwdmaint)
 "cSo" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
@@ -4280,9 +4275,6 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/library/study)
 "duk" = (
@@ -5886,9 +5878,9 @@
 /turf/simulated/floor/tiled/white,
 /area/endeavour/hallway/d1fwdmaint)
 "eFG" = (
-/obj/effect/floor_decal/rust,
+/obj/machinery/door/airlock/maintenance/common,
 /turf/simulated/floor/plating,
-/area/endeavour/surfacebase/sauna)
+/area/maintenance/tool_storage)
 "eFW" = (
 /turf/simulated/wall/r_wall/prepainted,
 /area/endeavour/hallway/d1afthall)
@@ -7717,7 +7709,7 @@
 "fND" = (
 /obj/structure/memorial{
 	name = "NSV Endeavour's Builder's Plate";
-	desc = "The Armstrong-Hawker Shipbuilding company would like to thank the following for the contributions to the design: Dáire van der Waals, M.D., Ph.D.; Ruminis Melro, Ph.D; Hammond McGuire Sr., M.S.E.. Their work was essential in the design and manufacture of this vessel, and those of her class in the years to follow."
+	desc = "The Armstrong-Hawker Shipbuilding company would like to thank the following for the contributions to the design: Dáire van der Waals, M.D., Ph.D.; Ruminis Melro, B.S.E; Hammond McGuire Sr., M.S.E.. Their work was essential in the design and manufacture of this vessel, and those of her class in the years to follow."
 	},
 /turf/simulated/wall/prepainted/civilian,
 /area/station/stairs_one)
@@ -8722,6 +8714,7 @@
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
 "gBF" = (
@@ -13322,6 +13315,7 @@
 /obj/machinery/door/firedoor{
 	dir = 1
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "jUy" = (
@@ -14333,6 +14327,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/fire_alarm/west_mount,
 /turf/simulated/floor/wood,
 /area/bridge/office)
 "kHM" = (
@@ -14569,10 +14564,6 @@
 /obj/machinery/recharge_station,
 /turf/simulated/floor/tiled,
 /area/endeavour/surfacebase/sauna)
-"kNV" = (
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/plating,
-/area/endeavour/hallway/d1portamidhall)
 "kOi" = (
 /obj/structure/bed/chair/bay/shuttle{
 	dir = 4
@@ -14599,6 +14590,7 @@
 	dir = 8
 	},
 /obj/structure/table/bench/wooden,
+/obj/effect/floor_decal/spline/fancy/wood,
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
 "kOQ" = (
@@ -17687,9 +17679,6 @@
 	},
 /turf/simulated/wall/r_wall/prepainted/civilian,
 /area/shuttle/civvie/general)
-"nka" = (
-/turf/simulated/floor/plating,
-/area/endeavour/surfacebase/sauna)
 "nkk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -22082,6 +22071,7 @@
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/fire_alarm/east_mount,
 /turf/simulated/floor/tiled/dark,
 /area/bridge/hallway)
 "qKF" = (
@@ -22125,6 +22115,7 @@
 /obj/effect/floor_decal/corner/navgold/bordercorner2{
 	dir = 9
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "qLL" = (
@@ -23165,12 +23156,9 @@
 /turf/simulated/floor/tiled,
 /area/exploration)
 "rzL" = (
-/obj/structure/extinguisher_cabinet{
-	dir = 8;
-	pixel_x = 30
-	},
-/turf/simulated/wall/wood/hardwood,
-/area/endeavour/surfacebase/sauna)
+/obj/machinery/fire_alarm/west_mount,
+/turf/simulated/floor/wood,
+/area/crew_quarters/captain)
 "rzM" = (
 /obj/structure/railing,
 /turf/simulated/floor/tiled,
@@ -23432,6 +23420,7 @@
 /obj/effect/floor_decal/corner/beige/border{
 	dir = 4
 	},
+/obj/machinery/fire_alarm/east_mount,
 /turf/simulated/floor/tiled/dark,
 /area/bridge/hallway)
 "rJw" = (
@@ -24327,6 +24316,7 @@
 /obj/machinery/camera/network/command{
 	dir = 9
 	},
+/obj/machinery/fire_alarm/east_mount,
 /turf/simulated/floor/tiled/dark,
 /area/teleporter)
 "sAT" = (
@@ -24692,6 +24682,7 @@
 /obj/machinery/door/firedoor{
 	dir = 8
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
 "sQi" = (
@@ -24896,6 +24887,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portforhall)
 "sYp" = (
@@ -24925,6 +24917,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portforhall)
 "sYy" = (
@@ -26417,6 +26410,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardamidhall)
 "ubW" = (
@@ -28023,14 +28017,12 @@
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "vik" = (
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/navgold/border,
-/obj/machinery/light,
-/obj/machinery/door/firedoor{
-	dir = 1
+/obj/effect/floor_decal/rust,
+/obj/machinery/light{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "viz" = (
 /obj/machinery/fire_alarm/south_mount{
 	pixel_y = -25
@@ -31282,6 +31274,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portforhall)
 "xEQ" = (
@@ -31298,15 +31291,20 @@
 /area/maintenance/substation/dock)
 "xFb" = (
 /obj/structure/closet/crate/trashcart,
+/obj/random/drinkbottle,
 /obj/random/maintenance,
 /obj/random/maintenance,
 /obj/random/maintenance,
-/obj/random/drinkbottle,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1fwdmaint)
 "xGd" = (
-/turf/simulated/floor/plating,
-/area/endeavour/hallway/d1portamidhall)
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/table/bench/wooden,
+/obj/effect/floor_decal/spline/fancy/wood,
+/turf/simulated/floor/tiled/dark,
+/area/chapel/main)
 "xGj" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -31409,10 +31407,6 @@
 /obj/effect/shuttle_landmark/endeavour/deck4/excursion_space,
 /turf/space/basic,
 /area/space)
-"xJZ" = (
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/endeavour/hallway/d1portamidhall)
 "xKz" = (
 /obj/machinery/fire_alarm/south_mount{
 	pixel_y = -25
@@ -31603,6 +31597,7 @@
 /obj/machinery/door/firedoor{
 	dir = 1
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardamidhall)
 "xSt" = (
@@ -31611,6 +31606,7 @@
 /area/hallway/secondary/docking_hallway2)
 "xSS" = (
 /obj/effect/floor_decal/corner/purple/full,
+/obj/machinery/fire_alarm/west_mount,
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
 "xST" = (
@@ -51827,7 +51823,7 @@ nEa
 gRB
 uVx
 gRB
-nEa
+xGd
 uni
 hWW
 sDi
@@ -53724,8 +53720,8 @@ hub
 maa
 maa
 byt
-jkE
 maa
+jkE
 svt
 xln
 eDR
@@ -53918,8 +53914,8 @@ hub
 maa
 maa
 byt
-sIg
 maa
+sIg
 cEb
 cEb
 cEb
@@ -54112,8 +54108,8 @@ hub
 maa
 maa
 byt
-sIg
 maa
+sIg
 cEb
 pvF
 pOC
@@ -54306,8 +54302,8 @@ oYa
 maa
 maa
 byt
-sIg
 maa
+sIg
 cEb
 cri
 coH
@@ -55664,8 +55660,8 @@ oYa
 maa
 byt
 maa
-nka
-cEb
+maa
+maa
 cEb
 cEb
 cEb
@@ -55858,8 +55854,8 @@ oYa
 maa
 byt
 maa
-eFG
-cEb
+kfn
+maa
 dIE
 dIE
 dIE
@@ -56052,8 +56048,8 @@ oYa
 maa
 byt
 maa
-nka
-cEb
+maa
+maa
 dIE
 ubG
 pGO
@@ -56246,8 +56242,8 @@ unB
 maa
 byt
 maa
-nka
-cEb
+maa
+maa
 dIE
 pGO
 job
@@ -56440,8 +56436,8 @@ unB
 maa
 byt
 kfn
-nka
-cEb
+maa
+maa
 dIE
 pGO
 job
@@ -56634,8 +56630,8 @@ unB
 maa
 byt
 byt
-nka
-cEb
+maa
+maa
 dIE
 pGO
 job
@@ -56661,7 +56657,7 @@ uTr
 uTr
 ubV
 xSm
-vik
+aoR
 huP
 rCH
 rCH
@@ -56828,8 +56824,8 @@ unB
 maa
 maa
 byt
-nka
-cEb
+maa
+maa
 dIE
 pGO
 job
@@ -56855,7 +56851,7 @@ maa
 uTr
 gJc
 rCE
-lSz
+ykX
 uTr
 maa
 maa
@@ -57022,8 +57018,8 @@ ris
 maa
 maa
 byt
-eFG
-cEb
+kfn
+maa
 dIE
 mpL
 pGO
@@ -57216,15 +57212,15 @@ ris
 maa
 kfn
 byt
-nka
-cEb
+uTr
+uTr
+dIE
 dIE
 dIE
 dIE
 dIE
 dIE
 dIE
-rzL
 dIE
 cEb
 hYO
@@ -57411,16 +57407,16 @@ maa
 maa
 byt
 uTr
-svt
-svt
-svt
-svt
-svt
-svt
-svt
-svt
-svt
-svt
+maa
+maa
+maa
+maa
+maa
+maa
+maa
+maa
+maa
+uTr
 hYO
 vEP
 cQC
@@ -57605,16 +57601,16 @@ maa
 byt
 byt
 izR
-xJZ
-xJZ
-kNV
-xGd
-xGd
-xJZ
-xJZ
-xGd
-kNV
-svt
+byt
+byt
+kfn
+maa
+maa
+byt
+byt
+maa
+kfn
+uTr
 hYO
 hZy
 vwv
@@ -57799,15 +57795,15 @@ sIg
 byt
 maa
 uTr
-xGd
-xJZ
-xJZ
-xJZ
-xJZ
-xJZ
-xJZ
-xJZ
-xJZ
+maa
+byt
+byt
+byt
+byt
+byt
+byt
+byt
+byt
 aEK
 wEG
 bve
@@ -57994,9 +57990,9 @@ izR
 uTr
 uTr
 uTr
-uTr
-uTr
-uTr
+maa
+maa
+maa
 pcK
 dDd
 pcK
@@ -59550,7 +59546,7 @@ bZN
 bZN
 bZN
 bpw
-rXC
+lia
 eDV
 tqr
 rXC
@@ -59743,8 +59739,8 @@ byt
 fvr
 maa
 maa
-pcK
-lia
+eFG
+rXC
 oLF
 wAr
 jrM
@@ -60524,7 +60520,7 @@ qJU
 qJU
 qJU
 byt
-uTr
+maa
 uTr
 rAx
 vHL
@@ -61882,8 +61878,8 @@ agQ
 xrx
 blR
 byt
-maa
-kfn
+xFb
+vik
 uTr
 mER
 xwO
@@ -62269,9 +62265,9 @@ blR
 mBw
 dAp
 blR
-izR
-uTr
-uTr
+byt
+maa
+maa
 uTr
 nuG
 khU
@@ -62464,8 +62460,8 @@ pCl
 wOi
 blR
 byt
-xFb
-qZT
+maa
+maa
 uTr
 uTr
 aEU
@@ -62480,9 +62476,9 @@ aEU
 aEU
 aEU
 uTr
-izR
-uTr
-uTr
+byt
+maa
+maa
 cYi
 cYi
 cYi
@@ -62660,8 +62656,8 @@ blR
 byt
 byt
 byt
-cSl
-byt
+maa
+maa
 aEU
 iDg
 iDg
@@ -62673,7 +62669,7 @@ oQJ
 iDg
 iDg
 aEU
-byt
+maa
 byt
 fvr
 byt
@@ -63456,7 +63452,7 @@ ugo
 cYi
 kXH
 prS
-hai
+rzL
 vFv
 qDT
 cYi
diff --git a/maps/endeavour/levels/deck2.dmm b/maps/endeavour/levels/deck2.dmm
index 3b70c7eb1a74..e718bceaa4d9 100644
--- a/maps/endeavour/levels/deck2.dmm
+++ b/maps/endeavour/levels/deck2.dmm
@@ -341,10 +341,6 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
 	},
-/obj/structure/filingcabinet/medical{
-	desc = "A large cabinet with hard copy medical records.";
-	name = "Medical Records"
-	},
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "amZ" = (
@@ -665,12 +661,12 @@
 	id_tag = "researchdoor";
 	name = "R&D Distribution Area"
 	},
-/obj/map_helper/access_helper/airlock/station/science/robotics,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/map_helper/access_helper/airlock/station/science/department,
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "aww" = (
@@ -1152,6 +1148,9 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "aNn" = (
@@ -1236,7 +1235,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/hallway/station/docks)
 "aPL" = (
 /obj/structure/sink{
@@ -1381,6 +1380,22 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
+"aXe" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/navblue/border{
+	dir = 1
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/computer/timeclock/premade/north,
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d2portafthall)
 "aXm" = (
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/plating,
@@ -1400,6 +1415,19 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
+"aYU" = (
+/obj/effect/floor_decal/corner/green{
+	dir = 10
+	},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/virology_fore_access)
 "aYX" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
@@ -2299,7 +2327,6 @@
 	id_tag = "researchdoor";
 	name = "R&D Distribution Area"
 	},
-/obj/map_helper/access_helper/airlock/station/science/robotics,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -2312,6 +2339,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
+/obj/map_helper/access_helper/airlock/station/science/department,
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology)
 "bEz" = (
@@ -2497,7 +2525,7 @@
 /obj/item/storage/toolbox/emergency,
 /obj/effect/floor_decal/rust,
 /turf/simulated/floor/plating,
-/area/maintenance/research)
+/area/maintenance/medbay/aft)
 "bHC" = (
 /obj/machinery/door/firedoor{
 	dir = 1
@@ -2603,6 +2631,14 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/cafeteria)
+"bKE" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/reinforced{
+	name = "Holodeck Projector Floor"
+	},
+/area/holodeck/alphadeck)
 "bKV" = (
 /obj/structure/table/steel,
 /obj/machinery/recharger,
@@ -2829,12 +2865,12 @@
 	id_tag = "researchdoor";
 	name = "Robotics Lab"
 	},
-/obj/map_helper/access_helper/airlock/station/science/robotics,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/map_helper/access_helper/airlock/station/science/department,
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "bSe" = (
@@ -2865,6 +2901,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardamidhall)
 "bSL" = (
@@ -3385,6 +3422,15 @@
 "chD" = (
 /turf/simulated/wall/prepainted,
 /area/maintenance/substation/medical)
+"chF" = (
+/obj/effect/floor_decal/corner/green{
+	dir = 10
+	},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/white,
+/area/medical/virology_fore_access)
 "chQ" = (
 /obj/structure/cable/green,
 /obj/machinery/power/apc/west_mount,
@@ -4074,6 +4120,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
+"cDb" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/turf/simulated/floor/wood,
+/area/medical/medbay4)
 "cDA" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
@@ -5049,7 +5104,7 @@
 	icon_state = "1-8"
 	},
 /turf/simulated/floor/tiled,
-/area/medical/virologymaint)
+/area/endeavour/hallway/d1starboardamidhall)
 "dnV" = (
 /obj/machinery/air_alarm{
 	pixel_y = 22
@@ -5903,7 +5958,7 @@
 	id_tag = "researchdoor";
 	name = "R&D Distribution Area"
 	},
-/obj/map_helper/access_helper/airlock/station/science/robotics,
+/obj/map_helper/access_helper/airlock/station/science/department,
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "dPs" = (
@@ -6779,6 +6834,12 @@
 "ejI" = (
 /turf/simulated/wall/prepainted,
 /area/maintenance/medbay/aft)
+"ekq" = (
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/medical/medbay4)
 "ekA" = (
 /obj/machinery/light{
 	dir = 1
@@ -6830,6 +6891,20 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardamidhall)
+"elS" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/beige/border{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/medbay4)
 "elT" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
@@ -7092,6 +7167,7 @@
 	},
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navblue/border,
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
 "ezh" = (
@@ -7875,6 +7951,12 @@
 /turf/simulated/wall/prepainted,
 /area/maintenance/fpmaint2)
 "eYM" = (
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_fore_access)
 "eYX" = (
@@ -7912,15 +7994,13 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d2aftmaint)
 "eZJ" = (
-/obj/machinery/camera/network/civilian{
-	dir = 1
-	},
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
 	},
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2afthall)
 "eZS" = (
@@ -8022,6 +8102,7 @@
 /obj/effect/floor_decal/corner/navblue/border{
 	dir = 1
 	},
+/obj/machinery/camera/network/civilian,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2afthall)
 "fcN" = (
@@ -8075,7 +8156,7 @@
 /obj/item/tank/emergency/oxygen/engi,
 /obj/item/tank/emergency/oxygen/engi,
 /turf/simulated/floor/plating,
-/area/maintenance/research)
+/area/maintenance/medbay/aft)
 "ffh" = (
 /obj/structure/cable/green{
 	icon_state = "1-4"
@@ -8105,6 +8186,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
 "ffI" = (
@@ -8663,6 +8745,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
+"fCb" = (
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled/dark,
+/area/station/stairs_two)
 "fCr" = (
 /obj/structure/table/steel_reinforced,
 /obj/item/hand_labeler{
@@ -8880,11 +8966,9 @@
 /obj/machinery/door/firedoor{
 	dir = 1
 	},
-/obj/machinery/camera/network/civilian{
-	dir = 1
-	},
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
 "fIE" = (
@@ -10280,8 +10364,12 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d2fwdmaint)
 "gAs" = (
-/obj/machinery/door/window/westleft{
-	req_one_access = list(5)
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+	dir = 4
+	},
+/obj/machinery/photocopier,
+/obj/structure/window/reinforced{
+	dir = 8
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/medical/reception)
@@ -10638,7 +10726,7 @@
 	id_tag = "researchdoor";
 	name = "R&D Distribution Area"
 	},
-/obj/map_helper/access_helper/airlock/station/science/robotics,
+/obj/map_helper/access_helper/airlock/station/exploration/auxillerysci,
 /turf/simulated/floor/tiled/dark,
 /area/rnd/research/researchdivision)
 "gMn" = (
@@ -10676,6 +10764,7 @@
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 4
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2afthall)
 "gMR" = (
@@ -11479,6 +11568,9 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "hmG" = (
@@ -11737,7 +11829,7 @@
 	dir = 1
 	},
 /obj/machinery/door/airlock/maintenance/common,
-/obj/map_helper/access_helper/airlock/station/science/robotics,
+/obj/map_helper/access_helper/airlock/station/science/department,
 /turf/simulated/floor/plating,
 /area/maintenance/medbay/aft)
 "hrJ" = (
@@ -11806,6 +11898,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/map_helper/access_helper/airlock/station/public,
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_fore_access)
 "huG" = (
@@ -11963,7 +12056,6 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 8
 	},
-/obj/machinery/photocopier,
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "hzh" = (
@@ -12701,7 +12793,7 @@
 	},
 /obj/effect/floor_decal/rust,
 /turf/simulated/floor/plating,
-/area/maintenance/research)
+/area/maintenance/medbay/aft)
 "iaO" = (
 /obj/machinery/r_n_d/circuit_imprinter,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -13008,6 +13100,13 @@
 /obj/effect/floor_decal/industrial/outline/red,
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/hallway/d2portamidhall)
+"ijC" = (
+/obj/effect/floor_decal/corner/green/diagonal,
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/virology_fore_access)
 "ijE" = (
 /obj/machinery/disposal{
 	pixel_y = -2
@@ -13130,6 +13229,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
+"ing" = (
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navgold/border,
+/obj/machinery/light,
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d1starboardafthall)
 "inF" = (
 /obj/item/radio/intercom{
 	dir = 1;
@@ -14076,9 +14181,10 @@
 /turf/simulated/wall/r_wall/prepainted,
 /area/endeavour/hallway/d2fwdhall)
 "iUp" = (
-/obj/structure/closet/emcloset,
+/obj/item/storage/briefcase/inflatable,
+/obj/structure/table/rack/shelf/steel,
 /turf/simulated/floor/plating,
-/area/maintenance/research)
+/area/maintenance/medbay/aft)
 "iUs" = (
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/mauve/border,
@@ -14330,8 +14436,14 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay4)
 "jdx" = (
-/obj/machinery/door/window/westleft{
-	req_one_access = list(5);
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+	dir = 8
+	},
+/obj/structure/filingcabinet/medical{
+	desc = "A large cabinet with hard copy medical records.";
+	name = "Medical Records"
+	},
+/obj/structure/window/reinforced{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
@@ -14502,6 +14614,7 @@
 /obj/effect/floor_decal/corner/navblue/border{
 	dir = 1
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
 "jlt" = (
@@ -15903,9 +16016,11 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2afthall)
 "kgb" = (
-/obj/machinery/portable_atmospherics/powered/scrubber,
+/obj/machinery/door/airlock/maintenance/common,
+/obj/structure/catwalk,
+/obj/map_helper/access_helper/airlock/station/science/department,
 /turf/simulated/floor/plating,
-/area/maintenance/research)
+/area/maintenance/medbay/aft)
 "kgh" = (
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
@@ -16309,15 +16424,13 @@
 /obj/effect/floor_decal/corner/navgold/border{
 	dir = 1
 	},
-/obj/machinery/light{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
 "kuF" = (
@@ -17442,6 +17555,12 @@
 	dir = 1
 	},
 /obj/effect/floor_decal/corner/paleblue/full,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "lfu" = (
@@ -17523,13 +17642,13 @@
 	id_tag = "researchdoor";
 	name = "Robotics Lab"
 	},
-/obj/map_helper/access_helper/airlock/station/science/robotics,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/map_helper/access_helper/airlock/station/science/department,
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "ljq" = (
@@ -17552,6 +17671,7 @@
 /area/maintenance/research)
 "lkB" = (
 /obj/machinery/photocopier,
+/obj/machinery/air_alarm/south_mount,
 /turf/simulated/floor/wood,
 /area/medical/medbay4)
 "lkW" = (
@@ -17825,6 +17945,7 @@
 /obj/effect/floor_decal/corner/navblue/border{
 	dir = 1
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2afthall)
 "lui" = (
@@ -17889,6 +18010,8 @@
 	dir = 8;
 	icon_state = "pipe-c"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
 "lwb" = (
@@ -18480,6 +18603,8 @@
 	req_one_access = null
 	},
 /obj/effect/floor_decal/spline/fancy/wood,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/wood,
 /area/medical/medbay4)
 "lSf" = (
@@ -18815,13 +18940,13 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/computer/timeclock/premade/north,
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
 	},
 /obj/effect/floor_decal/corner/navblue/border{
 	dir = 1
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
 "mgH" = (
@@ -19557,6 +19682,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portforhall)
+"mGd" = (
+/obj/effect/floor_decal/corner/green/diagonal,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/virology_fore_access)
 "mGl" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -20807,6 +20939,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
 "nxI" = (
@@ -21213,9 +21346,10 @@
 /turf/simulated/floor/plating,
 /area/medical/virologymaint)
 "nJI" = (
-/obj/machinery/space_heater,
+/obj/structure/catwalk,
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
-/area/maintenance/research)
+/area/maintenance/medbay/aft)
 "nJM" = (
 /obj/machinery/power/apc/north_mount,
 /obj/structure/cable/green{
@@ -21725,6 +21859,14 @@
 "nXm" = (
 /turf/simulated/floor/tiled/dark,
 /area/rnd/anomaly_lab/containment_two)
+"nXI" = (
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navgold/border,
+/obj/machinery/camera/network/civilian{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d1starboardafthall)
 "nYd" = (
 /obj/effect/floor_decal/borderfloorwhite,
 /obj/effect/floor_decal/corner/paleblue/border,
@@ -21739,6 +21881,7 @@
 /area/crew_quarters/medbreak)
 "nYN" = (
 /obj/machinery/fire_alarm/west_mount,
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
 /area/station/stairs_two)
 "nZC" = (
@@ -22134,6 +22277,8 @@
 /obj/machinery/door/firedoor{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "onv" = (
@@ -22660,7 +22805,7 @@
 	id_tag = "researchdoor";
 	name = "R&D Distribution Area"
 	},
-/obj/map_helper/access_helper/airlock/station/science/robotics,
+/obj/map_helper/access_helper/airlock/station/science/department,
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology)
 "oGQ" = (
@@ -25027,9 +25172,9 @@
 /turf/simulated/floor/plating,
 /area/maintenance/medbay/aft)
 "pTX" = (
-/obj/machinery/floodlight,
+/obj/machinery/portable_atmospherics/powered/scrubber,
 /turf/simulated/floor/plating,
-/area/maintenance/research)
+/area/maintenance/medbay/aft)
 "pUb" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -25782,6 +25927,7 @@
 /area/endeavour/hallway/d1starboardafthall)
 "qnO" = (
 /obj/machinery/papershredder,
+/obj/machinery/fire_alarm/south_mount,
 /turf/simulated/floor/wood,
 /area/medical/medbay4)
 "qog" = (
@@ -25958,6 +26104,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
+"quU" = (
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/medical/medbay4)
 "qvd" = (
 /obj/machinery/status_display{
 	pixel_y = 30
@@ -27297,9 +27449,6 @@
 /obj/machinery/door/firedoor/glass{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/black{
-	dir = 4
-	},
 /obj/machinery/door/airlock/medical{
 	name = "Medical Response Shuttle Dock";
 	req_one_access = null
@@ -27307,7 +27456,7 @@
 /obj/map_helper/access_helper/airlock/station/medical/department,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/hallway/station/docks)
 "rfd" = (
 /turf/simulated/wall/prepainted/medical,
@@ -27498,6 +27647,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portforhall)
+"rop" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/wood,
+/area/medical/medbay4)
 "roU" = (
 /obj/structure/cable/green{
 	icon_state = "1-8"
@@ -27678,6 +27832,9 @@
 /obj/effect/floor_decal/corner/paleblue/full{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "ruu" = (
@@ -28320,13 +28477,12 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
 "rRe" = (
-/obj/machinery/door/firedoor{
-	dir = 1
+/obj/machinery/light/small{
+	dir = 4
 	},
-/obj/machinery/door/airlock/maintenance/common,
-/obj/map_helper/access_helper/airlock/station/science/robotics,
+/obj/machinery/floodlight,
 /turf/simulated/floor/plating,
-/area/rnd/research/researchdivision)
+/area/maintenance/medbay/aft)
 "rRo" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 1
@@ -28736,6 +28892,8 @@
 	dir = 8;
 	icon_state = "pipe-j2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
 "sgW" = (
@@ -29560,7 +29718,7 @@
 	id_tag = "researchdoor";
 	name = "Robotics Lab"
 	},
-/obj/map_helper/access_helper/airlock/station/science/robotics,
+/obj/map_helper/access_helper/airlock/station/science/department,
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "sKg" = (
@@ -29573,6 +29731,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardamidhall)
 "sKw" = (
@@ -30377,6 +30536,7 @@
 	dir = 1
 	},
 /obj/machinery/fire_alarm/east_mount,
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
 /area/station/stairs_two)
 "tnk" = (
@@ -31145,7 +31305,7 @@
 	id_tag = "researchdoor";
 	name = "R&D Distribution Area"
 	},
-/obj/map_helper/access_helper/airlock/station/science/robotics,
+/obj/map_helper/access_helper/airlock/station/exploration/auxillerysci,
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "tLU" = (
@@ -31662,6 +31822,19 @@
 /obj/structure/disposalpipe/trunk,
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
+"ueE" = (
+/obj/machinery/door/firedoor,
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navblue/border,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/door/airlock/glass,
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d2portafthall)
 "ueJ" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 4
@@ -32211,6 +32384,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardamidhall)
 "uwU" = (
@@ -32347,6 +32521,11 @@
 /obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_wing)
+"uCx" = (
+/obj/machinery/fire_alarm/east_mount,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled/dark,
+/area/station/stairs_two)
 "uCH" = (
 /turf/simulated/wall/prepainted/medical,
 /area/crew_quarters/medical_restroom)
@@ -32963,6 +33142,7 @@
 	name = "Research & Development";
 	sortType = "Research & Development"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portafthall)
 "uVS" = (
@@ -33557,9 +33737,7 @@
 	dir = 8
 	},
 /obj/effect/floor_decal/borderfloorblack/corner2,
-/obj/effect/floor_decal/corner/navgold/bordercorner2{
-	dir = 2
-	},
+/obj/effect/floor_decal/corner/navgold/bordercorner2,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
 "vtg" = (
@@ -33680,6 +33858,8 @@
 /obj/effect/floor_decal/corner/paleblue/full{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "vzv" = (
@@ -34123,8 +34303,8 @@
 	id_tag = "researchdoor";
 	name = "R&D Distribution Area"
 	},
-/obj/map_helper/access_helper/airlock/station/science/robotics,
 /obj/structure/disposalpipe/segment,
+/obj/map_helper/access_helper/airlock/station/exploration/auxillerysci,
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "vQu" = (
@@ -34204,7 +34384,7 @@
 "vUa" = (
 /obj/effect/floor_decal/rust,
 /turf/simulated/floor/plating,
-/area/maintenance/research)
+/area/maintenance/medbay/aft)
 "vUf" = (
 /obj/structure/closet/secure_closet/personal/patient,
 /obj/effect/floor_decal/borderfloorwhite{
@@ -34463,7 +34643,7 @@
 /obj/structure/reagent_dispensers/watertank,
 /obj/effect/floor_decal/rust,
 /turf/simulated/floor/plating,
-/area/maintenance/research)
+/area/maintenance/medbay/aft)
 "waa" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -35132,7 +35312,7 @@
 	id_tag = "researchdoor";
 	name = "Robotics Lab"
 	},
-/obj/map_helper/access_helper/airlock/station/science/robotics,
+/obj/map_helper/access_helper/airlock/station/science/department,
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "wqB" = (
@@ -35218,6 +35398,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology_fore_access)
+"wsu" = (
+/obj/machinery/light,
+/turf/simulated/floor/reinforced{
+	name = "Holodeck Projector Floor"
+	},
+/area/holodeck/alphadeck)
 "wtw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -35793,17 +35979,13 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /obj/effect/floor_decal/borderfloorwhite/corner,
 /obj/effect/floor_decal/corner/paleblue/bordercorner,
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
 "wMd" = (
@@ -36754,7 +36936,7 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
 "xpI" = (
-/obj/map_helper/access_helper/airlock/station/science/robotics,
+/obj/map_helper/access_helper/airlock/station/science/department,
 /obj/machinery/door/airlock/maintenance/common,
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
@@ -37872,10 +38054,12 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardforhall)
 "ybi" = (
-/obj/structure/table/rack/shelf/steel,
-/obj/item/storage/briefcase/inflatable,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/machinery/space_heater,
 /turf/simulated/floor/plating,
-/area/maintenance/research)
+/area/maintenance/medbay/aft)
 "ybk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -38042,6 +38226,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay4)
+"yhA" = (
+/obj/structure/closet/emcloset,
+/turf/simulated/floor/plating,
+/area/maintenance/medbay/aft)
 "yhE" = (
 /obj/effect/floor_decal/industrial/warning/dust,
 /turf/simulated/floor/tiled/dark,
@@ -43696,8 +43884,8 @@ xVe
 xVe
 xVe
 xVe
-kim
-xIf
+ybi
+qpq
 qpq
 pTU
 qpq
@@ -43890,8 +44078,8 @@ xVe
 feQ
 bHB
 vZE
-nJI
-xIf
+qpq
+qpq
 qpq
 pTU
 qpq
@@ -44083,9 +44271,9 @@ xVe
 xVe
 hZY
 vUa
-xIf
-xIf
-xIf
+qpq
+qpq
+qpq
 qpq
 pTU
 qpq
@@ -44275,11 +44463,11 @@ eZZ
 xIf
 xIf
 tcy
-ybi
-iUp
-kgb
-pTX
-xIf
+qpq
+qpq
+qpq
+qpq
+qpq
 qpq
 pTU
 qpq
@@ -44469,11 +44657,11 @@ uwU
 xIf
 xIf
 tcy
-xIf
-xIf
-xIf
-mUB
-xIf
+iUp
+yhA
+pTX
+rRe
+qpq
 qpq
 pTU
 qpq
@@ -44687,7 +44875,7 @@ gOV
 kBS
 rbM
 hgb
-hgb
+ekq
 gvn
 syi
 dgC
@@ -44881,10 +45069,10 @@ gOV
 kBS
 cFH
 lKI
-hgb
-hgb
+cDb
+rop
 lSc
-gOV
+elS
 kBS
 aBt
 aBt
@@ -45075,7 +45263,7 @@ awE
 kBS
 rbM
 pFe
-hgb
+quU
 glw
 syi
 eUy
@@ -47573,7 +47761,7 @@ qpQ
 qpQ
 qpQ
 xHD
-iec
+kgb
 xHD
 uLi
 ajd
@@ -47763,11 +47951,11 @@ jPA
 ixo
 bhD
 wSM
-qpq
+aXm
 dyL
 aXm
 qpq
-iec
+nJI
 xHD
 ctj
 ogg
@@ -47959,7 +48147,7 @@ oGF
 wSM
 hjM
 qpq
-aXm
+qpq
 qpq
 iec
 xHD
@@ -48354,7 +48542,7 @@ xHD
 mSd
 uJM
 mSd
-wKp
+fCb
 hBs
 cny
 xGm
@@ -48364,7 +48552,7 @@ hjA
 xGm
 iCr
 hBs
-wKp
+fCb
 bHz
 wkU
 tJU
@@ -48732,7 +48920,7 @@ cje
 oCO
 jVn
 bOa
-rRe
+olh
 iec
 iec
 hqT
@@ -48742,7 +48930,7 @@ ulr
 mSd
 uJM
 mSd
-wKp
+fCb
 nzx
 nzx
 xGm
@@ -48752,7 +48940,7 @@ fcN
 xGm
 nzx
 nzx
-wKp
+fCb
 bHz
 eoT
 dFs
@@ -48936,7 +49124,7 @@ nBV
 mSd
 uJM
 mSd
-fvj
+uCx
 nzx
 nzx
 xGm
@@ -48946,7 +49134,7 @@ kxI
 xGm
 nzx
 nzx
-fvj
+uCx
 bHz
 mzd
 tJU
@@ -49710,7 +49898,7 @@ jZR
 jZR
 kCt
 kCt
-unJ
+aXe
 vFz
 sme
 oaU
@@ -49919,7 +50107,7 @@ oFP
 gSa
 dXL
 hdr
-elT
+nXI
 oMl
 vXm
 qlw
@@ -50113,7 +50301,7 @@ szG
 sSl
 nEU
 phe
-elT
+ing
 oMl
 oMl
 oMl
@@ -50292,8 +50480,8 @@ owo
 whu
 whu
 mgw
-nBm
-hGK
+pVB
+ueE
 bmg
 mcN
 gIV
@@ -56308,7 +56496,7 @@ dbo
 ekA
 dnZ
 mLh
-wKp
+fCb
 hBs
 cny
 xGm
@@ -56318,7 +56506,7 @@ uMm
 xGm
 iCr
 hBs
-wKp
+fCb
 srL
 eUd
 uQE
@@ -56696,7 +56884,7 @@ lGn
 jKh
 vXa
 fKw
-wKp
+fCb
 nzx
 nzx
 xGm
@@ -56706,7 +56894,7 @@ exl
 xGm
 nzx
 nzx
-wKp
+fCb
 srL
 eUd
 hyb
@@ -56900,7 +57088,7 @@ kYs
 xGm
 nzx
 nzx
-fvj
+uCx
 mXu
 dly
 bIN
@@ -61373,7 +61561,7 @@ sGJ
 vrn
 rdA
 vxY
-nHo
+ijC
 khE
 rdA
 dPs
@@ -61567,7 +61755,7 @@ rdA
 rdA
 rdA
 wzP
-nHo
+mGd
 eDF
 rdA
 cuS
@@ -61953,9 +62141,9 @@ huo
 iET
 iET
 bNQ
+chF
 axp
-axp
-axp
+aYU
 sqh
 auq
 hff
@@ -63862,6 +64050,7 @@ xVe
 kim
 neh
 tcy
+bKE
 jRK
 jRK
 jRK
@@ -63870,8 +64059,7 @@ jRK
 jRK
 jRK
 jRK
-jRK
-jRK
+wsu
 wMp
 oKF
 sEs
@@ -64638,6 +64826,7 @@ xVe
 xIf
 neh
 tcy
+bKE
 jRK
 jRK
 jRK
@@ -64646,8 +64835,7 @@ jRK
 jRK
 jRK
 jRK
-jRK
-jRK
+wsu
 wMp
 ppu
 mFT
@@ -65423,7 +65611,7 @@ jRK
 jRK
 jRK
 jRK
-jRK
+wsu
 wMp
 uWv
 mFT
@@ -65608,7 +65796,7 @@ xVe
 xIf
 neh
 tcy
-jRK
+bKE
 jRK
 jRK
 jRK
diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm
index 34aa1e4a38f7..f073b80a0f73 100644
--- a/maps/endeavour/levels/deck3.dmm
+++ b/maps/endeavour/levels/deck3.dmm
@@ -625,7 +625,7 @@
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "aAA" = (
 /obj/machinery/camera/network/civilian{
@@ -687,6 +687,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3portforhall)
 "aCO" = (
@@ -749,14 +750,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/security_equiptment_storage)
 "aFF" = (
-/obj/structure/disposalpipe/junction{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
+/obj/structure/disposalpipe/junction{
+	dir = 4;
+	icon_state = "pipe-j2"
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
 "aFS" = (
@@ -887,10 +889,6 @@
 /obj/item/melee/baton/loaded,
 /turf/simulated/floor/tiled/dark,
 /area/security/armoury)
-"aIB" = (
-/obj/machinery/vending/cola,
-/turf/simulated/floor/tiled,
-/area/security/lobby)
 "aII" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -1031,7 +1029,7 @@
 	dir = 1
 	},
 /obj/machinery/fire_alarm/north_mount,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "aOy" = (
 /obj/structure/bed/chair/wood{
@@ -1096,12 +1094,9 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
 "aRG" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/catwalk,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating,
-/area/maintenance/starboardsolar)
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled/dark,
+/area/endeavour/station/stairs_three)
 "aTm" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -1114,6 +1109,13 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
+"aTX" = (
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/obj/machinery/door/airlock/maintenance,
+/turf/simulated/floor/plating,
+/area/maintenance/bar/catwalk)
 "aUp" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
 	dir = 8
@@ -1279,11 +1281,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/starboardsolar)
@@ -1596,6 +1595,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3starboardamidhall)
 "bhh" = (
@@ -2000,6 +2000,9 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/machinery/fire_alarm/south_mount{
+	pixel_y = -25
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardamidhall)
 "buy" = (
@@ -2035,6 +2038,7 @@
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3afthall)
 "buX" = (
@@ -2227,6 +2231,22 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/prison/cell_block)
+"bCv" = (
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/navblue/border{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/door/airlock/glass,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d3portforhall)
 "bCC" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -2404,6 +2424,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3portamidhall)
 "bLw" = (
@@ -2514,15 +2535,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/brig)
 "bRs" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+/obj/machinery/fire_alarm/east_mount,
+/obj/machinery/door/firedoor{
+	dir = 8
 	},
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/endeavour/hallway/d3fwdmaint)
+/turf/simulated/floor/tiled/dark,
+/area/endeavour/station/stairs_three)
 "bRz" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -2581,6 +2599,7 @@
 	req_access = list(28)
 	},
 /obj/item/storage/belt/utility,
+/obj/item/multitool,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "bUl" = (
@@ -2604,7 +2623,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/nuke_storage)
 "bUz" = (
-/obj/machinery/fire_alarm/north_mount,
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
 	},
@@ -2777,7 +2795,10 @@
 /obj/machinery/status_display{
 	pixel_y = -32
 	},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "caA" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -2787,6 +2808,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/hallway/d3fwdhall)
 "cce" = (
@@ -3087,6 +3109,9 @@
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "crj" = (
@@ -3223,7 +3248,10 @@
 /obj/machinery/air_alarm{
 	pixel_y = 22
 	},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "cxF" = (
 /obj/structure/cable{
@@ -3751,6 +3779,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
+"cRh" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/recreation_area)
 "cRj" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
@@ -4124,6 +4161,12 @@
 /obj/structure/curtain/open/shower,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/showers)
+"ddh" = (
+/obj/structure/catwalk,
+/obj/machinery/door/airlock/maintenance,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/crew_quarters/recreation_area)
 "ddk" = (
 /obj/structure/cable/orange{
 	icon_state = "1-2"
@@ -4693,6 +4736,7 @@
 /obj/effect/floor_decal/corner/navgold/border{
 	dir = 1
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3starboardamidhall)
 "dym" = (
@@ -5400,18 +5444,10 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_7)
 "dUN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/catwalk,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/starboardsolar)
+/obj/machinery/fire_alarm/east_mount,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled/dark,
+/area/endeavour/station/stairs_three)
 "dVs" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -5888,7 +5924,6 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
 "ekD" = (
@@ -6145,6 +6180,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardforhall)
 "esB" = (
@@ -6170,9 +6206,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/riot_control)
 "eth" = (
-/obj/structure/disposalpipe/junction{
-	dir = 1
-	},
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
@@ -6182,6 +6215,10 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
 "etj" = (
@@ -6433,15 +6470,8 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3fwdhall)
 "eAp" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/endeavour/hallway/d3fwdmaint)
+/turf/simulated/wall/r_wall/prepainted,
+/area/space)
 "eBc" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 8
@@ -6500,7 +6530,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
 	},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "eCc" = (
 /obj/effect/floor_decal/industrial/outline/blue,
@@ -6704,7 +6734,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "eGj" = (
 /obj/machinery/light/small{
@@ -6817,6 +6847,11 @@
 /obj/fiftyspawner/glass,
 /turf/simulated/floor/tiled/dark,
 /area/janitor)
+"eJJ" = (
+/obj/machinery/fire_alarm/west_mount,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled/dark,
+/area/endeavour/station/stairs_three)
 "eJL" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -7015,7 +7050,10 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "eSJ" = (
 /obj/structure/cable{
@@ -7177,9 +7215,6 @@
 	},
 /obj/machinery/door/airlock/maintenance,
 /obj/structure/catwalk,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /turf/simulated/floor/plating,
 /area/maintenance/starboardsolar)
 "eXr" = (
@@ -7858,14 +7893,15 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/disposalpipe/junction{
-	dir = 1
-	},
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/disposalpipe/junction{
+	dir = 2;
+	icon_state = "pipe-j2"
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3afthall)
 "fva" = (
@@ -8669,6 +8705,7 @@
 /obj/machinery/camera/network/civilian{
 	dir = 8
 	},
+/obj/machinery/vending/loadout/uniform,
 /turf/simulated/floor/tiled/dark,
 /area/vacant/vacant_shop)
 "fUU" = (
@@ -8760,6 +8797,20 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/prison/cell_block)
+"fXd" = (
+/obj/machinery/door/firedoor,
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/navblue/border{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/door/airlock/glass,
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d3portforhall)
 "fYb" = (
 /obj/structure/table/woodentable,
 /obj/machinery/microwave,
@@ -9471,6 +9522,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardamidhall)
+"gBp" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/security/lobby)
 "gBU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/universal{
 	dir = 4
@@ -10164,6 +10221,17 @@
 /obj/machinery/microwave,
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_4)
+"hcm" = (
+/obj/machinery/door/firedoor,
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/navgold/border{
+	dir = 1
+	},
+/obj/machinery/door/airlock/glass,
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d3starboardforhall)
 "hcD" = (
 /obj/structure/table/rack/shelf/steel,
 /obj/structure/window/reinforced{
@@ -10463,6 +10531,9 @@
 /obj/item/book/manual/standard_operating_procedure{
 	pixel_x = -5
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/security/security_lockerroom)
 "hnK" = (
@@ -11057,7 +11128,6 @@
 /obj/machinery/fire_alarm/west_mount{
 	pixel_x = -24
 	},
-/obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
@@ -11556,6 +11626,9 @@
 /area/tether/surfacebase/entertainment)
 "ibL" = (
 /obj/structure/closet/wardrobe/mixed,
+/obj/machinery/light/small{
+	dir = 1
+	},
 /turf/simulated/floor/carpet/turcarpet,
 /area/crew_quarters/recreation_area)
 "ibT" = (
@@ -12667,6 +12740,9 @@
 /area/quartermaster/delivery)
 "jaT" = (
 /obj/machinery/holopad,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/security/security_lockerroom)
 "jaW" = (
@@ -12688,6 +12764,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardforhall)
 "jbI" = (
@@ -12805,7 +12882,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "jhH" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
@@ -13009,6 +13086,15 @@
 "jmv" = (
 /obj/structure/bed/chair/office/dark,
 /obj/structure/bed/chair/office/dark,
+/obj/machinery/button/remote/blast_door{
+	id = "fighterhanger";
+	name = "Security Fighter Hanger Door";
+	pixel_y = -32;
+	req_access = list(53);
+	req_one_access = list(53);
+	dir = 1;
+	pixel_x = -5
+	},
 /turf/simulated/floor/tiled,
 /area/security/hanger)
 "jmB" = (
@@ -13583,6 +13669,22 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_1)
+"jIP" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/maintenance/starboardsolar)
+"jJn" = (
+/obj/machinery/fire_alarm/west_mount,
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/endeavour/station/stairs_three)
 "jJA" = (
 /obj/machinery/camera/network/command{
 	dir = 4
@@ -13721,6 +13823,13 @@
 "jNA" = (
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/hos)
+"jNW" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled/dark,
+/area/endeavour/hallway/d3fwdhall)
 "jON" = (
 /turf/simulated/floor/tiled,
 /area/quartermaster/office)
@@ -13785,9 +13894,6 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardafthall)
 "jSG" = (
-/obj/structure/disposalpipe/junction{
-	dir = 8
-	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
@@ -13796,6 +13902,10 @@
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
 "jSX" = (
@@ -13874,6 +13984,7 @@
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3afthall)
 "jWp" = (
@@ -14032,9 +14143,6 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/bedrooms)
 "kcI" = (
-/obj/structure/disposalpipe/junction{
-	dir = 4
-	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
@@ -14045,6 +14153,10 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
 "kcO" = (
@@ -14112,7 +14224,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/machinery/vending/loadout/uniform,
+/obj/machinery/vending/loadout/overwear,
 /turf/simulated/floor/tiled/dark,
 /area/vacant/vacant_shop)
 "kfo" = (
@@ -14559,17 +14671,11 @@
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/kitchen)
 "kyI" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/multi_tile/glass/civilian{
-	name = "Annex Airlock"
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/wood,
-/area/crew_quarters/bar/lounge)
+/turf/simulated/floor/tiled,
+/area/security/security_lockerroom)
 "kyL" = (
 /obj/structure/table/reinforced,
 /obj/item/forensics/sample_kit/powder,
@@ -14952,7 +15058,10 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/office)
 "kPK" = (
-/obj/machinery/door/blast/regular,
+/obj/machinery/door/blast/regular{
+	name = "Fighter Hanger Blast Door";
+	id = "fighterhanger"
+	},
 /obj/machinery/atmospheric_field_generator/perma,
 /turf/simulated/floor/plating,
 /area/security/hanger)
@@ -15270,6 +15379,19 @@
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
+"kZV" = (
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/navgold/border{
+	dir = 1
+	},
+/obj/machinery/door/airlock/glass,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d3starboardafthall)
 "lag" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled,
@@ -15559,6 +15681,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/firedoor,
+/obj/map_helper/access_helper/airlock/station/maintenance,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3fwdmaint)
 "lmr" = (
@@ -15766,6 +15889,11 @@
 /obj/landmark/spawnpoint/job/botanist,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
+"lul" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/wood,
+/area/security/lobby)
 "luu" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -15938,8 +16066,11 @@
 /turf/simulated/floor/tiled,
 /area/security/hanger)
 "lyJ" = (
-/turf/simulated/floor/airless/ceiling,
-/area/crew_quarters/recreation_area)
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/maintenance/starboardsolar)
 "lzj" = (
 /obj/machinery/computer/ship/navigation/telescreen{
 	pixel_y = -37
@@ -16700,6 +16831,21 @@
 /obj/machinery/light,
 /turf/simulated/floor/reinforced,
 /area/quartermaster/miningdock)
+"mdJ" = (
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navblue/border,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/door/airlock/glass,
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d3portforhall)
 "mdL" = (
 /obj/machinery/computer/security{
 	dir = 8
@@ -16772,7 +16918,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/monotile,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "mhH" = (
 /turf/simulated/floor/tiled,
@@ -16813,9 +16962,6 @@
 /turf/simulated/floor/wood,
 /area/endeavour/hallway/d3fwdhall)
 "miB" = (
-/obj/structure/disposalpipe/junction{
-	dir = 4
-	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
@@ -16828,6 +16974,9 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
+/obj/structure/disposalpipe/junction/flipped{
+	dir = 8
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
 "miE" = (
@@ -16896,6 +17045,11 @@
 /obj/machinery/air_alarm/east_mount,
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
+"mkM" = (
+/obj/structure/catwalk,
+/obj/machinery/door/airlock/maintenance,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3fwdmaint)
 "mkN" = (
 /obj/item/stool/padded,
 /obj/structure/cable/green{
@@ -17673,15 +17827,19 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/wood,
-/area/crew_quarters/bar)
+/area/crew_quarters/bar/lounge)
 "mTI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/multi_tile/glass/civilian{
+	name = "Annex Airlock"
+	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/wood,
-/area/crew_quarters/bar)
+/area/crew_quarters/bar/lounge)
 "mVg" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -18758,7 +18916,8 @@
 	tag_airpump = "sec_shuttle_pump";
 	tag_chamber_sensor = "sec_shuttle_sensor";
 	tag_exterior_door = "sec_shuttle_outer";
-	tag_interior_door = "sec_shuttle_inner"
+	tag_interior_door = "sec_shuttle_inner";
+	pixel_x = 5
 	},
 /turf/simulated/floor/tiled,
 /area/security/hanger)
@@ -18816,7 +18975,7 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3portforhall)
 "nKC" = (
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "nKD" = (
 /obj/machinery/door/firedoor{
@@ -19154,6 +19313,16 @@
 /obj/effect/floor_decal/corner_oldtile/white/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
+"nTl" = (
+/obj/machinery/door/firedoor,
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navblue/border,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/door/airlock/glass,
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d3portforhall)
 "nTO" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -19584,6 +19753,19 @@
 "ohV" = (
 /turf/simulated/wall,
 /area/crew_quarters/showers)
+"ohZ" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/navblue/border{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/fire_alarm/north_mount,
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d3portforhall)
 "oit" = (
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/airlock/glass/security{
@@ -19741,6 +19923,7 @@
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3afthall)
 "oot" = (
@@ -19839,6 +20022,9 @@
 /obj/structure/disposalpipe/junction{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "orm" = (
@@ -20583,10 +20769,6 @@
 "oOV" = (
 /turf/simulated/wall/prepainted/cargo,
 /area/endeavour/surfacebase/mining_main/uxstorage)
-"oOX" = (
-/obj/machinery/disposal,
-/turf/simulated/floor/lino,
-/area/security/detectives_office)
 "oPq" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 6
@@ -20871,10 +21053,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
-	},
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/starboardsolar)
 "pdl" = (
@@ -21003,7 +21181,7 @@
 	pixel_y = 22
 	},
 /obj/machinery/camera/network/civilian,
-/obj/machinery/vending/fitness,
+/obj/structure/flora/pottedplant/smalltree,
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
 "phb" = (
@@ -21744,6 +21922,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3starboardafthall)
 "pEO" = (
@@ -22315,7 +22494,7 @@
 /area/security/brig)
 "qbv" = (
 /obj/machinery/vending/cigarette,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "qbQ" = (
 /obj/machinery/door/firedoor,
@@ -22562,7 +22741,10 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled/monotile,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "qkg" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
@@ -22659,6 +22841,7 @@
 	dir = 4
 	},
 /obj/machinery/fire_alarm/north_mount,
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/hallway/d3fwdhall)
 "qnp" = (
@@ -23054,7 +23237,7 @@
 "qyf" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "qyF" = (
 /obj/structure/cable/green{
@@ -23350,6 +23533,9 @@
 "qJd" = (
 /obj/structure/table/bench/steel,
 /obj/landmark/spawnpoint/job/security_officer,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/security/security_lockerroom)
 "qJu" = (
@@ -23572,7 +23758,7 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "qQz" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -23703,6 +23889,24 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/bar/lower)
+"qYi" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
+/obj/structure/disposalpipe/junction{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/recreation_area)
 "qYn" = (
 /obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 1
@@ -23845,12 +24049,6 @@
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/bar)
-"red" = (
-/obj/effect/floor_decal/spline/fancy/wood/corner{
-	dir = 1
-	},
-/turf/space/basic,
-/area/space)
 "reV" = (
 /obj/structure/cable/green,
 /obj/structure/cable/green{
@@ -24430,9 +24628,6 @@
 /turf/simulated/floor/tiled/old_cargo/red,
 /area/security/security_processing)
 "rzb" = (
-/obj/machinery/fire_alarm/south_mount{
-	pixel_y = -25
-	},
 /obj/machinery/door/firedoor{
 	dir = 8
 	},
@@ -24447,6 +24642,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3starboardamidhall)
 "rzc" = (
@@ -24861,11 +25057,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/starboardsolar)
 "rOW" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/catwalk,
+/obj/machinery/door/airlock/maintenance,
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
-/area/endeavour/hallway/d3fwdmaint)
+/area/maintenance/bar/catwalk)
 "rPa" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navblue/border,
@@ -25203,6 +25400,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3portamidhall)
 "saK" = (
@@ -25308,7 +25506,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/monotile,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "seV" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -25321,7 +25522,7 @@
 /obj/structure/bed/chair{
 	dir = 4
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "shr" = (
 /obj/structure/cable/yellow{
@@ -25608,13 +25809,11 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/security)
 "soz" = (
-/obj/machinery/light/small{
-	dir = 4
+/obj/machinery/door/airlock/maintenance,
+/obj/machinery/door/firedoor{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/plating,
 /area/crew_quarters/recreation_area)
 "soV" = (
 /obj/structure/cable/green{
@@ -25962,6 +26161,17 @@
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/surfacebase/mining_main/refinery)
+"sxq" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 8
+	},
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/glass,
+/turf/simulated/floor/tiled,
+/area/endeavour/hallway/d3portforhall)
 "sxA" = (
 /obj/item/bedsheet/purpledouble,
 /obj/structure/bed/double/padded,
@@ -26000,11 +26210,6 @@
 "szl" = (
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)
-"szn" = (
-/obj/structure/table/steel,
-/obj/item/phone,
-/turf/simulated/floor/tiled,
-/area/security/lobby)
 "szv" = (
 /obj/structure/cable/orange{
 	icon_state = "4-8"
@@ -26401,6 +26606,9 @@
 	dir = 1;
 	icon_state = "pipe-c"
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/security/security_lockerroom)
 "sRJ" = (
@@ -27055,14 +27263,6 @@
 	},
 /turf/simulated/floor/airless,
 /area/space)
-"toV" = (
-/obj/item/radio/intercom{
-	dir = 8;
-	pixel_x = -24
-	},
-/obj/structure/table/steel,
-/turf/simulated/floor/tiled,
-/area/security/lobby)
 "tpm" = (
 /obj/machinery/camera/network/civilian,
 /obj/effect/floor_decal/borderfloorblack{
@@ -27414,7 +27614,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/riot_control)
 "tDn" = (
-/obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/light/small{
@@ -27929,9 +28128,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/armoury)
 "tWr" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
@@ -28598,9 +28794,19 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
 "urn" = (
-/obj/machinery/vending/loadout/overwear,
-/turf/simulated/floor/tiled/dark,
-/area/vacant/vacant_shop)
+/obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
+	id = "security_lockdown";
+	name = "Security Blast Doors";
+	opacity = 0
+	},
+/obj/machinery/door/airlock/glass/security/polarized,
+/obj/map_helper/electrochromatic_linker{
+	id = "vicDetOffice"
+	},
+/turf/simulated/floor/lino,
+/area/security/lobby)
 "urB" = (
 /obj/effect/floor_decal/corner/red/full{
 	dir = 8
@@ -29021,7 +29227,10 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/monotile,
+/obj/machinery/vending/cola{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "uIG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -29033,6 +29242,7 @@
 /obj/machinery/air_alarm{
 	pixel_y = 22
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/hallway/d3fwdhall)
 "uIP" = (
@@ -29301,7 +29511,7 @@
 	},
 /obj/structure/table/steel,
 /obj/item/toy/figure/secofficer,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "uQm" = (
 /obj/structure/closet/secure_closet/brig,
@@ -29626,7 +29836,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "vew" = (
 /obj/structure/table/steel,
@@ -29658,7 +29868,6 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/starboardsolar)
 "vfr" = (
@@ -29670,6 +29879,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/hallway/d3fwdhall)
 "vfK" = (
@@ -30081,6 +30291,7 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/hallway/d3fwdhall)
 "vqa" = (
@@ -30615,6 +30826,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3portamidhall)
 "vEy" = (
@@ -31170,14 +31382,14 @@
 /obj/machinery/atm{
 	pixel_x = -33
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "vVx" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
 	},
-/turf/simulated/wall/prepainted,
-/area/endeavour/hallway/d3fwdmaint)
+/turf/simulated/floor/wood,
+/area/security/lobby)
 "vVA" = (
 /turf/simulated/wall/r_wall/prepainted/cargo,
 /area/endeavour/surfacebase/mining_main/uxstorage)
@@ -31427,6 +31639,9 @@
 /area/endeavour/hallway/d3starboardamidhall)
 "wez" = (
 /obj/structure/table/bench/steel,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/security/security_lockerroom)
 "wfZ" = (
@@ -31625,9 +31840,23 @@
 /turf/simulated/floor/carpet/sblucarpet,
 /area/quartermaster/foyer)
 "woj" = (
-/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
-/turf/simulated/floor/plating,
-/area/security/detectives_office)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/red/border{
+	dir = 1
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/security/hallway)
 "woH" = (
 /obj/structure/undies_wardrobe,
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
@@ -31748,7 +31977,11 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/simulated/floor/tiled,
+/obj/item/radio/intercom{
+	dir = 8;
+	pixel_x = -24
+	},
+/turf/simulated/floor/wood,
 /area/security/lobby)
 "wsI" = (
 /obj/structure/cryofeed{
@@ -31980,6 +32213,21 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3starboardafthall)
+"wBY" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
+/obj/structure/disposalpipe/junction{
+	dir = 4;
+	icon_state = "pipe-j2"
+	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/recreation_area)
 "wCE" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/effect/floor_decal/industrial/outline/blue,
@@ -32226,14 +32474,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
 "wNi" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 4
-	},
-/obj/structure/flora/pottedplant/smalltree,
-/obj/machinery/light/small{
-	dir = 1
-	},
-/turf/simulated/floor/carpet/turcarpet,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
 "wNo" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -32503,19 +32746,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/warden)
 "wYu" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/obj/structure/catwalk,
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/starboardsolar)
+/obj/machinery/door/firedoor,
+/turf/simulated/wall/prepainted,
+/area/endeavour/hallway/d3fwdmaint)
 "wYH" = (
 /obj/machinery/fire_alarm/south_mount{
 	pixel_y = -25
@@ -32526,6 +32759,7 @@
 	req_access = list(28)
 	},
 /obj/item/storage/belt/utility,
+/obj/item/multitool,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "wYQ" = (
@@ -32585,6 +32819,18 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3starboardafthall)
+"wZI" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/recreation_area)
 "wZP" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -33023,6 +33269,7 @@
 /obj/structure/disposalpipe/junction{
 	dir = 4
 	},
+/obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3starboardafthall)
 "xuO" = (
@@ -33500,6 +33747,7 @@
 /obj/item/clothing/under/oricon/utility/fleet/security,
 /obj/item/clothing/under/oricon/utility/marine/security,
 /obj/item/clothing/under/oricon/utility/marine/security,
+/obj/structure/cable/green,
 /turf/simulated/floor/tiled,
 /area/security/security_lockerroom)
 "xLm" = (
@@ -33659,6 +33907,7 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
+/obj/machinery/vending/fitness,
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
 "xQu" = (
@@ -34274,6 +34523,9 @@
 	},
 /obj/map_helper/access_helper/airlock/station/security/brig,
 /obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/security/security_lockerroom)
 "ymc" = (
@@ -40398,8 +40650,8 @@ xEe
 fxn
 xEe
 xEe
-kyI
-cop
+xEe
+xEe
 mSQ
 mTI
 cop
@@ -40592,11 +40844,11 @@ uzm
 uzm
 uzm
 uzm
+uzm
+uzm
+uzm
 xLN
 szl
-szl
-szl
-szl
 dhY
 ffu
 iwU
@@ -41362,7 +41614,7 @@ rEk
 rEk
 rEk
 rEk
-iaP
+aTX
 iaP
 aMQ
 aMQ
@@ -42720,7 +42972,7 @@ bta
 bta
 bta
 rEk
-mVn
+rOW
 mVn
 mVn
 lif
@@ -46796,8 +47048,8 @@ mLm
 mLm
 mLm
 hwP
-hwP
-hwP
+mLm
+mLm
 lMH
 vxy
 ukb
@@ -46989,9 +47241,9 @@ mLm
 mLm
 mLm
 mLm
-nYH
 hwP
 mLm
+mLm
 lMH
 iON
 ukb
@@ -47183,9 +47435,9 @@ gNj
 gNj
 mLm
 mLm
-mLm
 hwP
 mLm
+mLm
 lMH
 new
 ukb
@@ -47377,7 +47629,7 @@ npS
 gNj
 mLm
 mLm
-mLm
+hwP
 hwP
 hwP
 lMH
@@ -47573,13 +47825,13 @@ mLm
 mLm
 mLm
 mLm
-hwP
+mLm
 lMH
 skT
+ukb
 rfq
 mfm
 mfm
-mfm
 uzP
 dbK
 gxU
@@ -47595,11 +47847,11 @@ kSn
 kSn
 kSn
 kSn
-syH
+fiy
 kEF
 wuH
 qmV
-woj
+keU
 dfI
 bnZ
 voJ
@@ -47767,11 +48019,11 @@ xLm
 xLm
 xLm
 xLm
-hwP
+mLm
 lMH
 nqP
-wcT
 ukb
+wcT
 ukb
 ukb
 iwp
@@ -47799,7 +48051,7 @@ hHh
 hHh
 vSA
 vSA
-oOX
+bnZ
 vSA
 gbC
 tOa
@@ -47961,12 +48213,12 @@ hWB
 mLm
 mLm
 xLm
-hwP
+mLm
 lMH
 cBD
+ukb
 ghV
 jYY
-urn
 kff
 fUR
 hkE
@@ -47993,7 +48245,7 @@ pwE
 pwE
 pwE
 vjb
-qqF
+urn
 uxf
 vjb
 uxf
@@ -48187,7 +48439,7 @@ sWJ
 sWJ
 sWJ
 vjb
-toV
+nKC
 wsC
 sfw
 vVt
@@ -48381,10 +48633,10 @@ sWJ
 cFD
 sWJ
 vjb
-szn
+nKC
 azW
 nKC
-oSq
+nKC
 tTN
 tZq
 oSq
@@ -48575,10 +48827,10 @@ kiR
 sWJ
 sWJ
 vjb
-aIB
-seM
 nKC
-oSq
+gBp
+nKC
+nKC
 uGI
 mdL
 gMW
@@ -48771,8 +49023,8 @@ qVF
 vjb
 eSt
 seM
-nKC
-oSq
+vVx
+vVx
 epb
 qqF
 qqF
@@ -49179,7 +49431,7 @@ wez
 hnq
 qJd
 jaT
-ujF
+kyI
 xLd
 bPr
 bPr
@@ -49739,7 +49991,7 @@ eem
 wpe
 wpe
 eYt
-rNH
+lul
 qyf
 qQq
 uPY
@@ -49753,7 +50005,7 @@ oaj
 mrb
 cLp
 gAa
-wUZ
+woj
 moo
 kiu
 kiu
@@ -52044,9 +52296,9 @@ vfa
 vfa
 vfa
 rMi
-nJu
+bCv
 aCi
-wtj
+mdJ
 cGV
 cGV
 cGV
@@ -52058,7 +52310,7 @@ cGV
 cGV
 cGV
 cGV
-qZx
+kZV
 xuC
 pEt
 fVW
@@ -52420,10 +52672,10 @@ aaK
 wzB
 agX
 yab
-yab
-yab
 fju
 fju
+mIk
+fju
 fju
 rBG
 rMi
@@ -52612,12 +52864,12 @@ csb
 csb
 csb
 csb
-csb
-csb
 cih
-yab
-yab
-yab
+eAp
+fju
+fju
+mIk
+fju
 yab
 yab
 iID
@@ -52807,11 +53059,11 @@ csb
 csb
 csb
 csb
-csb
-csb
-csb
-csb
-lyJ
+eAp
+fju
+fju
+mIk
+fju
 ewu
 ykp
 eHQ
@@ -52826,11 +53078,11 @@ cQG
 eqa
 bDG
 qHq
-pkQ
+jJn
 qHq
 qHq
 rQK
-pkQ
+jJn
 qHq
 kwF
 qCe
@@ -53001,11 +53253,11 @@ csb
 csb
 csb
 csb
-csb
-csb
-csb
-csb
-lyJ
+eAp
+fju
+fju
+mIk
+fju
 ewu
 sms
 fUB
@@ -53020,11 +53272,11 @@ swv
 eqa
 bDG
 qHq
-qHq
+dFI
 qHq
 qHq
 rQK
-qHq
+dFI
 qHq
 kwF
 qCe
@@ -53195,11 +53447,11 @@ csb
 csb
 csb
 csb
-csb
-csb
-csb
-csb
-csb
+eAp
+fju
+fju
+mIk
+fju
 ewu
 ibL
 fUB
@@ -53389,13 +53641,13 @@ csb
 csb
 csb
 csb
-csb
-csb
-csb
-csb
-csb
-ewu
-wNi
+eAp
+fju
+fju
+mIk
+mIk
+soz
+lfy
 lfy
 tkJ
 cBe
@@ -53408,11 +53660,11 @@ sid
 eqa
 mmq
 mmq
-qHq
+dFI
 qHq
 qHq
 rQK
-qHq
+dFI
 mmq
 mmq
 qCe
@@ -53583,11 +53835,11 @@ csb
 csb
 csb
 csb
-csb
-csb
-csb
-csb
-csb
+eAp
+fju
+fju
+fju
+fju
 ewu
 pgJ
 syZ
@@ -53602,11 +53854,11 @@ sid
 eqa
 mmq
 mmq
-aec
+bRs
 qHq
 qHq
 rQK
-aec
+bRs
 mmq
 mmq
 qCe
@@ -53777,11 +54029,11 @@ csb
 csb
 csb
 csb
-csb
-csb
-csb
-csb
-csb
+eAp
+eAp
+eAp
+eAp
+eAp
 ewu
 tQn
 syZ
@@ -57697,7 +57949,7 @@ eth
 hKI
 tDn
 ekc
-qMf
+wNi
 qOs
 vfd
 pcN
@@ -57894,7 +58146,7 @@ iBG
 iBG
 vFE
 wVa
-aYo
+jIP
 haF
 haF
 haF
@@ -58282,7 +58534,7 @@ nhQ
 nhQ
 nhQ
 iJh
-aYo
+lyJ
 hwy
 cuJ
 pUW
@@ -58476,7 +58728,7 @@ hNb
 fCQ
 nhQ
 qQb
-aYo
+noY
 haF
 cuJ
 oVK
@@ -58864,7 +59116,7 @@ bmr
 dgX
 nhQ
 sZz
-dUN
+cuJ
 haF
 dFz
 gEK
@@ -59051,14 +59303,14 @@ jnU
 gRa
 ekH
 vIV
-ekX
+wZI
 nhQ
 tzN
 bmr
 sLk
 nhQ
 kXT
-dUN
+cuJ
 haF
 haF
 haF
@@ -59245,14 +59497,14 @@ ekH
 ekH
 ekH
 syZ
-ekX
+wZI
 nhQ
 oMi
 oKw
 orX
 nhQ
 cuJ
-dUN
+cuJ
 wWT
 mDp
 mDp
@@ -59439,14 +59691,14 @@ kLR
 pmM
 gSN
 syZ
-ekX
+wZI
 nhQ
 nhQ
 nhQ
 nhQ
 nhQ
 cuJ
-dUN
+cuJ
 bmY
 mDp
 mDp
@@ -59640,7 +59892,7 @@ sil
 ibT
 dlI
 bjW
-dUN
+cuJ
 wWT
 mDp
 mDp
@@ -59834,7 +60086,7 @@ xwz
 gxZ
 dlI
 cuJ
-dUN
+cuJ
 bmY
 lIp
 lIp
@@ -60021,14 +60273,14 @@ vxh
 dUF
 qoo
 nkn
-jSG
+wBY
 dlI
 oBE
 puL
 nBX
 dlI
 cuJ
-dUN
+cuJ
 wWT
 mDp
 mDp
@@ -60221,8 +60473,8 @@ tiV
 puL
 voV
 dlI
-aRG
-wYu
+cuJ
+cuJ
 bmY
 mDp
 mDp
@@ -60583,7 +60835,7 @@ tgl
 mWG
 kXK
 syD
-vVx
+mMr
 lTw
 lTw
 xwr
@@ -60991,7 +61243,7 @@ glK
 pvm
 hyv
 syZ
-miB
+qYi
 lYm
 pGM
 fnh
@@ -61166,7 +61418,7 @@ kyv
 kXK
 jFV
 mMr
-mMr
+lTw
 lTw
 xwr
 xwr
@@ -61743,7 +61995,7 @@ lTw
 lTw
 lTw
 lTw
-mMr
+wYu
 pjJ
 sWa
 iIC
@@ -61935,9 +62187,9 @@ alQ
 lUd
 lTw
 lTw
-lTw
-lTw
-mMr
+fSP
+fSP
+mkM
 bUz
 aII
 syD
@@ -62132,7 +62384,7 @@ mMr
 gRf
 mMr
 mMr
-qxm
+ohZ
 ofc
 okZ
 orP
@@ -62151,8 +62403,8 @@ ooS
 uJP
 ayd
 qMf
+cRh
 qMf
-soz
 nPn
 qMf
 mbJ
@@ -62346,7 +62598,7 @@ poW
 eVN
 eVN
 eVN
-eVN
+ddh
 eVN
 eVN
 eVN
@@ -62540,7 +62792,7 @@ hJb
 mMr
 lTw
 lTw
-bRs
+fSP
 lTw
 lTw
 lTw
@@ -62733,8 +62985,8 @@ avW
 qvK
 mMr
 fSP
-rOW
-eAp
+fSP
+fSP
 lTw
 lTw
 nEe
@@ -63870,7 +64122,7 @@ pRW
 pRW
 pRW
 pRW
-red
+pRW
 pRW
 pRW
 pRW
@@ -64072,9 +64324,9 @@ tUu
 alQ
 lTw
 mMr
-pjJ
-sWa
-iIC
+fXd
+sxq
+nTl
 mMr
 lTw
 fSP
@@ -64086,7 +64338,7 @@ mMr
 mMr
 mMr
 mMr
-paM
+hcm
 esA
 jbc
 mMr
@@ -64637,16 +64889,16 @@ mDp
 mDp
 mDp
 mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
-mDp
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
+pRW
 mDp
 pRW
 pRW
@@ -65244,7 +65496,7 @@ iXB
 iXB
 bWK
 uIG
-tGS
+jNW
 caA
 bWK
 iXB
@@ -65436,11 +65688,11 @@ lqZ
 iXB
 aiO
 ymj
-pkQ
+eJJ
 oeN
 tGS
 hhJ
-pkQ
+eJJ
 ymj
 iVR
 iXB
@@ -65630,11 +65882,11 @@ lqZ
 iXB
 aiO
 ymj
-qHq
+aRG
 oeN
 tGS
 hhJ
-qHq
+aRG
 ymj
 iVR
 iXB
@@ -66018,11 +66270,11 @@ jKI
 iXB
 mmq
 mmq
-qHq
+aRG
 oeN
 tGS
 hhJ
-qHq
+aRG
 mmq
 mmq
 iXB
@@ -66212,11 +66464,11 @@ eRz
 iXB
 mmq
 mmq
-aec
+dUN
 oeN
 tGS
 hhJ
-aec
+dUN
 mmq
 mmq
 iXB
diff --git a/maps/endeavour/levels/deck4.dmm b/maps/endeavour/levels/deck4.dmm
index 7bff718ed4d0..0e69f753e8d3 100644
--- a/maps/endeavour/levels/deck4.dmm
+++ b/maps/endeavour/levels/deck4.dmm
@@ -138,6 +138,10 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/glass/engineering{
+	name = "Engineering Hallway";
+	req_one_access = null
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardhall)
 "ahH" = (
@@ -1022,6 +1026,19 @@
 /obj/map_helper/access_helper/airlock/station/maintenance,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d4aftmaint)
+"bfu" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock/glass/engineering{
+	name = "Engineering Hallway";
+	req_one_access = null
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4starboardamidhall)
 "bfx" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -1539,6 +1556,10 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/glass/engineering{
+	name = "Engineering Hallway";
+	req_one_access = null
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4starboardhall)
 "bNS" = (
@@ -3140,6 +3161,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/glass/engineering{
+	name = "Engineering Hallway";
+	req_one_access = null
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4portamidhall)
 "dRg" = (
@@ -3587,6 +3612,10 @@
 	dir = 8
 	},
 /obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/glass/engineering{
+	name = "Engineering Hallway";
+	req_one_access = null
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4portamidhall)
 "etE" = (
@@ -6417,9 +6446,6 @@
 	dir = 4
 	},
 /obj/machinery/light/no_nightshift,
-/obj/machinery/computer/crew{
-	dir = 1
-	},
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/command/turrets)
 "hKp" = (
@@ -7176,6 +7202,10 @@
 /obj/machinery/door/firedoor{
 	dir = 8
 	},
+/obj/machinery/door/airlock/glass/engineering{
+	name = "Engineering Hallway";
+	req_one_access = null
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4starboardamidhall)
 "iHk" = (
@@ -8529,6 +8559,25 @@
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4portforhall)
+"kna" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/obj/machinery/door/airlock/glass/engineering{
+	name = "Engineering Hallway";
+	req_one_access = null
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4starboardamidhall)
 "knf" = (
 /turf/simulated/wall/r_wall/prepainted,
 /area/rnd/robotics/smallcraft)
@@ -8544,6 +8593,10 @@
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/glass/engineering{
+	name = "Engineering Hallway";
+	req_one_access = null
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4portamidhall)
 "koO" = (
@@ -9702,6 +9755,10 @@
 /obj/machinery/door/firedoor{
 	dir = 8
 	},
+/obj/machinery/door/airlock/glass/engineering{
+	name = "Engineering Hallway";
+	req_one_access = null
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4starboardamidhall)
 "lRa" = (
@@ -10484,6 +10541,10 @@
 /obj/structure/cable/orange{
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/glass/engineering{
+	name = "Engineering Hallway";
+	req_one_access = null
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4starboardhall)
 "mES" = (
@@ -12136,15 +12197,15 @@
 /turf/simulated/floor/tiled/steel,
 /area/tcommsat/computer)
 "oyc" = (
-/obj/machinery/computer/transhuman/resleeving{
-	dir = 1
-	},
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
 /obj/machinery/newscaster{
 	pixel_y = -32
 	},
+/obj/machinery/computer/mecha{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/command/turrets)
 "oyr" = (
@@ -12313,6 +12374,10 @@
 	},
 /obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock/glass/engineering{
+	name = "Engineering Hallway";
+	req_one_access = null
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4portamidhall)
 "oPx" = (
@@ -13947,6 +14012,25 @@
 	},
 /turf/simulated/floor/tiled/monowhite,
 /area/engineering/drone_fabrication)
+"rbd" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/obj/machinery/door/airlock/glass/engineering{
+	name = "Engineering Hallway";
+	req_one_access = null
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d4portamidhall)
 "rbo" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/lightorange/border,
@@ -14450,6 +14534,10 @@
 /obj/machinery/door/firedoor{
 	dir = 8
 	},
+/obj/machinery/door/airlock/glass/engineering{
+	name = "Engineering Hallway";
+	req_one_access = null
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/endeavour/hallway/d4starboardamidhall)
 "rRY" = (
@@ -16902,6 +16990,10 @@
 /obj/machinery/door/firedoor{
 	dir = 8
 	},
+/obj/machinery/door/airlock/glass/engineering{
+	name = "Engineering Hallway";
+	req_one_access = null
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4portamidhall)
 "vkW" = (
@@ -19487,6 +19579,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
+/obj/machinery/door/airlock/glass/engineering{
+	name = "Engineering Hallway";
+	req_one_access = null
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d4starboardamidhall)
 "yhV" = (
@@ -36366,7 +36462,7 @@ vzj
 odE
 puY
 jnR
-jsW
+bfu
 jnR
 jnR
 nRE
@@ -36738,7 +36834,7 @@ wiw
 xsV
 xsV
 vkt
-bmK
+rbd
 dQV
 etM
 etM
@@ -36752,7 +36848,7 @@ aQf
 aQf
 aQf
 yhC
-avq
+kna
 rRU
 xsV
 xsV