diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index a4e2a07bb12..7716b5a9a01 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -233,7 +233,7 @@
 /area/station/hallway/primary/central)
 "adt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 5
+	dir = 4
 	},
 /obj/effect/turf_decal/delivery,
 /turf/simulated/floor/plasteel,
@@ -955,6 +955,21 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry)
+"ahQ" = (
+/obj/machinery/airlock_controller/air_cycler{
+	pixel_y = -25;
+	vent_link_id = "enginen_vent";
+	ext_door_link_id = "enginen_door_ext";
+	int_door_link_id = "enginen_door_int";
+	ext_button_link_id = "enginen_btn_ext";
+	int_button_link_id = "enginen_btn_int"
+	},
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 4;
+	autolink_id = "enginen_vent"
+	},
+/turf/simulated/floor/plating,
+/area/station/hallway/secondary/entry)
 "ahV" = (
 /obj/item/kirbyplants,
 /turf/simulated/floor/mineral/titanium/blue,
@@ -1636,13 +1651,6 @@
 	icon_state = "red"
 	},
 /area/station/maintenance/fore2)
-"ani" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "arrival"
-	},
-/area/station/hallway/secondary/entry)
 "ank" = (
 /turf/simulated/floor/plasteel/white/corner{
 	dir = 4
@@ -14941,9 +14949,6 @@
 /obj/machinery/computer/supplycomp{
 	dir = 8
 	},
-/obj/structure/sign/poster/official/random{
-	pixel_x = 32
-	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "brown"
@@ -15721,12 +15726,12 @@
 	},
 /area/station/supply/qm)
 "aWJ" = (
+/obj/structure/sign/poster/official/random{
+	pixel_x = 32
+	},
 /obj/machinery/computer/card/minor/qm{
 	dir = 8
 	},
-/obj/machinery/keycard_auth{
-	pixel_x = 25
-	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "brown"
@@ -16293,11 +16298,21 @@
 	},
 /obj/item/gps/mining,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/keycard_auth,
 /obj/item/toy/figure/crew/qm,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
 /area/station/supply/qm)
+"aYj" = (
+/obj/machinery/computer/security/mining{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "brown"
+	},
+/area/station/supply/qm)
 "aYk" = (
 /turf/simulated/floor/plasteel{
 	dir = 9;
@@ -18676,19 +18691,6 @@
 	icon_state = "redfull"
 	},
 /area/station/service/kitchen)
-"bdT" = (
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/recharger{
-	pixel_x = 6;
-	pixel_y = 2
-	},
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/drinks/cans/starkist,
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel{
-	icon_state = "neutralfull"
-	},
-/area/station/engineering/break_room)
 "bdU" = (
 /turf/simulated/wall,
 /area/station/hallway/primary/fore)
@@ -19548,7 +19550,7 @@
 	},
 /area/station/service/kitchen)
 "bgA" = (
-/obj/structure/table,
+/obj/structure/table/reinforced,
 /obj/item/storage/bag/tray,
 /obj/effect/turf_decal/delivery/hollow,
 /turf/simulated/floor/plasteel{
@@ -19556,7 +19558,7 @@
 	},
 /area/station/service/kitchen)
 "bgB" = (
-/obj/structure/table,
+/obj/structure/table/reinforced,
 /obj/effect/turf_decal/delivery/hollow,
 /turf/simulated/floor/plasteel{
 	icon_state = "redfull"
@@ -19935,6 +19937,14 @@
 	icon_state = "white"
 	},
 /area/station/service/kitchen)
+"bhN" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/condiment/flour,
+/obj/effect/turf_decal/delivery/hollow,
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
+/area/station/service/kitchen)
 "bhO" = (
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -19960,8 +19970,17 @@
 	icon_state = "neutralfull"
 	},
 /area/station/hallway/primary/fore)
+"bhQ" = (
+/obj/structure/table/reinforced,
+/obj/item/food/snacks/dough,
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/effect/turf_decal/delivery/hollow,
+/turf/simulated/floor/plasteel{
+	icon_state = "redfull"
+	},
+/area/station/service/kitchen)
 "bhR" = (
-/obj/structure/table,
+/obj/structure/table/reinforced,
 /obj/effect/turf_decal/delivery/hollow,
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
@@ -21372,7 +21391,7 @@
 /turf/simulated/floor/plasteel,
 /area/station/service/kitchen)
 "bli" = (
-/obj/structure/table,
+/obj/structure/table/reinforced,
 /obj/item/storage/box/papersack,
 /obj/item/storage/box/papersack,
 /obj/item/storage/box/papersack,
@@ -21391,6 +21410,14 @@
 /obj/effect/turf_decal/delivery/hollow,
 /turf/simulated/floor/plasteel,
 /area/station/service/kitchen)
+"blk" = (
+/obj/structure/table/reinforced,
+/obj/item/food/snacks/mint,
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/machinery/reagentgrinder,
+/obj/effect/turf_decal/delivery/hollow,
+/turf/simulated/floor/plasteel,
+/area/station/service/kitchen)
 "bll" = (
 /obj/machinery/kitchen_machine/candy_maker,
 /turf/simulated/floor/plasteel,
@@ -21409,7 +21436,7 @@
 /turf/simulated/floor/plasteel,
 /area/station/service/kitchen)
 "blo" = (
-/obj/structure/table,
+/obj/structure/table/reinforced,
 /obj/item/clipboard,
 /obj/item/toy/figure/crew/chef,
 /obj/effect/turf_decal/delivery/hollow,
@@ -22206,11 +22233,6 @@
 /area/station/aisat)
 "bmZ" = (
 /obj/effect/spawner/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id_tag = "kitchenhall";
-	name = "Kitchen bridge Shutters";
-	dir = 2
-	},
 /turf/simulated/floor/plating,
 /area/station/service/kitchen)
 "bna" = (
@@ -22228,7 +22250,7 @@
 /turf/simulated/wall,
 /area/station/service/kitchen)
 "bnc" = (
-/obj/structure/table,
+/obj/structure/table/reinforced,
 /obj/item/clothing/suit/chef,
 /obj/item/kitchen/rollingpin,
 /obj/effect/turf_decal/delivery/hollow,
@@ -22247,6 +22269,14 @@
 	},
 /turf/simulated/wall,
 /area/station/hallway/primary/fore)
+"bne" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/condiment/saltshaker,
+/obj/item/reagent_containers/condiment/peppermill,
+/obj/item/kitchen/knife,
+/obj/effect/turf_decal/delivery,
+/turf/simulated/floor/plasteel,
+/area/station/service/kitchen)
 "bnf" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/delivery/hollow,
@@ -30049,6 +30079,14 @@
 	icon_state = "neutralfull"
 	},
 /area/station/engineering/break_room)
+"bGD" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/drinks/cans/starkist,
+/obj/effect/turf_decal/delivery/hollow,
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/station/engineering/break_room)
 "bGE" = (
 /obj/structure/table/reinforced,
 /obj/item/folder/yellow,
@@ -31556,6 +31594,9 @@
 /area/station/aisat)
 "bJZ" = (
 /obj/structure/closet/emcloset,
+/obj/structure/sign/vacuum{
+	pixel_x = -32
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "vault"
@@ -32408,15 +32449,15 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel/dark,
 /area/station/engineering/ai_transit_tube)
 "bMf" = (
@@ -33093,6 +33134,12 @@
 	},
 /area/station/engineering/ai_transit_tube)
 "bNX" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/engineering/ai_transit_tube)
 "bNY" = (
@@ -33642,7 +33689,7 @@
 	},
 /obj/machinery/button/windowtint{
 	dir = 1;
-	id = "kitchenbar";
+	id = "Detective";
 	pixel_y = -24
 	},
 /turf/simulated/floor/plasteel/dark,
@@ -34082,16 +34129,9 @@
 	},
 /area/station/hallway/primary/port)
 "bQy" = (
-/obj/structure/table,
+/obj/structure/table/reinforced,
 /obj/machinery/kitchen_machine/microwave,
 /obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/door_control{
-	id = "kitchenbar";
-	name = "Kitchen Bar Shutters Control";
-	pixel_x = -6;
-	pixel_y = -5;
-	req_access_txt = "28"
-	},
 /turf/simulated/floor/plasteel,
 /area/station/service/kitchen)
 "bQz" = (
@@ -34652,12 +34692,18 @@
 	c_tag = "AI Transit Tube Access";
 	network = list("SS13","Engineering")
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/engineering/ai_transit_tube)
 "bRU" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/engineering/ai_transit_tube)
@@ -36204,27 +36250,16 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
 /turf/space,
 /area/space/nearstation)
 "bVt" = (
-/obj/structure/sign/vacuum{
-	pixel_x = -32
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
 	},
 /obj/machinery/light/small,
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 1;
-	autolink_id = "stationai_vent"
-	},
-/turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "vault"
-	},
+/turf/simulated/floor/plasteel/dark,
 /area/station/engineering/ai_transit_tube)
 "bVB" = (
 /obj/machinery/door/firedoor,
@@ -37243,10 +37278,10 @@
 	icon_state = "1-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
+	dir = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
+	dir = 10
 	},
 /turf/space,
 /area/space/nearstation)
@@ -37400,6 +37435,12 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /obj/structure/lattice/catwalk,
 /turf/space,
 /area/space/nearstation)
@@ -48729,7 +48770,7 @@
 "cDb" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/external{
-	name = "MiniSat External Access"
+	name = "MiniSat Access"
 	},
 /obj/effect/mapping_helpers/airlock/access/all/science/minisat,
 /obj/structure/cable{
@@ -55068,9 +55109,6 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
-/obj/machinery/recharger{
-	pixel_x = -6
-	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "whitepurplecorner"
@@ -56108,27 +56146,6 @@
 	icon_state = "neutralfull"
 	},
 /area/station/hallway/primary/aft)
-"dcp" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "stationai_door_ext";
-	locked = 1;
-	name = "Minisat Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel/dark,
-/area/station/engineering/ai_transit_tube)
 "dcs" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
@@ -61383,7 +61400,7 @@
 /area/station/service/chapel)
 "dyW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 5
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "freezerfloor"
@@ -66269,25 +66286,12 @@
 /turf/simulated/floor/plating/airless,
 /area/station/engineering/control)
 "dVS" = (
-/obj/machinery/access_button{
-	autolink_id = "stationai_btn_ext";
-	name = "exterior access button";
-	pixel_x = 20;
-	pixel_y = 20;
-	req_access_txt = "10;13"
-	},
 /obj/structure/lattice/catwalk,
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
 /turf/space,
 /area/space/nearstation)
 "dWc" = (
@@ -67414,24 +67418,17 @@
 /turf/simulated/floor/plating,
 /area/station/security/brig)
 "ejT" = (
-/obj/machinery/access_button{
-	autolink_id = "perma_btn_int";
-	name = "interior access button";
-	pixel_x = -20;
-	pixel_y = 20;
-	req_access_txt = "67"
-	},
 /obj/structure/cable{
 	d1 = 2;
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 5
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 5
+	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/starboard2)
 "ekg" = (
@@ -67522,13 +67519,6 @@
 	},
 /area/station/public/fitness)
 "eml" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "atmostanks_door_int";
