diff --git a/maps/endeavour/levels/deck1.dmm b/maps/endeavour/levels/deck1.dmm
index dc94504c3bc1..1ea93744337d 100644
--- a/maps/endeavour/levels/deck1.dmm
+++ b/maps/endeavour/levels/deck1.dmm
@@ -101,10 +101,6 @@
 	},
 /turf/simulated/floor/carpet,
 /area/bridge/meeting_room)
-"afX" = (
-/obj/effect/floor_decal/rust,
-/turf/simulated/wall/prepainted/civilian,
-/area/endeavour/surfacebase/sauna)
 "afY" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
@@ -169,14 +165,14 @@
 /turf/simulated/floor/tiled/old_tile/green,
 /area/shuttle/civvie/general)
 "ahL" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/mauve/border,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navblue/border,
 /turf/simulated/floor/tiled,
 /area/exploration)
 "ahR" = (
@@ -358,7 +354,7 @@
 	dir = 4;
 	pixel_y = 7
 	},
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/endeavour/hallway/d1fwdmaint)
 "aqI" = (
 /obj/effect/floor_decal/techfloor,
@@ -722,8 +718,8 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1portamidhall)
 "aEU" = (
-/turf/simulated/wall/prepainted/civilian,
-/area/vacant/vacant_bar)
+/turf/simulated/wall/prepainted,
+/area/station/stairs_one)
 "aFa" = (
 /turf/simulated/wall/prepainted/civilian,
 /area/crew_quarters/coffee_shop)
@@ -845,7 +841,6 @@
 /obj/item/tank/jetpack/oxygen,
 /obj/item/storage/backpack/parachute,
 /obj/item/clothing/accessory/permit/gun/planetside,
-/obj/item/binoculars,
 /turf/simulated/floor/tiled/monotile,
 /area/exploration/medical)
 "aHc" = (
@@ -1225,18 +1220,18 @@
 /turf/simulated/floor/tiled,
 /area/exploration)
 "aUH" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/mauve/border{
-	dir = 1
-	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/navblue/border{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/exploration)
 "aUL" = (
@@ -1272,6 +1267,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/docking_hallway2)
+"aVJ" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/bridge/meeting_room)
 "aVK" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 1
@@ -1678,7 +1679,13 @@
 /obj/effect/floor_decal/corner/blue/border{
 	dir = 1
 	},
