diff --git a/GainStation13/icons/obj/toy.dmi b/GainStation13/icons/obj/toy.dmi
new file mode 100644
index 0000000000..7b796bd61f
Binary files /dev/null and b/GainStation13/icons/obj/toy.dmi differ
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index e453f918b8..0e61ac2a96 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -1048,12 +1048,13 @@
 /turf/open/floor/engine,
 /area/ai_monitored/turret_protected/ai)
 "acc" = (
-/obj/machinery/door/airlock/maintenance{
-	name = "security maintenance";
-	req_one_access_txt = "4;63"
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+	name = "Atrium";
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
-/area/maintenance/port/aft)
+/area/service/bar/atrium)
 "acd" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
@@ -1905,7 +1906,8 @@
 	glass = 1;
 	name = "Slime Euthanization Chamber";
 	opacity = 0;
-	req_access_txt = "55"
+	req_access_txt = "55";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/science/xenobiology)
@@ -2173,10 +2175,6 @@
 /turf/open/floor/plasteel/dark,
 /area/security/warden)
 "adW" = (
-/obj/machinery/door/airlock/external{
-	name = "Prison External Airlock";
-	req_access_txt = "2"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -2186,6 +2184,11 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
+/obj/machinery/door/airlock/external{
+	name = "Prison External Airlock";
+	req_access_txt = "2";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "adX" = (
@@ -2214,16 +2217,17 @@
 /turf/open/floor/engine,
 /area/ai_monitored/turret_protected/aisat/foyer)
 "adZ" = (
-/obj/machinery/door/airlock/external{
-	name = "Prison External Airlock";
-	req_access_txt = "2"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
+/obj/machinery/door/airlock/external{
+	name = "Prison External Airlock";
+	req_access_txt = "2";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/port/aft)
 "aea" = (
@@ -2422,7 +2426,8 @@
 	},
 /obj/machinery/door/airlock/research{
 	name = "Xenobiology Closet";
-	req_access_txt = "47"
+	req_access_txt = "47";
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
 /area/science/xenobiology)
@@ -3570,9 +3575,6 @@
 /turf/open/floor/plasteel/dark,
 /area/medical/virology)
 "agn" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -3585,6 +3587,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/maintenance{
+	req_one_access_txt = "12;5";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
 "ago" = (
@@ -3795,7 +3801,8 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/command{
 	name = "Chief Medical Officer's Office";
-	req_access_txt = "40"
+	req_access_txt = "40";
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/cmo)
@@ -4265,19 +4272,21 @@
 /area/hallway/primary/fore)
 "ahy" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/command{
-	name = "Transit Access";
-	req_access_txt = "19"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
+/obj/machinery/door/airlock/command{
+	name = "Transit Access";
+	req_access_txt = "19";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/command/bridge)
 "ahz" = (
 /obj/machinery/door/airlock/maintenance/external{
 	name = "construction zone";
-	req_access_txt = "12"
+	req_access_txt = "12";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/construction/mining/aux_base)
@@ -4490,9 +4499,6 @@
 /turf/open/floor/plasteel,
 /area/security/brig)
 "ahR" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -4505,6 +4511,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/maintenance{
+	req_access_txt = "12";
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
 "ahS" = (
@@ -5542,7 +5552,8 @@
 	},
 /obj/machinery/door/airlock/command{
 	name = "Council Chamber";
-	req_access_txt = "19"
+	req_access_txt = "19";
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
 /area/command/bridge)
@@ -5659,11 +5670,12 @@
 /turf/open/floor/plasteel/dark,
 /area/science/xenobiology)
 "ajY" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /obj/machinery/door/airlock/maintenance{
 	name = "genetics maintenance";
-	req_access_txt = "5; 9; 68"
-	},
-/obj/structure/disposalpipe/segment{
+	req_access_txt = "5; 9; 68";
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
@@ -6006,7 +6018,8 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/security{
 	name = "Courtroom";
-	req_access_txt = "38"
+	req_access_txt = "38";
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/courtroom)
@@ -6894,7 +6907,8 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/security/glass{
 	name = "Equipment Room";
-	req_access_txt = "1"
+	req_access_txt = "1";
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/brig)
@@ -6967,16 +6981,17 @@
 /area/tcommsat/computer)
 "ami" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/command{
-	name = "Research Division Server Room";
-	req_access_txt = "30"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/command{
+	name = "Research Division Server Room";
+	req_access_txt = "30";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/science/server)
 "amj" = (
@@ -7948,12 +7963,13 @@
 /turf/open/floor/plasteel/dark,
 /area/maintenance/starboard)
 "anR" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/maintenance{
+	req_one_access_txt = "12;5";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/port/aft)
 "anS" = (
@@ -8102,10 +8118,6 @@
 /turf/open/floor/plating,
 /area/ruin/space/djstation)
 "aoi" = (
-/obj/machinery/door/airlock/maintenance/external{
-	name = "transit intersection";
-	req_access_txt = "12"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -8118,6 +8130,11 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
+/obj/machinery/door/airlock/maintenance/external{
+	name = "transit intersection";
+	req_access_txt = "12";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/maintenance/fore)
 "aoj" = (
@@ -8462,10 +8479,6 @@
 /turf/open/floor/plasteel/dark,
 /area/commons/locker)
 "aoM" = (
-/obj/machinery/door/airlock/maintenance/external{
-	name = "transit intersection";
-	req_access_txt = "12"
-	},
 /obj/structure/sign/warning/vacuum/external{
 	pixel_y = -32
 	},
@@ -8478,6 +8491,11 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/maintenance/external{
+	name = "transit intersection";
+	req_access_txt = "12";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/maintenance/fore)
 "aoN" = (
@@ -9337,10 +9355,6 @@
 /turf/open/floor/plasteel/showroomfloor,
 /area/medical/genetics)
 "aqp" = (
-/obj/machinery/door/airlock/external{
-	name = "Solar Maintenance";
-	req_access_txt = "10; 13"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -9348,6 +9362,11 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock/external{
+	name = "Solar Maintenance";
+	req_access_txt = "10; 13";
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/maintenance/solars/port/fore)
 "aqq" = (
@@ -10652,17 +10671,18 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
-/obj/machinery/door/airlock/medical/glass{
-	id_tag = "CloningDoor";
-	name = "Cloning Lab";
-	req_access_txt = "5;68"
-	},
 /obj/effect/mapping_helpers/airlock/unres{
 	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/medical/glass{
+	id_tag = "CloningDoor";
+	name = "Cloning Lab";
+	req_access_txt = "5;68";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/medical/genetics/cloning)
 "asp" = (
@@ -11717,7 +11737,8 @@
 	},
 /obj/machinery/door/airlock/command{
 	name = "Teleport Access";
-	req_one_access_txt = "17;19"
+	req_one_access_txt = "17;19";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/command/teleporter)
@@ -11742,7 +11763,8 @@
 "auj" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "hydroponics maintenance";
-	req_access_txt = "35"
+	req_access_txt = "35";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/central)
@@ -11836,7 +11858,8 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/command{
 	name = "Head of Personnel's Office";
-	req_access_txt = "57"
+	req_access_txt = "57";
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/courtroom)
@@ -12028,16 +12051,17 @@
 /turf/open/floor/plasteel,
 /area/command/bridge)
 "auN" = (
-/obj/machinery/door/airlock/external{
-	name = "Solar Maintenance";
-	req_access_txt = "10; 13"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
+/obj/machinery/door/airlock/external{
+	name = "Solar Maintenance";
+	req_access_txt = "10; 13";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/maintenance/solars/starboard/fore)
 "auP" = (
@@ -12103,7 +12127,8 @@
 	},
 /obj/machinery/door/airlock/security{
 	name = "Prison Wing";
-	req_access_txt = "2"
+	req_access_txt = "2";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/prison)
@@ -12138,7 +12163,8 @@
 "avb" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "command maintenance";
-	req_access_txt = "17;19"
+	req_access_txt = "17;19";
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/central)
@@ -14074,13 +14100,14 @@
 /turf/open/floor/plasteel/dark,
 /area/science/explab)
 "ayy" = (
-/obj/machinery/door/airlock/external{
-	name = "Prison External Airlock";
-	req_access_txt = "2"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/external{
+	name = "Prison External Airlock";
+	req_access_txt = "2";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "ayz" = (
@@ -14276,9 +14303,6 @@
 /area/medical/genetics)
 "ayO" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Docking Hallway"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -14297,6 +14321,9 @@
 	dir = 1;
 	pixel_y = 32
 	},
+/obj/machinery/door/airlock/public/glass{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/hallway/primary/starboard)
 "ayP" = (
@@ -15658,13 +15685,14 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
 	dir = 4
 	},
-/obj/machinery/door/airlock/atmos/glass{
-	name = "Atmospherics";
-	req_access_txt = "24"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/atmos/glass{
+	name = "Atmospherics";
+	req_access_txt = "24";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/engineering/atmos)
 "aAW" = (
@@ -15974,7 +16002,8 @@
 	},
 /obj/machinery/door/airlock/maintenance{
 	name = "supermatter maintenance";
-	req_one_access_txt = "10"
+	req_one_access_txt = "10";
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/starboard/aft)
@@ -16082,7 +16111,8 @@
 	},
 /obj/machinery/door/airlock/security{
 	name = "Interrogation";
-	req_access_txt = "63"
+	req_access_txt = "63";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/warden)
@@ -16666,16 +16696,17 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
-/obj/machinery/door/airlock/research/glass{
-	name = "Robotics Lab";
-	req_access_txt = "29"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/research/glass{
+	name = "Robotics Lab";
+	req_access_txt = "29";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/science/robotics/lab)
 "aCK" = (
@@ -17243,10 +17274,6 @@
 /area/security/processing)
 "aDH" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering{
-	name = "Tech Storage";
-	req_one_access_txt = "23;30"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -17256,6 +17283,11 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
+/obj/machinery/door/airlock/engineering{
+	name = "Tech Storage";
+	req_one_access_txt = "23;30";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/engineering/storage/tech)
 "aDI" = (
@@ -17273,7 +17305,8 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/engineering{
 	name = "Tech Storage";
-	req_one_access_txt = "23;30"
+	req_one_access_txt = "23;30";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/engineering/storage/tech)
@@ -17453,7 +17486,8 @@
 	},
 /obj/machinery/door/airlock/command{
 	name = "E.V.A. Storage";
-	req_access_txt = "18"
+	req_access_txt = "18";
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/command/storage/eva)
@@ -18020,7 +18054,8 @@
 	},
 /obj/machinery/door/airlock/security{
 	name = "Evidence";
-	req_access_txt = "63"
+	req_access_txt = "63";
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/warden)
@@ -18167,13 +18202,14 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/machinery/door/airlock/security/glass{
-	name = "Equipment Room";
-	req_access_txt = "1"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/security/glass{
+	name = "Equipment Room";
+	req_access_txt = "1";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/brig)
 "aFk" = (
@@ -18927,14 +18963,15 @@
 /area/engineering/supermatter)
 "aGE" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security{
-	id_tag = "innerbrig";
-	name = "Brig";
-	req_access_txt = "63"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
+/obj/machinery/door/airlock/security{
+	id_tag = "outerbrig";
+	name = "Brig";
+	req_access_txt = "63";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/brig)
 "aGF" = (
@@ -19254,13 +19291,14 @@
 /area/engineering/atmos)
 "aHp" = (
 /obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
 /obj/machinery/door/airlock/security{
 	id_tag = "outerbrig";
 	name = "Brig";
-	req_access_txt = "63"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
+	req_access_txt = "63";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/brig)
@@ -20256,7 +20294,8 @@
 "aIQ" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/public/glass{
-	name = "Medbay"
+	name = "Medbay";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/hallway/primary/fore)
@@ -21786,10 +21825,6 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/engineering{
-	name = "Gravity Generator Access";
-	req_one_access_txt = "19;23"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -21799,6 +21834,11 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
+/obj/machinery/door/airlock/engineering{
+	name = "Gravity Generator Access";
+	req_one_access_txt = "10";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/engineering/gravity_generator)
 "aLs" = (
@@ -21981,7 +22021,8 @@
 /obj/effect/turf_decal/caution/stand_clear,
 /obj/machinery/door/airlock/research/glass{
 	name = "Experimentor Lab";
-	req_one_access_txt = "7;29"
+	req_one_access_txt = "7;29";
+	dir = 4
 	},
 /turf/open/floor/engine,
 /area/science/explab)
@@ -22042,7 +22083,8 @@
 "aLU" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/public/glass{
-	name = "Bar"
+	name = "Bar";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/service/bar)
@@ -22458,7 +22500,8 @@
 	},
 /obj/machinery/door/airlock/security/glass{
 	name = "Security Checkpoint";
-	req_access_txt = "63"
+	req_access_txt = "63";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/hallway/primary/aft)
@@ -22939,7 +22982,8 @@
 	},
 /obj/machinery/door/airlock/medical/glass{
 	name = "Medbay Desk";
-	req_access_txt = "5"
+	req_access_txt = "5";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/medical/medbay/central)
@@ -22995,7 +23039,8 @@
 	},
 /obj/machinery/door/airlock/medical/glass{
 	name = "Medbay Storage";
-	req_access_txt = "5"
+	req_access_txt = "5";
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
 /area/medical/storage)
@@ -23639,8 +23684,8 @@
 /area/medical/genetics)
 "aOy" = (
 /obj/machinery/door/airlock/maintenance{
-	name = "bar maintenance";
-	req_access_txt = "25"
+	req_access_txt = "12";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/central)
@@ -24393,7 +24438,8 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/door/airlock/public/glass{
-	name = "Bar"
+	name = "Bar";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/service/bar)
@@ -24670,7 +24716,8 @@
 	},
 /obj/machinery/door/airlock/medical/glass{
 	name = "Break Room";
-	req_access_txt = "5"
+	req_access_txt = "5";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/medical/storage)
@@ -25063,15 +25110,16 @@
 /turf/closed/wall,
 /area/medical/surgery)
 "aQO" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/door/airlock/maintenance{
+	req_access_txt = "12";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/central)
 "aQQ" = (
@@ -25175,7 +25223,7 @@
 	dir = 4
 	},
 /obj/machinery/door/airlock/maintenance{
-	dir = 2;
+	dir = 4;
 	name = "Bar Maintenance";
 	req_access_txt = "25"
 	},
@@ -25627,15 +25675,16 @@
 /area/hallway/primary/fore)
 "aRF" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Library"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
+/obj/machinery/door/airlock/public/glass{
+	name = "Library";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/service/library)
 "aRG" = (
@@ -26457,12 +26506,13 @@
 /area/medical/storage)
 "aSP" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Library"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/public/glass{
+	name = "Library";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/service/library)
 "aSQ" = (
@@ -27122,11 +27172,12 @@
 /area/science/lab)
 "aTU" = (
 /obj/machinery/door/firedoor/heavy,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /obj/machinery/door/airlock/research{
 	name = "Toxins Lab";
-	req_access_txt = "8"
-	},
-/obj/structure/disposalpipe/segment{
+	req_access_txt = "8";
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
@@ -27261,13 +27312,14 @@
 /area/science/storage)
 "aUe" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/command{
-	name = "Head of Security's Office";
-	req_access_txt = "58"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/command{
+	name = "Head of Security's Office";
+	req_access_txt = "58";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/hos)
 "aUf" = (
@@ -27779,7 +27831,8 @@
 	},
 /obj/machinery/door/airlock/security{
 	name = "Prison Wing";
-	req_access_txt = "2"
+	req_access_txt = "2";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/warden)
@@ -28836,13 +28889,14 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/medical/glass{
-	name = "Medbay Storage";
-	req_access_txt = "5"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/medical/glass{
+	name = "Medbay Storage";
+	req_access_txt = "5";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/medical/storage)
 "aWq" = (
@@ -29577,13 +29631,14 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
-/obj/machinery/door/airlock/research/glass{
-	name = "Robotics Lab";
-	req_access_txt = "29"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/research/glass{
+	name = "Robotics Lab";
+	req_access_txt = "29";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/science/robotics/lab)
 "aXQ" = (
@@ -31077,7 +31132,8 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/command/glass{
 	name = "Control Room";
-	req_access_txt = "19; 61"
+	req_access_txt = "19; 61";
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
 /area/tcommsat/computer)
@@ -31309,12 +31365,13 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/public/glass{
-	name = "Atrium"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/public/glass{
+	name = "Atrium";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/service/bar/atrium)
 "baN" = (
@@ -32117,13 +32174,14 @@
 	id = "research_shutters";
 	name = "Research Privacy Shutter"
 	},
-/obj/machinery/door/airlock/research/glass{
-	name = "Research Lab";
-	req_one_access_txt = "7;29"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/research/glass{
+	name = "Research Lab";
+	req_one_access_txt = "7;29";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/science/lab)
 "bci" = (
@@ -32307,11 +32365,12 @@
 /area/service/kitchen)
 "bcx" = (
 /obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
 /obj/machinery/door/airlock/command/glass{
 	name = "Server Access";
-	req_access_txt = "30"
-	},
-/obj/machinery/atmospherics/pipe/simple/general/visible{
+	req_access_txt = "30";
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
@@ -32892,13 +32951,14 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/door/firedoor/heavy,
-/obj/machinery/door/airlock/medical/glass{
-	name = "Chemistry Lab";
-	req_access_txt = "5; 33"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/medical/glass{
+	name = "Chemistry Lab";
+	req_access_txt = "5; 33";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/medical/chemistry)
 "bdr" = (
@@ -33164,12 +33224,13 @@
 /area/science/robotics/lab)
 "bdJ" = (
 /obj/machinery/door/firedoor/heavy,
+/obj/effect/mapping_helpers/airlock/unres{
+	dir = 4
+	},
 /obj/machinery/door/airlock/research{
 	id_tag = "ResearchInt";
 	name = "Research Division";
-	req_one_access_txt = "47"
-	},
-/obj/effect/mapping_helpers/airlock/unres{
+	req_one_access_txt = "47";
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
@@ -33266,7 +33327,8 @@
 	pixel_y = 24
 	},
 /obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
+	req_one_access_txt = "12;5";
+	dir = 4
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard)
@@ -33735,13 +33797,14 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
-/obj/machinery/door/airlock/research{
-	name = "Toxins Lab";
-	req_access_txt = "8"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/research{
+	name = "Toxins Lab";
+	req_access_txt = "8";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/science/mixing)
 "bey" = (
@@ -33866,16 +33929,17 @@
 /area/service/bar/atrium)
 "beM" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/command{
-	name = "Transit Access";
-	req_access_txt = "19"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/door/airlock/command{
+	name = "Transit Access";
+	req_access_txt = "19";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/command/bridge)
 "beN" = (
@@ -33990,13 +34054,14 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
-/obj/machinery/door/airlock/security{
-	name = "Prison Wing";
-	req_access_txt = "2"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/security{
+	name = "Prison Wing";
+	req_access_txt = "2";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/prison)
 "beW" = (
@@ -34327,7 +34392,8 @@
 	},
 /obj/machinery/door/airlock/command{
 	name = "Research Director's Office";
-	req_access_txt = "30"
+	req_access_txt = "30";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/rd)
@@ -35983,13 +36049,14 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/virology{
-	name = "Virology Access";
-	req_access_txt = "39"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/virology{
+	name = "Virology Access";
+	req_access_txt = "39";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/medical/virology)
 "biq" = (
@@ -36344,16 +36411,17 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/machinery/door/airlock/external{
-	name = "Mining Dock Airlock";
-	req_access_txt = "48"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/external{
+	name = "Mining Dock Airlock";
+	req_access_txt = "48";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/cargo/miningoffice)
 "biT" = (
@@ -36444,7 +36512,8 @@
 	},
 /obj/machinery/door/airlock/research{
 	name = "Toxins Storage";
-	req_access_txt = "8"
+	req_access_txt = "8";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/science/storage)
@@ -37673,7 +37742,8 @@
 "blc" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "kitchen maintenance";
-	req_access_txt = "28"
+	req_access_txt = "28";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/central)
@@ -38686,7 +38756,8 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/mining/glass{
 	name = "Mining Dock";
-	req_access_txt = "48"
+	req_access_txt = "48";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/cargo/miningoffice)
@@ -38831,11 +38902,12 @@
 /area/medical/virology)
 "bmZ" = (
 /obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /obj/machinery/door/airlock/medical{
 	name = "Kitchen";
-	req_access_txt = "28"
-	},
-/obj/structure/disposalpipe/segment{
+	req_access_txt = "28";
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
@@ -38958,10 +39030,6 @@
 "bnl" = (
 /obj/machinery/door/firedoor,
 /obj/effect/decal/cleanable/blood/old,
-/obj/machinery/door/airlock/external{
-	name = "Mining Dock Airlock";
-	req_access_txt = "48"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
@@ -38974,6 +39042,11 @@
 /obj/machinery/atmospherics/pipe/simple/general/hidden{
 	dir = 8
 	},
+/obj/machinery/door/airlock/external{
+	name = "Mining Dock Airlock";
+	req_access_txt = "48";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/cargo/miningoffice)
 "bnm" = (
@@ -39810,16 +39883,17 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
-/obj/machinery/door/airlock/mining/glass{
-	name = "Quartermaster";
-	req_access_txt = "41"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/mining/glass{
+	name = "Quartermaster";
+	req_access_txt = "41";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/cargo/qm)
 "boF" = (
@@ -39876,11 +39950,12 @@
 /area/service/kitchen)
 "boI" = (
 /obj/machinery/door/firedoor,
+/obj/structure/fans/tiny/invisible,
 /obj/machinery/door/airlock/medical{
 	name = "Kitchen Cold Room";
-	req_access_txt = "28"
+	req_access_txt = "28";
+	dir = 4
 	},
-/obj/structure/fans/tiny/invisible,
 /turf/open/floor/plasteel/dark,
 /area/service/kitchen)
 "boJ" = (
@@ -39899,13 +39974,14 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
-/obj/machinery/door/airlock/mining/glass{
-	name = "Mining Dock";
-	req_access_txt = "48"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/mining/glass{
+	name = "Mining Dock";
+	req_access_txt = "48";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/cargo/miningoffice)
 "boL" = (
@@ -40976,11 +41052,12 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
+/obj/structure/fans/tiny/invisible,
 /obj/machinery/door/airlock/medical{
 	name = "Kitchen Cold Room";
-	req_access_txt = "28"
+	req_access_txt = "28";
+	dir = 4
 	},
-/obj/structure/fans/tiny/invisible,
 /turf/open/floor/plasteel/dark,
 /area/service/kitchen)
 "bqz" = (
@@ -41037,13 +41114,14 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
-/obj/machinery/door/airlock/mining{
-	name = "Cargo Bay";
-	req_one_access_txt = "31;48"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/mining{
+	name = "Cargo Bay";
+	req_one_access_txt = "31;48";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/cargo/office)
 "bqD" = (
@@ -41123,13 +41201,14 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/medical/glass{
-	name = "Hydroponics";
-	req_access_txt = "35"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/medical/glass{
+	name = "Hydroponics";
+	req_access_txt = "35";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/service/hydroponics)
 "bqK" = (
@@ -41418,22 +41497,19 @@
 /turf/open/floor/plasteel/dark,
 /area/maintenance/port)
 "brg" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/maintenance{
+	req_access_txt = "12";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/central)
 "brh" = (
-/obj/machinery/door/airlock/maintenance{
-	name = "xenobiology maintenance";
-	req_access_txt = "55"
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
@@ -41441,6 +41517,11 @@
 	dir = 4;
 	pixel_y = -24
 	},
+/obj/machinery/door/airlock/maintenance{
+	name = "xenobiology maintenance";
+	req_access_txt = "55";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/starboard)
 "bri" = (
@@ -42177,11 +42258,12 @@
 /area/maintenance/central)
 "bsz" = (
 /obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /obj/machinery/door/airlock/mining/glass{
 	name = "Cargo Office";
-	req_one_access_txt = "31;48"
-	},
-/obj/structure/disposalpipe/segment{
+	req_one_access_txt = "31;48";
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
@@ -42218,7 +42300,8 @@
 "bsD" = (
 /obj/machinery/door/airlock/security/glass{
 	name = "Hazard Closet";
-	req_access_txt = "1"
+	req_access_txt = "1";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/port/aft)
@@ -42589,9 +42672,6 @@
 /turf/open/floor/plasteel,
 /area/commons/fitness/recreation)
 "bti" = (
-/obj/machinery/door/airlock/security/glass{
-	name = "Prison Yard"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "PCell 1Lock";
@@ -42603,6 +42683,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/door/airlock/security/glass{
+	name = "Prison Yard";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/prison)
 "btj" = (
@@ -42628,33 +42712,36 @@
 /area/service/chapel/office)
 "btl" = (
 /obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /obj/machinery/door/airlock/mining{
 	name = "Cargo Bay";
-	req_one_access_txt = "31;48"
-	},
-/obj/structure/disposalpipe/segment{
+	req_one_access_txt = "31;48";
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/cargo/office)
 "btm" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Holodeck"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
+/obj/machinery/door/airlock/public/glass{
+	name = "Holodeck";
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/commons/fitness/recreation)
 "btn" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Holodeck"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
+/obj/machinery/door/airlock/public/glass{
+	name = "Holodeck";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/commons/fitness/recreation)
 "bto" = (
@@ -42848,13 +42935,14 @@
 /area/service/bar)
 "btJ" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
-	name = "Security Office";
-	req_access_txt = "63"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/security/glass{
+	name = "Security Office";
+	req_access_txt = "63";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "btK" = (
@@ -43836,7 +43924,8 @@
 "bvy" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/public/glass{
-	name = "Art Cabinet"
+	name = "Art Cabinet";
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
 /area/service/library)
@@ -44351,11 +44440,12 @@
 /obj/machinery/atmospherics/pipe/simple/orange/visible{
 	dir = 6
 	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 4
+	},
 /obj/machinery/door/airlock/external{
 	name = "Atmospherics External Airlock";
-	req_access_txt = "24"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	req_access_txt = "24";
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
@@ -44893,7 +44983,8 @@
 	},
 /obj/machinery/door/airlock/medical{
 	name = "Operating Theatre";
-	req_access_txt = "45"
+	req_access_txt = "45";
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
 /area/medical/surgery)
@@ -45087,13 +45178,14 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
-/obj/machinery/door/airlock/virology/glass{
-	name = "Isolation A";
-	req_access_txt = "39"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/virology/glass{
+	name = "Isolation A";
+	req_access_txt = "39";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/medical/virology)
 "bxL" = (
@@ -45194,13 +45286,14 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
-/obj/machinery/door/airlock/virology/glass{
-	name = "Isolation B";
-	req_access_txt = "39"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/virology/glass{
+	name = "Isolation B";
+	req_access_txt = "39";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/medical/virology)
 "bxW" = (
@@ -45524,10 +45617,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
-/obj/machinery/door/airlock/maintenance{
-	name = "security maintenance";
-	req_access_txt = "63"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -45537,6 +45626,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/maintenance{
+	name = "security maintenance";
+	req_access_txt = "63";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/port/aft)
 "byv" = (
@@ -45653,11 +45747,12 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /obj/machinery/door/airlock/command{
 	name = "Captain's Office";
-	req_access_txt = "20"
-	},
-/obj/structure/disposalpipe/segment{
+	req_access_txt = "20";
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
@@ -46288,13 +46383,14 @@
 /area/security/brig)
 "bzH" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering/glass{
-	name = "Supermatter Engine";
-	req_access_txt = "10"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Supermatter Engine";
+	req_access_txt = "10";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/engineering/main)
 "bzI" = (
@@ -46498,14 +46594,14 @@
 /turf/open/floor/plasteel/dark,
 /area/cargo/sorting)
 "bzY" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/mining/glass{
+	name = "Quartermaster";
+	req_access_txt = "41";
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
-/area/maintenance/port)
+/area/cargo/qm)
 "bzZ" = (
 /obj/machinery/door/firedoor,
 /obj/structure/cable{
@@ -47276,7 +47372,8 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/security/glass{
 	name = "Cargo Security Post";
-	req_access_txt = "63"
+	req_access_txt = "63";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/checkpoint/supply)
@@ -47511,15 +47608,16 @@
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "bBJ" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
+/obj/machinery/door/airlock/maintenance{
+	req_one_access_txt = "12;5";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/starboard/aft)
 "bBK" = (
@@ -47926,16 +48024,17 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/machinery/door/airlock/security{
-	name = "Law Office";
-	req_access_txt = "38"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/security{
+	name = "Law Office";
+	req_access_txt = "38";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/service/lawoffice)
 "bCo" = (
@@ -48031,13 +48130,14 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/machinery/door/airlock/security/glass{
-	name = "Security Office";
-	req_access_txt = "63"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/security/glass{
+	name = "Security Office";
+	req_access_txt = "63";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "bCw" = (
@@ -48480,10 +48580,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
-/obj/machinery/door/airlock/engineering/glass{
-	name = "Engineering Storage";
-	req_access_txt = "32"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -48493,6 +48589,11 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Engineering Storage";
+	req_access_txt = "32";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/engineering/break_room)
 "bDn" = (
@@ -49119,15 +49220,16 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "bEp" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/door/airlock/maintenance{
+	req_one_access_txt = "12;5";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/aft)
 "bEq" = (
@@ -51065,13 +51167,14 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/command{
-	name = "Head of Personnel's Office";
-	req_access_txt = "57"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/command{
+	name = "Head of Personnel's Office";
+	req_access_txt = "57";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/hop)
 "bHJ" = (
@@ -51383,13 +51486,14 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
-/obj/machinery/door/airlock/security{
-	name = "Equipment Room";
-	req_access_txt = "1"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/security{
+	name = "Equipment Room";
+	req_access_txt = "1";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/brig)
 "bIo" = (
@@ -52179,10 +52283,6 @@
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/prison)
 "bJB" = (
-/obj/machinery/door/airlock/security/glass{
-	name = "Long-Term Cell 1";
-	req_access_txt = "2"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
@@ -52193,6 +52293,11 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
+/obj/machinery/door/airlock/security/glass{
+	name = "Long-Term Cell 1";
+	req_access_txt = "2";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/prison)
 "bJC" = (
@@ -52368,7 +52473,8 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/security/glass{
 	name = "Engineering Security Post";
-	req_access_txt = "63"
+	req_access_txt = "63";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/checkpoint/engineering)
@@ -52435,10 +52541,6 @@
 /area/commons/locker)
 "bJV" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/mining/glass{
-	name = "Mailroom";
-	req_access_txt = "50"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -52448,6 +52550,11 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/mining/glass{
+	name = "Mailroom";
+	req_access_txt = "50";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/cargo/sorting)
 "bJW" = (
@@ -54145,16 +54252,17 @@
 /area/maintenance/starboard/aft)
 "bMK" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering{
-	name = "Gravity Generator Chamber";
-	req_one_access_txt = "19; 61"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
+/obj/machinery/door/airlock/engineering{
+	name = "Gravity Generator Chamber";
+	req_one_access_txt = "19; 61";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/engineering/gravity_generator)
 "bML" = (
@@ -54301,16 +54409,17 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/maintenance{
-	name = "medbay maintenance";
-	req_access_txt = "5"
-	},
 /obj/structure/sign/directions/evac{
 	pixel_y = -24
 	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
+/obj/machinery/door/airlock/maintenance{
+	name = "medbay maintenance";
+	req_access_txt = "5";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/port)
 "bMW" = (
@@ -54576,9 +54685,6 @@
 /area/hallway/secondary/exit/departure_lounge)
 "bNA" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Docking Hallway"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -54597,6 +54703,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/public/glass{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/hallway/primary/starboard)
 "bNB" = (
@@ -54605,7 +54714,8 @@
 	},
 /obj/machinery/door/airlock/maintenance{
 	req_access_txt = "12";
-	welded = 1
+	welded = 1;
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/port/aft)
@@ -54652,7 +54762,8 @@
 "bNF" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "security maintenance";
-	req_access_txt = "4"
+	req_access_txt = "63";
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/port/aft)
@@ -54771,7 +54882,8 @@
 /obj/machinery/atmospherics/pipe/simple/cyan/visible,
 /obj/machinery/door/airlock/atmos/glass{
 	name = "Distribution Loop";
-	req_access_txt = "24"
+	req_access_txt = "24";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/engineering/atmos)
@@ -55161,7 +55273,8 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/mining/glass{
 	name = "Mailroom";
-	req_access_txt = "50"
+	req_access_txt = "50";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/cargo/sorting)
@@ -55674,9 +55787,6 @@
 /turf/open/floor/plasteel/dark,
 /area/maintenance/starboard/aft)
 "bPr" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -55686,6 +55796,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/maintenance{
+	req_access_txt = "12";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "bPs" = (
@@ -57090,16 +57204,17 @@
 /area/security/warden)
 "bRx" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/external{
-	name = "Brig Shuttle Airlock";
-	req_one_access_txt = "63"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
+/obj/machinery/door/airlock/external{
+	name = "Brig Shuttle Airlock";
+	req_one_access_txt = "63";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/hallway/secondary/exit/departure_lounge)
 "bRy" = (
@@ -57870,14 +57985,15 @@
 /area/commons/vacant_room/office)
 "bSM" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/external{
-	name = "Brig Shuttle Airlock";
-	req_one_access_txt = "63"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
 /obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external{
+	name = "Brig Shuttle Airlock";
+	req_one_access_txt = "63";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/hallway/secondary/exit/departure_lounge)
 "bSN" = (
@@ -59126,23 +59242,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/dark,
 /area/engineering/atmos)
-"bUU" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
-	dir = 8
-	},
-/turf/open/floor/plasteel)
 "bUV" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -59238,9 +59337,6 @@
 /area/maintenance/starboard/aft)
 "bVf" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Departure Lounge"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
@@ -59250,6 +59346,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/public/glass{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/hallway/secondary/exit/departure_lounge)
 "bVg" = (
@@ -59627,9 +59726,6 @@
 /area/science/test_area)
 "bVJ" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Departure Lounge"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
@@ -59639,6 +59735,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/public/glass{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/hallway/secondary/exit/departure_lounge)
 "bVK" = (
@@ -59935,15 +60034,16 @@
 /area/security/detectives_office)
 "bWf" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/external{
-	name = "Departure Shuttle Airlock"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
+/obj/machinery/door/airlock/external{
+	name = "Departure Shuttle Airlock";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/hallway/secondary/exit/departure_lounge)
 "bWg" = (
@@ -60036,9 +60136,6 @@
 	},
 /area/maintenance/starboard/aft)
 "bWn" = (
-/obj/machinery/door/airlock/maintenance{
-	name = "Vacant Office"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -60049,6 +60146,10 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/maintenance{
+	name = "Vacant Office";
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/commons/vacant_room/office)
 "bWo" = (
@@ -60551,13 +60652,14 @@
 /area/hallway/secondary/entry)
 "bXe" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/external{
-	name = "Departure Shuttle Airlock"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
 /obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external{
+	name = "Departure Shuttle Airlock";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/hallway/secondary/exit/departure_lounge)
 "bXf" = (
@@ -60924,9 +61026,6 @@
 /area/security/execution/education)
 "bXL" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Departure Lounge"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -60936,6 +61035,9 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
+/obj/machinery/door/airlock/public/glass{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/hallway/secondary/exit/departure_lounge)
 "bXM" = (
@@ -61163,9 +61265,6 @@
 /area/security/prison)
 "bYd" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Departure Lounge"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -61175,6 +61274,9 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
+/obj/machinery/door/airlock/public/glass{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/hallway/secondary/exit/departure_lounge)
 "bYe" = (
@@ -61635,16 +61737,17 @@
 /turf/open/floor/plasteel,
 /area/security/office)
 "bYM" = (
-/obj/machinery/door/airlock/engineering{
-	name = "Starboard Quarter Solar Access";
-	req_access_txt = "10"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/door/airlock/engineering{
+	name = "Starboard Quarter Solar Access";
+	req_access_txt = "10";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/solars/starboard/aft)
 "bYN" = (
@@ -61723,9 +61826,6 @@
 /turf/open/floor/plasteel,
 /area/security/brig)
 "bYR" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -61741,6 +61841,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/maintenance{
+	req_one_access_txt = "12;5";
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "bYT" = (
@@ -61932,11 +62036,12 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /obj/machinery/door/airlock/security{
 	name = "Prison Wing";
-	req_access_txt = "2"
-	},
-/obj/structure/disposalpipe/segment{
+	req_access_txt = "2";
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
@@ -62176,7 +62281,8 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/mining/glass{
 	name = "Cargo Office";
-	req_one_access_txt = "31;48"
+	req_one_access_txt = "31;48";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/hallway/secondary/exit/departure_lounge)
@@ -63690,9 +63796,6 @@
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/brig)
 "ccc" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -63708,6 +63811,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/maintenance{
+	req_one_access_txt = "12;5";
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "ccd" = (
@@ -64088,15 +64195,16 @@
 /area/security/brig)
 "ccW" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Locker Room"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
+/obj/machinery/door/airlock/public/glass{
+	name = "Locker Room";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/commons/locker)
 "ccX" = (
@@ -64638,15 +64746,16 @@
 /area/security/brig)
 "cec" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Locker Room"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/public/glass{
+	name = "Locker Room";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/commons/locker)
 "ced" = (
@@ -65622,11 +65731,12 @@
 /obj/machinery/atmospherics/pipe/simple/orange/visible{
 	dir = 4
 	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
 /obj/machinery/door/airlock/external{
 	name = "Engineering External Airlock";
-	req_access_txt = "10"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	req_access_txt = "10";
 	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
@@ -66850,13 +66960,14 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/machinery/door/airlock/security/glass{
-	name = "Brig Control";
-	req_access_txt = "3"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/security/glass{
+	name = "Brig Control";
+	req_access_txt = "3";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/warden)
 "chK" = (
@@ -66962,10 +67073,6 @@
 /turf/open/floor/plasteel,
 /area/engineering/main)
 "chU" = (
-/obj/machinery/door/airlock/external{
-	name = "Solar Maintenance";
-	req_access_txt = "10; 13"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -66973,6 +67080,11 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock/external{
+	name = "Solar Maintenance";
+	req_access_txt = "10; 13";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/maintenance/solars/port/aft)
 "chW" = (
@@ -67780,9 +67892,6 @@
 	},
 /area/ai_monitored/turret_protected/ai_upload)
 "cjf" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -67792,6 +67901,10 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/maintenance{
+	req_one_access_txt = "12;5";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "cjg" = (
@@ -68025,16 +68138,17 @@
 /area/maintenance/starboard/aft)
 "cjH" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering{
-	name = "Gravity Generator Access";
-	req_one_access_txt = "10"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
+/obj/machinery/door/airlock/engineering{
+	name = "Gravity Generator Access";
+	req_one_access_txt = "10";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/starboard/aft)
 "cjI" = (
@@ -68587,7 +68701,8 @@
 "ckM" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/external{
-	name = "External Freight Airlock"
+	name = "External Freight Airlock";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/djstation)
@@ -68669,24 +68784,26 @@
 /obj/structure/sign/warning/xeno_mining{
 	pixel_y = 32
 	},
-/obj/machinery/door/airlock/external/glass{
-	name = "External Freight Airlock"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
+/obj/machinery/door/airlock/external{
+	name = "External Freight Airlock";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/djstation)
 "ckY" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/external{
-	name = "External Freight Airlock"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
+/obj/machinery/door/airlock/external{
+	name = "External Freight Airlock";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/djstation)
 "ckZ" = (
@@ -68825,10 +68942,6 @@
 /turf/open/floor/plasteel,
 /area/engineering/atmos)
 "cln" = (
-/obj/machinery/door/airlock/external{
-	name = "Solar Maintenance";
-	req_access_txt = "10; 13"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -68838,6 +68951,11 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/door/airlock/external{
+	name = "Solar Maintenance";
+	req_access_txt = "10; 13";
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/maintenance/solars/starboard/aft)
 "clo" = (
@@ -69064,10 +69182,6 @@
 /turf/open/floor/plasteel,
 /area/engineering/main)
 "clH" = (
-/obj/machinery/door/airlock/external{
-	name = "Solar Maintenance";
-	req_access_txt = "10; 13"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -69078,6 +69192,11 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock/external{
+	name = "Solar Maintenance";
+	req_access_txt = "10; 13";
+	dir = 4
+	},
 /turf/open/floor/plating{
 	icon_state = "platingdmg1"
 	},
@@ -69146,10 +69265,6 @@
 /turf/open/floor/engine,
 /area/engineering/main)
 "clO" = (
-/obj/machinery/door/airlock/engineering{
-	name = "Port Quarter Solar Access";
-	req_access_txt = "10"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -69157,6 +69272,11 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock/engineering{
+	name = "Port Quarter Solar Access";
+	req_access_txt = "10";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/maintenance/solars/port/aft)
 "clQ" = (
@@ -70333,7 +70453,8 @@
 	dir = 4
 	},
 /obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
+	req_access_txt = "12";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/port/aft)
@@ -70992,9 +71113,6 @@
 /turf/open/floor/plasteel/dark,
 /area/engineering/atmos)
 "cps" = (
-/obj/machinery/door/airlock/maintenance{
-	req_one_access_txt = "12;47"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -71011,6 +71129,10 @@
 	dir = 4;
 	pixel_y = -24
 	},
+/obj/machinery/door/airlock/maintenance{
+	req_one_access_txt = "12;5";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "cpt" = (
@@ -71405,11 +71527,12 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/effect/turf_decal/delivery,
 /obj/machinery/door/airlock/atmos{
 	name = "Atmospherics Connector";
-	req_one_access_txt = "10;24"
+	req_one_access_txt = "10;24";
+	dir = 4
 	},
-/obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel/dark,
 /area/maintenance/port/aft)
 "cqd" = (
@@ -71782,12 +71905,13 @@
 /area/maintenance/port/aft)
 "cqN" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/external{
-	name = "Ferry Shuttle Airlock"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
+/obj/machinery/door/airlock/external{
+	name = "Ferry Shuttle Airlock";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/port/aft)
 "cqO" = (
@@ -71803,15 +71927,16 @@
 /area/engineering/atmos)
 "cqP" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/external{
-	name = "Ferry Shuttle Airlock"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/door/airlock/external{
+	name = "Ferry Shuttle Airlock";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/port/aft)
 "cqQ" = (
@@ -71958,14 +72083,15 @@
 /turf/open/floor/engine,
 /area/engineering/main)
 "cre" = (
-/obj/machinery/door/airlock/atmos{
-	name = "Atmospherics Connector";
-	req_one_access_txt = "10;24;5"
-	},
 /obj/effect/turf_decal/delivery,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/door/airlock/atmos{
+	name = "Atmospherics Connector";
+	req_one_access_txt = "10;24;5";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/port)
 "crf" = (
@@ -72464,7 +72590,8 @@
 "csc" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "Surgery Maintenance";
-	req_access_txt = "45"
+	req_access_txt = "45";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/port)
@@ -73377,10 +73504,6 @@
 /turf/open/floor/engine,
 /area/engineering/gravity_generator)
 "ctV" = (
-/obj/machinery/door/airlock/external{
-	name = "Solar Maintenance";
-	req_access_txt = "10; 13"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -73391,6 +73514,11 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock/external{
+	name = "Solar Maintenance";
+	req_access_txt = "10; 13";
+	dir = 8
+	},
 /turf/open/floor/plating{
 	icon_state = "platingdmg1"
 	},
@@ -73438,16 +73566,17 @@
 /turf/open/floor/plasteel/dark,
 /area/engineering/atmos)
 "cua" = (
-/obj/machinery/door/airlock/engineering{
-	name = "Port Bow Solar Access";
-	req_access_txt = "10"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/door/airlock/engineering{
+	name = "Port Bow Solar Access";
+	req_access_txt = "10";
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/maintenance/solars/port/fore)
 "cub" = (
@@ -73485,16 +73614,17 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "cue" = (
-/obj/machinery/door/airlock/external{
-	name = "External Airlock";
-	req_access_txt = "13"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
+/obj/machinery/door/airlock/external{
+	name = "External Airlock";
+	req_access_txt = "13";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/starboard)
 "cuf" = (
@@ -73587,13 +73717,13 @@
 /turf/open/floor/plasteel,
 /area/maintenance/disposal/incinerator)
 "cum" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12";
-	welded = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/door/airlock/maintenance{
+	req_one_access_txt = "12;5";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/port)
 "cun" = (
@@ -74507,16 +74637,17 @@
 /turf/open/floor/plating,
 /area/maintenance/disposal)
 "cwb" = (
-/obj/machinery/door/airlock/external{
-	name = "Solar Maintenance";
-	req_access_txt = "10; 13"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
+/obj/machinery/door/airlock/external{
+	name = "Solar Maintenance";
+	req_access_txt = "10; 13";
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/maintenance/solars/starboard/aft)
 "cwc" = (
@@ -75335,9 +75466,6 @@
 	},
 /area/maintenance/port/fore)
 "cxP" = (
-/obj/machinery/door/airlock/maintenance{
-	req_one_access_txt = "12;47"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -75353,6 +75481,10 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
+/obj/machinery/door/airlock/maintenance{
+	req_one_access_txt = "12;5";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
 "cxQ" = (
@@ -76137,11 +76269,6 @@
 /area/security/prison)
 "czS" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security{
-	id_tag = "innerbrig";
-	name = "Brig";
-	req_access_txt = "63"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
@@ -76151,6 +76278,12 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/security{
+	id_tag = "outerbrig";
+	name = "Brig";
+	req_access_txt = "63";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/brig)
 "czU" = (
@@ -76162,17 +76295,18 @@
 /area/maintenance/port/aft)
 "czV" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security{
-	id_tag = "outerbrig";
-	name = "Brig";
-	req_access_txt = "63"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/security{
+	id_tag = "outerbrig";
+	name = "Brig";
+	req_access_txt = "63";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/brig)
 "czW" = (
@@ -76686,10 +76820,6 @@
 /turf/open/floor/plating,
 /area/ruin/space/djstation)
 "cBQ" = (
-/obj/machinery/door/airlock/external{
-	name = "External Airlock";
-	req_access_txt = "13"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -76699,6 +76829,11 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/external{
+	name = "External Airlock";
+	req_access_txt = "13";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/central)
 "cBR" = (
@@ -76744,16 +76879,17 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "cBV" = (
-/obj/machinery/door/airlock/external{
-	name = "External Airlock";
-	req_access_txt = "13"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/external{
+	name = "External Airlock";
+	req_access_txt = "13";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/central)
 "cBW" = (
@@ -76915,7 +77051,8 @@
 "cCy" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "chapel maintenance";
-	req_one_access_txt = "22"
+	req_one_access_txt = "22";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/service/chapel/main)
@@ -77014,13 +77151,14 @@
 /turf/open/floor/plating,
 /area/hallway/secondary/exit/departure_lounge)
 "cCI" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/door/airlock/maintenance{
+	req_access_txt = "12";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/fore)
 "cCM" = (
@@ -77181,15 +77319,16 @@
 /area/maintenance/fore)
 "cDm" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/external{
-	name = "External Freight Airlock"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 4
 	},
+/obj/machinery/door/airlock/external{
+	name = "External Freight Airlock";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/djstation)
 "cDo" = (
@@ -78080,21 +78219,23 @@
 /area/engineering/atmos)
 "cFH" = (
 /obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
+	req_one_access_txt = "12;5";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/starboard/fore)
 "cFJ" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Medbay"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
+/obj/machinery/door/airlock/public/glass{
+	name = "Medbay";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/hallway/primary/fore)
 "cFK" = (
@@ -78329,9 +78470,6 @@
 /turf/open/floor/grass,
 /area/security/prison)
 "cGL" = (
-/obj/machinery/door/airlock/maintenance{
-	req_one_access_txt = "12;5"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -78341,12 +78479,13 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/maintenance{
+	req_one_access_txt = "12;5";
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/maintenance/port)
 "cGM" = (
-/obj/machinery/door/airlock/maintenance{
-	req_one_access_txt = "12;5"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -78359,12 +78498,13 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
+/obj/machinery/door/airlock/maintenance{
+	req_one_access_txt = "12;5";
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/maintenance/port)
 "cGN" = (
-/obj/machinery/door/airlock/maintenance{
-	req_one_access_txt = "12;5"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -78377,6 +78517,10 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
+/obj/machinery/door/airlock/maintenance{
+	req_one_access_txt = "12;5";
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/maintenance/port)
 "cGS" = (
@@ -78515,12 +78659,13 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "cHm" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/maintenance{
+	req_one_access_txt = "12;5";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/aft)
 "cHo" = (
@@ -78544,10 +78689,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
-/obj/machinery/door/airlock/command{
-	name = "Chief Engineer's Office";
-	req_access_txt = "56"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -78560,6 +78701,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/command{
+	name = "Chief Engineer's Office";
+	req_access_txt = "56";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/ce)
 "cHw" = (
@@ -78798,13 +78944,14 @@
 /area/security/office)
 "cIa" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
-	name = "Security Office";
-	req_access_txt = "63"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/security/glass{
+	name = "Security Office";
+	req_access_txt = "63";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/office)
 "cIc" = (
@@ -78840,12 +78987,6 @@
 /area/maintenance/starboard/fore)
 "cIj" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security{
-	aiControlDisabled = 1;
-	id_tag = "justicedoor_2";
-	name = "Justice Chamber";
-	req_access_txt = "3"
-	},
 /obj/machinery/button/door{
 	id = "justicedoor_2";
 	name = "Justice Door Lock";
@@ -78855,6 +78996,13 @@
 	specialfunctions = 4
 	},
 /obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/security{
+	aiControlDisabled = 1;
+	id_tag = "justicedoor_2";
+	name = "Justice Chamber";
+	req_access_txt = "3";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/execution/education)
 "cIm" = (
@@ -79140,9 +79288,6 @@
 /turf/open/floor/plasteel/dark,
 /area/security/prison)
 "cIS" = (
-/obj/machinery/door/airlock/security/glass{
-	name = "Prison Yard"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "PCell 3Lock";
@@ -79157,6 +79302,10 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/security/glass{
+	name = "Prison Yard";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/prison)
 "cIV" = (
@@ -79206,10 +79355,6 @@
 /turf/open/floor/plasteel/dark,
 /area/construction/mining/aux_base)
 "cJe" = (
-/obj/machinery/door/airlock/security/glass{
-	name = "Long-Term Cell 3";
-	req_access_txt = "2"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
@@ -79223,12 +79368,18 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/security/glass{
+	name = "Long-Term Cell 3";
+	req_access_txt = "2";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/prison)
 "cJi" = (
 /obj/machinery/door/airlock/mining{
 	name = "Auxiliary Base";
-	req_one_access_txt = "32;47;48"
+	req_one_access_txt = "32;47;48";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/construction/mining/aux_base)
@@ -79394,10 +79545,6 @@
 /turf/open/floor/plasteel/dark,
 /area/construction/mining/aux_base)
 "cJF" = (
-/obj/machinery/door/airlock/mining{
-	name = "Auxiliary Base";
-	req_one_access_txt = "32;47;48"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -79407,6 +79554,11 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/mining{
+	name = "Auxiliary Base";
+	req_one_access_txt = "32;47;48";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/construction/mining/aux_base)
 "cJG" = (
@@ -79441,7 +79593,8 @@
 /obj/machinery/door/airlock/medical/glass{
 	id_tag = "medbay_front_door";
 	name = "Medbay";
-	req_access_txt = "5"
+	req_access_txt = "5";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/medical/medbay/central)
@@ -79537,11 +79690,12 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /obj/machinery/door/airlock/atmos{
 	name = "Atmospherics Desk";
-	req_access_txt = "24"
-	},
-/obj/structure/disposalpipe/segment{
+	req_access_txt = "24";
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
@@ -79743,11 +79897,12 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /obj/machinery/door/airlock/engineering{
 	name = "Engineering Desk";
-	req_one_access_txt = "10;24"
-	},
-/obj/structure/disposalpipe/segment{
+	req_one_access_txt = "10;24";
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
@@ -80071,7 +80226,8 @@
 "cLE" = (
 /obj/machinery/door/airlock/engineering{
 	name = "Electrical Maintenance";
-	req_access_txt = "11"
+	req_access_txt = "11";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/department/electrical)
@@ -80124,16 +80280,17 @@
 /turf/open/floor/plating,
 /area/ruin/space/djstation)
 "cLQ" = (
-/obj/machinery/door/airlock/engineering{
-	name = "Starboard Bow Solar Access";
-	req_access_txt = "10"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/door/airlock/engineering{
+	name = "Starboard Bow Solar Access";
+	req_access_txt = "10";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/solars/starboard/fore)
 "cLR" = (
@@ -80161,10 +80318,6 @@
 	},
 /area/maintenance/solars/starboard/fore)
 "cLV" = (
-/obj/machinery/door/airlock/external{
-	name = "Solar Maintenance";
-	req_access_txt = "10; 13"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -80174,6 +80327,11 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/door/airlock/external{
+	name = "Solar Maintenance";
+	req_access_txt = "10; 13";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/maintenance/solars/starboard/fore)
 "cLY" = (
@@ -80244,10 +80402,6 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/engineering{
-	name = "Electrical Maintenance";
-	req_access_txt = "11"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -80255,6 +80409,11 @@
 	dir = 8
 	},
 /obj/structure/spider/stickyweb,
+/obj/machinery/door/airlock/engineering{
+	name = "Electrical Maintenance";
+	req_access_txt = "11";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/department/electrical)
 "cMn" = (
@@ -80567,14 +80726,15 @@
 /turf/open/floor/plasteel/dark,
 /area/maintenance/starboard)
 "cNs" = (
-/obj/machinery/door/airlock/atmos{
-	name = "Atmospherics Connector";
-	req_one_access_txt = "10;24;5"
-	},
 /obj/effect/turf_decal/delivery,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/door/airlock/atmos{
+	name = "Atmospherics Connector";
+	req_one_access_txt = "10;24;5";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/starboard)
 "cNy" = (
@@ -80788,9 +80948,6 @@
 /turf/open/floor/plasteel,
 /area/command/bridge)
 "cPa" = (
-/obj/machinery/door/airlock/security/glass{
-	name = "Prison Yard"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "PCell 2Lock";
@@ -80802,6 +80959,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
+/obj/machinery/door/airlock/security/glass{
+	name = "Prison Yard";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/prison)
 "cPb" = (
@@ -80826,10 +80987,6 @@
 /turf/closed/wall,
 /area/service/lawoffice)
 "cQP" = (
-/obj/machinery/door/airlock/security/glass{
-	name = "Long-Term Cell 2";
-	req_access_txt = "2"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
@@ -80840,6 +80997,11 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
+/obj/machinery/door/airlock/security/glass{
+	name = "Long-Term Cell 2";
+	req_access_txt = "2";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/prison)
 "cRk" = (
@@ -81674,7 +81836,7 @@
 "gSB" = (
 /obj/machinery/door/airlock/maintenance{
 	req_access_txt = "12";
-	welded = 1
+	dir = 8
 	},
 /turf/open/floor/wood,
 /area/maintenance/port/fore)
@@ -82619,16 +82781,18 @@
 /area/space/nearstation)
 "lpV" = (
 /obj/machinery/door/airlock/maintenance{
-	req_one_access_txt = "12;47"
+	req_one_access_txt = "12;5";
+	dir = 4
 	},
 /turf/open/floor/wood,
 /area/maintenance/starboard)
 "lqz" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
 /obj/machinery/door/airlock/external{
 	name = "External Airlock";
-	req_access_txt = "13"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	req_access_txt = "13";
 	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
@@ -83008,15 +83172,26 @@
 "ocN" = (
 /turf/open/floor/engine,
 /area/engineering/storage/tech)
+"odW" = (
+/obj/machinery/door/airlock/maintenance{
+	name = "hydroponics maintenance";
+	req_access_txt = "35";
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/maintenance/central)
 "oeS" = (
 /turf/closed/wall,
 /area/service/theater)
 "ofj" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/command/glass{
+	name = "Traffic Control";
+	req_access_txt = "19";
+	dir = 4
 	},
-/turf/open/floor/wood,
-/area/maintenance/port/fore)
+/turf/open/floor/plasteel/dark,
+/area/hallway/secondary/exit/departure_lounge)
 "ohv" = (
 /obj/effect/decal/cleanable/blood/old,
 /obj/effect/decal/cleanable/dirt,
@@ -83084,7 +83259,9 @@
 "ovS" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/mining/glass{
-	name = "Freight Mining Airlock"
+	name = "Mining Dock";
+	req_access_txt = "48";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/djstation)
@@ -83611,6 +83788,16 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/fore)
+"rjL" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/door/airlock/maintenance{
+	req_access_txt = "12";
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/maintenance/port)
 "rnD" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 6
@@ -83693,7 +83880,8 @@
 	},
 /obj/machinery/door/airlock/mining/glass{
 	name = "Mining Dock";
-	req_access_txt = "48"
+	req_access_txt = "48";
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/djstation)
@@ -83911,9 +84099,6 @@
 /area/ai_monitored/command/storage/eva)
 "sYx" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/external{
-	name = "Departure Shuttle Airlock"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
@@ -83924,6 +84109,10 @@
 	icon_state = "pipe11-3";
 	dir = 4
 	},
+/obj/machinery/door/airlock/external{
+	name = "External Freight Airlock";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/djstation)
 "taj" = (
@@ -98208,7 +98397,7 @@ cpX
 amR
 amA
 amA
-bzY
+cum
 amR
 cpX
 cqo
@@ -99551,7 +99740,7 @@ aaa
 aaa
 aaa
 aaa
-aaa
+aaB
 aaa
 aaa
 aaa
@@ -100234,7 +100423,7 @@ ctH
 ctB
 cwp
 cwp
-ofj
+gSB
 cwp
 cwp
 cwp
@@ -100244,7 +100433,7 @@ cwy
 cwJ
 cwp
 cve
-cum
+rjL
 amA
 cvB
 amA
@@ -103137,7 +103326,7 @@ aeo
 aaa
 aaa
 aaa
-aaB
+aaa
 aaa
 aaa
 aaa
@@ -108761,7 +108950,7 @@ cwO
 cyW
 agX
 agX
-acc
+bNF
 agX
 agX
 bmz
@@ -113641,7 +113830,7 @@ atr
 auG
 xIS
 bsP
-bUU
+bQx
 bOF
 bYW
 seV
@@ -118509,7 +118698,7 @@ lZB
 pSo
 pSo
 pSo
-auj
+odW
 pSo
 kna
 kna
@@ -120809,7 +120998,7 @@ pbD
 pbD
 pbD
 baM
-beL
+acc
 jvQ
 jvQ
 pbD
@@ -124674,7 +124863,7 @@ pLI
 pLI
 ufu
 ufu
-bom
+bzY
 pLI
 cju
 bpB
@@ -125473,7 +125662,7 @@ bOc
 bPe
 bOc
 bWz
-bYi
+ofj
 bTZ
 bZh
 bTC
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 18dc1d6fe4..079880e918 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -7554,17 +7554,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/centcom/control)
-"fLo" = (
-/obj/docking_port/stationary{
-	dir = 4;
-	dwidth = 2;
-	height = 7;
-	name = "recovery ship";
-	width = 5;
-	shuttle_id = "pod_away"
-	},
-/turf/open/floor/plating,
-/area/centcom/control)
 "fLE" = (
 /obj/structure/table,
 /obj/item/reagent_containers/glass/beaker/lipoifier,
@@ -10420,17 +10409,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/centcom/control)
-"hYv" = (
-/obj/docking_port/stationary{
-	dir = 4;
-	dwidth = 1;
-	height = 4;
-	name = "recovery ship";
-	width = 3;
-	shuttle_id = "pod2_away"
-	},
-/turf/open/floor/plating,
-/area/centcom/control)
 "hYx" = (
 /obj/structure/table/wood,
 /obj/item/storage/fancy/donut_box,
@@ -13196,17 +13174,6 @@
 "jWB" = (
 /turf/closed/indestructible/wood,
 /area/awaymission/jungleresort)
-"jXc" = (
-/obj/docking_port/stationary{
-	dir = 4;
-	dwidth = 1;
-	height = 4;
-	name = "recovery ship";
-	width = 3;
-	shuttle_id = "pod3_away"
-	},
-/turf/open/floor/plating,
-/area/centcom/control)
 "jXk" = (
 /obj/machinery/light{
 	dir = 8
@@ -26149,17 +26116,6 @@
 /obj/structure/chair/stool,
 /turf/open/floor/plasteel,
 /area/syndicate_mothership)
-"tvK" = (
-/obj/docking_port/stationary{
-	dir = 4;
-	dwidth = 1;
-	height = 4;
-	name = "recovery ship";
-	width = 3;
-	shuttle_id = "pod4_away"
-	},
-/turf/open/floor/plating,
-/area/centcom/control)
 "twJ" = (
 /obj/item/banner/gato,
 /turf/open/floor/plasteel,
@@ -81692,19 +81648,19 @@ ntl
 ntl
 mKC
 vsN
-fLo
+vsN
 vsN
 mpw
 vsN
-hYv
+vsN
 vsN
 mpw
 vsN
-jXc
+vsN
 vsN
 mpw
 vsN
-tvK
+vsN
 vsN
 aHU
 xMy
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index e4c0332595..50cc688eb2 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -684,7 +684,7 @@
 /obj/item/toy/cards/deck
 	name = "deck of cards"
 	desc = "A deck of space-grade playing cards."
-	icon = 'icons/obj/toys/toy.dmi'
+	icon = 'GainStation13/icons/obj/toys/toy.dmi' //GS13 - GATO sprite
 	deckstyle = "nanotrasen"
 	icon_state = "deck_nanotrasen_full"
 	w_class = WEIGHT_CLASS_SMALL
@@ -815,7 +815,7 @@
 /obj/item/toy/cards/cardhand
 	name = "hand of cards"
 	desc = "A number of cards not in a deck, customarily held in ones hand."
-	icon = 'icons/obj/toys/toy.dmi'
+	icon = 'GainStation13/icons/obj/toys/toy.dmi' //GS13 - GATO sprite
 	icon_state = "none"
 	w_class = WEIGHT_CLASS_TINY
 	var/list/currenthand = list()
@@ -912,7 +912,7 @@
 /obj/item/toy/cards/singlecard
 	name = "card"
 	desc = "a card"
-	icon = 'icons/obj/toys/toy.dmi'
+	icon = 'GainStation13/icons/obj/toys/toy.dmi' //GS13 - GATO sprite
 	icon_state = "singlecard_down_nanotrasen"
 	w_class = WEIGHT_CLASS_TINY
 	var/cardname = null