-	locked = 1;
-	name = "Atmos External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/construction,
-/obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/gravitygenerator)
 "emr" = (
@@ -68283,12 +68273,12 @@
 /area/station/legal/magistrate)
 "eGT" = (
 /obj/structure/table/wood,
+/obj/machinery/fishtank/bowl,
 /obj/machinery/alarm{
 	dir = 4;
 	name = "west bump";
 	pixel_x = -24
 	},
-/obj/machinery/fishtank/bowl,
 /turf/simulated/floor/wood,
 /area/station/public/pet_store)
 "eHg" = (
@@ -68390,6 +68380,15 @@
 	icon_state = "neutralfull"
 	},
 /area/station/public/fitness)
+"eKO" = (
+/obj/machinery/door/airlock/external{
+	name = "Arrival Airlock"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/station/hallway/secondary/entry)
 "eKP" = (
 /obj/machinery/hologram/holopad,
 /obj/structure/disposalpipe/segment{
@@ -68821,23 +68820,6 @@
 	icon_state = "neutralfull"
 	},
 /area/station/supply/storage)
-"eWt" = (
-/obj/machinery/door_control{
-	id = "kitchenbar";
-	name = "Kitchen Bar Shutters Control";
-	pixel_x = -6;
-	pixel_y = -5;
-	req_access_txt = "28"
-	},
-/obj/machinery/door_control{
-	id = "kitchenhall";
-	name = "Kitchen Hallway Shutters Control";
-	pixel_x = 6;
-	pixel_y = -5;
-	req_access_txt = "28"
-	},
-/turf/simulated/wall,
-/area/station/service/kitchen)
 "eWX" = (
 /obj/structure/table/reinforced,
 /obj/machinery/alarm{
@@ -69067,13 +69049,6 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/fsmaint)
 "ffC" = (
-/obj/machinery/access_button{
-	autolink_id = "assolar_btn_int";
-	name = "interior access button";
-	pixel_x = 25;
-	pixel_y = -25;
-	req_access_txt = "10;13"
-	},
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
@@ -69084,12 +69059,12 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 5
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 5
+	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/starboardsolar)
 "ffJ" = (
@@ -69395,14 +69370,6 @@
 	icon_state = "browncorner"
 	},
 /area/station/hallway/primary/fore)
-"fpe" = (
-/obj/structure/table,
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel{
-	icon_state = "redfull"
-	},
-/area/station/service/kitchen)
 "fpL" = (
 /obj/effect/spawner/window/reinforced/grilled,
 /obj/structure/cable,
@@ -69489,20 +69456,11 @@
 	},
 /area/station/maintenance/apmaint)
 "frh" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "assolar_door_int";
-	locked = 1;
-	name = "Engineering External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
@@ -69826,13 +69784,6 @@
 	},
 /area/station/security/brig)
 "fDS" = (
-/obj/machinery/access_button{
-	autolink_id = "stationai_btn_int";
-	name = "interior access button";
-	pixel_x = -20;
-	pixel_y = -20;
-	req_access_txt = "10;13"
-	},
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
@@ -69842,12 +69793,6 @@
 	dir = 10;
 	initialize_directions = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/engineering/ai_transit_tube)
 "fEo" = (
@@ -70365,20 +70310,17 @@
 /turf/simulated/floor/plasteel/dark,
 /area/station/engineering/smes)
 "fRb" = (
+/obj/structure/plasticflaps{
+	opacity = 1
+	},
 /obj/effect/turf_decal/delivery,
 /obj/machinery/door/window/classic/reversed{
 	dir = 8;
 	name = "Glass Door"
 	},
-/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mail_sorting{
-	dir = 8
-	},
 /obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mule_bot{
 	dir = 8
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
 /turf/simulated/floor/plasteel,
 /area/station/supply/office)
 "fRm" = (
@@ -70558,6 +70500,16 @@
 /obj/machinery/optable,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/surgery/secondary)
+"fYS" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/space/nearstation)
 "fZU" = (
 /obj/structure/chair/stool/bar{
 	dir = 1
@@ -71450,19 +71402,6 @@
 /obj/effect/spawner/random_spawners/oil_maybe,
 /turf/simulated/floor/plating,
 /area/station/maintenance/apmaint)
-"gHC" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "apmaint2_door_int";
-	locked = 1;
-	name = "West Maintenance External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/obj/machinery/atmospherics/pipe/simple/visible{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
 "gHE" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/research,
@@ -71867,7 +71806,7 @@
 /obj/machinery/door/airlock/mining/glass{
 	name = "Cargo Bay"
 	},
-/obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting,
+/obj/effect/mapping_helpers/airlock/access/all/supply/general,
 /turf/simulated/floor/plasteel,
 /area/station/supply/sorting)
 "gXp" = (
@@ -72872,22 +72811,6 @@
 	icon_state = "neutralcorner"
 	},
 /area/station/maintenance/apmaint)
-"hEv" = (
-/obj/machinery/computer/security/mining{
-	dir = 8
-	},
-/obj/machinery/requests_console{
-	announcementConsole = 1;
-	department = "Quartermaster's Desk";
-	departmentType = 5;
-	name = "Quartermaster Requests Console";
-	pixel_x = 30
-	},
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "brown"
-	},
-/area/station/supply/qm)
 "hEG" = (
 /obj/machinery/camera{
 	c_tag = "Clown and Mime office"
@@ -73791,15 +73714,7 @@
 	},
 /area/station/security/prison/cell_block)
 "ihi" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "perma_door_int";
-	locked = 1;
-	name = "Perma Brig Exterior Access"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden,
 /obj/effect/turf_decal/stripes/line,
-/obj/effect/mapping_helpers/airlock/access/any/security/brig,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
 /turf/simulated/floor/plating,
 /area/station/maintenance/starboard2)
 "ihK" = (
@@ -73937,6 +73852,7 @@
 /area/station/medical/surgery/primary)
 "inx" = (
 /obj/structure/table/wood,
+/obj/machinery/fishtank/bowl,
 /obj/machinery/status_display{
 	pixel_y = 32
 	},
@@ -73944,7 +73860,6 @@
 	name = "west bump";
 	pixel_x = -28
 	},
-/obj/machinery/fishtank/bowl,
 /turf/simulated/floor/wood,
 /area/station/public/pet_store)
 "iny" = (
@@ -74446,14 +74361,6 @@
 	icon_state = "whitepurple"
 	},
 /area/station/science/break_room)
-"iDz" = (
-/obj/structure/table,
-/obj/effect/turf_decal/delivery/hollow,
-/obj/item/reagent_containers/condiment/flour,
-/turf/simulated/floor/plasteel{
-	icon_state = "white"
-	},
-/area/station/service/kitchen)
 "iDA" = (
 /obj/structure/cable{
 	d2 = 4;
@@ -74584,6 +74491,15 @@
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/service/bar)
+"iIS" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/space,
+/area/space/nearstation)
 "iIY" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -74640,21 +74556,6 @@
 	icon_state = "neutral"
 	},
 /area/station/maintenance/starboard)
-"iKT" = (
-/obj/machinery/access_button{
-	autolink_id = "fpsolar_btn_ext";
-	name = "exterior access button";
-	pixel_x = 25;
-	pixel_y = -25;
-	req_access_txt = "32"
-	},
-/obj/structure/lattice/catwalk,
-/obj/structure/cable{
-	d2 = 4;
-	icon_state = "0-4"
-	},
-/turf/space,
-/area/station/maintenance/auxsolarport)
 "iLv" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
@@ -74985,6 +74886,18 @@
 	icon_state = "bar"
 	},
 /area/station/service/bar)
+"iUZ" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/condiment/peppermill,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/window,
+/obj/effect/mapping_helpers/airlock/windoor/autoname,
+/obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen,
+/obj/effect/turf_decal/delivery,
+/turf/simulated/floor/plasteel{
+	icon_state = "bar"
+	},
+/area/station/service/kitchen)
 "iVg" = (
 /obj/machinery/economy/atm{
 	pixel_x = -32
@@ -75122,15 +75035,12 @@
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
 "iYu" = (
-/obj/machinery/access_button{
-	autolink_id = "apmaint2_btn_ext";
-	name = "exterior access button";
-	pixel_x = 24;
-	pixel_y = 24
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/effect/spawner/airlock/e_to_w/engineer{
+	req_access_txt = 13
 	},
-/obj/structure/lattice/catwalk,
-/turf/space,
-/area/space/nearstation)
+/turf/simulated/floor/plating,
+/area/station/maintenance/auxsolarport)
 "jaE" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "Custodial Maintenance"
@@ -75570,14 +75480,6 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/fsmaint)
 "jrB" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "perma_door_ext";
-	locked = 1;
-	name = "Perma Brig External Access"
-	},
-/obj/structure/sign/securearea{
-	pixel_x = 32
-	},
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/door/poddoor{
 	density = 0;
@@ -75586,8 +75488,6 @@
 	name = "Prison Lockdown Blast Doors";
 	opacity = 0
 	},
-/obj/effect/mapping_helpers/airlock/access/any/security/brig,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
 /turf/simulated/floor/plating,
 /area/station/maintenance/starboard2)
 "jrC" = (
@@ -75827,15 +75727,6 @@
 	},
 /area/station/medical/morgue)
 "jCQ" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "fpsolar_door_int";
-	locked = 1;
-	name = "Engineering External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/construction,
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
@@ -75863,19 +75754,12 @@
 /turf/simulated/floor/plating,
 /area/station/medical/virology)
 "jEE" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "fpsolar_door_ext";
-	locked = 1;
-	name = "Engineering External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/construction,
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/effect/spawner/airlock/w_to_e/engineer{
+	req_access_txt = 13
 	},
 /turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/auxsolarstarboard)
 "jEI" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 4;
@@ -76595,24 +76479,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/port)
-"kan" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "assolar_door_ext";
-	locked = 1;
-	name = "Engineering External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
 "kaO" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/security/glass,
@@ -76877,17 +76743,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/starboard2)
-"khZ" = (
-/obj/machinery/access_button{
-	autolink_id = "fssolar_btn_ext";
-	name = "exterior access button";
-	pixel_x = -25;
-	pixel_y = -25;
-	req_access_txt = "10;13"
-	},
-/obj/structure/lattice/catwalk,
-/turf/space,
-/area/station/maintenance/auxsolarstarboard)
 "kii" = (
 /obj/structure/rack,
 /obj/item/storage/box/rubbershot{
@@ -77927,14 +77782,6 @@
 	icon_state = "neutral"
 	},
 /area/station/maintenance/starboard)