-/obj/machinery/suit_storage_unit/search_and_rescue,
+/obj/machinery/suit_cycler/medical,
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 9
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 10
+	},
 /turf/simulated/floor/tiled/white,
 /area/exploration/medical)
 "bmL" = (
@@ -2179,7 +2186,7 @@
 /turf/simulated/floor/wood,
 /area/hydroponics/garden)
 "bLC" = (
-/turf/simulated/wall/r_wall/prepainted/civilian,
+/turf/simulated/wall/r_wall/prepainted,
 /area/crew_quarters/lounge)
 "bLW" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -2836,7 +2843,7 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1aftmaint)
 "cqc" = (
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/exploration)
 "cqF" = (
 /obj/structure/cable/green{
@@ -2980,20 +2987,13 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1fwdhall)
 "cwi" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/mauve/border{
-	dir = 1
-	},
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/simulated/floor/tiled,
-/area/exploration)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/corner/black/diagonal,
+/obj/structure/table/marble,
+/obj/item/material/knife/butch,
+/obj/item/material/kitchen/rollingpin,
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/lounge/kitchen_freezer)
 "cxt" = (
 /obj/effect/floor_decal/borderfloorblack,
 /obj/effect/floor_decal/corner/navgold/border,
@@ -3125,14 +3125,14 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portforhall)
 "cCy" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/corner/mauve/border{
+/obj/effect/floor_decal/borderfloorblack{
 	dir = 1
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/effect/floor_decal/corner/navblue/border{
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/exploration)
@@ -3176,15 +3176,9 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portforhall)
 "cEb" = (
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/endeavour/surfacebase/sauna)
 "cEM" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/mauve/border{
-	dir = 1
-	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
@@ -3192,6 +3186,12 @@
 	dir = 1;
 	icon_state = "pipe-c"
 	},
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/navblue/border{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/exploration)
 "cEN" = (
@@ -3399,7 +3399,7 @@
 /turf/simulated/floor/wood,
 /area/hydroponics/garden)
 "cMJ" = (
-/turf/simulated/wall/r_wall/prepainted/civilian,
+/turf/simulated/wall/r_wall/prepainted,
 /area/endeavour/surfacebase/tram)
 "cMQ" = (
 /obj/effect/floor_decal/industrial/outline/red,
@@ -3602,6 +3602,9 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/pool/changing_room)
 "cSZ" = (
@@ -3699,8 +3702,6 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardafthall)
 "cVD" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/mauve/border,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -3711,6 +3712,8 @@
 	dir = 1;
 	icon_state = "pipe-c"
 	},
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navblue/border,
 /turf/simulated/floor/tiled,
 /area/exploration)
 "cVE" = (
@@ -4016,7 +4019,7 @@
 /obj/structure/sign/directions/elevator{
 	dir = 4
 	},
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/endeavour/hallway/d1fwdmaint)
 "dkm" = (
 /obj/structure/table/rack/shelf/steel,
@@ -4455,7 +4458,7 @@
 	pixel_y = -24;
 	dir = 8
 	},
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/maintenance/tool_storage)
 "dDt" = (
 /obj/effect/floor_decal/borderfloor{
@@ -4649,7 +4652,6 @@
 /turf/simulated/floor/tiled,
 /area/chapel/main)
 "dKn" = (
-/obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
@@ -4657,10 +4659,6 @@
 /obj/effect/floor_decal/corner/navblue/border{
 	dir = 8
 	},
-/obj/machinery/door/airlock/multi_tile/glass{
-	dir = 1;
-	name = "Exploration Public Lobby"
-	},
 /turf/simulated/floor/tiled,
 /area/exploration)
 "dKp" = (
@@ -4855,6 +4853,46 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge/hallway)
+"dSn" = (
+/obj/structure/table/marble,
+/obj/item/reagent_containers/food/drinks/cup{
+	pixel_x = -9;
+	pixel_y = 10
+	},
+/obj/item/reagent_containers/food/drinks/cup{
+	pixel_x = -9;
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/food/drinks/cup{
+	pixel_x = -2;
+	pixel_y = 10
+	},
+/obj/item/reagent_containers/food/drinks/cup{
+	pixel_x = -9;
+	pixel_y = -1
+	},
+/obj/item/reagent_containers/food/drinks/cup{
+	pixel_x = -2;
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/food/drinks/cup{
+	pixel_x = 7;
+	pixel_y = 10
+	},
+/obj/item/reagent_containers/food/drinks/cup{
+	pixel_x = 7;
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/food/drinks/cup{
+	pixel_x = -2;
+	pixel_y = -1
+	},
+/obj/item/reagent_containers/food/drinks/cup{
+	pixel_x = 7;
+	pixel_y = -1
+	},
+/turf/simulated/floor/wood,
+/area/bridge/meeting_room)
 "dSB" = (
 /obj/machinery/light{
 	dir = 8
@@ -4997,7 +5035,7 @@
 /turf/simulated/floor/lino,
 /area/crew_quarters/coffee_shop)
 "dZr" = (
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/maintenance/substation/dock)
 "dZv" = (
 /obj/structure/table/reinforced,
@@ -5018,6 +5056,14 @@
 	},
 /turf/simulated/floor/wood,
 /area/hydroponics/garden)
+"dZQ" = (
+/obj/structure/table/marble,
+/obj/item/reagent_containers/food/drinks/britcup{
+	pixel_y = 9;
+	pixel_x = 9
+	},
+/turf/simulated/floor/carpet,
+/area/bridge/meeting_room)
 "eav" = (
 /obj/machinery/light{
 	dir = 1
@@ -5171,9 +5217,6 @@
 /obj/effect/floor_decal/corner/navgold/bordercorner2{
 	dir = 4
 	},
-/obj/machinery/door/firedoor{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -5673,6 +5716,9 @@
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/wood,
 /area/bridge/meeting_room)
 "eyU" = (
@@ -5844,7 +5890,7 @@
 /turf/simulated/floor/plating,
 /area/endeavour/surfacebase/sauna)
 "eFW" = (
-/turf/simulated/wall/r_wall/prepainted/civilian,
+/turf/simulated/wall/r_wall/prepainted,
 /area/endeavour/hallway/d1afthall)
 "eGo" = (
 /obj/structure/closet/emcloset,
@@ -6046,7 +6092,7 @@
 	dir = 4;
 	pixel_y = 7
 	},
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/maintenance/substation/civilian)
 "eOl" = (
 /turf/simulated/floor/wood,
@@ -6437,16 +6483,8 @@
 /turf/simulated/floor/tiled,
 /area/gateway/prep_room)
 "eZR" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 6
-	},
-/obj/effect/floor_decal/corner/mauve/border{
-	dir = 6
-	},
-/obj/machinery/camera/network/exploration{
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
+/obj/structure/closet/emcloset,
+/turf/simulated/floor/plating,
 /area/exploration)
 "eZZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -6654,7 +6692,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/hallway/secondary/docking_hallway)
 "fhK" = (
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/hallway/secondary/docking_hallway)
 "fit" = (
 /obj/effect/floor_decal/techfloor{
@@ -6688,9 +6726,6 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/hallway/secondary/docking_hallway2)
 "fix" = (
-/obj/structure/table/marble,
-/obj/item/material/knife/butch,
-/obj/item/material/kitchen/rollingpin,
 /obj/machinery/light,
 /obj/effect/floor_decal/corner/black{
 	dir = 5
@@ -6698,6 +6733,7 @@
 /obj/effect/floor_decal/corner/black{
 	dir = 10
 	},
+/obj/structure/closet/secure_closet/freezer/kitchen,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/lounge/kitchen_freezer)
 "fjs" = (
@@ -6769,16 +6805,16 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardamidhall)
 "flf" = (
-/obj/effect/floor_decal/borderfloor/corner{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/mauve/bordercorner{
-	dir = 1
-	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
 /obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/borderfloorblack/corner{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/navblue/bordercorner{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/exploration)
 "flG" = (
@@ -6911,6 +6947,7 @@
 /area/crew_quarters/mimeoffice)
 "foK" = (
 /obj/structure/flora/pottedplant/shoot,
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/endeavour/surfacebase/tram)
 "foM" = (
@@ -7056,7 +7093,6 @@
 /obj/effect/floor_decal/corner/black/full{
 	dir = 1
 	},
-/obj/structure/table/marble,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/lounge/kitchen_freezer)
 "fta" = (
@@ -8104,7 +8140,7 @@
 /obj/effect/floor_decal/corner/black/full{
 	dir = 1
 	},
-/obj/structure/table/marble,
+/obj/machinery/appliance/cooker/oven,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/lounge/kitchen_freezer)
 "geF" = (
@@ -8440,7 +8476,6 @@
 	dir = 4
 	},
 /obj/structure/flora/ausbushes/fullgrass,
-/obj/structure/flora/tree/jungle_small,
 /turf/simulated/floor/grass,
 /area/hydroponics/garden)
 "goT" = (
@@ -8531,7 +8566,7 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/mimeoffice)
 "grq" = (
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/endeavour/hallway/d1starboardamidhall)
 "gsj" = (
 /obj/machinery/holopad,
@@ -9048,17 +9083,12 @@
 /turf/simulated/floor/tiled,
 /area/exploration/explorer_prep)
 "gOX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
+/obj/machinery/door/airlock/maintenance/common,
 /obj/machinery/door/firedoor{
-	dir = 8
+	dir = 1
 	},
-/turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
+/turf/simulated/floor/plating,
+/area/hallway/secondary/docking_hallway)
 "gPm" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/corner/black/full,
@@ -9295,7 +9325,6 @@
 	},
 /obj/item/storage/box/donkpockets,
 /obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/food/condiment/enzyme,
 /obj/effect/floor_decal/corner/black{
 	dir = 5
 	},
@@ -9501,9 +9530,6 @@
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on,
 /turf/simulated/floor/wood,
 /area/hydroponics/garden)
-"hgE" = (
-/turf/simulated/wall/r_wall/prepainted/civilian,
-/area/hallway/secondary/docking_hallway)
 "hgJ" = (
 /obj/machinery/door/airlock/maintenance/common,
 /obj/machinery/door/firedoor{
@@ -9711,7 +9737,7 @@
 /obj/effect/floor_decal/corner/black/full{
 	dir = 1
 	},
-/obj/structure/table/marble,
+/obj/machinery/appliance/cooker/oven,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/lounge/kitchen_freezer)
 "hpL" = (
@@ -9896,7 +9922,6 @@
 /area/maintenance/substation/dock)
 "hvO" = (
 /obj/effect/floor_decal/borderfloorblack{
-	alpha = 255;
 	dir = 5
 	},
 /obj/effect/floor_decal/corner/navgold/border{
@@ -10746,10 +10771,9 @@
 /turf/simulated/floor/wood,
 /area/exploration/meeting)
 "idu" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/mauve/border,
-/turf/simulated/floor/tiled,
-/area/exploration)
+/obj/machinery/appliance/cooker/grill/stand,
+/turf/simulated/floor/grass,
+/area/hydroponics/garden)
 "idJ" = (
 /obj/structure/table/fancyblack,
 /obj/item/flashlight/pen{
@@ -11285,7 +11309,6 @@
 /obj/item/tank/jetpack/oxygen,
 /obj/item/storage/backpack/parachute,
 /obj/item/clothing/accessory/permit/gun/planetside,
-/obj/item/binoculars,
 /turf/simulated/floor/tiled/monotile,
 /area/exploration/medical)
 "ixp" = (
@@ -11622,9 +11645,6 @@
 /obj/item/book/manual/the_humanized_mice,
 /turf/simulated/floor/wood,
 /area/library)
-"iLb" = (
-/turf/simulated/wall/prepainted/civilian,
-/area/maintenance/tool_storage)
 "iLv" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
 /obj/machinery/air_alarm{
@@ -12059,9 +12079,6 @@
 "jda" = (
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/station/exploration)
-"jdq" = (
-/turf/simulated/wall/r_wall/prepainted/civilian,
-/area/endeavour/hallway/d1fwdmaint)
 "jec" = (
 /obj/machinery/requests_console{
 	announcementConsole = 1;
@@ -12610,6 +12627,7 @@
 	dir = 1
 	},
 /obj/structure/table/marble,
+/obj/machinery/microwave,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/lounge/kitchen_freezer)
 "jvT" = (
@@ -12654,13 +12672,15 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardamidhall)
 "jwy" = (
-/obj/machinery/suit_cycler/medical,
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
 	},
 /obj/effect/floor_decal/corner/blue/border{
 	dir = 1
 	},
+/obj/structure/table/standard,
+/obj/item/duct_tape_roll,
+/obj/item/hand_labeler,
 /turf/simulated/floor/tiled/white,
 /area/exploration/medical)
 "jxc" = (
@@ -13054,9 +13074,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/exploration/explorer_prep)
-"jMU" = (
-/turf/simulated/wall/prepainted/civilian,
-/area/maintenance/substation/civilian)
 "jNb" = (
 /turf/simulated/floor/plating,
 /area/space)
@@ -13177,14 +13194,14 @@
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
-/obj/effect/floor_decal/borderfloor/corner{
-	dir = 4
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/corner/mauve/bordercorner{
+/obj/effect/floor_decal/borderfloorblack/corner{
 	dir = 4
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/effect/floor_decal/corner/navblue/bordercorner{
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/exploration)
@@ -13256,16 +13273,14 @@
 /turf/simulated/floor/wood,
 /area/bridge/meeting_room)
 "jTN" = (
-/obj/structure/table/standard,
-/obj/item/duct_tape_roll,
 /obj/effect/floor_decal/borderfloor{
 	dir = 5
 	},
 /obj/effect/floor_decal/corner/blue/border{
 	dir = 5
 	},
-/obj/item/hand_labeler,
 /obj/machinery/fire_alarm/north_mount,
+/obj/machinery/suit_storage_unit/search_and_rescue,
 /turf/simulated/floor/tiled/white,
 /area/exploration/medical)
 "jTR" = (
@@ -13338,7 +13353,7 @@
 "jVG" = (
 /obj/machinery/door/airlock/maintenance/common,
 /obj/machinery/door/firedoor,
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/floor/plating,
 /area/maintenance/substation/dock)
 "jWm" = (
 /obj/effect/floor_decal/borderfloorblack{
@@ -13382,11 +13397,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/mauve/border,
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navblue/border,
 /turf/simulated/floor/tiled,
 /area/exploration)
 "jWP" = (
@@ -13758,14 +13773,6 @@
 /obj/effect/mist,
 /turf/simulated/floor/water/deep/pool,
 /area/endeavour/surfacebase/sauna)
-"kiC" = (
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/navgold/border,
-/obj/machinery/door/firedoor{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/steel,
-/area/endeavour/hallway/d1starboardamidhall)
 "kiD" = (
 /obj/structure/bed/chair/sofa/black{
 	dir = 1
@@ -13941,7 +13948,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1afthall)
 "krO" = (
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/maintenance/arrivals)
 "ksB" = (
 /obj/item/radio/intercom{
@@ -14049,7 +14056,7 @@
 /area/vacant/vacant_bar)
 "kxk" = (
 /obj/structure/sign/deck/fourth,
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/crew_quarters/clownoffice)
 "kxn" = (
 /obj/machinery/atmospherics/pipe/tank/air{
@@ -14116,7 +14123,7 @@
 /obj/structure/cable/orange{
 	icon_state = "1-2"
 	},
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/floor/plating,
 /area/maintenance/substation/dock)
 "kAE" = (
 /obj/structure/cable/green{
@@ -14403,7 +14410,6 @@
 "kKt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -14475,7 +14481,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/bridge/hallway)
 "kMv" = (
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/crew_quarters/mimeoffice)
 "kMz" = (
 /obj/effect/floor_decal/corner/orange{
@@ -14988,7 +14994,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/chapel)
 "lhS" = (
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/hallway/secondary/docking_hallway2)
 "lia" = (
 /obj/machinery/light{
@@ -15580,7 +15586,7 @@
 /turf/simulated/floor/wood,
 /area/lawoffice)
 "lHm" = (
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/endeavour/hallway/d1starboardafthall)
 "lIc" = (
 /obj/item/gun/energy/lasertag/red,
@@ -15925,7 +15931,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
 "lUh" = (
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/endeavour/hallway/d1fwdhall)
 "lUE" = (
 /obj/effect/floor_decal/borderfloorblack{
@@ -16021,7 +16027,7 @@
 /area/rnd/test_area)
 "lZv" = (
 /obj/structure/sign/department/biblio,
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/maintenance/chapel)
 "maa" = (
 /turf/simulated/floor/plating,
@@ -16451,7 +16457,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/station/exploration)
 "mmO" = (
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/crew_quarters/lounge)
 "mnd" = (
 /obj/effect/floor_decal/spline/plain{
@@ -16495,15 +16501,15 @@
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 6
 	},
-/obj/effect/floor_decal/corner/navgold/border{
-	dir = 6
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
+/obj/effect/floor_decal/corner/navgold/border{
+	dir = 6
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardforhall)
 "mpL" = (
@@ -16935,7 +16941,7 @@
 	id_tag = "civvie_dock";
 	req_one_access = list(67)
 	},
-/turf/simulated/wall/r_wall/prepainted/civilian,
+/turf/simulated/wall/r_wall/prepainted,
 /area/hallway/secondary/docking_hallway)
 "mFr" = (
 /obj/effect/floor_decal/borderfloorblack{
@@ -17136,7 +17142,7 @@
 	dir = 8;
 	pixel_y = -7
 	},
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/station/stairs_one)
 "mMT" = (
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -17271,9 +17277,6 @@
 	},
 /turf/simulated/floor/carpet/blucarpet,
 /area/lawoffice)
-"mSg" = (
-/turf/simulated/wall/r_wall/prepainted/civilian,
-/area/space)
 "mSi" = (
 /obj/machinery/fire_alarm/south_mount{
 	pixel_y = -24
@@ -17477,7 +17480,7 @@
 /turf/simulated/floor/lino,
 /area/crew_quarters/coffee_shop)
 "mYb" = (
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/hydroponics/garden)
 "mYF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -17668,9 +17671,6 @@
 /obj/effect/floor_decal/corner/mauve/border,
 /turf/simulated/floor/tiled,
 /area/exploration)
-"niH" = (
-/turf/simulated/wall/prepainted/civilian,
-/area/maintenance/substation/command)
 "njM" = (
 /obj/effect/floor_decal/steeldecal/steel_decals5,
 /obj/item/clothing/under/swimsuit/stripper/cowbikini,
@@ -18026,12 +18026,6 @@
 /area/crew_quarters/heads/hop)
 "nuQ" = (
 /obj/machinery/door/firedoor,
-/obj/effect/floor_decal/spline/plain{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/paleblue/full{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
@@ -18039,7 +18033,7 @@
 	dir = 8
 	},
 /obj/machinery/door/airlock/maintenance_hatch,
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/plating,
 /area/endeavour/hallway/d1fwdmaint)
 "nuU" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden{
@@ -18172,12 +18166,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/pool/changing_room)
-"nAF" = (
-/obj/machinery/atmospherics/component/binary/passive_gate/on{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/hallway/secondary/docking_hallway)
 "nAT" = (
 /obj/structure/table/marble,
 /obj/machinery/photocopier/faxmachine{
@@ -18237,7 +18225,7 @@
 /area/exploration/courser_dock)
 "nCl" = (
 /obj/structure/symbol/sa,
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/maintenance/substation/dock)
 "nCE" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -18465,6 +18453,13 @@
 	dir = 5
 	},
 /obj/effect/floor_decal/corner/black/diagonal,
+/obj/structure/table/marble,
+/obj/item/storage/fancy/egg_box{
+	pixel_y = 11
+	},
+/obj/item/storage/fancy/egg_box{
+	pixel_y = 5
+	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/lounge/kitchen_freezer)
 "nLZ" = (
@@ -19303,14 +19298,14 @@
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint)
 "ovp" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
-	dir = 1
-	},
 /obj/machinery/meter{
 	frequency = 1443;
 	id = "dist_aux_meter";
 	name = "Distribution Loop"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 6
+	},
 /turf/simulated/floor/plating,
 /area/hallway/secondary/docking_hallway)
 "ovq" = (
@@ -20049,12 +20044,22 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
-/obj/effect/floor_decal/borderfloor/corner,
-/obj/effect/floor_decal/corner/mauve/bordercorner,
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/camera/network/exploration{
+	dir = 8
+	},
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/navblue/border{
+	dir = 4
+	},
+/obj/machinery/holoposter{
+	pixel_x = 32
+	},
 /turf/simulated/floor/tiled,
 /area/exploration)
 "pbT" = (
@@ -21222,8 +21227,12 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portforhall)
 "pWN" = (
-/turf/simulated/wall/r_wall/prepainted/civilian,
-/area/endeavour/hallway/d1aftmaint)
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d1fwdmaint)
 "pXa" = (
 /obj/structure/bed/chair/bay/comfy/black,
 /turf/simulated/floor/tiled/monodark,
@@ -22669,9 +22678,9 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
 "reN" = (
-/obj/landmark/spawnpoint/overflow/station,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/endeavour/hallway/d1afthall)
+/obj/machinery/cryopod/robot/door/shuttle,
+/turf/simulated/floor/tiled,
+/area/crew_quarters/lounge)
 "rfe" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -23060,7 +23069,7 @@
 /area/endeavour/hallway/d1fwdmaint)
 "ruI" = (
 /obj/structure/sign/deck/first,
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/endeavour/hallway/d1aftmaint)
 "rvc" = (
 /obj/machinery/air_alarm{
@@ -23134,12 +23143,6 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/exploration/excursion_dock)
 "rzp" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/mauve/border{
-	dir = 1
-	},
 /obj/machinery/light{
 	dir = 1
 	},
@@ -23153,6 +23156,12 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 5
+	},
+/obj/effect/floor_decal/corner/navblue/border{
+	dir = 5
+	},
 /turf/simulated/floor/tiled,
 /area/exploration)
 "rzL" = (
@@ -24063,6 +24072,12 @@
 	},
 /turf/simulated/floor/grass,
 /area/hydroponics/garden)
+"snk" = (
+/obj/structure/table/marble,
+/obj/item/paper_bin,
+/obj/item/pen,
+/turf/simulated/floor/carpet,
+/area/bridge/meeting_room)
 "snQ" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /turf/simulated/floor,
@@ -24117,13 +24132,13 @@
 /turf/simulated/floor/tiled/white,
 /area/endeavour/hallway/d1fwdmaint)
 "ssN" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/mauve/border,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/navblue/border,
 /turf/simulated/floor/tiled,
 /area/exploration)
 "ssZ" = (
@@ -24199,7 +24214,7 @@
 /turf/simulated/wall/r_wall/prepainted/command,
 /area/teleporter)
 "svt" = (
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/endeavour/hallway/d1portamidhall)
 "svI" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
@@ -24943,16 +24958,16 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/effect/floor_decal/borderfloor/corner{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/mauve/bordercorner{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 2;
 	icon_state = "pipe-c"
 	},
+/obj/effect/floor_decal/borderfloorblack/corner{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/navblue/bordercorner{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/exploration)
 "sZF" = (
@@ -25109,13 +25124,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/hallway/secondary/docking_hallway)
 "tfY" = (
-/obj/machinery/door/firedoor{
-	dir = 1
-	},
-/obj/machinery/door/airlock/maintenance/common,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /turf/simulated/floor/plating,
 /area/exploration)
 "tgG" = (
@@ -25628,9 +25636,6 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1starboardforhall)
-"txk" = (
-/turf/simulated/wall/prepainted/civilian,
-/area/maintenance/substation/exploration)
 "txl" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/machinery/door/firedoor/glass{
@@ -25835,19 +25840,14 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/surfacebase/tram)
 "tGb" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/mauve/border{
-	dir = 1
-	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/computer/ship/navigation/telescreen{
-	pixel_y = 27
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor{
+	dir = 1
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/plating,
 /area/exploration)
 "tGh" = (
 /obj/effect/floor_decal/borderfloorblack{
@@ -27494,6 +27494,13 @@
 /obj/landmark/spawnpoint/job/mime,
 /turf/simulated/floor/carpet/bcarpet,
 /area/crew_quarters/mimeoffice)
+"uQm" = (
+/obj/machinery/computer/cryopod{
+	name = "asset retention console";
+	pixel_x = 32
+	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/lounge)
 "uQz" = (
 /obj/structure/cable/orange{
 	icon_state = "1-8"
@@ -28313,7 +28320,7 @@
 	dir = 4;
 	pixel_y = 8
 	},
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/endeavour/hallway/d1fwdmaint)
 "vsG" = (
 /obj/effect/floor_decal/borderfloorblack,
@@ -28426,9 +28433,6 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d1portamidhall)
-"vwC" = (
-/turf/simulated/wall/prepainted/civilian,
-/area/endeavour/hallway/d1aftmaint)
 "vwD" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -28766,7 +28770,7 @@
 	dir = 4;
 	pixel_y = 7
 	},
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/hydroponics/garden)
 "vGJ" = (
 /turf/simulated/wall/r_wall/prepainted,
@@ -28962,7 +28966,7 @@
 /area/endeavour/hallway/d1starboardafthall)
 "vOo" = (
 /obj/structure/sign/deck/first,
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/endeavour/hallway/d1fwdmaint)
 "vQw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -29004,7 +29008,7 @@
 /area/maintenance/substation/civilian)
 "vRx" = (
 /obj/structure/sign/deck/first,
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/station/stairs_one)
 "vSp" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -29371,14 +29375,8 @@
 /area/endeavour/hallway/d1aftmaint)
 "wiE" = (
 /obj/machinery/door/firedoor,
-/obj/effect/floor_decal/spline/plain{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/paleblue/full{
-	dir = 4
-	},
 /obj/machinery/door/airlock/maintenance_hatch,
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/plating,
 /area/endeavour/hallway/d1fwdmaint)
 "wiN" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
@@ -29421,7 +29419,7 @@
 /turf/simulated/floor/tiled/monodark,
 /area/crew_quarters/lounge)
 "wki" = (
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/endeavour/hallway/d1portforhall)
 "wkB" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -29578,7 +29576,7 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d1aftmaint)
 "wqi" = (
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/crew_quarters/clownoffice)
 "wqQ" = (
 /obj/machinery/holopad,
@@ -29746,11 +29744,34 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/lawoffice)
 "wwG" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal{
-	dir = 4
+/obj/effect/floor_decal/corner/black/diagonal,
+/obj/structure/table/marble,
+/obj/item/reagent_containers/food/condiment/small/saltshaker{
+	pixel_x = -9
 	},
-/turf/simulated/floor/plating,
-/area/hallway/secondary/docking_hallway)
+/obj/item/reagent_containers/food/condiment/small/saltshaker{
+	pixel_x = -3
+	},
+/obj/item/reagent_containers/food/condiment/small/peppermill{
+	pixel_x = 3
+	},
+/obj/item/reagent_containers/food/condiment/small/peppermill{
+	pixel_x = 9
+	},
+/obj/item/reagent_containers/food/condiment/enzyme{
+	layer = 5;
+	pixel_y = 16
+	},
+/obj/item/reagent_containers/food/condiment/soysauce{
+	pixel_x = 8;
+	pixel_y = 16
+	},
+/obj/item/reagent_containers/food/condiment/spacespice{
+	pixel_x = -8;
+	pixel_y = 13
+	},
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/lounge/kitchen_freezer)
 "wwN" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 4
@@ -29857,13 +29878,8 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/borderfloor{
-	dir = 5
-	},
-/obj/effect/floor_decal/corner/mauve/border{
-	dir = 5
-	},
-/turf/simulated/floor/tiled,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
 /area/exploration)
 "wzN" = (
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -30059,13 +30075,14 @@
 /turf/simulated/floor/tiled/dark,
 /area/bridge/hallway)
 "wEG" = (
-/obj/structure/table/marble,
-/obj/structure/dancepole{
-	name = "structural pylon";
-	desc = "You wouldn't want the ceiling to come crashing down on your head, would you?"
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 5
 	},
-/turf/simulated/floor/carpet,
-/area/bridge/meeting_room)
+/obj/effect/floor_decal/corner/navblue/border{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/steel,
+/area/endeavour/hallway/d1portamidhall)
 "wEZ" = (
 /obj/machinery/light{
 	dir = 8
@@ -30403,7 +30420,7 @@
 "wXh" = (
 /obj/machinery/door/airlock/maintenance_hatch,
 /obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/plating,
 /area/endeavour/hallway/d1fwdmaint)
 "wXu" = (
 /obj/spawner/window/low_wall/full/firelocks,
@@ -30895,7 +30912,7 @@
 	dir = 4;
 	pixel_y = 7
 	},
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/maintenance/substation/civilian)
 "xtJ" = (
 /obj/machinery/door/firedoor{
@@ -31117,7 +31134,7 @@
 /area/hallway/secondary/docking_hallway)
 "xyG" = (
 /obj/machinery/door/firedoor/glass,
-/turf/simulated/wall/prepainted/civilian,
+/turf/simulated/wall/prepainted,
 /area/hallway/secondary/docking_hallway)
 "xzk" = (
 /obj/structure/cable/green{
@@ -31201,9 +31218,6 @@
 /obj/effect/floor_decal/corner/navblue/border{
 	dir = 1
 	},
-/obj/machinery/holoposter{
-	pixel_y = 32
-	},
 /obj/machinery/vending/cola,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/endeavour/hallway/d1afthall)
@@ -36102,10 +36116,10 @@ xRj
 xRj
 xRj
 xRj
-mSg
-mSg
-mSg
-mSg
+sQl
+sQl
+sQl
+sQl
 jNg
 jNg
 jNg
@@ -36296,10 +36310,10 @@ xRj
 xRj
 xRj
 xRj
-mSg
-mSg
-mSg
-mSg
+sQl
+sQl
+sQl
+sQl
 jNg
 jNg
 jNg
@@ -36490,10 +36504,10 @@ dTn
 dTn
 dTn
 dTn
-hgE
-mSg
-mSg
-mSg
+wBM
+sQl
+sQl
+sQl
 jNg
 jNg
 jNg
@@ -36684,9 +36698,9 @@ tAk
 tAk
 tAk
 tAk
-hgE
-mSg
-mSg
+wBM
+sQl
+sQl
 xRj
 xRj
 xRj
@@ -36879,7 +36893,7 @@ tAk
 tAk
 tAk
 tAk
-mSg
+sQl
 xRj
 xRj
 xRj
@@ -37073,7 +37087,7 @@ tAk
 tAk
 tAk
 eiz
-mSg
+sQl
 nof
 xRj
 xRj
@@ -37267,7 +37281,7 @@ xxD
 xxD
 kwV
 fIt
-mSg
+sQl
 xRj
 xRj
 xRj
@@ -37461,7 +37475,7 @@ tAk
 tAk
 nei
 tAk
-mSg
+sQl
 usG
 fOo
 xRj
@@ -37655,7 +37669,7 @@ tMy
 yiH
 nei
 tAk
-mSg
+sQl
 usY
 usG
 xRj
@@ -37849,7 +37863,7 @@ nwz
 njW
 nei
 tAk
-mSg
+sQl
 usG
 fOo
 xRj
@@ -38043,7 +38057,7 @@ nKO
 uRE
 nei
 tAk
-mSg
+sQl
 xRj
 xRj
 xRj
@@ -38237,7 +38251,7 @@ eCo
 uRE
 nei
 tAk
-mSg
+sQl
 xRj
 xRj
 xRj
@@ -38431,7 +38445,7 @@ iPS
 eJe
 nei
 fIt
-mSg
+sQl
 xRj
 xRj
 xRj
@@ -38625,7 +38639,7 @@ yiH
 pCg
 nei
 tAk
-mSg
+sQl
 xRj
 xRj
 jNg
@@ -38819,7 +38833,7 @@ uFy
 tAk
 nei
 tAk
-mSg
+sQl
 nof
 xRj
 jNg
@@ -39013,7 +39027,7 @@ yiH
 pbi
 nei
 eiz
-mSg
+sQl
 xRj
 xRj
 jNg
@@ -39207,7 +39221,7 @@ uFy
 tAk
 nei
 tAk
-mSg
+sQl
 xRj
 xRj
 jNg
@@ -39401,7 +39415,7 @@ yiH
 tAk
 nei
 tAk
-mSg
+sQl
 xRj
 xRj
 jNg
@@ -39595,7 +39609,7 @@ yiH
 tAk
 nei
 tAk
-mSg
+sQl
 xRj
 xRj
 jNg
@@ -39788,8 +39802,8 @@ kfH
 oeE
 tAk
 nei
-hgE
-mSg
+wBM
+sQl
 xRj
 xRj
 jNg
@@ -39982,8 +39996,8 @@ ert
 tAk
 tAk
 nei
-hgE
-mSg
+wBM
+sQl
 xRj
 xRj
 xRj
@@ -40149,7 +40163,7 @@ wTD
 wTD
 wTD
 sQR
-bLC
+reN
 rTZ
 rTZ
 sqa
@@ -40176,8 +40190,8 @@ ert
 tAk
 tAk
 nei
-hgE
-mSg
+wBM
+sQl
 xRj
 xRj
 xRj
@@ -40342,8 +40356,8 @@ wTD
 wTD
 yaG
 dvq
-wTD
-bLC
+uQm
+reN
 rTZ
 rTZ
 sjw
@@ -40370,8 +40384,8 @@ tAk
 tAk
 tAk
 nei
-hgE
-mSg
+wBM
+sQl
 xRj
 xRj
 xRj
@@ -40534,13 +40548,13 @@ mmO
 oAh
 oiy
 wkh
-vwC
-vwC
-vwC
-pWN
-pWN
-pWN
-pWN
+aNK
+aNK
+aNK
+sti
+sti
+sti
+sti
 tvS
 eFW
 eFW
@@ -40564,8 +40578,8 @@ tAk
 tAk
 tAk
 egF
-hgE
-mSg
+wBM
+sQl
 nof
 xRj
 jNg
@@ -40724,21 +40738,21 @@ uHc
 maw
 pJi
 toF
-vwC
-vwC
-vwC
-vwC
-vwC
-vwC
-vwC
+aNK
+aNK
+aNK
+aNK
+aNK
+aNK
+aNK
 sWz
 efK
 wim
-pWN
+sti
 apf
 agD
 pgL
-pgL
+agD
 aqI
 cMJ
 rTZ
@@ -40758,8 +40772,8 @@ tAk
 tAk
 tAk
 nei
-hgE
-mSg
+wBM
+sQl
 xRj
 xRj
 jNg
@@ -40918,7 +40932,7 @@ epw
 iVk
 rbl
 qVN
-vwC
+aNK
 jLe
 jLe
 jLe
@@ -40929,8 +40943,8 @@ jLe
 jLe
 jLe
 fVV
-amu
-reN
+apf
+pgL
 pgL
 pgL
 eNz
@@ -40952,8 +40966,8 @@ vYA
 xxD
 xxD
 wvb
-hgE
-mSg
+wBM
+sQl
 xRj
 xRj
 jNg
@@ -41110,19 +41124,19 @@ mgA
 mgA
 fcl
 jPH
-vwC
-vwC
-vwC
+aNK
+aNK
+aNK
 jLe
 aLP
 wim
 wim
-pWN
-pWN
-pWN
-pWN
-pWN
-pWN
+sti
+sti
+sti
+sti
+sti
+sti
 amu
 pgL
 pgL
@@ -41134,23 +41148,23 @@ cMJ
 cMJ
 cMJ
 cMJ
-hgE
-hgE
-hgE
-hgE
+wBM
+wBM
+wBM
+wBM
 mFk
 qdM
 ydR
-hgE
-hgE
-hgE
-hgE
-hgE
-hgE
-hgE
-hgE
-hgE
-hgE
+wBM
+wBM
+wBM
+wBM
+wBM
+wBM
+wBM
+wBM
+wBM
+wBM
 ijU
 ijU
 ijU
@@ -41304,14 +41318,14 @@ iaB
 bMm
 cCy
 ahL
-vwC
+aNK
 efK
 efK
 jLe
 sWz
 wim
 wim
-pWN
+sti
 xvH
 clV
 sJO
@@ -41498,14 +41512,14 @@ mBH
 oXj
 flf
 cVD
-vwC
+aNK
 jLe
 jLe
 jLe
 jLe
 jLe
 wim
-pWN
+sti
 rlK
 usu
 pwe
@@ -41692,14 +41706,14 @@ juq
 opn
 jQF
 ssN
-vwC
+aNK
 jLe
 jLe
 jLe
 jLe
 jLe
 efK
-pWN
+sti
 rlK
 pNW
 iTz
@@ -41884,23 +41898,23 @@ tCz
 tCz
 nis
 bMm
-cwi
+aUH
 jWs
-vwC
+aNK
 jLe
 jLe
 jLe
-wWq
-wWq
-wWq
+aEU
+aEU
+aEU
 lDc
 iAO
 oiv
 fcG
-wWq
-wWq
-wWq
-wWq
+aEU
+aEU
+aEU
+aEU
 dZr
 dZr
 dZr
@@ -41922,11 +41936,11 @@ loX
 fhK
 fhK
 fhK
-hgE
-hgE
-hgE
-hgE
-hgE
+wBM
+wBM
+wBM
+wBM
+wBM
 ijU
 apc
 eGS
@@ -42080,11 +42094,11 @@ vpR
 hTA
 cCy
 jWs
-vwC
+aNK
 jLe
 jLe
 jLe
-wWq
+aEU
 iDg
 iDg
 lOm
@@ -42094,7 +42108,7 @@ kHh
 fVP
 iDg
 iDg
-wWq
+aEU
 dZr
 dZr
 xNI
@@ -42274,11 +42288,11 @@ brd
 hTA
 cCy
 jWs
-vwC
+aNK
 ckc
 ckc
 jLe
-wWq
+aEU
 iDg
 iDg
 dnA
@@ -42288,7 +42302,7 @@ xuO
 lOm
 iDg
 iDg
-wWq
+aEU
 dZr
 dZr
 xNI
@@ -42468,12 +42482,12 @@ vpR
 hTA
 cCy
 jWs
-vwC
-vwC
-vwC
+aNK
+aNK
+aNK
 fVV
-wWq
-wWq
+aEU
+aEU
 wXu
 mMw
 cUW
@@ -42481,8 +42495,8 @@ rAN
 gKk
 vRx
 wXu
-wWq
-wWq
+aEU
+aEU
 nCl
 dZr
 xao
@@ -43478,7 +43492,7 @@ fhK
 fhK
 fhK
 fhK
-fhK
+gOX
 lhS
 qfY
 vYM
@@ -43631,7 +43645,7 @@ ffU
 qTj
 bMm
 tGb
-idu
+cqc
 cqc
 mAo
 owg
@@ -44018,9 +44032,9 @@ gGO
 cgw
 qvM
 bMm
+wzh
 tfY
 cqc
-cqc
 fFk
 fnJ
 dOv
@@ -44213,8 +44227,8 @@ ugn
 bmL
 qTj
 gPV
-efK
-vwC
+wim
+aNK
 xfm
 ovq
 rmX
@@ -44408,7 +44422,7 @@ emL
 qTj
 gPV
 wim
-vwC
+aNK
 phl
 fnJ
 oxV
@@ -44796,7 +44810,7 @@ qTj
 qTj
 gPV
 wim
-vwC
+aNK
 ojQ
 fnJ
 oxV
@@ -44990,7 +45004,7 @@ wim
 wim
 gPV
 wim
-vwC
+aNK
 pvA
 dkB
 oxV
@@ -45006,7 +45020,7 @@ hDt
 axR
 nVE
 iYr
-aEU
+dJe
 dJe
 dJe
 dJe
@@ -45184,7 +45198,7 @@ wim
 ibx
 sjt
 wim
-vwC
+aNK
 uqH
 dth
 oxV
@@ -45200,7 +45214,7 @@ piy
 cHu
 oHo
 vIw
-aEU
+dJe
 eYV
 eYV
 vpK
@@ -45225,7 +45239,7 @@ dIw
 dIw
 bci
 bci
-vwC
+aNK
 aLP
 mqa
 wim
@@ -45378,7 +45392,7 @@ wim
 gPV
 wim
 wim
-vwC
+aNK
 qXN
 dth
 oxV
@@ -45394,7 +45408,7 @@ xLn
 ioz
 lAz
 trN
-aEU
+dJe
 pFN
 rEv
 eYV
@@ -45419,7 +45433,7 @@ dIw
 dIw
 bci
 bci
-vwC
+aNK
 aLP
 wim
 wim
@@ -45572,7 +45586,7 @@ wim
 gPV
 wim
 aLP
-vwC
+aNK
 bRG
 pDa
 trw
@@ -45588,7 +45602,7 @@ piy
 nxJ
 qAf
 dLH
-aEU
+dJe
 vuf
 eYV
 pbT
@@ -45613,13 +45627,13 @@ dIw
 dIw
 bci
 bci
-vwC
+aNK
 aLP
 wim
 wim
 wim
 uTl
-wwG
+nct
 syO
 wBM
 usY
@@ -45766,7 +45780,7 @@ wim
 gPV
 wim
 wim
-vwC
+aNK
 xdS
 mHv
 aEv
@@ -45782,7 +45796,7 @@ piy
 axR
 sNQ
 kNE
-aEU
+dJe
 sja
 eYV
 eYV
@@ -45813,7 +45827,7 @@ jLe
 jLe
 jLe
 uTl
-nAF
+nct
 ddG
 wBM
 usG
@@ -45960,7 +45974,7 @@ wim
 gPV
 wim
 wim
-vwC
+aNK
 ojQ
 vmH
 sUh
@@ -45976,7 +45990,7 @@ piy
 pfG
 nUI
 yiz
-aEU
+dJe
 lkN
 eYV
 eYV
@@ -46001,7 +46015,7 @@ bci
 bci
 bci
 bci
-vwC
+aNK
 ckz
 sSQ
 gEQ
@@ -46154,7 +46168,7 @@ wim
 gPV
 wim
 wim
-vwC
+aNK
 fFk
 mlQ
 qMB
@@ -46170,7 +46184,7 @@ piy
 axR
 vEK
 qzv
-aEU
+dJe
 oAT
 eYV
 eYV
@@ -46195,7 +46209,7 @@ dPQ
 dPQ
 dPQ
 hrC
-vwC
+aNK
 aLP
 aLP
 irX
@@ -46348,11 +46362,11 @@ wim
 gPV
 wim
 wim
-vwC
+aNK
 ojQ
 mlQ
 qMB
-vwC
+aNK
 jLe
 ciZ
 jLe
@@ -46360,11 +46374,11 @@ jLe
 wim
 wim
 wim
-vwC
+aNK
 cHu
 vEK
 qzv
-aEU
+dJe
 qtu
 kvM
 xdJ
@@ -46389,7 +46403,7 @@ bci
 bci
 bci
 sUx
-vwC
+aNK
 aLP
 aLP
 wim
@@ -46542,11 +46556,11 @@ aNK
 wHj
 aNK
 aNK
-vwC
+aNK
 vEN
 mlQ
 qMB
-vwC
+aNK
 wim
 wim
 wim
@@ -46558,7 +46572,7 @@ nzK
 lPB
 vEK
 qzv
-aEU
+dJe
 dJe
 dJe
 dJe
@@ -46572,18 +46586,18 @@ dJe
 dJe
 dJe
 dJe
-vwC
+aNK
 fVV
-vwC
-vwC
-vwC
-vwC
-vwC
-vwC
-vwC
-vwC
-vwC
-vwC
+aNK
+aNK
+aNK
+aNK
+aNK
+aNK
+aNK
+aNK
+aNK
+aNK
 aNK
 aNK
 aNK
@@ -46736,19 +46750,19 @@ etS
 gPV
 iMr
 wim
-vwC
+aNK
 trx
 jlN
 cNT
-vwC
-vwC
-vwC
-vwC
-vwC
-vwC
-vwC
-vwC
-vwC
+aNK
+aNK
+aNK
+aNK
+aNK
+aNK
+aNK
+aNK
+aNK
 ffi
 cVp
 uUX
@@ -47124,7 +47138,7 @@ etS
 gPV
 wim
 wim
-vwC
+aNK
 phl
 mlQ
 aIU
@@ -47156,9 +47170,9 @@ iHc
 dsD
 dsD
 dsD
-wUJ
-wUJ
-wUJ
+oxc
+oxc
+oxc
 oxc
 oxc
 oxc
@@ -47318,18 +47332,18 @@ etS
 cpU
 wim
 wLB
-vwC
+aNK
 nuG
 aSA
 ngG
 wpv
-jMU
-jMU
-jMU
-jMU
-jMU
+pEr
+pEr
+pEr
+pEr
+pEr
 qTR
-jMU
+pEr
 xtn
 axR
 vEK
@@ -47512,19 +47526,19 @@ etS
 cpU
 wim
 wim
-vwC
-vwC
+aNK
+aNK
 vEN
 vHL
 bdJ
-jMU
+pEr
 rGD
 heq
 heq
 heq
 sxY
 pPL
-jMU
+pEr
 axR
 vEK
 doZ
@@ -47707,11 +47721,11 @@ qzh
 wim
 wim
 wim
-vwC
+aNK
 bRG
 vHL
 bdJ
-jMU
+pEr
 kgt
 pEr
 pEr
@@ -47901,18 +47915,18 @@ wim
 wim
 wim
 wim
-vwC
+aNK
 fFk
 dkq
 bdJ
-jMU
+pEr
 vBH
 etW
 pEr
 wAt
 pPL
 pPL
-jMU
+pEr
 cHu
 vEK
 iuy
@@ -47932,16 +47946,16 @@ gVv
 sfX
 sLI
 dsD
-wUJ
-wUJ
-wUJ
-wUJ
-wUJ
-wUJ
+oxc
+oxc
+oxc
+oxc
+oxc
+oxc
 yjC
-wUJ
-wUJ
-wUJ
+oxc
+oxc
+oxc
 vca
 dIm
 uze
@@ -48095,11 +48109,11 @@ jLe
 jLe
 jLe
 eca
-vwC
+aNK
 phl
 vHL
 bdJ
-jMU
+pEr
 vDR
 hWC
 vRj
@@ -48300,7 +48314,7 @@ pEr
 mWe
 cGJ
 qfo
-jMU
+pEr
 aFB
 wmH
 jeN
@@ -48487,15 +48501,15 @@ npN
 ojQ
 vHL
 bdJ
-jMU
+pEr
 pEr
 pEr
 pEr
 kWt
 nQy
 pEr
-jMU
-jMU
+pEr
+pEr
 jTT
 cdv
 qLH
@@ -48677,11 +48691,11 @@ wim
 wim
 wim
 wim
-vwC
+aNK
 uqH
 nYu
 flH
-jMU
+pEr
 cSr
 pPL
 pPL
@@ -48871,11 +48885,11 @@ wim
 wim
 wim
 wim
-vwC
+aNK
 pKc
 iCH
 hJZ
-jMU
+pEr
 sQy
 sQy
 sQy
@@ -48883,7 +48897,7 @@ wsZ
 uQz
 sQy
 eGo
-jMU
+pEr
 jkq
 lxY
 sxq
@@ -49065,19 +49079,19 @@ wim
 wim
 wim
 wim
-vwC
+aNK
 sYx
 sXO
 xEy
-jMU
-jMU
-jMU
-jMU
+pEr
+pEr
+pEr
+pEr
 aYQ
-jMU
-jMU
-jMU
-jMU
+pEr
+pEr
+pEr
+pEr
 eTb
 rqe
 nXJ
@@ -50837,16 +50851,16 @@ dsD
 erf
 pkW
 dsD
-wUJ
+oxc
 lZv
-wUJ
-wUJ
-wUJ
-wUJ
+oxc
+oxc
+oxc
+oxc
 leq
-wUJ
-wUJ
-wUJ
+oxc
+oxc
+oxc
 nZR
 pdu
 ucD
@@ -51040,7 +51054,7 @@ llV
 mWz
 vJi
 kNi
-wUJ
+oxc
 uze
 pdu
 ucD
@@ -51203,7 +51217,7 @@ mYH
 jie
 xOD
 wNy
-wUJ
+oxc
 uze
 uze
 uze
@@ -51211,7 +51225,7 @@ sTF
 uze
 uze
 uze
-wUJ
+oxc
 hYA
 uZh
 rCE
@@ -51229,12 +51243,12 @@ jXs
 qke
 qke
 qke
-aGG
 pql
+aGG
 iUW
 sAT
 lSz
-wUJ
+oxc
 ckq
 pdu
 ucD
@@ -51397,7 +51411,7 @@ mYH
 veS
 dkq
 wNy
-wUJ
+oxc
 dqm
 whp
 whp
@@ -51405,7 +51419,7 @@ xTY
 uze
 uze
 fAe
-wUJ
+oxc
 hvO
 fyb
 rCE
@@ -51428,7 +51442,7 @@ xUN
 dJH
 mYF
 jJh
-wUJ
+oxc
 eza
 pdu
 ucD
@@ -51591,7 +51605,7 @@ aFa
 gDF
 reM
 hev
-wUJ
+oxc
 sTF
 uze
 uze
@@ -51599,7 +51613,7 @@ uze
 fAe
 oxc
 oxc
-wUJ
+oxc
 grq
 oNH
 lMT
@@ -51785,7 +51799,7 @@ aFa
 qOD
 xgi
 sOS
-txk
+bjg
 nOh
 bjg
 bjg
@@ -51794,7 +51808,7 @@ bjg
 bjg
 iLD
 iLD
-txk
+bjg
 gpc
 xHM
 ptG
@@ -51979,7 +51993,7 @@ fBm
 hWM
 xgi
 iVd
-txk
+bjg
 lkX
 uWM
 bjg
@@ -51988,7 +52002,7 @@ iLD
 iLD
 iLD
 iLD
-txk
+bjg
 hRp
 rCE
 ycC
@@ -52173,7 +52187,7 @@ xHh
 nRa
 kef
 xRT
-txk
+bjg
 rHo
 eVc
 rqD
@@ -52367,7 +52381,7 @@ mmC
 kEh
 qcV
 vGD
-txk
+bjg
 eyU
 ybg
 bjg
@@ -52376,7 +52390,7 @@ tWk
 iLD
 iLD
 ojn
-txk
+bjg
 vDK
 rCE
 lSz
@@ -52552,7 +52566,7 @@ wim
 fZy
 hpw
 sYy
-sYy
+cwi
 nLW
 dMa
 har
@@ -52561,16 +52575,16 @@ enD
 tOv
 atm
 mYb
-txk
-txk
-txk
-txk
+bjg
+bjg
+bjg
+bjg
 hfQ
 eAL
-txk
-txk
-txk
-txk
+bjg
+bjg
+bjg
+bjg
 yaO
 oPk
 nqO
@@ -52746,7 +52760,7 @@ wim
 fZy
 gdn
 dMa
-dMa
+wwG
 xoZ
 dMa
 fix
@@ -53130,7 +53144,7 @@ wim
 wim
 wim
 kQd
-vwC
+aNK
 fZy
 fZy
 mWX
@@ -53738,7 +53752,7 @@ nAf
 jLq
 jwq
 lSz
-wUJ
+oxc
 uze
 uze
 uze
@@ -53924,15 +53938,15 @@ gnr
 hEs
 tTD
 tTD
-bNR
+idu
 gnD
-bNR
+idu
 jrd
 nAf
 jLq
 sCh
 uXz
-wUJ
+oxc
 uze
 nZR
 uze
@@ -54320,7 +54334,7 @@ nAf
 gJc
 sCh
 cSo
-wUJ
+oxc
 oxc
 oxc
 oxc
@@ -54514,7 +54528,7 @@ gAA
 jFy
 fVc
 hYM
-wUJ
+oxc
 uze
 uze
 uze
@@ -56427,7 +56441,7 @@ maa
 byt
 kfn
 nka
-afX
+cEb
 dIE
 pGO
 job
@@ -56634,17 +56648,17 @@ cEb
 sQg
 gBE
 acA
-ogT
-ogT
-ogT
-ogT
-ogT
-ogT
-ogT
-ogT
-ogT
-ogT
-ogT
+uTr
+uTr
+uTr
+uTr
+uTr
+uTr
+uTr
+uTr
+uTr
+uTr
+uTr
 ubV
 xSm
 vik
@@ -56815,7 +56829,7 @@ maa
 maa
 byt
 nka
-afX
+cEb
 dIE
 pGO
 job
@@ -56838,11 +56852,11 @@ maa
 maa
 maa
 maa
-ogT
+uTr
 gJc
 rCE
 lSz
-ogT
+uTr
 maa
 maa
 maa
@@ -57036,7 +57050,7 @@ cfl
 nrF
 rCE
 lSz
-ogT
+uTr
 maa
 maa
 maa
@@ -57216,21 +57230,21 @@ cEb
 hYO
 bHE
 aRA
-ogT
-ogT
+uTr
+uTr
 byt
 xTb
 tjQ
 tjQ
 tjQ
 oiK
-ogT
-ogT
+uTr
+uTr
 apW
 eez
-gOX
-kiC
-ogT
+rCE
+lSz
+pWN
 byt
 byt
 byt
@@ -57238,12 +57252,12 @@ byt
 byt
 byt
 maa
-ogT
-ogT
+uTr
+uTr
 nuQ
 wiE
-ogT
-mSg
+ris
+sQl
 xRj
 xRj
 xRj
@@ -57396,7 +57410,7 @@ ris
 maa
 maa
 byt
-ogT
+uTr
 svt
 svt
 svt
@@ -57407,25 +57421,25 @@ svt
 svt
 svt
 svt
-uvX
+hYO
 vEP
 cQC
 ydG
-ogT
+uTr
 maa
 xqf
 maa
 byt
 byt
 dNZ
-ogT
+uTr
 eGI
 uAt
 koX
 bAu
 vsG
-ogT
-maa
+uTr
+byt
 maa
 maa
 kfn
@@ -57437,7 +57451,7 @@ pvj
 oSJ
 pvj
 hSh
-mSg
+sQl
 xRj
 xRj
 xRj
@@ -57601,24 +57615,24 @@ xJZ
 xGd
 kNV
 svt
-sZv
+hYO
 hZy
 vwv
 mne
-ogT
+uTr
 maa
 vlU
 maa
 byt
 byt
 maa
-ogT
+uTr
 iXX
 ikY
 xeT
 cxE
 cVc
-ogT
+uTr
 pQQ
 maa
 maa
@@ -57626,12 +57640,12 @@ maa
 maa
 fta
 maa
-ogT
+uTr
 uNS
 hqs
 aMl
 lGw
-mSg
+sQl
 xRj
 xRj
 xRj
@@ -57784,7 +57798,7 @@ ris
 sIg
 byt
 maa
-ogT
+uTr
 xGd
 xJZ
 xJZ
@@ -57795,24 +57809,24 @@ xJZ
 xJZ
 xJZ
 aEK
-gnm
+wEG
 bve
 kah
 mne
-ogT
+uTr
 maa
 vlU
 maa
 maa
 maa
 maa
-ogT
+uTr
 tdX
 jGp
 hYj
 fmw
 xpv
-ogT
+uTr
 maa
 maa
 kfn
@@ -57820,12 +57834,12 @@ kZn
 maa
 fta
 maa
-ogT
+uTr
 ipU
 qSG
 cXD
 lGw
-mSg
+sQl
 nof
 xRj
 xRj
@@ -57978,35 +57992,35 @@ ris
 uTr
 izR
 uTr
-ogT
-ogT
-ogT
-ogT
-ogT
-iLb
+uTr
+uTr
+uTr
+uTr
+uTr
+pcK
 dDd
-iLb
-iLb
-iLb
-iLb
-iLb
+pcK
+pcK
+pcK
+pcK
+pcK
 nGa
 pWE
 iXl
-niH
+aLV
 stV
 kiQ
 aLV
 aLV
 aLV
 aLV
-niH
+aLV
 ulK
 mbU
 kQE
-ogT
-ogT
-ogT
+uTr
+uTr
+uTr
 uTr
 uTr
 uTr
@@ -58014,12 +58028,12 @@ uTr
 maa
 fta
 maa
-ogT
+uTr
 jmh
 veH
 aMl
 qgD
-mSg
+sQl
 xRj
 xRj
 xRj
@@ -58187,18 +58201,18 @@ snQ
 ojQ
 oXb
 lJy
-niH
+aLV
 wAL
 yme
 aDX
 aLV
 kYE
 hff
-niH
+aLV
 reC
 jux
 nwc
-ogT
+uTr
 pbo
 aGj
 aMl
@@ -58213,7 +58227,7 @@ aMl
 pgd
 oVi
 viz
-mSg
+sQl
 xRj
 xRj
 xRj
@@ -58381,18 +58395,18 @@ snQ
 eCz
 kaL
 lJy
-niH
+aLV
 tzx
 lmB
 oVe
 lCd
 ghn
 meH
-niH
+aLV
 uhY
 jux
 qzr
-ogT
+uTr
 wqe
 aGj
 dam
@@ -58402,12 +58416,12 @@ uTr
 maa
 fta
 maa
-ogT
+uTr
 aMl
 aMl
 pcO
 sMI
-mSg
+sQl
 usG
 fOo
 xRj
@@ -58575,7 +58589,7 @@ kRq
 jpf
 ipM
 uwI
-niH
+aLV
 oZB
 cdx
 wmU
@@ -58586,7 +58600,7 @@ cvv
 uhY
 mRz
 pUQ
-ogT
+uTr
 aGj
 nHX
 tme
@@ -58596,12 +58610,12 @@ uTr
 maa
 fta
 maa
-ogT
+uTr
 lXo
 qXx
 uPj
 aRu
-mSg
+sQl
 usY
 usG
 xRj
@@ -58769,18 +58783,18 @@ snQ
 aSm
 oXb
 lJy
-niH
+aLV
 txl
-niH
-niH
-niH
+aLV
+aLV
+aLV
 ctS
 bBw
-niH
+aLV
 mTU
 jux
 ybU
-ogT
+uTr
 uTr
 uTr
 uTr
@@ -58790,12 +58804,12 @@ uTr
 maa
 fta
 maa
-ogT
+uTr
 vNq
 xrv
 nio
 jUZ
-mSg
+sQl
 usG
 fOo
 xRj
@@ -58984,12 +58998,12 @@ uTr
 maa
 fta
 maa
-jdq
+ris
 qtn
 xrv
 nio
 qCA
-mSg
+sQl
 xRj
 xRj
 xRj
@@ -59168,7 +59182,7 @@ aZE
 gpx
 jGp
 qzr
-ogT
+uTr
 dBa
 hfG
 uTr
@@ -59178,12 +59192,12 @@ uTr
 maa
 fta
 maa
-jdq
-jdq
+ris
+ris
 xrv
 nio
 eLZ
-mSg
+sQl
 xRj
 xRj
 xRj
@@ -59351,18 +59365,18 @@ snQ
 ojQ
 iCH
 hqh
-ogT
-ogT
-ogT
-ogT
-ogT
-ogT
-ogT
-ogT
+uTr
+uTr
+uTr
+uTr
+uTr
+uTr
+uTr
+uTr
 liZ
 aWO
 qzr
-ogT
+uTr
 uTr
 uTr
 uTr
@@ -59373,7 +59387,7 @@ maa
 fta
 maa
 maa
-jdq
+ris
 xrv
 nio
 pNM
@@ -59545,18 +59559,18 @@ snQ
 eCz
 nYu
 uJC
-ogT
+uTr
 ssc
 eFE
-ogT
+uTr
 dMB
-ogT
+uTr
 rgG
-ogT
+uTr
 gQH
 kDV
 uXy
-ogT
+uTr
 maa
 maa
 maa
@@ -59567,7 +59581,7 @@ maa
 fta
 maa
 sIg
-jdq
+ris
 suQ
 kwn
 bkf
@@ -59740,13 +59754,13 @@ cBN
 kWj
 jlS
 vso
-ogT
+uTr
 rba
-ogT
+uTr
 rqv
-ogT
+uTr
 rqv
-ogT
+uTr
 mEr
 aWe
 jux
@@ -59761,11 +59775,11 @@ byt
 fta
 uTr
 uTr
-jdq
-jdq
-jdq
-jdq
-mSg
+ris
+ris
+ris
+ris
+sQl
 nof
 xRj
 xRj
@@ -59933,18 +59947,18 @@ snQ
 aSm
 vHL
 qek
-ogT
+uTr
 rui
 pjd
 pjd
 pjd
 uqY
 qsG
-ogT
+uTr
 rfe
 sdj
 oJK
-ogT
+uTr
 maa
 maa
 maa
@@ -60130,15 +60144,15 @@ hhr
 aLm
 sIK
 eFE
-ogT
+uTr
 eFE
-ogT
+uTr
 eFE
 cXS
 oWx
 bAu
 itm
-ogT
+uTr
 iLP
 tlI
 tlI
@@ -60321,18 +60335,18 @@ wrE
 dBE
 tOJ
 bOP
-ogT
+uTr
 vaT
 xAa
-ogT
+uTr
 qtB
 nUC
-ogT
-ogT
+uTr
+uTr
 oxe
 gaI
 aJX
-ogT
+uTr
 maa
 maa
 maa
@@ -60511,22 +60525,22 @@ qJU
 qJU
 byt
 uTr
-ogT
+uTr
 rAx
 vHL
 pWz
-ogT
-ogT
-ogT
-ogT
-ogT
-ogT
-ogT
+uTr
+uTr
+uTr
+uTr
+uTr
+uTr
+uTr
 vBg
 koX
 fcc
 vsG
-ogT
+uTr
 maa
 kZn
 kfn
@@ -60696,7 +60710,7 @@ jNg
 skI
 kab
 avM
-qnv
+aVJ
 cAF
 uDt
 xNZ
@@ -60705,7 +60719,7 @@ mIj
 qJU
 byt
 maa
-ogT
+uTr
 aHu
 jHq
 fbD
@@ -60720,7 +60734,7 @@ uJk
 oWx
 tvd
 xpv
-ogT
+uTr
 uTr
 uTr
 uTr
@@ -60899,8 +60913,8 @@ xPF
 qJU
 byt
 maa
-ogT
-ogT
+uTr
+uTr
 aUL
 jTR
 pKV
@@ -60913,8 +60927,8 @@ qyL
 bdP
 lJv
 qJY
-ogT
-ogT
+uTr
+uTr
 maa
 bFR
 maa
@@ -61083,10 +61097,10 @@ xRj
 xRj
 skI
 tps
+dZQ
+snk
 xlX
 xlX
-wEG
-xlX
 pgc
 xQD
 jbd
@@ -61094,7 +61108,7 @@ qJU
 aCy
 kfn
 maa
-ogT
+uTr
 nMe
 bwE
 rVd
@@ -61288,7 +61302,7 @@ qJU
 byt
 maa
 pQQ
-ogT
+uTr
 mJc
 nxf
 sDJ
@@ -61470,11 +61484,11 @@ xRj
 xRj
 xRj
 skI
-kab
+dSn
 lKq
 qnv
-cgB
 qnv
+cgB
 qnv
 xUH
 jlr
@@ -61482,7 +61496,7 @@ qJU
 byt
 rDe
 maa
-ogT
+uTr
 lUE
 cDX
 pQg
@@ -61495,7 +61509,7 @@ qyL
 rwP
 mHc
 wVF
-ogT
+uTr
 pQQ
 maa
 maa
@@ -61676,7 +61690,7 @@ qJU
 byt
 uTr
 uTr
-ogT
+uTr
 xGj
 cDX
 pQg
@@ -61689,7 +61703,7 @@ tuO
 uJk
 oWx
 kta
-ogT
+uTr
 maa
 kfn
 maa
@@ -61870,7 +61884,7 @@ blR
 byt
 maa
 kfn
-ogT
+uTr
 mER
 xwO
 pQg
@@ -61883,7 +61897,7 @@ lUh
 etr
 oWx
 prV
-ogT
+uTr
 maa
 byt
 byt
@@ -62064,7 +62078,7 @@ blR
 byt
 maa
 sIg
-ogT
+uTr
 aiX
 jfK
 hlO
@@ -62077,7 +62091,7 @@ nlF
 xem
 fqL
 kta
-ogT
+uTr
 maa
 byt
 maa
@@ -62258,7 +62272,7 @@ blR
 izR
 uTr
 uTr
-ogT
+uTr
 nuG
 khU
 vvR
@@ -62271,7 +62285,7 @@ tGh
 bwp
 mZA
 mpa
-ogT
+uTr
 byt
 byt
 kfn
@@ -62452,20 +62466,20 @@ blR
 byt
 xFb
 qZT
-ogT
-ogT
-wWq
-wWq
-wWq
+uTr
+uTr
+aEU
+aEU
+aEU
 vRx
 vmD
 qcd
 jlB
-wWq
-wWq
-wWq
-wWq
-ogT
+aEU
+aEU
+aEU
+aEU
+uTr
 izR
 uTr
 uTr
@@ -62648,7 +62662,7 @@ byt
 byt
 cSl
 byt
-wWq
+aEU
 iDg
 iDg
 uBH
@@ -62658,7 +62672,7 @@ eDl
 oQJ
 iDg
 iDg
-wWq
+aEU
 byt
 byt
 fvr
@@ -62852,7 +62866,7 @@ eDl
 uBH
 iDg
 iDg
-wWq
+aEU
 maa
 maa
 maa
@@ -63037,16 +63051,16 @@ jWo
 kEl
 xkO
 iBH
-wWq
-wWq
-wWq
+aEU
+aEU
+aEU
 eDl
 uhG
 eDl
 vRx
-wWq
-wWq
-wWq
+aEU
+aEU
+aEU
 teS
 kfn
 maa
@@ -63233,14 +63247,14 @@ nFc
 iBH
 srV
 vBK
-wWq
+aEU
 wyY
 uhG
 eDl
 fND
 srV
 srV
-wWq
+aEU
 maa
 sIg
 maa
@@ -63427,14 +63441,14 @@ kdX
 iBH
 srV
 srV
-wWq
+aEU
 hBB
 uhG
 xYV
 wWq
 srV
 vBK
-wWq
+aEU
 tve
 ugo
 ugo
diff --git a/maps/endeavour/levels/deck2.dmm b/maps/endeavour/levels/deck2.dmm
index 47802fa2adb3..3b70c7eb1a74 100644
--- a/maps/endeavour/levels/deck2.dmm
+++ b/maps/endeavour/levels/deck2.dmm
@@ -3184,14 +3184,13 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/glass/medical/polarized{
-	req_one_access = null;
-	name = "Operating Theatre 2";
-	id_tint = "or2"
-	},
 /obj/map_helper/electrochromatic_linker{
 	id = "or2"
 	},
+/obj/machinery/door/airlock/medical{
+	name = "Operating Theatre 2";
+	req_one_access = null
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
 "cbh" = (
@@ -4800,7 +4799,8 @@
 /area/medical/virology)
 "ddG" = (
 /obj/machinery/smartfridge/chemistry/chemvator{
-	name = "\improper Smart Chemavator"
+	name = "\improper Smart Chemavator";
+	desc = "A refrigerated storage unit for medicine and chemical storage."
 	},
 /turf/simulated/wall,
 /area/medical/chemistry)
@@ -4932,7 +4932,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/structure/dispenser/oxygen,
+/obj/machinery/vending/medical,
 /turf/simulated/floor/tiled,
 /area/medical/medbay_primary_storage)
 "djp" = (
@@ -5169,6 +5169,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/medbreak)
 "drp" = (
@@ -8167,6 +8170,12 @@
 /obj/structure/bed/chair/sofa/beige/left{
 	dir = 8
 	},
+/obj/machinery/button/windowtint{
+	dir = 6;
+	id = "medbreak";
+	pixel_x = 24;
+	pixel_y = -8
+	},
 /turf/simulated/floor/carpet/blucarpet,
 /area/crew_quarters/medbreak)
 "fjt" = (
@@ -8220,13 +8229,17 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor,
 /obj/map_helper/access_helper/airlock/station/medical/department,
-/obj/machinery/door/airlock/glass/medical{
-	name = "Medical Breakroom"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
 /obj/effect/floor_decal/spline/fancy/wood,
+/obj/machinery/door/airlock/medical{
+	name = "Medical Breakroom";
+	req_one_access = null
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/medbreak)
 "flY" = (
@@ -8685,6 +8698,9 @@
 	dir = 8;
 	icon_state = "pipe-c"
 	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay3)
 "fDp" = (
@@ -9537,14 +9553,13 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/glass/medical/polarized{
-	req_one_access = null;
-	name = "Operating Theatre 1";
-	id_tint = "or1"
-	},
 /obj/map_helper/electrochromatic_linker{
 	id = "or1"
 	},
+/obj/machinery/door/airlock/medical{
+	name = "Operating Theatre 1";
+	req_one_access = null
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgeryprep)
 "gao" = (
@@ -10068,6 +10083,9 @@
 	dir = 8;
 	light_range = 12
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2fwdhall)
 "gtH" = (
@@ -10583,12 +10601,13 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/medical_science)
 "gKL" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
 	},
+/obj/machinery/fire_alarm/north_mount,
 /turf/simulated/floor/wood,
 /area/crew_quarters/medbreak)
 "gKZ" = (
@@ -11078,6 +11097,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/medbreak)
 "hce" = (
@@ -11596,6 +11618,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/air_alarm{
+	pixel_y = 22
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/medbreak)
 "hoX" = (
@@ -11875,8 +11900,13 @@
 /turf/simulated/floor/plating,
 /area/rnd/workshop)
 "hxs" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/effect/paint/babyblue,
+/obj/structure/window/reinforced/polarized/full{
+	id = "exam_1"
+	},
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
 /area/medical/exam_room/exam_1)
 "hxy" = (
@@ -12379,7 +12409,7 @@
 	dir = 1
 	},
 /obj/structure/cable/green{
-	icon_state = "1-4"
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay3)
@@ -12494,7 +12524,7 @@
 /area/rnd/xenobiology/xenoflora/lab_atmos)
 "hQy" = (
 /obj/machinery/computer/ship/navigation/telescreen{
-	pixel_x = -32
+	pixel_x = 32
 	},
 /turf/simulated/floor/tiled,
 /area/medical/medbay_primary_storage)
@@ -12762,6 +12792,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/medbreak)
 "idK" = (
@@ -12982,7 +13015,6 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
-/obj/item/barrier_tape_segment/engineering,
 /turf/simulated/floor/tiled,
 /area/medical/medbay_primary_storage)
 "ijZ" = (
@@ -13186,6 +13218,12 @@
 	pixel_x = -26;
 	pixel_y = -4
 	},
+/obj/machinery/button/windowtint{
+	dir = 8;
+	id = "oncall";
+	pixel_x = -26;
+	pixel_y = 6
+	},
 /turf/simulated/floor/wood,
 /area/medical/oncall_room)
 "iro" = (
@@ -13846,13 +13884,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora/lab_atmos)
-"iNn" = (
-/obj/effect/floor_decal/spline/fancy/wood,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/carpet/blucarpet,
-/area/crew_quarters/medbreak)
 "iNo" = (
 /obj/spawner/window/low_wall/reinforced/full,
 /obj/machinery/door/blast/regular{
@@ -14102,9 +14133,6 @@
 /obj/item/storage/box/donkpockets{
 	pixel_y = 4
 	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/medbreak)
 "iWo" = (
@@ -14485,7 +14513,7 @@
 /turf/simulated/floor/tiled,
 /area/rnd/reception_desk)
 "jlP" = (
-/obj/machinery/vending/medical,
+/obj/structure/dispenser/oxygen,
 /turf/simulated/floor/tiled,
 /area/medical/medbay_primary_storage)
 "jlX" = (
@@ -14896,8 +14924,12 @@
 /area/endeavour/hallway/d2fwdmaint)
 "jym" = (
 /obj/effect/paint/babyblue,
-/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
-/obj/effect/paint/babyblue,
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/obj/structure/window/reinforced/polarized/full{
+	id = "oncall"
+	},
 /turf/simulated/floor/plating,
 /area/medical/oncall_room)
 "jyt" = (
@@ -16426,11 +16458,11 @@
 /obj/effect/floor_decal/corner/navgold/border{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d1starboardafthall)
@@ -17311,6 +17343,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2fwdhall)
 "lcu" = (
@@ -17454,9 +17489,9 @@
 /obj/machinery/power/apc/east_mount,
 /obj/machinery/button/windowtint{
 	dir = 8;
-	id = "ward_a";
 	pixel_x = 24;
-	pixel_y = 24
+	pixel_y = 24;
+	id = "ward_a"
 	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
@@ -19907,22 +19942,14 @@
 /obj/machinery/camera/network/civilian{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2fwdhall)
 "mSd" = (
 /turf/simulated/floor/tiled/dark,
 /area/endeavour/hallway/d2portafthall)
-"mSe" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d1starboardafthall)
 "mSK" = (
 /obj/machinery/computer/timeclock/premade/south,
 /obj/effect/floor_decal/borderfloorblack,
@@ -20422,9 +20449,6 @@
 "nho" = (
 /obj/structure/table/woodentable,
 /obj/item/book/manual/medical_diagnostics_manual,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /turf/simulated/floor/carpet/blucarpet,
 /area/crew_quarters/medbreak)
 "nhq" = (
@@ -20617,6 +20641,9 @@
 /obj/effect/floor_decal/corner/navgold/bordercorner{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2fwdhall)
 "nrZ" = (
@@ -23432,6 +23459,9 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/medbreak)
 "pbm" = (
@@ -24330,6 +24360,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
+"pBD" = (
+/obj/machinery/smartfridge{
+	accepted_types = list(/obj/item);
+	desc = "A wall-mounted refrigerated storage unit. Should keep your food fresh until lunchtime."
+	},
+/turf/simulated/wall/prepainted/medical,
+/area/crew_quarters/medical_restroom)
 "pBG" = (
 /obj/structure/closet/crate,
 /obj/item/grenade/chem_grenade,
@@ -24771,8 +24808,13 @@
 /turf/simulated/floor/tiled,
 /area/holodeck_control)
 "pNT" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/effect/paint/babyblue,
+/obj/structure/window/reinforced/polarized/full{
+	id = "ward_b"
+	},
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
 /area/medical/patient_b)
 "pNX" = (
@@ -25084,6 +25126,9 @@
 "pVI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/medbreak)
 "pVT" = (
@@ -25587,7 +25632,7 @@
 /obj/machinery/door/firedoor/glass{
 	dir = 4
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/white,
 /area/medical/virology_fore_access)
 "qjz" = (
 /obj/effect/floor_decal/borderfloorblack{
@@ -26211,23 +26256,23 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d2aftmaint)
 "qBq" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/obj/effect/paint/babyblue,
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 1
 	},
-/turf/simulated/floor/plating,
-/area/crew_quarters/medbreak)
-"qCG" = (
-/obj/structure/cable{
+/obj/effect/floor_decal/corner/paleblue/border{
+	dir = 1
+	},
+/obj/effect/floor_decal/borderfloorwhite/corner2{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/paleblue/bordercorner2{
+	dir = 4
+	},
+/obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/navgold/border,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d1starboardafthall)
+/turf/simulated/floor/tiled/white,
+/area/medical/medbay3)
 "qCZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -26989,8 +27034,13 @@
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "qZA" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/effect/paint/babyblue,
+/obj/structure/window/reinforced/polarized/full{
+	id = "ward_c"
+	},
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
 /area/medical/patient_c)
 "rau" = (
@@ -27088,6 +27138,16 @@
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/rnd/reception_desk)
+"rbX" = (
+/obj/effect/paint/babyblue,
+/obj/structure/window/reinforced/polarized/full{
+	id = "oncall"
+	},
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/medical/oncall_room)
 "rcb" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
 	dir = 8
@@ -27098,10 +27158,6 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/surgery)
 "rci" = (
-/obj/machinery/air_alarm{
-	dir = 1;
-	pixel_y = -22
-	},
 /obj/machinery/vending/cola,
 /turf/simulated/floor/wood,
 /area/crew_quarters/medbreak)
@@ -28346,7 +28402,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/space/basic,
+/turf/simulated/floor/plating,
 /area/endeavour/hallway/d2aftmaint)
 "rUx" = (
 /obj/effect/floor_decal/borderfloorwhite{
@@ -29786,23 +29842,10 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portforhall)
 "sUg" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/medical{
-	name = "Rest Room";
-	req_one_access = null
-	},
-/obj/map_helper/access_helper/airlock/station/medical/department,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 1
 	},
-/turf/simulated/floor/wood,
+/turf/simulated/wall/prepainted/medical,
 /area/crew_quarters/medbreak)
 "sUx" = (
 /obj/structure/disposalpipe/segment,
@@ -30631,8 +30674,13 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d2afthall)
 "twc" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/effect/paint/babyblue,
+/obj/structure/window/reinforced/polarized/full{
+	id = "ward_a"
+	},
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
 /area/medical/patient_a)
 "twx" = (
@@ -31013,9 +31061,6 @@
 /obj/item/storage/box/cups{
 	pixel_y = 5
 	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /turf/simulated/floor/carpet/blucarpet,
 /area/crew_quarters/medbreak)
 "tIG" = (
@@ -31532,6 +31577,9 @@
 /obj/effect/floor_decal/corner/navgold/border{
 	dir = 8
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2fwdhall)
 "tZm" = (
@@ -32586,8 +32634,13 @@
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d2portamidhall)
 "uMG" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/effect/paint/babyblue,
+/obj/structure/window/reinforced/polarized/full{
+	id = "exam_2"
+	},
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
 /area/medical/exam_room/exam_2)
 "uML" = (
@@ -33377,6 +33430,9 @@
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 9
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/carpet/blucarpet,
 /area/crew_quarters/medbreak)
 "vpL" = (
@@ -33597,9 +33653,6 @@
 /turf/space/basic,
 /area/space)
 "vwR" = (
-/obj/machinery/door/airlock/maintenance/rnd{
-	req_one_access = null
-	},
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/research{
 	name = "Research Entrance"
@@ -34926,7 +34979,7 @@
 	dir = 1
 	},
 /obj/structure/cable/green{
-	icon_state = "1-2"
+	icon_state = "1-8"
 	},
 /turf/simulated/floor/carpet/blucarpet,
 /area/crew_quarters/medbreak)
@@ -36009,8 +36062,13 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/medical/morgue)
 "wRU" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/effect/paint/babyblue,
+/obj/structure/window/reinforced/polarized/full{
+	id = "medbreak"
+	},
+/obj/machinery/door/firedoor{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
 /area/crew_quarters/medbreak)
 "wSf" = (
@@ -37447,6 +37505,10 @@
 /obj/structure/bed/chair/sofa/beige{
 	dir = 8
 	},
+/obj/item/radio/intercom{
+	dir = 4;
+	pixel_x = 24
+	},
 /turf/simulated/floor/carpet/blucarpet,
 /area/crew_quarters/medbreak)
 "xLH" = (
@@ -37769,7 +37831,8 @@
 /area/medical/psych/psych_2)
 "xYH" = (
 /obj/machinery/smartfridge/chemistry/chemvator{
-	name = "\improper Smart Chemavator"
+	name = "\improper Smart Chemavator";
+	desc = "A refrigerated storage unit for medicine and chemical storage."
 	},
 /turf/simulated/wall/prepainted/medical,
 /area/medical/chemistry)
@@ -37979,15 +38042,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay4)
-"yhx" = (
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/navgold/border{
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
-/area/endeavour/hallway/d2fwdhall)
 "yhE" = (
 /obj/effect/floor_decal/industrial/warning/dust,
 /turf/simulated/floor/tiled/dark,
@@ -50858,9 +50912,9 @@ jmm
 qKw
 hXy
 qnr
-jym
+rbX
 nfS
-jym
+rbX
 fcX
 fcX
 fcX
@@ -51051,7 +51105,7 @@ yfP
 vXJ
 kqx
 hXy
-jym
+rbX
 uQM
 hrJ
 lSl
@@ -51245,7 +51299,7 @@ fwu
 ehC
 kqx
 hXy
-jym
+rbX
 kNr
 qhH
 qGj
@@ -51439,7 +51493,7 @@ yfP
 vXJ
 pHA
 hXy
-jym
+rbX
 rMO
 jHE
 eYX
@@ -54908,8 +54962,8 @@ cHC
 cHC
 oDd
 kzM
-mSe
-qCG
+cTm
+mdU
 sUg
 gKL
 pVI
@@ -55112,7 +55166,7 @@ hRR
 wEl
 lwt
 wRU
-igr
+qBq
 njG
 eTk
 klY
@@ -55303,9 +55357,9 @@ bjp
 wng
 nho
 tIq
-iNn
+sWG
 iVW
-qBq
+wRU
 hMB
 lYU
 sPx
@@ -55691,7 +55745,7 @@ pEq
 uCH
 uCH
 uCH
-uCH
+pBD
 uCH
 uCH
 rsI
@@ -68096,7 +68150,7 @@ dSt
 oZA
 cmb
 gtd
-yhx
+cmb
 mRH
 tYH
 nrD
diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm
index 85d682402049..34aa1e4a38f7 100644
--- a/maps/endeavour/levels/deck3.dmm
+++ b/maps/endeavour/levels/deck3.dmm
@@ -573,9 +573,6 @@
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "ayi" = (
-/obj/structure/closet{
-	name = "Evidence Closet"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
@@ -927,23 +924,10 @@
 /turf/simulated/floor/airless/ceiling,
 /area/endeavour/command/turrets)
 "aKD" = (
-/obj/structure/closet/crate/hydroponics{
-	desc = "All you need to start your own honey farm.";
-	name = "beekeeping crate"
-	},
-/obj/item/honey_frame,
-/obj/item/honey_frame,
-/obj/item/honey_frame,
-/obj/item/honey_frame,
-/obj/item/honey_frame,
-/obj/item/beehive_assembly,
-/obj/item/bee_smoker,
-/obj/item/bee_pack,
-/obj/item/tool/crowbar,
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lime/border,
-/turf/simulated/floor/tiled,
-/area/hydroponics)
+/obj/structure/catwalk,
+/obj/machinery/door/airlock/maintenance,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "aKK" = (
 /obj/machinery/light{
 	dir = 1
@@ -1265,16 +1249,6 @@
 /obj/map_helper/access_helper/airlock/station/security/department,
 /turf/simulated/floor/tiled/dark,
 /area/security/lobby)
-"aXn" = (
-/obj/machinery/fire_alarm/south_mount{
-	pixel_y = -25
-	},
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lime/border,
-/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
-/turf/simulated/floor/tiled,
-/area/hydroponics)
 "aXy" = (
 /obj/machinery/light{
 	dir = 1
@@ -2921,7 +2895,9 @@
 	tag = "mailroom";
 	id = "DLBelt"
 	},
-/obj/structure/plasticflaps,
+/obj/structure/plasticflaps/mining{
+	desc = "Heavy duty, airtight, plastic flaps."
+	},
 /turf/simulated/floor/plating,
 /area/quartermaster/delivery)
 "chh" = (
@@ -2977,10 +2953,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_9)
-"clL" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled,
-/area/maintenance/cargo/mining)
 "cmi" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -3429,6 +3401,10 @@
 /obj/structure/railing,
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d3aftmaint)
+"cFD" = (
+/obj/machinery/holopad,
+/turf/simulated/floor/tiled/monotile,
+/area/prison/cell_block)
 "cFR" = (
 /obj/structure/bed/chair/sofa/right,
 /turf/simulated/floor/wood,
@@ -3882,6 +3858,10 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/warden)
+"cVn" = (
+/obj/structure/reagent_dispensers/water_cooler/full,
+/turf/simulated/floor/tiled/monotile,
+/area/prison/cell_block)
 "cVu" = (
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /obj/structure/cable/green{
@@ -3926,14 +3906,23 @@
 /obj/effect/floor_decal/corner/lime/border{
 	dir = 5
 	},
-/obj/structure/closet/secure_closet/hydroponics{
-	req_access = list(28)
-	},
 /obj/structure/curtain/open/bed{
 	name = "brown curtain";
 	pixel_y = 32
 	},
-/obj/item/storage/belt/utility,
+/obj/structure/closet/crate/hydroponics{
+	desc = "All you need to start your own honey farm.";
+	name = "beekeeping crate"
+	},
+/obj/item/bee_pack,
+/obj/item/bee_smoker,
+/obj/item/beehive_assembly,
+/obj/item/honey_frame,
+/obj/item/honey_frame,
+/obj/item/honey_frame,
+/obj/item/honey_frame,
+/obj/item/honey_frame,
+/obj/item/tool/crowbar,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "cXR" = (
@@ -4047,26 +4036,6 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/quartermaster/office)
-"daG" = (
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "security_lockdown";
-	name = "Security Blast Doors";
-	opacity = 0
-	},
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/red/border{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
-/area/security/hallway)
 "daO" = (
 /turf/simulated/wall/prepainted,
 /area/crew_quarters/sleep/Dorm_4)
@@ -4113,13 +4082,15 @@
 /turf/simulated/wall/prepainted/civilian,
 /area/endeavour/surfacebase/bar_backroom)
 "dct" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "dcu" = (
@@ -6233,11 +6204,16 @@
 /turf/simulated/floor/carpet/tealcarpet,
 /area/crew_quarters/sleep/Dorm_8)
 "etV" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/machinery/light{
-	dir = 4
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+	dir = 8
+	},
+/obj/effect/floor_decal/borderfloor{
+	dir = 6
+	},
+/obj/effect/floor_decal/corner/lime/border{
+	dir = 6
 	},
-/obj/machinery/portable_atmospherics/hydroponics,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "etZ" = (
@@ -6456,10 +6432,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/endeavour/hallway/d3fwdhall)
-"eAj" = (
-/obj/effect/floor_decal/steeldecal/steel_decals_central6,
-/turf/simulated/floor/tiled,
-/area/hydroponics)
 "eAp" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -7849,13 +7821,11 @@
 /turf/simulated/floor/lino,
 /area/security/detectives_office)
 "fqT" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lime/border,
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/hydroponics)
@@ -8785,7 +8755,10 @@
 /obj/machinery/camera/network/security{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/old_cargo/gray,
+/obj/structure/bed/chair{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/monotile,
 /area/prison/cell_block)
 "fYb" = (
 /obj/structure/table/woodentable,
@@ -9782,6 +9755,7 @@
 /area/janitor)
 "gMQ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/portable_atmospherics/hydroponics,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "gMW" = (
@@ -12346,12 +12320,6 @@
 /obj/random/drinkbottle,
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/starboardsolar)
-"iJx" = (
-/obj/machinery/door/firedoor{
-	dir = 8
-	},
-/turf/simulated/wall/prepainted/cargo,
-/area/quartermaster/qm)
 "iJy" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass/security{
@@ -12692,7 +12660,9 @@
 	tag = "mailroom";
 	id = "DLBelt"
 	},
-/obj/structure/plasticflaps,
+/obj/structure/plasticflaps/mining{
+	desc = "Heavy duty, airtight, plastic flaps."
+	},
 /turf/simulated/floor/plating,
 /area/quartermaster/delivery)
 "jaT" = (
@@ -14267,14 +14237,10 @@
 /turf/simulated/wall/r_wall/prepainted/security,
 /area/security/breakroom)
 "kiR" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/structure/disposalpipe/segment,
+/obj/structure/table/standard,
+/obj/item/storage/box/cups,
 /turf/simulated/floor/tiled/monotile,
-/area/security/lobby)
+/area/prison/cell_block)
 "kiY" = (
 /obj/structure/undies_wardrobe,
 /turf/simulated/floor/wood,
@@ -15097,14 +15063,13 @@
 /turf/simulated/floor/plating,
 /area/prison/cell_block)
 "kSm" = (
+/obj/machinery/light{
+	dir = 4
+	},
 /obj/effect/floor_decal/borderfloor{
-	dir = 6
+	dir = 4
 	},
 /obj/effect/floor_decal/corner/lime/border{
-	dir = 6
-	},
-/obj/machinery/portable_atmospherics/hydroponics,
-/obj/machinery/light{
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
@@ -15359,12 +15324,20 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/security_equiptment_storage)
 "lcL" = (
-/obj/structure/catwalk,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
-/area/security/hallway)
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
+/obj/effect/floor_decal/borderfloor{
+	dir = 10
+	},
+/obj/effect/floor_decal/corner/lime/border{
+	dir = 10
+	},
+/turf/simulated/floor/tiled,
+/area/hydroponics)
 "ldm" = (
 /obj/machinery/fire_alarm/south_mount{
 	pixel_y = -24
@@ -15786,6 +15759,11 @@
 	name = "sink";
 	pixel_x = 13
 	},
+/obj/effect/floor_decal/steeldecal/steel_decals10,
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 4
+	},
+/obj/landmark/spawnpoint/job/botanist,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "luu" = (
@@ -16503,14 +16481,13 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "lUH" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/lime/border{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment{
+	dir = 1
 	},
-/turf/simulated/floor/tiled,
-/area/hydroponics)
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d3aftmaint)
 "lVi" = (
 /obj/machinery/holopad,
 /turf/simulated/floor/carpet,
@@ -17756,6 +17733,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/camera/network/civilian{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3starboardamidhall)
 "mWw" = (
@@ -17923,16 +17903,6 @@
 /area/endeavour/surfacebase/mining_main/refinery)
 "mZI" = (
 /obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/effect/floor_decal/borderfloorblack,
 /obj/machinery/door/blast/regular{
 	density = 0;
 	icon_state = "pdoor0";
@@ -17940,19 +17910,13 @@
 	name = "Security Blast Doors";
 	opacity = 0
 	},
+/obj/map_helper/access_helper/airlock/station/security/general,
 /obj/machinery/door/airlock/glass/security{
 	layer = 2.8;
 	name = "Security";
 	req_one_access = null
 	},
-/obj/map_helper/access_helper/airlock/station/security/general,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/monotile,
 /area/prison/cell_block)
 "mZL" = (
 /obj/item/radio/intercom{
@@ -17974,7 +17938,6 @@
 /turf/simulated/floor/tiled/old_cargo/gray,
 /area/security/hanger)
 "nbL" = (
-/obj/structure/ladder,
 /turf/simulated/floor/airless,
 /area/space)
 "nbW" = (
@@ -18086,10 +18049,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/vacant/vacant_shop)
 "nfA" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate/trashcart,
 /obj/random/maintenance/engineering,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/plating,
 /area/maintenance/cargo/mining)
 "nfG" = (
 /obj/structure/cable{
@@ -18251,8 +18213,14 @@
 /turf/simulated/floor/reinforced,
 /area/quartermaster/miningdock)
 "nmQ" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/machinery/portable_atmospherics/hydroponics,
+/obj/effect/floor_decal/borderfloor/corner{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/lime/bordercorner{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "nnI" = (
@@ -18358,9 +18326,6 @@
 /obj/machinery/photocopier/faxmachine{
 	department = "Quartermaster-Office"
 	},
-/obj/machinery/door/firedoor{
-	dir = 8
-	},
 /turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "nqm" = (
@@ -19701,6 +19666,10 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "olG" = (
@@ -19888,6 +19857,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
+/obj/structure/reagent_dispensers/watertank,
+/obj/item/reagent_containers/glass/bucket,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "orP" = (
@@ -20653,14 +20624,11 @@
 /turf/simulated/floor/tiled,
 /area/security/lobby)
 "oSr" = (
-/obj/machinery/door/airlock/multi_tile/glass,
 /obj/map_helper/access_helper/airlock/station/engineering/department,
-/obj/structure/cable/orange{
-	icon_state = "1-2"
-	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
+/obj/machinery/door/airlock/multi_tile,
+/turf/simulated/floor/tiled/dark,
 /area/security/hallway)
 "oSF" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
@@ -21271,13 +21239,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/armoury)
 "plO" = (
-/obj/machinery/portable_atmospherics/hydroponics,
-/obj/effect/floor_decal/corner/green{
-	dir = 10
-	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "plT" = (
@@ -21593,19 +21560,10 @@
 /turf/simulated/floor/tiled/monotile,
 /area/security/lobby)
 "pwE" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/structure/bed/chair{
 	dir = 4
 	},
-/obj/machinery/door/airlock/glass/security/polarized,
-/obj/map_helper/access_helper/airlock/station/security/forensics,
-/obj/map_helper/electrochromatic_linker{
-	id = "vicDetOffice"
-	},
-/turf/simulated/floor/lino,
+/turf/simulated/floor/tiled/monotile,
 /area/prison/cell_block)
 "pxt" = (
 /obj/structure/table/rack/steel,
@@ -22538,10 +22496,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/security)
 "qeX" = (
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
+/obj/machinery/portable_atmospherics/hydroponics,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "qfY" = (
@@ -23568,9 +23523,11 @@
 /turf/simulated/floor/tiled/old_cargo/white,
 /area/security/forensics)
 "qOr" = (
-/obj/machinery/portable_atmospherics/hydroponics,
-/obj/effect/floor_decal/corner/green{
-	dir = 10
+/obj/effect/floor_decal/borderfloor{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/lime/border{
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/hydroponics)
@@ -23701,6 +23658,23 @@
 	},
 /turf/simulated/floor/carpet/purcarpet,
 /area/crew_quarters/sleep/Dorm_13)
+"qVF" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
+	id = "security_lockdown";
+	name = "Security Blast Doors";
+	opacity = 0
+	},
+/obj/map_helper/access_helper/airlock/station/security/general,
+/obj/machinery/door/airlock/glass/security{
+	layer = 2.8;
+	name = "Security";
+	req_one_access = null
+	},
+/turf/simulated/floor/tiled/monotile,
+/area/security/lobby)
 "qVJ" = (
 /obj/machinery/door/airlock/glass_external{
 	frequency = 1379;
@@ -26605,8 +26579,7 @@
 /turf/simulated/floor/tiled,
 /area/security/range)
 "sWJ" = (
-/obj/machinery/holopad,
-/turf/simulated/floor/tiled/old_cargo/gray,
+/turf/simulated/floor/tiled/monotile,
 /area/prison/cell_block)
 "sXC" = (
 /obj/machinery/atmospherics/component/unary/vent_scrubber/on{
@@ -26676,31 +26649,25 @@
 /turf/simulated/floor/plating,
 /area/maintenance/starboardsolar)
 "sZD" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lime/border,
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
+/obj/effect/floor_decal/borderfloor{
 	dir = 8
 	},
+/obj/effect/floor_decal/corner/lime/border{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "sZO" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "security_lockdown";
-	name = "Security Blast Doors";
-	opacity = 0
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/glass/security{
-	layer = 2.8;
-	name = "Security";
-	req_one_access = null
+/obj/machinery/light{
+	dir = 4
 	},
-/obj/map_helper/access_helper/airlock/station/security/general,
-/turf/simulated/floor/tiled/dark,
-/area/prison/cell_block)
+/turf/simulated/floor/tiled/monotile,
+/area/security/lobby)
 "sZQ" = (
 /obj/effect/floor_decal/borderfloorblack/corner{
 	dir = 1
@@ -28878,18 +28845,8 @@
 /turf/simulated/floor/carpet/sblucarpet,
 /area/crew_quarters/sleep/Dorm_12)
 "uAq" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/lime/border{
-	dir = 8
-	},
-/obj/machinery/camera/network/civilian{
-	dir = 4
-	},
-/obj/machinery/newscaster{
-	pixel_x = -27
-	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central6,
+/obj/machinery/portable_atmospherics/hydroponics,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "uAt" = (
@@ -30244,13 +30201,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/brig)
-"vuU" = (
-/obj/effect/floor_decal/corner/green{
-	dir = 10
-	},
-/obj/machinery/portable_atmospherics/hydroponics,
-/turf/simulated/floor/tiled,
-/area/hydroponics)
 "vvH" = (
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/hos)
@@ -30894,12 +30844,6 @@
 /turf/simulated/floor/tiled,
 /area/crew_quarters/toilet)
 "vMf" = (
-/obj/machinery/camera/network/civilian{
-	dir = 1
-	},
-/obj/item/radio/intercom{
-	pixel_y = -24
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -31749,6 +31693,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/item/radio/intercom{
+	pixel_y = -24
+	},
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d3starboardamidhall)
 "wri" = (
@@ -32570,11 +32517,15 @@
 /turf/simulated/floor/plating,
 /area/maintenance/starboardsolar)
 "wYH" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
+/obj/machinery/fire_alarm/south_mount{
+	pixel_y = -25
 	},
-/obj/landmark/spawnpoint/job/botanist,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lime/border,
+/obj/structure/closet/secure_closet/hydroponics{
+	req_access = list(28)
+	},
+/obj/item/storage/belt/utility,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "wYQ" = (
@@ -32685,28 +32636,10 @@
 /area/maintenance/bar/lower)
 "xcs" = (
 /obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/floor_decal/borderfloorblack{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/red/border{
-	dir = 8
-	},
-/obj/machinery/door/airlock/multi_tile/glass{
-	id_tag = "BrigFoyer";
-	name = "Security"
-	},
 /obj/map_helper/access_helper/airlock/station/security/general,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "security_lockdown";
-	name = "Security Blast Doors";
-	opacity = 0
-	},
 /obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/dark,
+/obj/machinery/door/airlock/maintenance,
+/turf/simulated/floor/plating,
 /area/security/hallway)
 "xdM" = (
 /turf/simulated/wall/prepainted,
@@ -42429,7 +42362,7 @@ kSn
 gCh
 cEH
 kSn
-kSn
+cZa
 vFB
 pTu
 ihQ
@@ -42615,16 +42548,16 @@ lgT
 iSj
 ozn
 etj
-glG
-glG
-glG
-glG
-glG
-glG
-glG
-glG
-glG
-glG
+fIm
+kSn
+kSn
+kSn
+kSn
+mnn
+cEH
+kSn
+cZa
+cZa
 pTu
 pTu
 nPU
@@ -42810,16 +42743,16 @@ iyq
 dME
 qrV
 glG
-kdV
-vNb
-fxG
-bee
-aGV
-fET
-uAq
-lUH
-fxG
-lTX
+glG
+glG
+glG
+glG
+glG
+glG
+glG
+glG
+aKD
+pTu
 pTu
 tVk
 pBw
@@ -43004,16 +42937,16 @@ bhQ
 qaT
 fRk
 wWK
-vwK
-gHM
-eAj
-plO
-jQE
-qOr
-gHM
-qOr
-gHM
-xHY
+kdV
+vNb
+fxG
+bee
+aGV
+fET
+lTX
+glG
+cZa
+kSn
 pTu
 vvV
 oOf
@@ -43198,16 +43131,16 @@ fbB
 eBf
 kir
 okS
-prq
-jQE
-gHM
+vwK
+all
+uAq
 plO
-mnr
-qOr
-gHM
-qOr
+qeX
 gHM
-aXn
+xHY
+glG
+cZa
+kSn
 pTu
 pTu
 pTu
@@ -43393,17 +43326,17 @@ fsu
 dUA
 mqs
 prq
-mnr
-all
-plO
-mnr
-qOr
-gHM
-qOr
+jQE
+qeX
+fqT
+qeX
 gHM
-aKD
+wYH
 glG
-bUP
+cZa
+cZa
+cZa
+cZa
 kSn
 kSn
 evH
@@ -43588,16 +43521,16 @@ xXF
 wWK
 buf
 mnr
-gHM
+qeX
 olB
 qeX
 gHM
-gHM
-gHM
-gHM
 bUa
 glG
-kSn
+glG
+glG
+bUP
+cZa
 kSn
 kSn
 evH
@@ -43784,13 +43717,13 @@ mmc
 nYR
 wma
 dct
-wYH
-dKh
 vbj
-vbj
-vbj
-fqT
+dKh
+nmQ
+sZD
+lcL
 aNk
+lUH
 iSy
 aQM
 kSn
@@ -43976,15 +43909,15 @@ vQh
 wWK
 cXP
 jKE
-gHM
+qeX
 jEn
-gHM
-nmQ
-gHM
-nmQ
+qeX
+xBX
+qeX
 gHM
 bYk
 glG
+kSn
 heG
 uMp
 kSn
@@ -44170,15 +44103,15 @@ enc
 glG
 nOt
 gHM
-gHM
+qeX
 jEn
-xBX
-nmQ
+qeX
 gHM
-vuU
+qeX
 gHM
 cQg
 glG
+kSn
 heG
 uMp
 kSn
@@ -44363,16 +44296,16 @@ kfD
 cQv
 glG
 jzG
-gHM
-gHM
+all
+qeX
 dII
 gMQ
 ayg
-gHM
-gHM
+qeX
 gHM
 orr
 glG
+kSn
 heG
 uMp
 kSn
@@ -44562,11 +44495,11 @@ ikN
 lub
 kSm
 qOr
-qOr
+kSm
 qOr
 etV
-sZD
 glG
+kSn
 heG
 uMp
 kSn
@@ -44760,7 +44693,7 @@ glG
 glG
 glG
 glG
-glG
+kSn
 heG
 uMp
 kSn
@@ -45152,7 +45085,7 @@ kSn
 cxF
 kSn
 kSn
-daG
+evH
 nIT
 eDt
 wCM
@@ -45928,7 +45861,7 @@ msG
 lqj
 kPR
 gnm
-lcL
+pFD
 eia
 pYU
 vnn
@@ -47247,7 +47180,7 @@ twR
 twR
 gNj
 gNj
-iJx
+gNj
 mLm
 mLm
 mLm
@@ -47441,7 +47374,7 @@ nWj
 iIq
 sBr
 npS
-iJx
+gNj
 mLm
 mLm
 mLm
@@ -47830,10 +47763,10 @@ juy
 feq
 nNn
 oOI
-mLm
-mLm
-mLm
-mLm
+xLm
+xLm
+xLm
+xLm
 hwP
 lMH
 nqP
@@ -47862,7 +47795,7 @@ vPs
 qmV
 fnF
 hHh
-pwE
+hHh
 hHh
 vSA
 vSA
@@ -48056,9 +47989,9 @@ upw
 wxK
 vIs
 fWX
-rFP
-rFP
-rFP
+pwE
+pwE
+pwE
 vjb
 qqF
 uxf
@@ -48220,7 +48153,7 @@ tkT
 gNj
 atw
 nfA
-clL
+mLm
 xLm
 hwP
 lMH
@@ -48249,10 +48182,10 @@ tpm
 sKW
 feQ
 vIs
-rFP
 sWJ
-rFP
-rFP
+sWJ
+sWJ
+sWJ
 vjb
 toV
 wsC
@@ -48443,10 +48376,10 @@ awA
 deJ
 mBA
 vIs
-rFP
-rFP
-rFP
-rFP
+sWJ
+sWJ
+cFD
+sWJ
 vjb
 szn
 azW
@@ -48637,10 +48570,10 @@ jRB
 lCJ
 vUA
 vIs
-rFP
-rFP
-rFP
-rFP
+cVn
+kiR
+sWJ
+sWJ
 vjb
 aIB
 seM
@@ -48832,9 +48765,9 @@ lCJ
 uwo
 hHh
 vIs
-sZO
+vIs
 mZI
-vjb
+qVF
 vjb
 eSt
 seM
@@ -49028,7 +48961,7 @@ suB
 sFM
 sFM
 sFM
-kiR
+sFM
 inp
 pwu
 kps
@@ -49222,7 +49155,7 @@ nWU
 gpu
 gpu
 gpu
-gpu
+sZO
 gpu
 gpu
 fRe
diff --git a/maps/endeavour/levels/deck4.dmm b/maps/endeavour/levels/deck4.dmm
index 19e041fbe702..c29e317895e5 100644
--- a/maps/endeavour/levels/deck4.dmm
+++ b/maps/endeavour/levels/deck4.dmm
@@ -419,7 +419,10 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/command/turrets)
 "aws" = (
-/obj/structure/table/reinforced,
+/obj/structure/closet/secure_closet/engineering_personal,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/locker_room)
 "awG" = (
@@ -1460,6 +1463,11 @@
 "bHY" = (
 /turf/simulated/floor/tiled/monotile,
 /area/engineering/engineering_monitoring)
+"bIs" = (
+/obj/effect/floor_decal/techfloor/orange,
+/obj/machinery/vending/tool,
+/turf/simulated/floor/tiled/techmaint,
+/area/engineering/locker_room)
 "bII" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -2473,9 +2481,9 @@
 /turf/simulated/floor/carpet/oracarpet,
 /area/engineering/engineering_monitoring)
 "cQd" = (
-/obj/machinery/vending/engivend,
-/turf/simulated/floor/tiled/techmaint,
-/area/engineering/storage)
+/obj/machinery/portable_atmospherics/canister/empty,
+/turf/simulated/floor/plating,
+/area/endeavour/hallway/d4aftmaint)
 "cQn" = (
 /obj/machinery/computer/atmos_alert,
 /obj/effect/floor_decal/corner/yellow{
@@ -2894,11 +2902,10 @@
 /turf/simulated/floor/tiled/monotile,
 /area/engineering/engineering_monitoring)
 "dxT" = (
-/obj/effect/floor_decal/techfloor/orange,
-/obj/structure/table/bench/padded,
-/obj/machinery/light,
+/obj/machinery/door/airlock/glass/engineering,
+/obj/map_helper/access_helper/airlock/station/engineering/department,
 /turf/simulated/floor/tiled/techmaint,
-/area/engineering/locker_room)
+/area/engineering/storage)
 "dyB" = (
 /turf/space,
 /area/engineering/portnacelle)
@@ -6242,6 +6249,24 @@
 /obj/item/stack/material/glass/phoronrglass{
 	amount = 40
 	},
+/obj/item/stack/material/plastic{
+	amount = 50
+	},
+/obj/item/stack/material/plastic{
+	amount = 50
+	},
+/obj/item/stack/material/plastic{
+	amount = 50
+	},
+/obj/item/stack/material/plasteel{
+	amount = 10
+	},
+/obj/item/stack/material/plasteel{
+	amount = 10
+	},
+/obj/item/stack/material/plasteel{
+	amount = 10
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/storage)
 "hEj" = (
@@ -6385,9 +6410,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/command/turrets)
 "hKh" = (
-/obj/machinery/computer/med_data{
-	dir = 1
-	},
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
@@ -6395,6 +6417,9 @@
 	dir = 4
 	},
 /obj/machinery/light/no_nightshift,
+/obj/machinery/computer/crew{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/command/turrets)
 "hKp" = (
@@ -6513,6 +6538,7 @@
 	pixel_y = 5
 	},
 /obj/item/storage/toolbox/mechanical,
+/obj/machinery/light,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/locker_room)
 "hPj" = (
@@ -7101,8 +7127,7 @@
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 6
 	},
-/obj/machinery/suit_cycler/engineering,
-/obj/machinery/light,
+/obj/structure/closet/secure_closet/engineering_personal,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/locker_room)
 "iFh" = (
@@ -7564,10 +7589,6 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/engine_eva)
 "jkF" = (
-/obj/machinery/door/airlock/glass/engineering{
-	name = "Shield Room";
-	req_one_access = null
-	},
 /obj/machinery/door/firedoor{
 	dir = 8
 	},
@@ -7575,6 +7596,10 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/glass/engineering{
+	name = "Monitoring Room";
+	req_one_access = null
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/engineering/engineering_monitoring)
 "jlf" = (
@@ -7623,8 +7648,10 @@
 /turf/simulated/floor/plating,
 /area/endeavour/hallway/d4aftmaint)
 "jnl" = (
+/obj/effect/floor_decal/techfloor/orange,
+/obj/machinery/light,
 /obj/structure/closet/secure_closet/engineering_personal,
-/obj/effect/floor_decal/techfloor/orange{
+/obj/structure/window/reinforced{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -7743,14 +7770,11 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
 "jsv" = (
-/obj/machinery/door/airlock/glass/engineering{
-	name = "Engineering Hallway";
-	req_one_access = null
-	},
 /obj/map_helper/access_helper/airlock/station/maintenance,
 /obj/machinery/door/firedoor{
 	dir = 8
 	},
+/obj/machinery/door/airlock/maintenance,
 /turf/simulated/floor/airless/ceiling,
 /area/endeavour/hallway/d4fwdmaint)
 "jsW" = (
@@ -8282,7 +8306,7 @@
 /area/engineering/atmos)
 "jYd" = (
 /obj/machinery/door/airlock/glass/engineering{
-	name = "Shield Room";
+	name = "Monitoring Room";
 	req_one_access = null
 	},
 /obj/machinery/door/firedoor{
@@ -8846,14 +8870,14 @@
 /turf/simulated/floor/tiled/steel,
 /area/endeavour/hallway/d4starboardamidhall)
 "kJO" = (
-/obj/machinery/door/airlock/glass/engineering{
-	name = "Shield Room";
-	req_one_access = null
-	},
 /obj/machinery/door/firedoor{
 	dir = 8
 	},
 /obj/map_helper/access_helper/airlock/station/engineering/department,
+/obj/machinery/door/airlock/glass/engineering{
+	name = "Break Room";
+	req_one_access = null
+	},
 /turf/simulated/floor/wood,
 /area/engineering/hallway/lower)
 "kJR" = (
@@ -9041,7 +9065,6 @@
 /turf/simulated/floor/reinforced/airless,
 /area/engineering/portnacelle)
 "kVC" = (
-/obj/structure/closet/secure_closet/engineering_personal,
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 8
 	},
@@ -11077,7 +11100,7 @@
 /area/endeavour/hallway/d4starboardafthall)
 "npV" = (
 /obj/effect/floor_decal/techfloor/orange,
-/obj/structure/table/bench/padded,
+/obj/machinery/vending/assist,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/locker_room)
 "nqa" = (
@@ -11938,25 +11961,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/endeavour/command/turrets)
 "ohO" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/material/plasteel{
-	amount = 10
-	},
-/obj/item/stack/material/plasteel{
-	amount = 10
-	},
-/obj/item/stack/material/plasteel{
-	amount = 10
-	},
-/obj/item/stack/material/plastic{
-	amount = 50
-	},
-/obj/item/stack/material/plastic{
-	amount = 50
-	},
-/obj/item/stack/material/plastic{
-	amount = 50
-	},
+/obj/machinery/suit_cycler/engineering,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/storage)
 "oie" = (
@@ -12681,7 +12686,7 @@
 /area/engineering/atmos)
 "pnG" = (
 /obj/machinery/door/airlock/glass/engineering{
-	name = "Shield Room";
+	name = "Break Room";
 	req_one_access = null
 	},
 /obj/machinery/door/firedoor{
@@ -15252,7 +15257,9 @@
 /turf/simulated/wall/r_wall/prepainted/engineering/atmos,
 /area/engineering/atmos/eva)
 "sWB" = (
-/obj/machinery/vending/tool,
+/obj/structure/dispenser{
+	phorontanks = 0
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/storage)
 "sXt" = (
@@ -19037,7 +19044,6 @@
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 9
 	},
-/obj/structure/closet/toolcloset,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/locker_room)
 "xCS" = (
@@ -19304,7 +19310,7 @@
 /turf/space/basic,
 /area/space)
 "xSM" = (
-/obj/machinery/vending/assist,
+/obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/storage)
 "xSO" = (
@@ -19520,7 +19526,7 @@
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 10
 	},
-/obj/machinery/suit_cycler/engineering,
+/obj/machinery/vending/engivend,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/locker_room)
 "yky" = (
@@ -31684,7 +31690,7 @@ ppa
 qTY
 jZF
 jZF
-cQd
+sWB
 dpZ
 liC
 hER
@@ -32294,9 +32300,9 @@ aIs
 vLj
 aIs
 aIs
-jBO
-jBO
-jBO
+cQd
+cQd
+cQd
 jBO
 jBO
 jBO
@@ -32460,7 +32466,7 @@ sHl
 hDC
 jZF
 jZF
-ohO
+okW
 dpZ
 vTS
 qzJ
@@ -32651,7 +32657,7 @@ qip
 kiI
 hLB
 sHl
-okW
+ohO
 jZF
 jZF
 wHS
@@ -33234,7 +33240,7 @@ vRr
 uJI
 dpZ
 dpZ
-dpZ
+dxT
 dpZ
 dpZ
 dpZ
@@ -33428,7 +33434,7 @@ kiI
 qjJ
 jQA
 xCw
-jnl
+kuh
 kVC
 yki
 fJm
@@ -33624,7 +33630,7 @@ qyK
 grk
 kuh
 kuh
-nqw
+bIs
 fJm
 azJ
 atZ
@@ -34012,7 +34018,7 @@ jQA
 fHR
 kBo
 ryp
-npV
+nqw
 fJm
 azJ
 atZ
@@ -34982,7 +34988,7 @@ jQA
 dsn
 kuh
 aws
-vvE
+jnl
 fJm
 vVK
 atZ
@@ -35176,7 +35182,7 @@ jQA
 fHR
 kuh
 ryp
-npV
+nqw
 fJm
 azJ
 atZ
@@ -35370,7 +35376,7 @@ qyK
 grk
 kuh
 ryp
-dxT
+nqw
 fJm
 xQN
 gTq