-"kTe" = (
-/obj/structure/table,
-/obj/item/kitchen/knife,
-/obj/effect/turf_decal/delivery,
-/obj/item/reagent_containers/condiment/saltshaker,
-/obj/item/reagent_containers/condiment/peppermill,
-/turf/simulated/floor/plasteel,
-/area/station/service/kitchen)
 "kTw" = (
 /obj/machinery/fishtank/tank,
 /turf/simulated/floor/plating,
@@ -80028,17 +79875,8 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_x = 25;
-	req_access_txt = "63";
-	vent_link_id = "perma_vent";
-	ext_door_link_id = "perma_door_ext";
-	int_door_link_id = "perma_door_int";
-	ext_button_link_id = "perma_btn_ext";
-	int_button_link_id = "perma_btn_int"
-	},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	autolink_id = "perma_vent"
+/obj/structure/sign/securearea{
+	pixel_x = 32
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/starboard2)
@@ -80336,7 +80174,7 @@
 /area/station/command/office/hos)
 "myx" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 5
+	dir = 4
 	},
 /obj/structure/cable{
 	d1 = 1;
@@ -80879,6 +80717,12 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/equipmentstorage)
+"mPU" = (
+/obj/effect/spawner/airlock/s_to_n{
+	req_access_txt = 32
+	},
+/turf/simulated/wall,
+/area/station/engineering/gravitygenerator)
 "mQk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -81159,7 +81003,7 @@
 /area/station/security/permabrig)
 "mUR" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 5
+	dir = 4
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft2)
@@ -81183,21 +81027,11 @@
 	},
 /area/station/maintenance/starboard)
 "mVF" = (
-/obj/machinery/access_button{
-	autolink_id = "apsolar_btn_ext";
-	name = "exterior access button";
-	pixel_x = 25;
-	pixel_y = 25;
-	req_access_txt = "13"
+/obj/effect/spawner/airlock/s_to_n{
+	req_access_txt = 1
 	},
-/obj/structure/lattice/catwalk,
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/space,
-/area/station/maintenance/portsolar)
+/turf/simulated/wall/r_wall,
+/area/station/security/permasolitary)
 "mWe" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
@@ -81439,13 +81273,6 @@
 /obj/machinery/economy/vending/cigarette,
 /turf/simulated/floor/plasteel/dark,
 /area/station/legal/courtroom)
-"nfI" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/recharge_station,
-/turf/simulated/floor/plasteel,
-/area/station/engineering/break_room)
 "ngg" = (
 /turf/simulated/wall/r_wall,
 /area/station/security/armory/secure)
@@ -81797,6 +81624,19 @@
 /obj/machinery/economy/vending/crittercare,
 /turf/simulated/floor/carpet,
 /area/station/maintenance/starboard)
+"nnP" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/window,
+/obj/effect/mapping_helpers/airlock/windoor/autoname,
+/obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen,
+/obj/item/reagent_containers/drinks/britcup,
+/obj/item/reagent_containers/condiment/saltshaker,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/delivery,
+/turf/simulated/floor/plasteel{
+	icon_state = "bar"
+	},
+/area/station/service/kitchen)
 "nnW" = (
 /obj/machinery/door/airlock/security,
 /obj/effect/mapping_helpers/airlock/autoname,
@@ -81823,16 +81663,6 @@
 /obj/structure/closet/emcloset,
 /turf/simulated/floor/plating,
 /area/station/maintenance/fsmaint)
-"noB" = (
-/obj/machinery/access_button{
-	autolink_id = "perma_btn_ext";
-	name = "exterior access button";
-	pixel_x = 20;
-	pixel_y = -20;
-	req_access_txt = "67"
-	},
-/turf/space,
-/area/space)
 "noW" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/plasteel/white,
@@ -82835,18 +82665,6 @@
 	name = "reinforced stairs"
 	},
 /area/station/science/test_chamber)
-"nXF" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "arrivalsn_door_ext"
-	},
-/obj/machinery/access_button{
-	autolink_id = "arrivalsn_btn_ext";
-	name = "exterior access button";
-	pixel_x = 24;
-	pixel_y = 4
-	},
-/turf/simulated/floor/plating,
-/area/station/hallway/secondary/entry)
 "nYi" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
@@ -83267,10 +83085,10 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/mining/glass,
 /obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/supply/general,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/effect/mapping_helpers/airlock/access/all/supply/general,
 /turf/simulated/floor/plasteel,
 /area/station/supply/storage)
 "olR" = (
@@ -83759,19 +83577,6 @@
 /turf/simulated/floor/plating/airless,
 /area/station/maintenance/incinerator)
 "ozn" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 4;
-	autolink_id = "apsolar_vent"
-	},
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_y = -25;
-	req_access_txt = "13";
-	vent_link_id = "apsolar_vent";
-	ext_door_link_id = "apsolar_door_ext";
-	int_door_link_id = "apsolar_door_int";
-	int_button_link_id = "apsolar_btn_int";
-	ext_button_link_id = "apsolar_btn_ext"
-	},
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
@@ -83802,11 +83607,10 @@
 /obj/machinery/door/airlock/mining/glass{
 	name = "Cargo Bay"
 	},
+/obj/effect/mapping_helpers/airlock/access/all/supply/general,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/supply/general,
 /turf/simulated/floor/plasteel,
 /area/station/supply/office)
 "ozX" = (
@@ -84004,11 +83808,6 @@
 /obj/effect/mapping_helpers/airlock/windoor/autoname,
 /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen,
 /obj/effect/turf_decal/delivery,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id_tag = "kitchenbar";
-	name = "Kitchen Shutters";
-	dir = 1
-	},
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
 	},
@@ -84212,10 +84011,10 @@
 /turf/simulated/wall/r_wall,
 /area/station/telecomms/chamber)
 "oMA" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/plasteel,
+/obj/machinery/door/airlock/external{
+	name = "Arrival Airlock"
+	},
+/turf/simulated/floor/plating,
 /area/station/hallway/secondary/entry)
 "oMI" = (
 /obj/structure/disposalpipe/segment{
@@ -84446,14 +84245,9 @@
 /area/station/medical/virology)
 "oTS" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	id = "kitchenbar"
-	},
+/obj/machinery/door/airlock/public/glass,
 /obj/effect/mapping_helpers/airlock/autoname,
 /obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
-/obj/effect/mapping_helpers/airlock/polarized{
-	id = "kitchenbar"
-	},
 /turf/simulated/floor/plasteel,
 /area/station/service/kitchen)
 "oUw" = (
@@ -85374,10 +85168,6 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/delivery,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id_tag = "kitchenhall";
-	name = "Kitchen Shutters"
-	},
 /turf/simulated/floor/plasteel,
 /area/station/service/kitchen)
 "pAy" = (
@@ -85700,13 +85490,6 @@
 /turf/simulated/floor/plasteel,
 /area/station/engineering/control)
 "pIC" = (
-/obj/machinery/access_button{
-	autolink_id = "fssolar_btn_int";
-	name = "interior access button";
-	pixel_x = 25;
-	pixel_y = 25;
-	req_access_txt = "13"
-	},
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
@@ -85717,12 +85500,12 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 5
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 5
+	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/auxsolarstarboard)
 "pIY" = (
@@ -86093,17 +85876,6 @@
 	},
 /area/station/science/toxins/mixing)
 "pUC" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	autolink_id = "arrivalsn_vent"
-	},
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_x = 25;
-	vent_link_id = "arrivalsn_vent";
-	ext_door_link_id = "arrivalsn_door_ext";
-	int_door_link_id = "arrivalsn_door_int";
-	ext_button_link_id = "arrivalsn_btn_ext";
-	int_button_link_id = "arrivalsn_btn_int"
-	},
 /obj/machinery/light/small{
 	dir = 8
 	},
@@ -86180,24 +85952,6 @@
 /obj/machinery/optable,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/surgery/primary)
-"pWI" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window,
-/obj/effect/mapping_helpers/airlock/windoor/autoname,
-/obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id_tag = "kitchenbar";
-	name = "Kitchen Shutters";
-	dir = 1
-	},
-/obj/item/reagent_containers/drinks/britcup,
-/obj/item/reagent_containers/condiment/saltshaker,
-/turf/simulated/floor/plasteel{
-	icon_state = "bar"
-	},
-/area/station/service/kitchen)
 "pWP" = (
 /obj/structure/table/glass,
 /obj/item/storage/box/gloves{
@@ -86364,20 +86118,11 @@
 /turf/simulated/floor/plasteel/dark,
 /area/station/aisat)
 "qbz" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "apsolar_door_int";
-	locked = 1;
-	name = "Engineering External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/portsolar)
 "qcs" = (
@@ -86401,6 +86146,12 @@
 	name = "port bay 4 at Kerberos";
 	width = 9
 	},
+/obj/machinery/access_button{
+	autolink_id = "enginen_btn_ext";
+	name = "exterior access button";
+	pixel_x = 23;
+	pixel_y = -23
+	},
 /turf/space,
 /area/space)
 "qcR" = (
@@ -87078,19 +86829,6 @@
 	},
 /area/station/maintenance/apmaint)
 "qFR" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 8;
-	autolink_id = "assolar_vent"
-	},
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_y = 25;
-	req_access_txt = "13";
-	vent_link_id = "assolar_vent";
-	ext_door_link_id = "assolar_door_ext";
-	int_door_link_id = "assolar_door_int";
-	ext_button_link_id = "assolar_btn_ext";
-	int_button_link_id = "assolar_btn_int"
-	},
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
@@ -87216,20 +86954,6 @@
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/service/library)
-"qKd" = (
-/obj/structure/table,
-/obj/machinery/reagentgrinder,
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/button/windowtint{
-	dir = 1;
-	id = "kitchenbar";
-	pixel_y = -24
-	},
-/obj/item/food/snacks/mint,
-/obj/item/reagent_containers/condiment/enzyme,
-/obj/machinery/reagentgrinder,
-/turf/simulated/floor/plasteel,
-/area/station/service/kitchen)
 "qKk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -88004,13 +87728,6 @@
 /turf/simulated/floor/plasteel,
 /area/station/engineering/break_room)
 "riQ" = (
-/obj/machinery/access_button{
-	autolink_id = "atmostanks_btn_int";
-	name = "interior access button";
-	pixel_x = -23;
-	pixel_y = 20;
-	req_access_txt = "32"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
 	},
@@ -88353,23 +88070,6 @@
 	icon_state = "freezerfloor"
 	},
 /area/station/public/sleep)
-"rri" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/window,
-/obj/effect/mapping_helpers/airlock/windoor/autoname,
-/obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id_tag = "kitchenbar";
-	name = "Kitchen Shutters";
-	dir = 1
-	},
-/obj/item/reagent_containers/condiment/peppermill,
-/turf/simulated/floor/plasteel{
-	icon_state = "bar"
-	},
-/area/station/service/kitchen)
 "rrv" = (
 /obj/structure/chair/office,
 /obj/effect/landmark/start/coroner,
@@ -88443,12 +88143,12 @@
 	},
 /area/station/security/storage)
 "rtH" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "arrivalsn_door_int"
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/effect/spawner/airlock/e_to_w/engineer{
+	req_access_txt = 13
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/plating,
-/area/station/hallway/secondary/entry)
+/area/station/maintenance/portsolar)
 "rtU" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/atmos/glass{
@@ -88830,17 +88530,6 @@
 	icon_state = "vault"
 	},
 /area/station/telecomms/chamber)
-"rHp" = (
-/obj/machinery/access_button{
-	autolink_id = "atmostanks_btn_ext";
-	name = "exterior access button";
-	pixel_x = 20;
-	pixel_y = -20;
-	req_access_txt = "32"
-	},
-/obj/structure/lattice/catwalk,
-/turf/space,
-/area/space/nearstation)
 "rHr" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/reagent_dispensers/watertank,
@@ -88943,7 +88632,7 @@
 	color = "#009dff"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 5
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -89274,10 +88963,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	id_tag = "kitchenhall";
-	name = "Kitchen Shutters"
-	},
 /turf/simulated/floor/plasteel,
 /area/station/service/kitchen)
 "rVL" = (
@@ -89338,13 +89023,6 @@
 /turf/simulated/floor/plating,
 /area/station/command/office/rd)
 "rXy" = (
-/obj/machinery/access_button{
-	autolink_id = "apsolar_btn_int";
-	name = "interior access button";
-	pixel_x = -25;
-	pixel_y = -25;
-	req_access_txt = "13"
-	},
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
@@ -90710,11 +90388,6 @@
 /obj/effect/mapping_helpers/airlock/windoor/autoname,
 /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen,
 /obj/effect/turf_decal/delivery,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id_tag = "kitchenbar";
-	name = "Kitchen Shutters";
-	dir = 1
-	},
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
 	},
@@ -91323,19 +90996,6 @@
 	},
 /area/station/hallway/primary/central)
 "sVl" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 4;
-	autolink_id = "fpsolar_vent"
-	},
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_y = 25;
-	req_access_txt = "32";
-	vent_link_id = "fpsolar_vent";
-	ext_door_link_id = "fpsolar_door_ext";
-	int_door_link_id = "fpsolar_door_int";
-	ext_button_link_id = "fpsolar_btn_ext";
-	int_button_link_id = "fpsolar_btn_int"
-	},
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
@@ -91355,13 +91015,6 @@
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "sWd" = (
-/obj/machinery/access_button{
-	autolink_id = "assolar_btn_ext";
-	name = "exterior access button";
-	pixel_x = -25;
-	pixel_y = 25;
-	req_access_txt = "13"
-	},
 /obj/structure/lattice/catwalk,
 /obj/structure/cable{
 	d1 = 4;
@@ -91371,28 +91024,10 @@
 /turf/space,
 /area/station/maintenance/starboardsolar)
 "sWx" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "stationai_door_int";
-	locked = 1;
-	name = "Minisat Access"
+/obj/effect/spawner/airlock/e_to_w/engineer{
+	req_access_txt = "11,13"
 	},
-/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel/dark,
+/turf/simulated/wall,
 /area/station/engineering/ai_transit_tube)
 "sXr" = (
 /obj/effect/spawner/window/reinforced/polarized/grilled{
@@ -91774,18 +91409,6 @@
 	},
 /area/station/medical/morgue)
 "tls" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	autolink_id = "atmostanks_vent"
-	},
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_x = 57;
-	req_access_txt = "32";
-	vent_link_id = "atmostanks_vent";
-	ext_door_link_id = "atmostanks_door_ext";
-	int_door_link_id = "atmostanks_door_int";
-	ext_button_link_id = "atmostanks_btn_ext";
-	int_button_link_id = "atmostanks_btn_int"
-	},
 /obj/effect/turf_decal/delivery/hollow,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/gravitygenerator)
@@ -92111,6 +91734,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/mining,
 /obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment,
@@ -92119,7 +91743,6 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
 /turf/simulated/floor/plasteel,
 /area/station/supply/miningdock)
 "tyQ" = (
@@ -92152,6 +91775,16 @@
 	icon_state = "neutralcorner"
 	},
 /area/station/hallway/primary/fore)
+"tAi" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/space/nearstation)
 "tAt" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -92347,15 +91980,6 @@
 /obj/effect/spawner/window/reinforced/grilled,
 /turf/simulated/floor/plating,
 /area/station/maintenance/starboard2)
-"tGB" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "atmostanks_door_ext";
-	locked = 1;
-	name = "Atmos External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/construction,
-/turf/simulated/floor/plasteel,
-/area/station/engineering/gravitygenerator)
 "tGY" = (
 /obj/structure/sign/nosmoking_2{
 	pixel_y = 32
@@ -92571,13 +92195,11 @@
 	},
 /area/station/security/warden)
 "tOv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 6
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "red"
-	},
-/area/station/security/permabrig)
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/secondary/entry)
 "tOM" = (
 /obj/machinery/power/apc{
 	name = "south bump";
@@ -92786,20 +92408,11 @@
 /turf/simulated/floor/plating,
 /area/station/science/server)
 "tSB" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "fssolar_door_int";
-	locked = 1;
-	name = "Engineering External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/auxsolarstarboard)
 "tSM" = (
@@ -93168,13 +92781,12 @@
 	},
 /area/station/public/fitness)
 "uci" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "apmaint2_door_ext";
-	locked = 1;
-	name = "West Maintenance External Access"
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/effect/spawner/airlock/s_to_n{
+	req_access_txt = null
 	},
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/port)
+/turf/simulated/floor/plating,
+/area/station/hallway/secondary/entry)
 "ucl" = (
 /obj/machinery/economy/vending/cigarette,
 /turf/simulated/floor/plating,
@@ -93221,19 +92833,12 @@
 	},
 /area/station/medical/cloning)
 "udZ" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "sol_door_ext";
-	locked = 1;
-	name = "Arrivals External Access"
-	},
-/obj/machinery/access_button{
-	autolink_id = "sol_btn_ext";
-	name = "exterior access button";
-	pixel_x = -13;
-	pixel_y = -23
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/effect/spawner/airlock/w_to_e/engineer{
+	req_access_txt = 13
 	},
 /turf/simulated/floor/plating,
-/area/station/hallway/secondary/entry)
+/area/station/maintenance/starboardsolar)
 "uec" = (
 /obj/machinery/door_control{
 	id = "cmoofficedoor";
@@ -93362,12 +92967,6 @@
 /turf/simulated/floor/wood,
 /area/station/maintenance/library)
 "uht" = (
-/obj/machinery/access_button{
-	autolink_id = "apmaint2_btn_int";
-	name = "interior access button";
-	pixel_x = -24;
-	pixel_y = 24
-	},
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 4
 	},
@@ -93672,13 +93271,6 @@
 	},
 /area/station/hallway/secondary/entry)
 "upI" = (
-/obj/machinery/access_button{
-	autolink_id = "fpsolar_btn_int";
-	name = "interior access button";
-	pixel_x = -25;
-	pixel_y = 25;
-	req_access_txt = "32"
-	},
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
@@ -94018,13 +93610,6 @@
 /turf/simulated/floor/plating,
 /area/station/security/permabrig)
 "uDO" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "fssolar_door_ext";
-	locked = 1;
-	name = "Engineering External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
@@ -94696,12 +94281,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/security/detective)
-"uYK" = (
-/obj/structure/table,
-/obj/machinery/kitchen_machine/microwave,
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel,
-/area/station/service/kitchen)
 "uYN" = (
 /obj/structure/table/reinforced,
 /obj/item/folder/blue,
@@ -94845,20 +94424,13 @@
 	},
 /area/station/security/main)
 "vcx" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 4;
-	autolink_id = "sol_vent"
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
 	},
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_y = -25;
-	vent_link_id = "sol_vent";
-	ext_door_link_id = "sol_door_ext";
-	int_door_link_id = "sol_door_int";
-	ext_button_link_id = "sol_btn_ext";
-	int_button_link_id = "sol_btn_int"
-	},
-/turf/simulated/floor/plating,
-/area/station/hallway/secondary/entry)
+/turf/simulated/floor/plasteel/dark,
+/area/station/engineering/ai_transit_tube)
 "vdI" = (
 /obj/machinery/keycard_auth{
 	pixel_y = 26
@@ -95299,19 +94871,6 @@
 /turf/simulated/floor/plasteel/white,
 /area/station/science/explab)
 "vzo" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 8;
-	autolink_id = "fssolar_vent"
-	},
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_y = 25;
-	req_access_txt = "13";
-	vent_link_id = "fssolar_vent";
-	ext_door_link_id = "fssolar_door_ext";
-	int_door_link_id = "fssolar_door_int";
-	ext_button_link_id = "fssolar_btn_ext";
-	int_button_link_id = "fssolar_btn_int"
-	},
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
@@ -95739,16 +95298,6 @@
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/reception)
-"vIN" = (
-/obj/machinery/access_button{
-	autolink_id = "arrivalsn_btn_int";
-	name = "exterior access button";
-	pixel_x = 4;
-	pixel_y = 24
-	},
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel,
-/area/station/hallway/secondary/entry)
 "vIR" = (
 /obj/machinery/atmospherics/unary/outlet_injector{
 	dir = 8;
@@ -96812,22 +96361,6 @@
 	icon_state = "whitegreen"
 	},
 /area/station/medical/virology)
-"wrr" = (
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_y = 25;
-	vent_link_id = "apmaint2_vent";
-	ext_door_link_id = "apmaint2_door_ext";
-	int_door_link_id = "apmaint2_door_int";
-	ext_button_link_id = "apmaint2_btn_ext";
-	int_button_link_id = "apmaint2_btn_int"
-	},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 4;
-	autolink_id = "apmaint2_vent"
-	},
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/port)
 "wrE" = (
 /obj/structure/table/reinforced,
 /obj/machinery/alarm{
@@ -97878,31 +97411,11 @@
 	},
 /area/station/maintenance/fsmaint)
 "wZD" = (
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_y = -57;
-	req_access_txt = "10;13";
-	vent_link_id = "stationai_vent";
-	ext_door_link_id = "stationai_door_ext";
-	int_door_link_id = "stationai_door_int";
-	ext_button_link_id = "stationai_btn_ext";
-	int_button_link_id = "stationai_btn_int"
+/obj/effect/spawner/airlock/e_to_w/engineer{
+	req_access_txt = 13
 	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel/dark,
-/area/station/engineering/ai_transit_tube)
+/turf/simulated/wall,
+/area/station/maintenance/port)
 "wZK" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "Internal Medbay Maintenance"
@@ -98027,7 +97540,7 @@
 	},
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/access_button{
-	autolink_id = "sol_btn_int";
+	autolink_id = "engines_btn_int";
 	name = "interior access button";
 	pixel_x = -25;
 	pixel_y = -25
@@ -98299,13 +97812,6 @@
 	},
 /area/station/command/office/cmo)
 "xnw" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "apsolar_door_ext";
-	locked = 1;
-	name = "Engineering External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
@@ -99291,17 +98797,6 @@
 /obj/item/kirbyplants,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/explab)
-"xPJ" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "sol_door_int";
-	locked = 1;
-	name = "Arrivals External Access"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/station/hallway/secondary/entry)
 "xPQ" = (
 /obj/machinery/economy/vending/coffee,
 /obj/structure/disposalpipe/segment{
@@ -99364,6 +98859,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/starboard)
+"xQX" = (
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "arrival"
+	},
+/area/station/hallway/secondary/entry)
 "xRk" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "Checkpoint Maintenance"
@@ -119260,7 +118762,7 @@ cCy
 hkk
 aaa
 abj
-iYu
+acF
 cHA
 aaa
 aaa
@@ -119517,8 +119019,8 @@ maf
 hkk
 aaa
 cHA
-uci
-cHA
+ddh
+wZD
 aaa
 aaa
 aaa
@@ -119774,7 +119276,7 @@ cTi
 hkk
 aaa
 cHA
-wrr
+cCq
 cHA
 aaa
 aaa
@@ -119955,7 +119457,7 @@ abj
 abj
 abj
 abj
-iKT
+atK
 abj
 aLT
 aNT
@@ -120031,7 +119533,7 @@ sZp
 cHA
 aaa
 cHA
-gHC
+drn
 cHA
 aaa
 aaa
@@ -120212,8 +119714,8 @@ aaa
 abj
 abj
 gmT
-jEE
-gmT
+jCQ
+iYu
 acF
 aGZ
 wok
@@ -120505,9 +120007,9 @@ bGs
 bwN
 abj
 bVs
-bXG
+iIS
 bYJ
-abj
+tAi
 nmF
 abj
 bXU
@@ -120764,7 +120266,7 @@ abj
 dVS
 abj
 abj
-abj
+fYS
 nmF
 abj
 bXU
@@ -121018,10 +120520,10 @@ bEI
 bGv
 bwN
 qGf
-dcp
-qGf
-qGf
+vcx
+sWx
 abj
+fYS
 giK
 abj
 bXU
@@ -121275,9 +120777,9 @@ bEK
 bGw
 bwN
 bJZ
-wZD
 bVt
 qGf
+abj
 bZf
 fRW
 qYL
@@ -121532,7 +121034,7 @@ bEM
 bGx
 bwN
 qGf
-sWx
+vcx
 qGf
 qGf
 bRT
@@ -122039,7 +121541,7 @@ aOg
 acF
 bzL
 byi
-bzL
+mPU
 bBt
 rcq
 bEN
@@ -122293,8 +121795,8 @@ lOm
 odQ
 wWl
 aOg
-rHp
-tGB
+acF
+eml
 tls
 eml
 riQ
@@ -124612,7 +124114,7 @@ bys
 bzR
 bBA
 bDs
-nfI
+bIx
 byl
 bIx
 bKC
@@ -125641,7 +125143,7 @@ bKr
 bBE
 bKp
 bEX
-bdT
+bGD
 bIA
 bKp
 bMq
@@ -127528,7 +127030,7 @@ abj
 abj
 abj
 aaa
-mVF
+dYJ
 abj
 aaa
 dij
@@ -127786,7 +127288,7 @@ aaa
 abj
 nKk
 xnw
-nKk
+rtH
 abj
 dij
 aaa
@@ -130722,7 +130224,7 @@ abj
 abj
 abj
 grB
-udZ
+oMA
 rJk
 abj
 abj
@@ -130979,7 +130481,7 @@ aaa
 aaa
 abj
 grB
-vcx
+ahQ
 grB
 aaa
 aaa
@@ -131236,7 +130738,7 @@ grB
 grB
 adb
 grB
-xPJ
+eKO
 grB
 adb
 adb
@@ -131466,8 +130968,8 @@ aaa
 aaa
 grB
 grB
-grB
-vIN
+uci
+afb
 tXb
 adZ
 san
@@ -131494,9 +130996,9 @@ agA
 agg
 adZ
 xcL
-oMA
+tOv
 qtk
-ani
+xQX
 wSO
 adb
 aaa
@@ -131721,9 +131223,9 @@ aaa
 aaa
 aaa
 aaa
-nXF
+aeN
 pUC
-rtH
+aeN
 adt
 afh
 aea
@@ -136418,7 +135920,7 @@ bct
 bcr
 bdM
 bfh
-eWt
+aYZ
 bdQ
 bjt
 blj
@@ -136678,7 +136180,7 @@ bfi
 aYZ
 aYa
 aYC
-qKd
+blk
 aYZ
 boo
 tmq
@@ -137700,11 +137202,11 @@ aWg
 aUo
 aOG
 aTp
-rri
+iUZ
 bdQ
 bfk
 bgA
-fpe
+bhQ
 aZk
 bln
 aZa
@@ -137957,7 +137459,7 @@ aWh
 aUw
 aOG
 aTp
-pWI
+nnP
 bdP
 bgv
 bgB
@@ -138217,10 +137719,10 @@ aVQ
 oHk
 bdQ
 bfm
-iDz
+bhN
 bli
 bdQ
-kTe
+bne
 bmZ
 boo
 tmq
@@ -138734,7 +138236,7 @@ bdS
 bdQ
 bdP
 bdQ
-uYK
+bQy
 aYZ
 fJp
 tmq
@@ -144338,7 +143840,7 @@ aaa
 ofi
 ofi
 tSB
-ofi
+jEE
 ofi
 abj
 akB
@@ -145108,7 +144610,7 @@ aaa
 aaa
 aaa
 abj
-khZ
+adg
 abj
 abj
 aaa
@@ -146435,7 +145937,7 @@ aSb
 aWD
 aVj
 aWJ
-hEv
+aYj
 aZD
 nuO
 aWf
@@ -152085,7 +151587,7 @@ ygH
 uUu
 kju
 aKU
-tOv
+aOX
 nFh
 aSj
 aTH
@@ -154999,7 +154501,7 @@ aaa
 jtb
 jtb
 frh
-jtb
+udZ
 jtb
 abj
 abj
@@ -155512,7 +155014,7 @@ aaa
 aaa
 abj
 jtb
-kan
+frh
 jtb
 abj
 abj
@@ -157488,7 +156990,7 @@ mhu
 mhu
 mhu
 mhu
-mhu
+mVF
 bda
 aTM
 bdf
@@ -157742,7 +157244,7 @@ aaa
 aaa
 aaa
 aaa
-noB
+aaa
 jrB
 mmV
 ihi
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index d09ab771c61..d778028b5be 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -47566,17 +47566,8 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/starboardsolar)
 "dUF" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "soldock_door_ext";
-	locked = 1;
-	name = "Arrivals External Access"
-	},
-/obj/machinery/access_button{
-	autolink_id = "soldock_btn_ext";
-	name = "exterior access button";
-	pixel_x = -7;
-	pixel_y = -25
-	},
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/effect/spawner/airlock/e_to_w/arrivals,
 /turf/simulated/floor/plating,
 /area/station/hallway/secondary/entry)
 "dUG" = (
@@ -52696,17 +52687,6 @@
 /obj/item/deck/cards,
 /turf/simulated/floor/plasteel,
 /area/station/security/permabrig)
-"gcW" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
-/obj/machinery/door/airlock/external{
-	id_tag = "soldock_door_int";
-	locked = 1;
-	name = "Arrivals External Access"
-	},
-/turf/simulated/floor/plating,
-/area/station/hallway/secondary/entry)
 "gdb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -57975,12 +57955,6 @@
 /turf/simulated/floor/plasteel,
 /area/station/science/robotics)
 "inw" = (
-/obj/machinery/access_button{
-	autolink_id = "soldock_btn_int";
-	name = "interior access button";
-	pixel_x = -25;
-	pixel_y = -25
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 10
 	},
@@ -69728,18 +69702,6 @@
 	},
 /area/station/science/xenobiology)
 "nlp" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 4;
-	autolink_id = "soldock_vent"
-	},
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_y = -25;
-	vent_link_id = "soldock_vent";
-	ext_door_link_id = "soldock_door_ext";
-	int_door_link_id = "soldock_door_int";
-	ext_button_link_id = "soldock_btn_ext";
-	int_button_link_id = "soldock_btn_int"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
@@ -102866,8 +102828,8 @@ aaa
 ajo
 abq
 aug
+bOx
 dUF
-oTn
 abq
 ajo
 aaa
@@ -103380,7 +103342,7 @@ aSq
 aWG
 ayC
 aJv
-gcW
+bOx
 oTn
 oTn
 oTn
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index 8e8d115347b..ef94ff1df98 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -9665,16 +9665,6 @@
 /obj/structure/chair,
 /turf/simulated/floor/wood,
 /area/station/maintenance/fpmaint2)
-"aEM" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/machinery/door/airlock/external{
-	id_tag = "evamaint_door_int";
-	locked = 1;
-	name = "EVA Internal Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint2)
 "aEN" = (
 /obj/structure/closet/emcloset,
 /turf/simulated/floor/plating,
@@ -10368,9 +10358,6 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/structure/sign/vacuum/external{
-	pixel_y = 32
-	},
 /obj/machinery/power/solar_control{
 	name = "Fore Starboard Solar Control"
 	},
@@ -10395,6 +10382,9 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/portable/canister/air,
+/obj/structure/sign/vacuum/external{
+	pixel_y = 32
+	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/auxsolarstarboard)
 "aGX" = (
@@ -18178,11 +18168,6 @@
 	},
 /area/station/service/kitchen)
 "bdK" = (
-/obj/machinery/access_button{
-	autolink_id = "evamaint_btn_int";
-	pixel_y = 25;
-	req_access_txt = "13"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
 	},
@@ -25916,6 +25901,12 @@
 	icon_state = "browncorner"
 	},
 /area/station/hallway/primary/central/west)
+"bzN" = (
+/obj/effect/spawner/airlock/w_to_e/long{
+	req_access_txt = 11
+	},
+/turf/simulated/wall/r_wall,
+/area/station/engineering/ai_transit_tube)
 "bzO" = (
 /obj/structure/chair,
 /turf/simulated/floor/plasteel,
@@ -42610,27 +42601,6 @@
 	icon_state = "darkbluecorners"
 	},
 /area/station/service/expedition)
-"cGW" = (
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 8;
-	autolink_id = "scibomb_vent"
-	},
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_y = 27;
-	req_access_txt = "13";
-	vent_link_id = "scibomb_vent";
-	ext_door_link_id = "scibomb_door_ext";
-	int_door_link_id = "scibomb_door_int";
-	ext_button_link_id = "scibomb_btn_ext";
-	int_button_link_id = "scibomb_btn_int"
-	},
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
 "cGX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -48106,12 +48076,6 @@
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
 "cZV" = (
-/obj/machinery/access_button{
-	autolink_id = "barmaint_btn_int";
-	pixel_x = -25;
-	pixel_y = 25;
-	req_access_txt = "13"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
 	},
@@ -48209,18 +48173,11 @@
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
 "dap" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "fpsolar_door_int";
-	locked = 1;
-	name = "Engineering External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/plating,
 /area/station/maintenance/auxsolarport)
 "dar" = (
@@ -49975,21 +49932,6 @@
 /obj/machinery/atmospherics/meter,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
-"dgv" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/door/airlock/external{
-	id_tag = "assolar_door_ext";
-	locked = 1;
-	name = "Engineering External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
 "dgy" = (
 /obj/effect/landmark/spawner/nukedisc_respawn,
 /obj/structure/table,
@@ -51470,13 +51412,13 @@
 /turf/simulated/floor/engine,
 /area/station/engineering/control)
 "dlj" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 3;
-	name = "3maintenance loot spawner"
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/structure/sign/securearea{
+	desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
+	name = "KEEP CLEAR: DOCKING AREA"
 	},
 /turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
+/area/station/hallway/secondary/entry)
 "dlk" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -53659,11 +53601,8 @@
 /turf/simulated/floor/plasteel,
 /area/station/medical/sleeper)
 "dvb" = (
-/obj/structure/sign/securearea{
-	desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
-	name = "KEEP CLEAR: DOCKING AREA"
-	},
 /obj/effect/spawner/window/reinforced/grilled,
+/obj/effect/spawner/airlock/e_to_w/arrivals,
 /turf/simulated/floor/plating,
 /area/station/hallway/secondary/entry)
 "dvv" = (
@@ -54446,20 +54385,6 @@
 	icon_state = "whitepurple"
 	},
 /area/station/science/xenobiology)
-"dQn" = (
-/obj/machinery/access_button{
-	autolink_id = "evamaint_btn_ext";
-	pixel_x = 25;
-	req_access_txt = "13"
-	},
-/obj/machinery/door/airlock/external{
-	id_tag = "evamaint_door_ext";
-	locked = 1;
-	name = "EVA External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint2)
 "dQC" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
@@ -56491,13 +56416,6 @@
 	icon_state = "dark"
 	},
 /area/station/security/prison/cell_block/A)
-"eIz" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 4;
-	autolink_id = "evamaint_vent"
-	},
-/turf/simulated/floor/plating/airless,
-/area/station/maintenance/fpmaint2)
 "eIN" = (
 /obj/structure/table/reinforced,
 /obj/effect/spawner/lootdrop/maintenance,
@@ -56992,17 +56910,12 @@
 	},
 /area/station/hallway/primary/aft)
 "eXd" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/effect/spawner/airlock/s_to_n/engineer{
+	req_access_txt = 13
 	},
-/obj/machinery/door/airlock/external{
-	id_tag = "southatmos_door_int";
-	locked = 1;
-	name = "Atmospherics External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
 /turf/simulated/floor/plating,
-/area/station/maintenance/storage)
+/area/station/maintenance/auxsolarstarboard)
 "eXy" = (
 /obj/machinery/alarm{
 	dir = 1;
@@ -57802,6 +57715,15 @@
 /obj/machinery/door/airlock/command/glass,
 /turf/simulated/floor/plasteel,
 /area/station/supply/qm)
+"fof" = (
+/obj/structure/rack,
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance{
+	lootcount = 2;
+	name = "2maintenance loot spawner"
+	},
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
 "fog" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 5
@@ -58923,21 +58845,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
-"fRa" = (
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/door/airlock/external{
-	id_tag = "apsolar_door_ext";
-	locked = 1;
-	name = "Engineering External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
 "fRh" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -59586,13 +59493,12 @@
 /turf/simulated/floor/carpet/royalblack,
 /area/station/maintenance/apmaint)
 "ghR" = (
-/obj/structure/sign/vacuum/external{
-	pixel_x = -32
-	},
 /obj/machinery/light/small{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/structure/sign/vacuum/external{
+	pixel_x = 32
+	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft)
 "gif" = (
@@ -60437,16 +60343,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/apmaint)
-"gCP" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "scimaint_door_int";
-	locked = 1;
-	name = "External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft)
 "gCU" = (
 /obj/structure/punching_bag,
 /obj/effect/turf_decal/delivery/hollow,
@@ -60923,12 +60819,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
 	},
-/obj/machinery/access_button{
-	autolink_id = "apsolar_btn_int";
-	pixel_x = -25;
-	pixel_y = -25;
-	req_access_txt = "13"
-	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/portsolar)
 "gOr" = (
@@ -61429,26 +61319,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/station/command/meeting_room)
-"gXU" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
-/obj/machinery/door/airlock/external{
-	id_tag = "sol_door_int";
-	locked = 1;
-	name = "Arrivals External Access"
-	},
-/turf/simulated/floor/plating,
-/area/station/hallway/secondary/entry)
-"gYf" = (
-/obj/machinery/access_button{
-	autolink_id = "southatmos_btn_ext";
-	pixel_x = -25;
-	pixel_y = -8
-	},
-/obj/structure/lattice,
-/turf/space,
-/area/space/nearstation)
 "gYq" = (
 /obj/machinery/atmospherics/pipe/manifold/visible,
 /turf/simulated/floor/plating,
@@ -62001,12 +61871,6 @@
 /turf/space,
 /area/space)
 "hoD" = (
-/obj/machinery/access_button{
-	autolink_id = "fpsolar_btn_int";
-	pixel_x = 25;
-	pixel_y = 25;
-	req_access_txt = "13"
-	},
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 8;
@@ -62458,12 +62322,6 @@
 /turf/simulated/floor/plasteel,
 /area/station/science/storage)
 "hzG" = (
-/obj/machinery/access_button{
-	autolink_id = "scimaint_btn_int";
-	pixel_x = -28;
-	pixel_y = -5;
-	req_access_txt = "13"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 6
 	},
@@ -62556,21 +62414,6 @@
 	icon_state = "red"
 	},
 /area/station/security/permabrig)
-"hDJ" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/access_button{
-	autolink_id = "assolar_btn_ext";
-	pixel_x = 25;
-	pixel_y = 25;
-	req_access_txt = "13"
-	},
-/obj/structure/lattice/catwalk,
-/turf/space,
-/area/station/engineering/solar/starboard)
 "hDQ" = (
 /obj/structure/table/wood,
 /obj/machinery/recharger{
@@ -62717,15 +62560,15 @@
 /turf/simulated/floor/plating,
 /area/station/service/chapel)
 "hFM" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 5
-	},
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/fpmaint2)
 "hGb" = (
@@ -65722,19 +65565,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/assembly_line)
-"jmd" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "sol_door_ext";
-	locked = 1;
-	name = "Arrivals External Access"
-	},
-/obj/machinery/access_button{
-	autolink_id = "sol_btn_ext";
-	pixel_x = -10;
-	pixel_y = -23
-	},
-/turf/simulated/floor/plating,
-/area/station/hallway/secondary/entry)
 "jmM" = (
 /obj/effect/spawner/window/reinforced/grilled,
 /obj/structure/cable,
@@ -66548,16 +66378,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/public/dorms)
-"jEq" = (
-/obj/machinery/access_button{
-	autolink_id = "barmaint_btn_ext";
-	pixel_x = -25;
-	pixel_y = -25;
-	req_access_txt = "13"
-	},
-/obj/structure/lattice/catwalk,
-/turf/space,
-/area/space/nearstation)
 "jFf" = (
 /obj/structure/closet/crate/secure{
 	req_one_access = list(33,41);
@@ -66800,13 +66620,6 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/external{
-	id_tag = "fssolar_door_ext";
-	locked = 1;
-	name = "Engineering External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
 /turf/simulated/floor/plating,
 /area/station/maintenance/auxsolarstarboard)
 "jOA" = (
@@ -66845,16 +66658,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/science/xenobiology)
-"jPd" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "barmaint_door_int";
-	locked = 1;
-	name = "External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
 "jPk" = (
 /obj/structure/cable{
 	d2 = 2;
@@ -66949,20 +66752,9 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/port)
 "jRo" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	autolink_id = "barmaint_vent"
-	},
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_x = 25;
-	req_access_txt = "13";
-	vent_link_id = "barmaint_vent";
-	ext_door_link_id = "barmaint_door_ext";
-	int_door_link_id = "barmaint_door_int";
-	ext_button_link_id = "barmaint_btn_ext";
-	int_button_link_id = "barmaint_btn_int"
-	},
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
+/obj/effect/spawner/airlock/s_to_n/long/square/engineer,
+/turf/simulated/wall,
+/area/station/maintenance/fpmaint2)
 "jRx" = (
 /obj/machinery/photocopier,
 /turf/simulated/floor/wood,
@@ -69371,12 +69163,6 @@
 /turf/simulated/floor/wood,
 /area/station/security/permabrig)
 "laU" = (
-/obj/machinery/access_button{
-	autolink_id = "fpsolar_btn_ext";
-	pixel_x = 25;
-	pixel_y = -25;
-	req_access_txt = "13"
-	},
 /obj/structure/cable{
 	d2 = 2;
 	icon_state = "0-2"
@@ -69501,19 +69287,6 @@
 /turf/simulated/floor/grass/jungle/no_creep,
 /area/station/command/bridge)
 "lcl" = (
-/obj/machinery/airlock_controller/air_cycler{
-	name = "EVA Airlock Console";
-	pixel_x = 25;
-	req_one_access_txt = "1;5;11;18;24";
-	vent_link_id = "evamaint_vent";
-	ext_door_link_id = "evamaint_door_ext";
-	int_door_link_id = "evamaint_door_int";
-	ext_button_link_id = "evamaint_btn_ext";
-	int_button_link_id = "evamaint_btn_int"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden{
-	dir = 4
-	},
 /turf/simulated/floor/plating/airless,
 /area/station/maintenance/fpmaint2)
 "lcw" = (
@@ -69637,21 +69410,6 @@
 	icon_state = "white"
 	},
 /area/station/science/genetics)
-"lgb" = (
-/obj/machinery/access_button{
-	autolink_id = "fssolar_btn_ext";
-	pixel_x = -25;
-	pixel_y = -25;
-	req_access_txt = "10;13"
-	},
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/lattice/catwalk,
-/turf/space,
-/area/station/engineering/solar/auxstarboard)
 "lgS" = (
 /obj/structure/closet/secure_closet/brig,
 /turf/simulated/floor/plasteel{
@@ -70146,15 +69904,6 @@
 /obj/machinery/light/small,
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
-"lrP" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "southatmos_door_ext";
-	locked = 1;
-	name = "Atmospherics External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/turf/simulated/floor/plating,
-/area/station/maintenance/storage)
 "lsa" = (
 /obj/machinery/economy/slot_machine,
 /obj/machinery/camera{
@@ -73554,6 +73303,13 @@
 	icon_state = "darkred"
 	},
 /area/station/hallway/secondary/exit)
+"nee" = (
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/effect/spawner/airlock/s_to_n{
+	req_access_txt = "11,13"
+	},
+/turf/simulated/floor/plating,
+/area/station/maintenance/auxsolarport)
 "neo" = (
 /obj/effect/spawner/window/reinforced/tinted,
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
@@ -73758,14 +73514,12 @@
 /turf/simulated/floor/plasteel,
 /area/station/medical/virology)
 "nnF" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "fpmaint_door_ext";
-	locked = 1;
-	name = "External Access"
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/effect/spawner/airlock/s_to_n/engineer{
+	req_access_txt = 13
 	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
 /turf/simulated/floor/plating,
-/area/station/maintenance/apmaint)
+/area/station/maintenance/fsmaint)
 "noq" = (
 /obj/machinery/conveyor/west{
 	id = "QMLoad";
@@ -73791,16 +73545,6 @@
 	icon_state = "whitehall"
 	},
 /area/station/science/genetics)
-"npm" = (
-/obj/machinery/access_button{
-	autolink_id = "scimaint_btn_ext";
-	pixel_x = 8;
-	pixel_y = 25;
-	req_access_txt = "13"
-	},
-/obj/structure/lattice/catwalk,
-/turf/space,
-/area/space/nearstation)
 "nps" = (
 /obj/machinery/atmospherics/binary/valve/open{
 	dir = 4
@@ -73996,19 +73740,6 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 4;
-	autolink_id = "apsolar_vent"
-	},
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_y = -25;
-	req_access_txt = "13";
-	vent_link_id = "apsolar_vent";
-	ext_door_link_id = "apsolar_door_ext";
-	int_door_link_id = "apsolar_door_int";
-	ext_button_link_id = "apsolar_btn_ext";
-	int_button_link_id = "apsolar_btn_int"
-	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/portsolar)
 "nuq" = (
@@ -74260,19 +73991,9 @@
 	},
 /area/station/science/toxins/mixing)
 "nBq" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 1;
-	autolink_id = "scimaint_vent"
-	},
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_x = -25;
-	pixel_y = -6;
-	req_access_txt = "13";
-	vent_link_id = "scimaint_vent";
-	ext_door_link_id = "scimaint_door_ext";
-	int_door_link_id = "scimaint_door_int";
-	ext_button_link_id = "scimaint_btn_ext";
-	int_button_link_id = "scimaint_btn_int"
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/effect/spawner/airlock/long/engineer{
+	req_access_txt = 13
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft)
@@ -75472,20 +75193,6 @@
 	},
 /turf/simulated/floor/carpet/arcade,
 /area/station/public/arcade)
-"oeE" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "scibomb_door_ext";
-	locked = 1;
-	name = "External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
 "oeO" = (
 /obj/structure/table,
 /obj/machinery/cell_charger,
@@ -76367,9 +76074,6 @@
 /turf/simulated/floor/plating/airless,
 /area/station/maintenance/asmaint)
 "oxe" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 10
-	},
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/simulated/floor/plating/airless,
 /area/station/maintenance/fpmaint2)
@@ -76519,20 +76223,10 @@
 /turf/simulated/floor/mech_bay_recharge_floor,
 /area/station/maintenance/asmaint)
 "oBF" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/door/airlock/external{
-	id_tag = "fssolar_door_int";
-	locked = 1;
-	name = "Engineering External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/effect/spawner/airlock/s_to_n/long/engineer,
 /turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/fpmaint2)
 "oBJ" = (
 /obj/structure/chair/stool{
 	dir = 8
@@ -79294,12 +78988,6 @@
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/asmaint)
 "pTK" = (
-/obj/machinery/access_button{
-	autolink_id = "arrivalsmaint_btn_int";
-	pixel_x = -25;
-	pixel_y = 25;
-	req_access_txt = "13"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
 	},
@@ -79412,15 +79100,6 @@
 	},
 /turf/simulated/floor/engine/xenobio,
 /area/station/science/xenobiology)
-"pWR" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "evamaint_door_int";
-	locked = 1;
-	name = "EVA Internal Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint2)
 "pWW" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark/spawner/nukedisc_respawn,
@@ -79532,14 +79211,12 @@
 /turf/simulated/floor/plasteel,
 /area/station/supply/miningdock)
 "qaB" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "evamaint_door_ext";
-	locked = 1;
-	name = "EVA External Access"
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/effect/spawner/airlock/engineer{
+	req_access_txt = 13
 	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
 /turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint2)
+/area/station/maintenance/apmaint)
 "qaI" = (
 /obj/item/clothing/suit/chef/classic,
 /turf/simulated/floor/plating,
@@ -81201,11 +80878,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 10
 	},
-/obj/machinery/access_button{
-	autolink_id = "sol_btn_int";
-	pixel_x = -22;
-	pixel_y = -23
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
@@ -83092,21 +82764,6 @@
 	icon_state = "blue"
 	},
 /area/station/command/bridge)
-"rFZ" = (
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/access_button{
-	autolink_id = "scibomb_btn_ext";
-	pixel_x = -24;
-	pixel_y = 25;
-	req_access_txt = "10;13"
-	},
-/obj/structure/lattice/catwalk,
-/turf/space,
-/area/space/nearstation)
 "rGg" = (
 /obj/structure/cable{
 	d2 = 4;
@@ -83182,16 +82839,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/asmaint)
-"rIX" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "fpmaint_door_int";
-	locked = 1;
-	name = "External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/obj/machinery/atmospherics/pipe/simple/visible,
-/turf/simulated/floor/plating,
-/area/station/maintenance/apmaint)
 "rJb" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -83320,25 +82967,16 @@
 	},
 /area/station/turret_protected/ai)
 "rMP" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	autolink_id = "fpsolar_vent"
-	},
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_x = 25;
-	req_access_txt = "13";
-	vent_link_id = "fpsolar_vent";
-	ext_door_link_id = "fpsolar_door_ext";
-	int_door_link_id = "fpsolar_door_int";
-	ext_button_link_id = "fpsolar_btn_ext";
-	int_button_link_id = "fpsolar_btn_int"
-	},
 /obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 5
 	},
 /turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/fpmaint2)
 "rMX" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/cyan{
 	dir = 8
@@ -83362,21 +83000,6 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/plasteel,
 /area/station/command/bridge)
-"rOS" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 4;
-	autolink_id = "sol_vent"
-	},
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_y = -25;
-	vent_link_id = "sol_vent";
-	ext_door_link_id = "sol_door_ext";
-	int_door_link_id = "sol_door_int";
-	ext_button_link_id = "sol_btn_ext";
-	int_button_link_id = "sol_btn_int"
-	},
-/turf/simulated/floor/plating,
-/area/station/hallway/secondary/entry)
 "rOW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -84317,21 +83940,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint2)
-"spJ" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/door/airlock/external{
-	id_tag = "assolar_door_int";
-	locked = 1;
-	name = "Engineering External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
 "spK" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -84767,12 +84375,6 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/obj/machinery/access_button{
-	autolink_id = "fssolar_btn_int";
-	pixel_x = 25;
-	pixel_y = 25;
-	req_access_txt = "13"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
 	},
@@ -85413,19 +85015,6 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_x = 25;
-	req_access_txt = "13";
-	vent_link_id = "assolar_vent";
-	ext_door_link_id = "assolar_door_ext";
-	int_door_link_id = "assolar_door_int";
-	ext_button_link_id = "assolar_btn_ext";
-	int_button_link_id = "assolar_btn_int"
-	},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 1;
-	autolink_id = "assolar_vent"
-	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/starboardsolar)
 "sTQ" = (
@@ -85673,15 +85262,6 @@
 /mob/living/simple_animal/slime,
 /turf/simulated/floor/engine,
 /area/station/science/xenobiology)
-"taW" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "scimaint_door_ext";
-	locked = 1;
-	name = "External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft)
 "tbr" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/binary/pump,
@@ -86043,18 +85623,6 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 8;
-	autolink_id = "southatmos_vent"
-	},
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_y = -25;
-	vent_link_id = "southatmos_vent";
-	ext_door_link_id = "southatmos_door_ext";
-	int_door_link_id = "southatmos_door_int";
-	ext_button_link_id = "southatmos_btn_ext";
-	int_button_link_id = "southatmos_btn_int"
-	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/storage)
 "tle" = (
@@ -86359,21 +85927,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/hardsuitstorage)
-"tvQ" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	autolink_id = "arrivalsmaint_vent"
-	},
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_x = 25;
-	req_access_txt = "13";
-	vent_link_id = "arrivalsmaint_vent";
-	ext_door_link_id = "arrivalsmaint_door_ext";
-	int_door_link_id = "arrivalsmaint_door_int";
-	ext_button_link_id = "arrivalsmaint_btn_ext";
-	int_button_link_id = "arrivalsmaint_btn_int"
-	},
-/turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint2)
 "twe" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -87097,12 +86650,6 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/obj/machinery/access_button{
-	autolink_id = "assolar_btn_int";
-	pixel_x = -25;
-	pixel_y = -25;
-	req_access_txt = "10;13"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 6
 	},
@@ -87816,12 +87363,6 @@
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 10
 	},
-/obj/machinery/access_button{
-	autolink_id = "fpmaint_btn_int";
-	pixel_x = -25;
-	pixel_y = -25;
-	req_access_txt = "13"
-	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/apmaint)
 "uco" = (
@@ -88029,12 +87570,6 @@
 	},
 /area/station/science/misc_lab)
 "uhA" = (
-/obj/machinery/access_button{
-	autolink_id = "scibomb_btn_int";
-	pixel_x = 24;
-	pixel_y = 25;
-	req_access_txt = "10;13"
-	},
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
@@ -88187,15 +87722,12 @@
 	},
 /area/station/command/office/hop)
 "unh" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "arrivalsmaint_door_ext";
-	locked = 1;
-	name = "Engineering External Access"
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/effect/spawner/airlock/w_to_e/engineer{
+	req_access_txt = 13
 	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
 /turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint2)
+/area/station/maintenance/asmaint)
 "uno" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -88441,26 +87973,6 @@
 	},
 /turf/simulated/floor/carpet/green,
 /area/station/command/bridge)
-"utp" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	autolink_id = "fssolar_vent"
-	},
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_x = 25;
-	req_access_txt = "13";
-	vent_link_id = "fssolar_vent";
-	ext_door_link_id = "fssolar_door_ext";
-	int_door_link_id = "fssolar_door_int";
-	ext_button_link_id = "fssolar_btn_ext";
-	int_button_link_id = "fssolar_btn_int"
-	},
-/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
 "utu" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -88753,16 +88265,6 @@
 /obj/effect/turf_decal/stripes/line,
 /turf/simulated/floor/engine,
 /area/station/engineering/control)
-"uBQ" = (
-/obj/machinery/access_button{
-	autolink_id = "fpmaint_btn_ext";
-	pixel_x = 25;
-	pixel_y = 8;
-	req_access_txt = "13"
-	},
-/obj/structure/lattice/catwalk,
-/turf/space,
-/area/space/nearstation)
 "uCf" = (
 /obj/structure/lattice/catwalk,
 /obj/machinery/atmospherics/unary/passive_vent,
@@ -90166,23 +89668,6 @@
 	icon_state = "whiteyellow"
 	},
 /area/station/medical/chemistry)
-"vpQ" = (
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
-/obj/machinery/door/airlock/external{
-	id_tag = "apsolar_door_int";
-	locked = 1;
-	name = "Engineering External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
 "vpR" = (
 /obj/machinery/door/airlock/security/glass{
 	name = "Solitary Confinement 2"
@@ -90286,20 +89771,10 @@
 	},
 /area/station/maintenance/asmaint)
 "vrV" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "fpsolar_door_ext";
-	locked = 1;
-	name = "Engineering External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/effect/spawner/airlock/engineer,
 /turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/starboardsolar)
 "vsw" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/flag/rnd,
@@ -91311,23 +90786,6 @@
 	name = "Old Note #6"
 	},
 /area/station/maintenance/assembly_line)
-"vQt" = (
-/obj/machinery/airlock_controller/air_cycler{
-	pixel_y = 6;
-	req_access_txt = "13";
-	vent_link_id = "fpmaint_vent";
-	ext_door_link_id = "fpmaint_door_ext";
-	int_door_link_id = "fpmaint_door_int";
-	pixel_x = 24;
-	ext_button_link_id = "fpmaint_btn_ext";
-	int_button_link_id = "fpmaint_btn_int"
-	},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 1;
-	autolink_id = "fpmaint_vent"
-	},
-/turf/simulated/floor/plating,
-/area/station/maintenance/apmaint)
 "vQZ" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
@@ -93545,21 +93003,6 @@
 	icon_state = "whitegreen"
 	},
 /area/station/public/sleep)
-"wZp" = (
-/obj/machinery/access_button{
-	autolink_id = "apsolar_btn_ext";
-	pixel_x = 25;
-	pixel_y = 25;
-	req_access_txt = "13"
-	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/structure/lattice/catwalk,
-/turf/space,
-/area/station/engineering/solar/port)
 "wZy" = (
 /obj/effect/spawner/window/reinforced/grilled,
 /obj/structure/cable{
@@ -93737,16 +93180,6 @@
 	icon_state = "whitepurplecorner"
 	},
 /area/station/science/hallway)
-"xdO" = (
-/obj/machinery/access_button{
-	autolink_id = "arrivalsmaint_btn_ext";
-	pixel_x = -25;
-	pixel_y = -25;
-	req_access_txt = "13"
-	},
-/obj/structure/lattice/catwalk,
-/turf/space,
-/area/space/nearstation)
 "xdY" = (
 /obj/structure/chair/office/light{
 	dir = 4
@@ -94142,23 +93575,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/hardsuitstorage)
-"xmS" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "scibomb_door_int";
-	locked = 1;
-	name = "External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/visible{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
 "xnn" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
@@ -95371,15 +94787,10 @@
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/apmaint2)
 "xSF" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "arrivalsmaint_door_int";
-	locked = 1;
-	name = "Engineering External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/effect/spawner/airlock/e_to_w/engineer,
 /turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint2)
+/area/station/maintenance/portsolar)
 "xSH" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/plating,
@@ -96297,15 +95708,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft)
-"yky" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "barmaint_door_ext";
-	locked = 1;
-	name = "External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
 "ykF" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/girder,
@@ -104971,8 +104373,8 @@ aaa
 aaa
 aaa
 aaa
-apx
-jmd
+dlj
+aOQ
 dvb
 aab
 aab
@@ -105229,7 +104631,7 @@ aaa
 aaa
 aaa
 apx
-rOS
+aOQ
 apx
 aab
 aLd
@@ -105486,7 +104888,7 @@ aMs
 aMs
 aMs
 aLd
-gXU
+aOQ
 apx
 aMs
 aLd
@@ -108052,7 +107454,7 @@ doE
 loS
 loS
 loS
-loS
+oBF
 aHl
 aLg
 pUb
@@ -108305,11 +107707,11 @@ aaa
 aaa
 aaa
 aaa
-xdO
-unh
+doE
+aHS
+aHS
+aHS
 aHS
-tvQ
-xSF
 pTK
 aND
 aGn
@@ -110099,7 +109501,7 @@ aaa
 aaa
 ymb
 ymb
-ymb
+nee
 aDu
 aEC
 aFQ
@@ -110162,7 +109564,7 @@ fJK
 rcY
 cgQ
 lRv
-lRv
+qaB
 aab
 aaa
 aaa
@@ -110354,8 +109756,8 @@ asb
 asb
 asb
 laU
-vrV
-rMP
+dap
+dap
 dap
 hoD
 aEE
@@ -110417,10 +109819,10 @@ bGn
 jWI
 noP
 ubK
-rIX
-vQt
-nnF
-uBQ
+coL
+coL
+coL
+doE
 aaa
 aaa
 aaa
@@ -113959,7 +113361,7 @@ bat
 aGn
 aKW
 aGn
-aGn
+jRo
 aUy
 fAQ
 aNB
@@ -114213,11 +113615,11 @@ aaa
 aaa
 doE
 doE
-qaB
-eIz
-eIz
-pWR
-aLx
+aHS
+lcl
+lcl
+aHS
+rMP
 blG
 aHl
 aLu
@@ -114470,10 +113872,10 @@ aaa
 aaa
 aaa
 doE
-dQn
+aHS
 oxe
 lcl
-aEM
+aHS
 hFM
 blG
 aHS
@@ -117123,7 +116525,7 @@ aab
 aab
 aaa
 aaa
-wZp
+cPG
 aaa
 aaa
 aaa
@@ -117380,8 +116782,8 @@ aaa
 aab
 aaa
 swl
-fRa
-swl
+ntD
+xSF
 aab
 aab
 aab
@@ -117894,7 +117296,7 @@ aaa
 aab
 swl
 swl
-vpQ
+ntD
 swl
 swl
 aab
@@ -128712,8 +128114,8 @@ dcq
 dcq
 dcq
 dcq
-eXd
-dOc
+ddr
+bzN
 dfx
 eLY
 dOc
@@ -129483,7 +128885,7 @@ bbM
 dlv
 cZS
 dcq
-lrP
+ddr
 dOc
 jhW
 dfT
@@ -129739,7 +129141,7 @@ qRU
 dkO
 dkO
 cZS
-gYf
+aab
 aaa
 dOc
 fXw
@@ -137343,7 +136745,7 @@ aab
 aab
 fnH
 fnH
-fnH
+eXd
 aGU
 aHK
 aIB
@@ -137597,10 +136999,10 @@ aqZ
 azU
 awQ
 axq
-lgb
+axq
+jOz
+jOz
 jOz
-utp
-oBF
 sDz
 aHI
 aIA
@@ -137711,8 +137113,8 @@ chf
 klf
 klf
 klf
-klf
-npm
+nBq
+doE
 aaa
 aaa
 aaa
@@ -137965,10 +137367,10 @@ cyJ
 cyJ
 cep
 hzG
-gCP
+cep
 ghR
-nBq
-taW
+cep
+cep
 doE
 aaa
 aaa
@@ -139399,7 +138801,7 @@ aab
 doE
 ici
 ici
-ici
+nnF
 aGY
 aOC
 aGX
@@ -139653,10 +139055,10 @@ aab
 aqZ
 aaa
 aaa
-jEq
-yky
-jRo
-jPd
+doE
+aGY
+aGY
+aGY
 cZV
 aGY
 dys
@@ -143614,7 +143016,7 @@ kdc
 csL
 djP
 cQC
-dlj
+fof
 dlz
 dSu
 csL
@@ -146702,7 +146104,7 @@ dfb
 dfn
 fNh
 fNh
-fNh
+vrV
 aaa
 aaa
 aab
@@ -146957,10 +146359,10 @@ jZT
 deN
 dfa
 tMT
-spJ
 sTF
-dgv
-hDJ
+sTF
+sTF
+ddE
 ddE
 ddE
 ddN
@@ -150003,8 +149405,8 @@ aab
 ciY
 ycI
 ycI
-xmS
-ycI
+cNq
+unh
 ciY
 pCv
 ciY
@@ -150260,7 +149662,7 @@ aaa
 aaa
 aab
 ycI
-cGW
+cNq
 ycI
 ciY
 sKQ
@@ -150517,7 +149919,7 @@ aab
 aaa
 doE
 ycI
-oeE
+cNq
 ycI
 ciY
 qlE
@@ -150774,7 +150176,7 @@ aab
 aab
 doE
 doE
-rFZ
+cxm
 doE
 ciY
 ciY
diff --git a/code/game/objects/effects/spawners/airlock_spawner.dm b/code/game/objects/effects/spawners/airlock_spawner.dm
index 12191d0c297..4c868311746 100644
--- a/code/game/objects/effects/spawners/airlock_spawner.dm
+++ b/code/game/objects/effects/spawners/airlock_spawner.dm
@@ -232,6 +232,14 @@ This spawner places pipe leading up to the interior door, you will need to finis
 	icon_state = "1x2_S_to_N"
 	tiles_in_y_direction = 2
 
+/obj/effect/spawner/airlock/s_to_n/long/square/engineer
+	req_access_txt = ACCESS_ENGINE_EQUIP
+	door_name = "engineering external access"
+
+/obj/effect/spawner/airlock/s_to_n/long/engineer
+	req_access_txt = ACCESS_ENGINE_EQUIP
+	door_name = "engineering external access"
+
 /obj/effect/spawner/airlock/e_to_w/long
 	name = "long airlock spawner (interior east, exterior west)"
 	icon_state = "1x2_E_to_W"