diff --git a/aurorastation.dme b/aurorastation.dme
index 43f17f77a0e..2c885c0f833 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -906,6 +906,7 @@
 #include "code\game\objects\empulse.dm"
 #include "code\game\objects\explosion.dm"
 #include "code\game\objects\items.dm"
+#include "code\game\objects\merge_conflict_marker.dm"
 #include "code\game\objects\objs.dm"
 #include "code\game\objects\structures.dm"
 #include "code\game\objects\auras\auras.dm"
@@ -1927,7 +1928,6 @@
 #include "code\modules\effects\ion_trail_follow.dm"
 #include "code\modules\effects\shuttle_landing_warning.dm"
 #include "code\modules\effects\visual_effect.dm"
-#include "code\modules\effects\map_effects\airlock_marker.dm"
 #include "code\modules\effects\map_effects\airlock_spawner.dm"
 #include "code\modules\effects\map_effects\beam_point.dm"
 #include "code\modules\effects\map_effects\door_helper.dm"
@@ -1939,6 +1939,11 @@
 #include "code\modules\effects\map_effects\screen_shaker.dm"
 #include "code\modules\effects\map_effects\sound_emitter.dm"
 #include "code\modules\effects\map_effects\window_spawner.dm"
+#include "code\modules\effects\map_effects\marker\_defines.dm"
+#include "code\modules\effects\map_effects\marker\airlock_.dm"
+#include "code\modules\effects\map_effects\marker\airlock_docking.dm"
+#include "code\modules\effects\map_effects\marker\airlock_helper.dm"
+#include "code\modules\effects\map_effects\marker\airlock_shuttle.dm"
 #include "code\modules\effects\maze_generation\maze_generator.dm"
 #include "code\modules\effects\maze_generation\maze_generator_blockwise.dm"
 #include "code\modules\effects\maze_generation\maze_helper_atoms.dm"
diff --git a/code/controllers/subsystems/processing/shuttle.dm b/code/controllers/subsystems/processing/shuttle.dm
index 118926a923e..92e5ff57e1d 100644
--- a/code/controllers/subsystems/processing/shuttle.dm
+++ b/code/controllers/subsystems/processing/shuttle.dm
@@ -8,6 +8,8 @@ SUBSYSTEM_DEF(shuttle)
 	var/list/ships = list()                      //List of all ships.
 	var/list/shuttles = list()                   //maps shuttle tags to shuttle datums, so that they can be looked up.
 	var/list/process_shuttles = list()           //simple list of shuttles, for processing
+
+	/// Map of shuttle landmark `landmark_tag` to the actual landmark object.
 	var/list/registered_shuttle_landmarks = list()
 	var/last_landmark_registration_time
 	var/list/docking_registry = list()           //Docking controller tag -> docking controller program, mostly for init purposes.
diff --git a/code/game/objects/merge_conflict_marker.dm b/code/game/objects/merge_conflict_marker.dm
new file mode 100644
index 00000000000..0e56e818331
--- /dev/null
+++ b/code/game/objects/merge_conflict_marker.dm
@@ -0,0 +1,5 @@
+/obj/merge_conflict_marker
+	name = "MERGE CONFLICT MARKER"
+	icon = 'icons/effects/map_effects.dmi'
+	icon_state = "portal_projection_side_b"
+	layer = ABOVE_ALL_MOB_LAYER
diff --git a/code/modules/effects/map_effects/airlock_marker.dm b/code/modules/effects/map_effects/airlock_marker.dm
deleted file mode 100644
index a932e5ceda4..00000000000
--- a/code/modules/effects/map_effects/airlock_marker.dm
+++ /dev/null
@@ -1,121 +0,0 @@
-/obj/effect/map_effect/marker
-	name = "map marker parent abstract object"
-	icon = 'icons/effects/map_effects.dmi'
-	icon_state = "map_marker"
-
-/obj/effect/map_effect/marker_helper
-	name = "map marker helper parent abstract object"
-	icon = 'icons/effects/map_effects.dmi'
-	icon_state = "map_marker"
-
-/// Airlock marker that, when placed above airlock components (doors, pumps, sensors, etc),
-/// actually sets the airlock up to make it functional.
-/obj/effect/map_effect/marker/airlock
-	name = "airlock marker (inside the airlock)"
-	desc = "MASTER_TAG VAR MUST BE UNIQUE FOR THE AIRLOCK! Place this on top of airlock components (doors, pumps, sensors, etc)."
-	icon = 'icons/effects/map_effects.dmi'
-	icon_state = "airlock_marker"
-	layer = LIGHTING_LAYER
-
-	/// Radio frequency of this airlock.
-	var/frequency = 2137
-
-	/// Unique tag for this airlock. Not visible in game and to the player. Do not leave this as null.
-	/// THIS MUST BE UNIQUE FOR THE AIRLOCK. Every marker in one airlock should have the same `master_tag`.
-	/// But different airlocks, even on different maps, cannot share the same `master_tag`.
-	var/master_tag = null
-
-	/// Doors/buttons/etc will be set to this access requirement. If null, they will not have any access requirements.
-	var/required_access = list(access_external_airlocks)
-
-/// Specialization helper for the airlock marker, to be put above "exterior" parts of the airlock,
-/// and on top of the actual airlock marker. By itself does nothing.
-/obj/effect/map_effect/marker_helper/airlock/exterior
-	name = "airlock marker (exterior/outside/vacuum)"
-	icon = 'icons/effects/map_effects.dmi'
-	icon_state = "airlock_marker_exterior"
-	layer = LIGHTING_LAYER
-
-/// Specialization helper for the airlock marker, to be put above "interior" parts of the airlock,
-/// and on top of the actual airlock marker. By itself does nothing.
-/obj/effect/map_effect/marker_helper/airlock/interior
-	name = "airlock marker (interior/inside/pressurized)"
-	icon = 'icons/effects/map_effects.dmi'
-	icon_state = "airlock_marker_interior"
-	layer = LIGHTING_LAYER
-
-/obj/effect/map_effect/marker/airlock/Initialize(mapload, ...)
-	..()
-	return INITIALIZE_HINT_LATELOAD
-
-#define MASTER_TAG		"[master_tag]_controller"
-#define AIRPUMP_TAG		"[master_tag]_pump"
-#define SENSOR_TAG		"[master_tag]_sensor"
-#define EXTERIOR_DOOR_TAG	"[master_tag]_outer"
-#define INTERIOR_DOOR_TAG	"[master_tag]_inner"
-
-/obj/effect/map_effect/marker/airlock/LateInitialize()
-	if(!master_tag || !frequency)
-		return
-
-	var/is_interior = locate(/obj/effect/map_effect/marker_helper/airlock/interior) in loc
-	var/is_exterior = locate(/obj/effect/map_effect/marker_helper/airlock/exterior) in loc
-
-	// iterate over airlock components under this marker
-	// and actually set them up
-	for(var/thing in loc)
-		var/obj/machinery/embedded_controller/radio/airlock/airlock_controller/airlock_controller = thing
-		if(istype(airlock_controller))
-			airlock_controller.set_frequency(frequency)
-			airlock_controller.id_tag = MASTER_TAG
-			airlock_controller.tag_airpump = AIRPUMP_TAG
-			airlock_controller.tag_chamber_sensor = SENSOR_TAG
-			airlock_controller.tag_exterior_door = EXTERIOR_DOOR_TAG
-			airlock_controller.tag_interior_door = INTERIOR_DOOR_TAG
-			airlock_controller.req_access = required_access
-			airlock_controller.program = new /datum/computer/file/embedded_program/airlock(airlock_controller)
-			continue
-
-		var/obj/machinery/door/airlock/door = thing
-		if(istype(door))
-			door.set_frequency(frequency)
-			door.req_access = required_access
-			door.lock()
-			if(is_interior)
-				door.id_tag = INTERIOR_DOOR_TAG
-			else if(is_exterior)
-				door.id_tag = EXTERIOR_DOOR_TAG
-			continue
-
-		var/obj/machinery/airlock_sensor/sensor = thing
-		if(istype(sensor))
-			sensor.set_frequency(frequency)
-			sensor.id_tag = SENSOR_TAG
-			sensor.master_tag = MASTER_TAG
-			continue
-
-		var/obj/machinery/atmospherics/unary/vent_pump/pump = thing
-		if(istype(pump))
-			pump.frequency = frequency
-			unregister_radio(pump, frequency)
-			pump.setup_radio()
-			pump.id_tag = AIRPUMP_TAG
-			continue
-
-		var/obj/machinery/access_button/button = thing
-		if(istype(button))
-			button.set_frequency(frequency)
-			button.master_tag = MASTER_TAG
-			button.req_access = required_access
-			if(is_interior)
-				button.command = "cycle_interior"
-			else if(is_exterior)
-				button.command = "cycle_exterior"
-			continue
-
-#undef MASTER_TAG
-#undef AIRPUMP_TAG
-#undef SENSOR_TAG
-#undef EXTERIOR_DOOR_TAG
-#undef INTERIOR_DOOR_TAG
-
diff --git a/code/modules/effects/map_effects/marker/_defines.dm b/code/modules/effects/map_effects/marker/_defines.dm
new file mode 100644
index 00000000000..059d67350fb
--- /dev/null
+++ b/code/modules/effects/map_effects/marker/_defines.dm
@@ -0,0 +1,10 @@
+
+#define AIRLOCK_MARKER_TAG_MASTER			"[master_tag]"
+#define AIRLOCK_MARKER_TAG_SENSOR_CHAMBER		"[master_tag]_sensor_chamber"
+#define AIRLOCK_MARKER_TAG_SENSOR_INTERIOR		"[master_tag]_sensor_interior"
+#define AIRLOCK_MARKER_TAG_SENSOR_EXTERIOR		"[master_tag]_sensor_exterior"
+#define AIRLOCK_MARKER_TAG_DOOR_EXTERIOR	"[master_tag]_door_exterior"
+#define AIRLOCK_MARKER_TAG_DOOR_INTERIOR	"[master_tag]_door_interior"
+#define AIRLOCK_MARKER_TAG_AIRPUMP_CHAMBER		"[master_tag]_airpump_chamber"
+#define AIRLOCK_MARKER_TAG_AIRPUMP_OUT_EXTERNAL	"[master_tag]_pump_out_external"
+#define AIRLOCK_MARKER_TAG_AIRPUMP_OUT_INTERNAL	"[master_tag]_pump_out_internal"
diff --git a/code/modules/effects/map_effects/marker/airlock_.dm b/code/modules/effects/map_effects/marker/airlock_.dm
new file mode 100644
index 00000000000..670844b7d77
--- /dev/null
+++ b/code/modules/effects/map_effects/marker/airlock_.dm
@@ -0,0 +1,118 @@
+/obj/effect/map_effect/marker
+	name = "map marker parent abstract object"
+	icon = 'icons/effects/map_effects.dmi'
+	icon_state = "marker_base"
+
+/// Airlock marker that, when placed above airlock components, actually sets them up to make it functional.
+/// This is a simple exterior access airlock, not used for docking.
+/// See `maps/helpers/guidelines_airlocks.dmm` for examples of good and bad airlocks.
+/obj/effect/map_effect/marker/airlock
+	name = "airlock marker"
+	desc = "See comments/documentation in code."
+	icon = 'icons/effects/map_effects.dmi'
+	icon_state = "marker_airlock"
+	layer = LIGHTING_LAYER
+
+	/// Radio frequency of this airlock.
+	/// For simple external/service access airlocks it does not affect anything.
+	var/frequency = 2137
+
+	/// Unique tag for this airlock. Not visible in game and to the player. Do not leave this as null.
+	/// THIS MUST BE UNIQUE FOR THE AIRLOCK. Every marker in one airlock should have the same `master_tag`.
+	/// Different airlocks, even on different maps, cannot share the same `master_tag`.
+	var/master_tag = null
+
+	/// If true, the airlock will be set up to fill with air from the outside when cycling to exterior,
+	/// and will empty air to outside before filling with interior air. This makes it so exterior and interior atmospheres do not mix.
+	/// Should be used for airlocks that may be used on planets with atmosphere and air (as opposed to ships or space stations that stay in vacuum).
+	var/cycle_to_external_air = FALSE
+
+	/// Doors/buttons/etc will be set to this access requirement. If null, they will not have any access requirements.
+	req_access = null
+
+	/// Doors/buttons/etc will be set to this access requirement. If null, they will not have any access requirements.
+	req_one_access = list(access_external_airlocks)
+
+/obj/effect/map_effect/marker/airlock/Initialize(mapload, ...)
+	..()
+	return INITIALIZE_HINT_LATELOAD
+
+/obj/effect/map_effect/marker/airlock/LateInitialize()
+	if(!master_tag || !frequency)
+		return
+
+	var/is_interior = locate(/obj/effect/map_effect/marker_helper/airlock/interior) in loc
+	var/is_exterior = locate(/obj/effect/map_effect/marker_helper/airlock/exterior) in loc
+	var/is_out = locate(/obj/effect/map_effect/marker_helper/airlock/out) in loc
+
+	// iterate over airlock components under this marker
+	// and actually set them up
+	for(var/thing in loc)
+		// set up the controller
+		var/obj/machinery/embedded_controller/radio/airlock/airlock_controller/controller = thing
+		if(istype(controller))
+			// common controller vars
+			controller.set_frequency(frequency)
+			controller.id_tag = AIRLOCK_MARKER_TAG_MASTER
+			controller.tag_airpump = AIRLOCK_MARKER_TAG_AIRPUMP_CHAMBER
+			controller.tag_chamber_sensor = AIRLOCK_MARKER_TAG_SENSOR_CHAMBER
+			controller.tag_exterior_sensor = AIRLOCK_MARKER_TAG_SENSOR_EXTERIOR
+			controller.tag_exterior_door = AIRLOCK_MARKER_TAG_DOOR_EXTERIOR
+			controller.tag_interior_door = AIRLOCK_MARKER_TAG_DOOR_INTERIOR
+			controller.cycle_to_external_air = cycle_to_external_air
+			controller.req_access = req_access
+			controller.req_one_access = req_one_access
+			// controller subtype specific vars
+			controller.program = new /datum/computer/file/embedded_program/airlock(controller)
+			continue
+
+		// and all the other airlock components
+
+		var/obj/machinery/door/airlock/door = thing
+		if(istype(door))
+			door.set_frequency(frequency)
+			door.req_access = req_access
+			door.req_one_access = req_one_access
+			door.lock()
+			if(is_interior)
+				door.id_tag = AIRLOCK_MARKER_TAG_DOOR_INTERIOR
+			else if(is_exterior)
+				door.id_tag = AIRLOCK_MARKER_TAG_DOOR_EXTERIOR
+			continue
+
+		var/obj/machinery/airlock_sensor/sensor = thing
+		if(istype(sensor))
+			sensor.set_frequency(frequency)
+			sensor.master_tag = AIRLOCK_MARKER_TAG_MASTER
+			if(is_interior)
+				sensor.id_tag = AIRLOCK_MARKER_TAG_SENSOR_INTERIOR
+			else if(is_exterior)
+				sensor.id_tag = AIRLOCK_MARKER_TAG_SENSOR_EXTERIOR
+			else
+				sensor.id_tag = AIRLOCK_MARKER_TAG_SENSOR_CHAMBER
+			continue
+
+		var/obj/machinery/atmospherics/unary/vent_pump/pump = thing
+		if(istype(pump))
+			pump.frequency = frequency
+			unregister_radio(pump, frequency)
+			pump.setup_radio()
+			if(is_exterior)
+				pump.id_tag = AIRLOCK_MARKER_TAG_AIRPUMP_OUT_EXTERNAL
+			else if(is_out)
+				pump.id_tag = AIRLOCK_MARKER_TAG_AIRPUMP_OUT_INTERNAL
+			else
+				pump.id_tag = AIRLOCK_MARKER_TAG_AIRPUMP_CHAMBER
+			continue
+
+		var/obj/machinery/access_button/button = thing
+		if(istype(button))
+			button.set_frequency(frequency)
+			button.master_tag = AIRLOCK_MARKER_TAG_MASTER
+			button.req_access = req_access
+			button.req_one_access = req_one_access
+			if(is_interior)
+				button.command = "cycle_interior"
+			else if(is_exterior)
+				button.command = "cycle_exterior"
+			continue
diff --git a/code/modules/effects/map_effects/marker/airlock_docking.dm b/code/modules/effects/map_effects/marker/airlock_docking.dm
new file mode 100644
index 00000000000..4de21ca35d2
--- /dev/null
+++ b/code/modules/effects/map_effects/marker/airlock_docking.dm
@@ -0,0 +1,117 @@
+
+/// Docking airlock marker that, when placed above airlock components, actually sets them up to make it functional.
+/// This is a docking airlock, meaning it is connected to a shuttle landmark object.
+/// When some shuttle arrives at that landmark, the actual docking may commence, with the doors of the airlock automatically opening, etc.
+/// This is the station/ship side of that docking (the other being the shuttle).
+/obj/effect/map_effect/marker/airlock/docking
+	name = "docking airlock marker"
+	icon = 'icons/effects/map_effects.dmi'
+	icon_state = "marker_airlock_docking"
+	layer = LIGHTING_LAYER
+
+	/// Radio frequency of this airlock.
+	/// For docking airlocks, the frequency of docking port airlock and the shuttle airlock needs to match,
+	/// otherwise they can't "talk", and the docking will never actually happen.
+	/// Keep 1380 as default frequency, to maximize compatibility between various shuttles and docks.
+	frequency = 1380
+
+	/// Unique tag for this airlock. Not visible in game and to the player. Do not leave this as null.
+	/// THIS MUST BE UNIQUE FOR THE AIRLOCK. Every marker in one airlock should have the same `master_tag`.
+	/// Different airlocks, even on different maps, cannot share the same `master_tag`.
+	/// This must be the same as the `docking_controller` tag in the shuttle landmark object.
+	master_tag = null
+
+	/// Tag of the shuttle landmark, that this docking port is supposed to be connected to.
+	/// Same as `landmark_tag` var of the shuttle landmark object, and same as the key for `registered_shuttle_landmarks` in shuttle subsystem.
+	var/landmark_tag = null
+
+/obj/effect/map_effect/marker/airlock/docking/LateInitialize()
+	if(!master_tag || !frequency || !landmark_tag)
+		return
+
+	var/is_interior = locate(/obj/effect/map_effect/marker_helper/airlock/interior) in loc
+	var/is_exterior = locate(/obj/effect/map_effect/marker_helper/airlock/exterior) in loc
+	var/is_out = locate(/obj/effect/map_effect/marker_helper/airlock/out) in loc
+
+	// iterate over airlock components under this marker
+	// and actually set them up
+	for(var/thing in loc)
+		// set up the controller
+		var/obj/machinery/embedded_controller/radio/airlock/docking_port/controller = thing
+		if(istype(controller))
+			// common controller vars
+			controller.set_frequency(frequency)
+			controller.id_tag = AIRLOCK_MARKER_TAG_MASTER
+			controller.tag_airpump = AIRLOCK_MARKER_TAG_AIRPUMP_CHAMBER
+			controller.tag_chamber_sensor = AIRLOCK_MARKER_TAG_SENSOR_CHAMBER
+			controller.tag_exterior_sensor = AIRLOCK_MARKER_TAG_SENSOR_EXTERIOR
+			controller.tag_exterior_door = AIRLOCK_MARKER_TAG_DOOR_EXTERIOR
+			controller.tag_interior_door = AIRLOCK_MARKER_TAG_DOOR_INTERIOR
+			controller.cycle_to_external_air = cycle_to_external_air
+			controller.req_access = req_access
+			controller.req_one_access = req_one_access
+			// controller subtype specific vars
+			controller.airlock_program = new /datum/computer/file/embedded_program/airlock/docking(controller)
+			controller.docking_program = new /datum/computer/file/embedded_program/docking/airlock(controller, controller.airlock_program)
+			controller.program = controller.docking_program
+			if(SSshuttle.registered_shuttle_landmarks[landmark_tag])
+				var/obj/effect/shuttle_landmark/landmark = SSshuttle.registered_shuttle_landmarks[landmark_tag]
+				landmark.docking_controller = SSshuttle.docking_registry[AIRLOCK_MARKER_TAG_MASTER]
+			continue
+
+		var/obj/effect/shuttle_landmark/landmark = thing
+		if(istype(landmark))
+			if(SSshuttle.docking_registry[AIRLOCK_MARKER_TAG_MASTER])
+				landmark.docking_controller = SSshuttle.docking_registry[AIRLOCK_MARKER_TAG_MASTER]
+			continue
+
+		// and all the other airlock components
+
+		var/obj/machinery/door/airlock/door = thing
+		if(istype(door))
+			door.set_frequency(frequency)
+			door.req_access = req_access
+			door.req_one_access = req_one_access
+			door.lock()
+			if(is_interior)
+				door.id_tag = AIRLOCK_MARKER_TAG_DOOR_INTERIOR
+			else if(is_exterior)
+				door.id_tag = AIRLOCK_MARKER_TAG_DOOR_EXTERIOR
+			continue
+
+		var/obj/machinery/airlock_sensor/sensor = thing
+		if(istype(sensor))
+			sensor.set_frequency(frequency)
+			sensor.master_tag = AIRLOCK_MARKER_TAG_MASTER
+			if(is_interior)
+				sensor.id_tag = AIRLOCK_MARKER_TAG_SENSOR_INTERIOR
+			else if(is_exterior)
+				sensor.id_tag = AIRLOCK_MARKER_TAG_SENSOR_EXTERIOR
+			else
+				sensor.id_tag = AIRLOCK_MARKER_TAG_SENSOR_CHAMBER
+			continue
+
+		var/obj/machinery/atmospherics/unary/vent_pump/pump = thing
+		if(istype(pump))
+			pump.frequency = frequency
+			unregister_radio(pump, frequency)
+			pump.setup_radio()
+			if(is_exterior)
+				pump.id_tag = AIRLOCK_MARKER_TAG_AIRPUMP_OUT_EXTERNAL
+			else if(is_out)
+				pump.id_tag = AIRLOCK_MARKER_TAG_AIRPUMP_OUT_INTERNAL
+			else
+				pump.id_tag = AIRLOCK_MARKER_TAG_AIRPUMP_CHAMBER
+			continue
+
+		var/obj/machinery/access_button/button = thing
+		if(istype(button))
+			button.set_frequency(frequency)
+			button.master_tag = AIRLOCK_MARKER_TAG_MASTER
+			button.req_access = req_access
+			button.req_one_access = req_one_access
+			if(is_interior)
+				button.command = "cycle_interior"
+			else if(is_exterior)
+				button.command = "cycle_exterior"
+			continue
diff --git a/code/modules/effects/map_effects/marker/airlock_helper.dm b/code/modules/effects/map_effects/marker/airlock_helper.dm
new file mode 100644
index 00000000000..d2d06e1ac39
--- /dev/null
+++ b/code/modules/effects/map_effects/marker/airlock_helper.dm
@@ -0,0 +1,28 @@
+/obj/effect/map_effect/marker_helper
+	name = "map marker helper parent abstract object"
+	icon = 'icons/effects/map_effects.dmi'
+	icon_state = "marker_base"
+
+/// Specialization helper for the airlock marker. By itself does nothing.
+/// To be put above "exterior" components of the airlock, and on top of the actual airlock marker.
+/obj/effect/map_effect/marker_helper/airlock/exterior
+	name = "airlock marker helper (exterior/outside/vacuum)"
+	icon = 'icons/effects/map_effects.dmi'
+	icon_state = "marker_helper_airlock_exterior"
+	layer = LIGHTING_LAYER
+
+/// Specialization helper for the airlock marker, to be put above "interior" parts of the airlock,
+/// and on top of the actual airlock marker. By itself does nothing.
+/obj/effect/map_effect/marker_helper/airlock/interior
+	name = "airlock marker helper (interior/inside/pressurized)"
+	icon = 'icons/effects/map_effects.dmi'
+	icon_state = "marker_helper_airlock_interior"
+	layer = LIGHTING_LAYER
+
+/// Specialization helper for the airlock marker, to be put above the out pump of the airlock,
+/// and on top of the actual airlock marker. By itself does nothing.
+/obj/effect/map_effect/marker_helper/airlock/out
+	name = "airlock marker helper (chamber, out pump)"
+	icon = 'icons/effects/map_effects.dmi'
+	icon_state = "marker_helper_airlock_out"
+	layer = LIGHTING_LAYER
diff --git a/code/modules/effects/map_effects/marker/airlock_shuttle.dm b/code/modules/effects/map_effects/marker/airlock_shuttle.dm
new file mode 100644
index 00000000000..5e66c134e80
--- /dev/null
+++ b/code/modules/effects/map_effects/marker/airlock_shuttle.dm
@@ -0,0 +1,111 @@
+
+/// Docking airlock marker that, when placed above airlock components, actually sets them up to make it functional.
+/// This is a docking airlock specialized for shuttles, and is connected to a shuttle datum.
+/// When that shuttle arrives at some landmark, the actual docking may commence, with the doors of the airlock automatically opening, etc.
+/// This is the shuttle side of that docking (the other being the station/ship).
+/obj/effect/map_effect/marker/airlock/shuttle
+	name = "shuttle docking airlock marker"
+	icon = 'icons/effects/map_effects.dmi'
+	icon_state = "marker_airlock_shuttle"
+	layer = LIGHTING_LAYER
+
+	/// Radio frequency of this airlock.
+	/// For docking airlocks, the frequency of docking port airlock and the shuttle airlock needs to match,
+	/// otherwise they can't "talk", and the docking will never actually happen (meaning the automatic opening/closing of doors).
+	/// Keep 1380 as default frequency, to maximize compatibility between various shuttles and docks.
+	frequency = 1380
+
+	/// Unique tag for this airlock. Not visible in game and to the player. Do not leave this as null.
+	/// THIS MUST BE UNIQUE FOR THE AIRLOCK. Every marker in one airlock should have the same `master_tag`.
+	/// Different airlocks, even on different maps, cannot share the same `master_tag`.
+	/// This must be the same as the `dock_target` tag in the shuttle datum.
+	master_tag = null
+
+	/// Tag of the shuttle, that this docking port is supposed to be connected to.
+	/// Same as `name` var of the shuttle datum, and same as the key for `shuttles` in shuttle subsystem.
+	var/shuttle_tag = null
+
+/obj/effect/map_effect/marker/airlock/shuttle/LateInitialize()
+	if(!master_tag || !frequency || !shuttle_tag)
+		return
+
+	var/is_interior = locate(/obj/effect/map_effect/marker_helper/airlock/interior) in loc
+	var/is_exterior = locate(/obj/effect/map_effect/marker_helper/airlock/exterior) in loc
+	var/is_out = locate(/obj/effect/map_effect/marker_helper/airlock/out) in loc
+
+	// iterate over airlock components under this marker
+	// and actually set them up
+	for(var/thing in loc)
+		// set up the controller
+		var/obj/machinery/embedded_controller/radio/airlock/docking_port/controller = thing
+		if(istype(controller))
+			// common controller vars
+			controller.set_frequency(frequency)
+			controller.id_tag = AIRLOCK_MARKER_TAG_MASTER
+			controller.tag_airpump = AIRLOCK_MARKER_TAG_AIRPUMP_CHAMBER
+			controller.tag_chamber_sensor = AIRLOCK_MARKER_TAG_SENSOR_CHAMBER
+			controller.tag_exterior_sensor = AIRLOCK_MARKER_TAG_SENSOR_EXTERIOR
+			controller.tag_exterior_door = AIRLOCK_MARKER_TAG_DOOR_EXTERIOR
+			controller.tag_interior_door = AIRLOCK_MARKER_TAG_DOOR_INTERIOR
+			controller.cycle_to_external_air = cycle_to_external_air
+			controller.req_access = req_access
+			controller.req_one_access = req_one_access
+			// controller subtype specific vars
+			controller.airlock_program = new /datum/computer/file/embedded_program/airlock/docking(controller)
+			controller.docking_program = new /datum/computer/file/embedded_program/docking/airlock(controller, controller.airlock_program)
+			controller.program = controller.docking_program
+			if(SSshuttle.shuttles[shuttle_tag])
+				var/datum/shuttle/autodock/shuttle = SSshuttle.shuttles[shuttle_tag]
+				shuttle.dock_target = AIRLOCK_MARKER_TAG_MASTER
+			continue
+
+		// and all the other airlock components
+
+		var/obj/machinery/door/airlock/door = thing
+		if(istype(door))
+			door.set_frequency(frequency)
+			door.req_access = req_access
+			door.req_one_access = req_one_access
+			door.lock()
+			if(is_interior)
+				door.id_tag = AIRLOCK_MARKER_TAG_DOOR_INTERIOR
+			else if(is_exterior)
+				door.id_tag = AIRLOCK_MARKER_TAG_DOOR_EXTERIOR
+			continue
+
+		var/obj/machinery/airlock_sensor/sensor = thing
+		if(istype(sensor))
+			sensor.set_frequency(frequency)
+			sensor.master_tag = AIRLOCK_MARKER_TAG_MASTER
+			if(is_interior)
+				sensor.id_tag = AIRLOCK_MARKER_TAG_SENSOR_INTERIOR
+			else if(is_exterior)
+				sensor.id_tag = AIRLOCK_MARKER_TAG_SENSOR_EXTERIOR
+			else
+				sensor.id_tag = AIRLOCK_MARKER_TAG_SENSOR_CHAMBER
+			continue
+
+		var/obj/machinery/atmospherics/unary/vent_pump/pump = thing
+		if(istype(pump))
+			pump.frequency = frequency
+			unregister_radio(pump, frequency)
+			pump.setup_radio()
+			if(is_exterior)
+				pump.id_tag = AIRLOCK_MARKER_TAG_AIRPUMP_OUT_EXTERNAL
+			else if(is_out)
+				pump.id_tag = AIRLOCK_MARKER_TAG_AIRPUMP_OUT_INTERNAL
+			else
+				pump.id_tag = AIRLOCK_MARKER_TAG_AIRPUMP_CHAMBER
+			continue
+
+		var/obj/machinery/access_button/button = thing
+		if(istype(button))
+			button.set_frequency(frequency)
+			button.master_tag = AIRLOCK_MARKER_TAG_MASTER
+			button.req_access = req_access
+			button.req_one_access = req_one_access
+			if(is_interior)
+				button.command = "cycle_interior"
+			else if(is_exterior)
+				button.command = "cycle_exterior"
+			continue
diff --git a/code/modules/shuttles/shuttle_autodock.dm b/code/modules/shuttles/shuttle_autodock.dm
index 65294c1a855..f1afa84b668 100644
--- a/code/modules/shuttles/shuttle_autodock.dm
+++ b/code/modules/shuttles/shuttle_autodock.dm
@@ -4,7 +4,8 @@
 	var/in_use = null  //tells the controller whether this shuttle needs processing, also attempts to prevent double-use
 	var/last_dock_attempt_time = 0
 	var/current_dock_target
-	//ID of the controller on the shuttle
+
+	/// `id_tag`/`master_tag` of the docking controller of this shuttle.
 	var/dock_target = null
 
 	var/obj/effect/shuttle_landmark/next_location
diff --git a/html/changelogs/DreamySkrell-airlock-markers-docking-shuttle.yml b/html/changelogs/DreamySkrell-airlock-markers-docking-shuttle.yml
new file mode 100644
index 00000000000..f47cd78bae2
--- /dev/null
+++ b/html/changelogs/DreamySkrell-airlock-markers-docking-shuttle.yml
@@ -0,0 +1,48 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: DreamySkrell
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Airlock markers: Adds support for docking and shuttle airlocks."
+  - rscadd: "Airlock markers: Adds support for out pumps."
+  - maptweak: "Adds examples for docking and shuttle airlocks to the airlock guidelines helper map."
+  - maptweak: "Remaps third deck docks to use docking airlock markers."
+  - maptweak: "Remaps Intrepid and Spark to use docking airlock markers."
+  - maptweak: "Changes frequencies of airlocks of antag shuttles to work with new docks."
+  - bugfix: "Fixes bad canary and ert shuttle docking controller tags."
+  - rscadd: "Adds merge conflict marker for use with mapmerge2."
diff --git a/icons/effects/map_effects.dmi b/icons/effects/map_effects.dmi
index faaf32eda46..9080a1fc9f4 100644
Binary files a/icons/effects/map_effects.dmi and b/icons/effects/map_effects.dmi differ
diff --git a/icons/effects/map_effects_96x96.dmi b/icons/effects/map_effects_96x96.dmi
index 0ca9d39c17f..aa74dfb56a9 100644
Binary files a/icons/effects/map_effects_96x96.dmi and b/icons/effects/map_effects_96x96.dmi differ
diff --git a/maps/aurora/code/aurora_shuttles.dm b/maps/aurora/code/aurora_shuttles.dm
index a36c9166f92..940b12c920d 100644
--- a/maps/aurora/code/aurora_shuttles.dm
+++ b/maps/aurora/code/aurora_shuttles.dm
@@ -592,7 +592,6 @@ AURORA_ESCAPE_POD(4)
 /obj/effect/shuttle_landmark/distress/blue
 	name = "First Deck Port Hangar Bay 2b"
 	landmark_tag = "nav_distress_blue"
-	docking_controller = "distress_shuttle_dock"
 	special_dock_targets = list("Distress Shuttle" = "distress_shuttle_fore")
 	landmark_flags = SLANDMARK_FLAG_AUTOSET
 	base_turf = /turf/simulated/floor/plating
diff --git a/maps/helpers/guidelines_airlocks.dmm b/maps/helpers/guidelines_airlocks.dmm
index 62eff2ce4d4..dd1476bb19a 100644
--- a/maps/helpers/guidelines_airlocks.dmm
+++ b/maps/helpers/guidelines_airlocks.dmm
@@ -8,11 +8,8 @@
 	pixel_y = -8;
 	dir = 2
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
 /obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "bx" = (
@@ -39,15 +36,19 @@
 	},
 /turf/template_noop,
 /area/template_noop)
+"di" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+	dir = 1
+	},
+/obj/effect/map_effect/marker/airlock,
+/turf/simulated/floor/plating,
+/area/template_noop)
 "dk" = (
 /obj/machinery/door/airlock/external{
 	dir = 2
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
 /obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "du" = (
@@ -57,29 +58,88 @@
 /obj/effect/map_effect/map_helper/mark_good,
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
+"fj" = (
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/turf/template_noop,
+/area/template_noop)
+"fw" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/template_noop)
 "fC" = (
-/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
 	dir = 1;
 	pixel_y = -20;
 	pixel_x = 6
 	},
-/obj/machinery/airlock_sensor{
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 2;
+	pixel_y = 28;
+	pixel_x = 6
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 4;
+	pixel_y = 6;
+	pixel_x = -20
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 8;
+	pixel_y = 6;
+	pixel_x = 20
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 2;
+	pixel_y = 28;
+	pixel_x = -6
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 4;
+	pixel_y = -6;
+	pixel_x = -20
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
 	dir = 1;
 	pixel_y = -20;
 	pixel_x = -6
 	},
+/obj/effect/map_effect/marker/airlock/docking,
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 8;
+	pixel_y = -6;
+	pixel_x = 20
+	},
 /turf/template_noop,
 /area/template_noop)
+"gi" = (
+/obj/machinery/access_button{
+	pixel_x = -28;
+	pixel_y = 12;
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+	dir = 6
+	},
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/effect/map_effect/marker/airlock,
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/turf/simulated/floor/plating,
+/area/template_noop)
 "gk" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
 	dir = 8
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
+"gm" = (
+/obj/machinery/portable_atmospherics/canister/air/airlock,
+/obj/machinery/atmospherics/portables_connector,
+/turf/simulated/floor/tiled/dark/full,
+/area/template_noop)
 "gv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 6
@@ -91,20 +151,52 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
 /area/template_noop)
+"ik" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 1
+	},
+/obj/machinery/airlock_sensor{
+	dir = 2;
+	pixel_y = 28;
+	pixel_x = -28
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock,
+/turf/simulated/floor/airless,
+/area/template_noop)
+"js" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux,
+/turf/template_noop,
+/area/template_noop)
 "jx" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
+"jM" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume,
+/obj/machinery/airlock_sensor{
+	pixel_x = 20;
+	dir = 8
+	},
+/obj/effect/map_effect/marker/airlock,
+/obj/effect/map_effect/marker_helper/airlock/out,
+/turf/simulated/floor/plating,
+/area/template_noop)
+"kg" = (
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/effect/map_effect/marker/airlock,
+/turf/simulated/floor/plating,
+/area/template_noop)
 "kx" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 8
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "kZ" = (
@@ -116,6 +208,10 @@
 	},
 /turf/template_noop,
 /area/template_noop)
+"li" = (
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/turf/template_noop,
+/area/template_noop)
 "mk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
@@ -123,15 +219,46 @@
 /turf/template_noop,
 /area/template_noop)
 "mo" = (
+/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
+	dir = 8;
+	pixel_y = -6;
+	pixel_x = 20
+	},
+/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
+	dir = 1;
+	pixel_y = -20;
+	pixel_x = 6
+	},
+/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
+	dir = 2;
+	pixel_y = 28;
+	pixel_x = 6
+	},
+/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
+	dir = 4;
+	pixel_y = 6;
+	pixel_x = -20
+	},
+/obj/effect/map_effect/marker/airlock,
+/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
+	dir = 8;
+	pixel_y = 6;
+	pixel_x = 20
+	},
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller{
 	dir = 2;
 	pixel_y = 28;
 	pixel_x = -6
 	},
-/obj/machinery/airlock_sensor{
-	dir = 2;
-	pixel_y = 28;
-	pixel_x = 6
+/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
+	dir = 4;
+	pixel_y = -6;
+	pixel_x = -20
+	},
+/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
+	dir = 1;
+	pixel_y = -20;
+	pixel_x = -6
 	},
 /turf/template_noop,
 /area/template_noop)
@@ -157,6 +284,7 @@
 	pixel_y = 0;
 	pixel_x = -20
 	},
+/obj/effect/map_effect/marker/airlock,
 /turf/template_noop,
 /area/template_noop)
 "oq" = (
@@ -177,49 +305,103 @@
 	dir = 2
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
 /obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
-"pV" = (
+"oR" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+	dir = 8
+	},
 /obj/machinery/door/airlock/external{
 	dir = 2
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
+/obj/effect/map_effect/marker/airlock,
 /obj/effect/map_effect/marker_helper/airlock/exterior,
 /turf/simulated/floor/plating,
 /area/template_noop)
+"pm" = (
+/obj/effect/map_effect/marker/airlock,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 10
+	},
+/turf/simulated/floor/plating,
+/area/template_noop)
 "qg" = (
 /obj/machinery/access_button{
 	dir = 4;
 	pixel_x = -24
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
 /obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/airless,
 /area/template_noop)
 "qk" = (
-/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
-	dir = 4;
-	pixel_y = -6;
-	pixel_x = -20
-	},
 /obj/machinery/airlock_sensor{
 	pixel_x = -20;
 	dir = 4;
 	pixel_y = 6
 	},
+/obj/machinery/airlock_sensor{
+	pixel_x = 20;
+	dir = 8;
+	pixel_y = 6
+	},
+/obj/machinery/airlock_sensor{
+	dir = 1;
+	pixel_y = -20;
+	pixel_x = -6
+	},
+/obj/machinery/airlock_sensor{
+	dir = 2;
+	pixel_y = 28;
+	pixel_x = 6
+	},
+/obj/machinery/airlock_sensor{
+	dir = 2;
+	pixel_y = 28;
+	pixel_x = -6
+	},
+/obj/machinery/airlock_sensor{
+	pixel_x = 20;
+	dir = 8;
+	pixel_y = -6
+	},
+/obj/machinery/airlock_sensor{
+	pixel_x = -20;
+	dir = 4;
+	pixel_y = -6
+	},
+/obj/machinery/airlock_sensor{
+	dir = 1;
+	pixel_y = -20;
+	pixel_x = 6
+	},
 /turf/template_noop,
 /area/template_noop)
+"qu" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 4
+	},
+/obj/machinery/airlock_sensor{
+	dir = 2;
+	pixel_y = 28
+	},
+/obj/effect/map_effect/marker/airlock,
+/turf/simulated/floor/airless,
+/area/template_noop)
+"qz" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+	dir = 1
+	},
+/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
+	dir = 8;
+	pixel_y = 0;
+	pixel_x = 20
+	},
+/obj/effect/map_effect/marker/airlock,
+/turf/simulated/floor/plating,
+/area/template_noop)
 "qS" = (
 /obj/machinery/portable_atmospherics/canister/air/airlock,
 /obj/machinery/atmospherics/portables_connector{
@@ -231,17 +413,45 @@
 /obj/effect/map_effect/map_helper/mark_bad,
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
+"sh" = (
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/machinery/access_button{
+	pixel_x = -28;
+	pixel_y = 12;
+	dir = 1
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker/airlock,
+/turf/simulated/floor/plating,
+/area/template_noop)
+"so" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+	dir = 1
+	},
+/turf/template_noop,
+/area/template_noop)
 "sx" = (
-/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
 	dir = 8;
-	pixel_y = 6;
+	pixel_y = 0;
 	pixel_x = 20
 	},
-/obj/machinery/airlock_sensor{
-	pixel_x = 20;
-	dir = 8;
-	pixel_y = -6
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 1;
+	pixel_y = -20
 	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 2;
+	pixel_y = 28
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 4;
+	pixel_y = 0;
+	pixel_x = -20
+	},
+/obj/effect/map_effect/marker/airlock/docking,
 /turf/template_noop,
 /area/template_noop)
 "sN" = (
@@ -252,6 +462,36 @@
 	},
 /turf/simulated/floor/airless,
 /area/template_noop)
+"ue" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+	dir = 4
+	},
+/turf/template_noop,
+/area/template_noop)
+"uU" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 4
+	},
+/obj/effect/map_effect/marker/airlock,
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/turf/simulated/floor/airless,
+/area/template_noop)
+"vf" = (
+/obj/effect/map_effect/marker/airlock,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/template_noop)
+"vo" = (
+/obj/machinery/access_button{
+	pixel_x = 24;
+	pixel_y = 0;
+	dir = 8
+	},
+/obj/effect/map_effect/marker/airlock,
+/turf/simulated/floor/airless,
+/area/template_noop)
 "vW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/aux{
 	dir = 6
@@ -266,6 +506,33 @@
 /obj/effect/map_effect/marker_helper/airlock/interior,
 /turf/simulated/floor/plating,
 /area/template_noop)
+"wb" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/aux{
+	dir = 4
+	},
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/effect/map_effect/marker/airlock,
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/turf/simulated/floor/plating,
+/area/template_noop)
+"wE" = (
+/obj/machinery/door/airlock/external{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
+/obj/effect/map_effect/marker/airlock,
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/machinery/access_button{
+	pixel_x = -12;
+	pixel_y = 28;
+	dir = 8
+	},
+/turf/simulated/floor/airless,
+/area/template_noop)
 "wP" = (
 /obj/machinery/atmospherics/pipe/simple/visible/universal,
 /obj/structure/lattice/catwalk/indoor/grate,
@@ -275,38 +542,90 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden,
 /turf/template_noop,
 /area/template_noop)
-"xW" = (
+"xw" = (
+/obj/machinery/portable_atmospherics/canister/air/airlock,
+/obj/machinery/atmospherics/portables_connector{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/template_noop)
+"xX" = (
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
 /obj/machinery/access_button{
-	pixel_x = 24;
-	pixel_y = 0;
-	dir = 8
+	pixel_x = 28;
+	pixel_y = -8;
+	dir = 2
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
-/turf/simulated/floor/airless,
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock,
+/turf/simulated/floor/plating,
 /area/template_noop)
 "zn" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/aux{
 	dir = 8
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
+"zt" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/template_noop)
+"AH" = (
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 1;
+	pixel_y = -20;
+	pixel_x = 6
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 2;
+	pixel_y = 28;
+	pixel_x = 6
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 4;
+	pixel_y = 6;
+	pixel_x = -20
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 8;
+	pixel_y = 6;
+	pixel_x = 20
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 2;
+	pixel_y = 28;
+	pixel_x = -6
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 4;
+	pixel_y = -6;
+	pixel_x = -20
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 1;
+	pixel_y = -20;
+	pixel_x = -6
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 8;
+	pixel_y = -6;
+	pixel_x = 20
+	},
+/obj/effect/map_effect/marker/airlock/shuttle,
+/turf/template_noop,
+/area/template_noop)
 "Bl" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/aux,
 /obj/machinery/door/airlock/external{
 	dir = 2
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
 /obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "Bt" = (
@@ -314,10 +633,7 @@
 	dir = 2
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "BE" = (
@@ -332,6 +648,23 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
+"Da" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 8
+	},
+/obj/effect/map_effect/marker/airlock,
+/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
+	dir = 2;
+	pixel_y = 28;
+	pixel_x = -6
+	},
+/obj/machinery/airlock_sensor{
+	dir = 2;
+	pixel_y = 28;
+	pixel_x = 6
+	},
+/turf/simulated/floor/airless,
+/area/template_noop)
 "DW" = (
 /turf/template_noop,
 /area/template_noop)
@@ -350,32 +683,25 @@
 	pixel_y = 28;
 	dir = 4
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
 /obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker/airlock,
+/turf/simulated/floor/plating,
+/area/template_noop)
+"EY" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume,
+/obj/effect/map_effect/marker/airlock,
+/obj/effect/map_effect/marker_helper/airlock/out,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "Fj" = (
 /obj/machinery/atmospherics/binary/pump/on,
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
-"FS" = (
-/obj/machinery/door/airlock/external{
-	dir = 2
+"FP" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+	dir = 8
 	},
-/obj/machinery/access_button{
-	pixel_x = 28;
-	pixel_y = -8;
-	dir = 2
-	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
-/obj/effect/map_effect/marker_helper/airlock/exterior,
-/turf/simulated/floor/plating,
+/turf/template_noop,
 /area/template_noop)
 "GH" = (
 /obj/effect/map_effect/map_helper/mark_good,
@@ -392,10 +718,7 @@
 	pixel_y = -8;
 	dir = 2
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "HE" = (
@@ -404,27 +727,27 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
+"Ib" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 9
+	},
+/turf/simulated/floor/airless,
+/area/template_noop)
 "Ij" = (
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller{
 	dir = 4;
 	pixel_y = 0;
 	pixel_x = -20
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "Jx" = (
 /obj/machinery/door/airlock/external{
 	dir = 4
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
 /obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "Jy" = (
@@ -441,32 +764,14 @@
 /obj/machinery/door/airlock/external{
 	dir = 2
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "Li" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Lp" = (
-/obj/machinery/door/airlock/external{
-	dir = 2
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
-/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "Lt" = (
@@ -482,11 +787,19 @@
 /obj/machinery/door/airlock/external{
 	dir = 4
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
 /obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker/airlock,
+/turf/simulated/floor/plating,
+/area/template_noop)
+"LW" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 5
+	},
+/obj/machinery/airlock_sensor{
+	pixel_x = -20;
+	dir = 4
+	},
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "Nr" = (
@@ -495,6 +808,18 @@
 	},
 /turf/template_noop,
 /area/template_noop)
+"Nt" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 4
+	},
+/obj/machinery/airlock_sensor{
+	dir = 2;
+	pixel_y = 28
+	},
+/obj/effect/map_effect/marker/airlock,
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/turf/simulated/floor/airless,
+/area/template_noop)
 "NH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/aux,
 /obj/machinery/door/airlock/external{
@@ -505,27 +830,25 @@
 	pixel_y = 12;
 	dir = 1
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
 /obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "OG" = (
 /obj/structure/lattice,
 /turf/space,
 /area/template_noop)
+"Pa" = (
+/obj/effect/map_effect/map_helper/mark_good,
+/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
+/area/template_noop)
 "Pe" = (
 /obj/effect/map_effect/marker_helper/airlock/interior,
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
 /obj/machinery/access_button{
 	pixel_y = 28;
 	dir = 2
 	},
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
 "PU" = (
@@ -543,11 +866,32 @@
 	pixel_y = 28;
 	dir = 8
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
 /obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock,
+/turf/simulated/floor/plating,
+/area/template_noop)
+"Qs" = (
+/obj/effect/map_effect/marker/airlock,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 4
+	},
+/obj/effect/map_effect/marker_helper/airlock/out,
+/turf/simulated/floor/plating,
+/area/template_noop)
+"Qt" = (
+/obj/effect/map_effect/marker/airlock,
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/template_noop)
+"Qu" = (
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "Qw" = (
@@ -559,12 +903,20 @@
 	pixel_y = 0;
 	pixel_x = 20
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
+"QX" = (
+/obj/effect/map_effect/marker_helper/airlock/out,
+/turf/template_noop,
+/area/template_noop)
+"Rg" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 4
+	},
+/obj/effect/map_effect/marker/airlock,
+/turf/simulated/floor/airless,
+/area/template_noop)
 "Rh" = (
 /obj/machinery/door/airlock/external{
 	dir = 2
@@ -574,11 +926,34 @@
 	pixel_y = -8;
 	dir = 2
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
 /obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker/airlock,
+/turf/simulated/floor/plating,
+/area/template_noop)
+"Ri" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+	dir = 4
+	},
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/machinery/access_button{
+	pixel_x = 28;
+	dir = 2
+	},
+/obj/effect/map_effect/marker/airlock,
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/turf/simulated/floor/plating,
+/area/template_noop)
+"Rv" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+	dir = 8
+	},
+/obj/effect/map_effect/marker/airlock,
+/obj/machinery/airlock_sensor{
+	pixel_x = 20;
+	dir = 8
+	},
 /turf/simulated/floor/plating,
 /area/template_noop)
 "RN" = (
@@ -603,10 +978,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
 	dir = 8
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "TP" = (
@@ -615,6 +987,14 @@
 	},
 /turf/template_noop,
 /area/template_noop)
+"TW" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 1
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock,
+/turf/simulated/floor/airless,
+/area/template_noop)
 "UO" = (
 /obj/machinery/atmospherics/pipe/manifold4w/hidden,
 /turf/simulated/floor/tiled/dark/full,
@@ -629,10 +1009,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/aux{
 	dir = 5
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "Vv" = (
@@ -644,10 +1021,7 @@
 	pixel_y = 0;
 	pixel_x = 20
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "VJ" = (
@@ -659,13 +1033,32 @@
 	pixel_y = 28;
 	dir = 4
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
 /obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
+"VO" = (
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 8;
+	pixel_y = 0;
+	pixel_x = 20
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 1;
+	pixel_y = -20
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 2;
+	pixel_y = 28
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 4;
+	pixel_y = 0;
+	pixel_x = -20
+	},
+/obj/effect/map_effect/marker/airlock/shuttle,
+/turf/template_noop,
+/area/template_noop)
 "Wc" = (
 /obj/machinery/door/airlock/external{
 	dir = 2
@@ -773,17 +1166,11 @@
 /area/template_noop)
 "WC" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/aux,
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "WP" = (
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "WW" = (
@@ -792,12 +1179,34 @@
 	},
 /turf/template_noop,
 /area/template_noop)
+"Xv" = (
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock,
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/turf/simulated/floor/plating,
+/area/template_noop)
 "Xw" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 4
 	},
 /turf/template_noop,
 /area/template_noop)
+"Xz" = (
+/obj/machinery/door/airlock/external{
+	dir = 4
+	},
+/obj/effect/map_effect/marker/airlock,
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/machinery/access_button{
+	pixel_x = 12;
+	pixel_y = 28;
+	dir = 4
+	},
+/turf/simulated/floor/airless,
+/area/template_noop)
 "XT" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 8
@@ -813,11 +1222,8 @@
 	pixel_y = 12;
 	dir = 1
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
 /obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "Yo" = (
@@ -844,22 +1250,22 @@
 	pixel_x = -20;
 	dir = 4
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "YK" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 8
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
+"YM" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+	dir = 4
+	},
+/turf/simulated/floor/airless,
+/area/template_noop)
 "YW" = (
 /obj/machinery/door/airlock/external{
 	dir = 2
@@ -869,30 +1275,19 @@
 	pixel_y = 12;
 	dir = 1
 	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 "Ze" = (
 /obj/structure/lattice/catwalk,
 /turf/space,
 /area/template_noop)
-"ZK" = (
+"ZE" = (
 /obj/machinery/door/airlock/external{
 	dir = 2
 	},
-/obj/machinery/access_button{
-	pixel_x = -28;
-	pixel_y = 12;
-	dir = 1
-	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "some_unique_maste_tag";
-	name = "some_unique_maste_tag"
-	},
-/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock,
 /turf/simulated/floor/plating,
 /area/template_noop)
 
@@ -976,6 +1371,17 @@ DW
 DW
 DW
 DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 "}
 (2,1,1) = {"
 DW
@@ -1005,35 +1411,46 @@ DW
 DW
 DW
 DW
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
 DW
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 nd
 nd
@@ -1086,7 +1503,6 @@ DW
 DW
 DW
 DW
-nd
 DW
 DW
 DW
@@ -1102,9 +1518,6 @@ DW
 DW
 DW
 DW
-nd
-DW
-nd
 DW
 DW
 DW
@@ -1114,7 +1527,22 @@ DW
 DW
 DW
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 nd
 DW
@@ -1167,7 +1595,7 @@ DW
 DW
 DW
 DW
-nd
+DW
 DW
 DW
 DW
@@ -1184,18 +1612,29 @@ DW
 DW
 DW
 nd
-DW
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
 nd
 DW
 DW
-Lt
 DW
 DW
-Km
-EC
-lh
-DW
-nd
 DW
 nd
 DW
@@ -1248,7 +1687,7 @@ DW
 DW
 DW
 DW
-nd
+DW
 DW
 DW
 DW
@@ -1266,18 +1705,29 @@ DW
 DW
 nd
 DW
-nd
 DW
-Lt
-Wn
-Lt
 DW
-WW
-mk
-BE
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 nd
 DW
+DW
+DW
+DW
+DW
 nd
 DW
 DW
@@ -1329,36 +1779,47 @@ DW
 DW
 DW
 DW
-nd
 DW
 DW
 DW
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-du
-du
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
 nd
 DW
-nd
+DW
+Lt
+DW
+DW
+DW
+Lt
+DW
 DW
 DW
 Lt
 DW
 DW
 Km
-gv
-Nr
+EC
+lh
+FP
 DW
 nd
 DW
+DW
+DW
+DW
+DW
 nd
 DW
 DW
@@ -1371,9 +1832,9 @@ Lt
 Lt
 Lt
 Lt
-Lt
-Lt
-Lt
+du
+du
+du
 du
 du
 DW
@@ -1410,36 +1871,47 @@ DW
 DW
 DW
 DW
-nd
 DW
 DW
 DW
-Lt
-kZ
-kZ
-Lt
-WP
-Yr
-Lt
-du
-du
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
 nd
 DW
-nd
-DW
-DW
+Lt
+nz
+Lt
 DW
+Lt
+mo
+Lt
 DW
+Lt
+Wn
+Lt
 DW
 WW
-PU
-Xw
+mk
+BE
+so
 DW
 nd
 DW
+DW
+DW
+DW
+DW
 nd
 DW
 DW
@@ -1449,11 +1921,11 @@ DW
 DW
 DW
 Lt
-kZ
-kZ
+xw
+xw
+Lt
+Lt
 Lt
-WP
-Yr
 Lt
 du
 du
@@ -1491,25 +1963,13 @@ DW
 DW
 DW
 DW
-nd
 DW
 DW
 DW
-sa
-kZ
-kZ
-YW
-WP
-WP
-KX
-du
-du
 DW
 DW
 DW
-nd
 DW
-nd
 DW
 DW
 DW
@@ -1521,6 +1981,29 @@ DW
 DW
 nd
 DW
+DW
+Lt
+DW
+DW
+DW
+Lt
+DW
+DW
+DW
+Lt
+DW
+DW
+Km
+gv
+Nr
+js
+DW
+nd
+DW
+DW
+DW
+DW
+DW
 nd
 DW
 DW
@@ -1530,12 +2013,12 @@ DW
 DW
 DW
 dA
-kZ
-kZ
-ZK
-WP
-WP
-pV
+zt
+fw
+Qu
+kx
+LW
+ZE
 du
 du
 DW
@@ -1572,36 +2055,47 @@ DW
 DW
 DW
 DW
-nd
 DW
 DW
 DW
-kZ
-HE
-jx
-Bt
-kx
-Li
-Ht
-du
-du
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
 nd
 DW
-nd
 DW
 DW
-Lt
+li
+fj
+QX
 DW
 DW
-XT
 DW
-TP
+DW
+DW
+DW
+DW
+WW
+PU
+Xw
+ue
 DW
 nd
 DW
+DW
+DW
+DW
+DW
 nd
 DW
 DW
@@ -1611,12 +2105,12 @@ DW
 DW
 DW
 kZ
-HE
-jx
-Lp
-kx
-Li
-FS
+kZ
+kZ
+kg
+Vv
+YK
+xX
 du
 du
 DW
@@ -1653,36 +2147,47 @@ DW
 DW
 DW
 DW
-nd
 DW
 DW
 DW
-Lt
-qS
-qS
-Lt
-Vv
-YK
-Lt
-du
-du
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
 nd
 DW
-nd
 DW
 Lt
-nz
+DW
+DW
+DW
 Lt
 DW
-US
-cp
-LF
+DW
+DW
+Lt
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 nd
 DW
+DW
+DW
+DW
+DW
 nd
 DW
 DW
@@ -1692,11 +2197,11 @@ DW
 DW
 DW
 Lt
-qS
-qS
+kZ
+kZ
+Lt
+Lt
 Lt
-Vv
-YK
 Lt
 du
 du
@@ -1734,36 +2239,47 @@ DW
 DW
 DW
 DW
-nd
 DW
 DW
 DW
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-du
-du
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
 nd
 DW
-nd
-DW
-DW
+Lt
+sx
 Lt
 DW
+Lt
+fC
+Lt
+DW
+Lt
+Yo
+Lt
+DW
+XT
 DW
-cO
-cp
 TP
 DW
+DW
 nd
 DW
+DW
+DW
+DW
+DW
 nd
 DW
 DW
@@ -1776,9 +2292,9 @@ Lt
 Lt
 Lt
 Lt
-Lt
-Lt
-Lt
+du
+du
+du
 du
 du
 DW
@@ -1815,7 +2331,7 @@ DW
 DW
 DW
 DW
-nd
+DW
 DW
 DW
 DW
@@ -1833,18 +2349,29 @@ DW
 DW
 nd
 DW
-nd
+DW
+Lt
 DW
 DW
 DW
+Lt
 DW
 DW
-wT
 DW
+Lt
+DW
+DW
+US
+cp
 LF
 DW
+DW
 nd
 DW
+DW
+DW
+DW
+DW
 nd
 DW
 DW
@@ -1896,7 +2423,7 @@ DW
 DW
 DW
 DW
-nd
+DW
 DW
 DW
 DW
@@ -1914,18 +2441,29 @@ DW
 DW
 nd
 DW
+DW
+DW
+li
+fj
+QX
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+cO
+cp
+TP
+DW
+DW
 nd
 DW
 DW
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-nd
-DW
 nd
 DW
 DW
@@ -1968,15 +2506,24 @@ DW
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
 nd
 DW
 DW
@@ -1984,29 +2531,31 @@ DW
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-nd
-DW
 nd
 DW
 DW
 Lt
 DW
 DW
-sx
 DW
+Lt
+DW
+DW
+DW
+Lt
+DW
+DW
+wT
+DW
+LF
 DW
 DW
 nd
 DW
+DW
+DW
+DW
+DW
 nd
 DW
 DW
@@ -2049,6 +2598,15 @@ DW
 DW
 DW
 DW
+nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -2062,32 +2620,34 @@ nd
 DW
 DW
 DW
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-du
-du
 DW
 DW
 DW
 nd
 DW
-nd
-DW
 Lt
-Yo
+VO
 Lt
 DW
 Lt
-fC
+AH
 Lt
-mo
+DW
+Lt
+qk
+Lt
+DW
+DW
+DW
+DW
+DW
+DW
 nd
 DW
+DW
+DW
+DW
+DW
 nd
 DW
 DW
@@ -2130,6 +2690,15 @@ DW
 DW
 DW
 DW
+nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -2143,32 +2712,34 @@ nd
 DW
 DW
 DW
-Lt
-kZ
-kZ
-Lt
-WP
-Yr
-Lt
-du
-du
 DW
 DW
 DW
 nd
 DW
-nd
+DW
+Lt
+DW
 DW
 DW
 Lt
 DW
 DW
-qk
+DW
+Lt
+DW
+DW
+DW
+DW
 DW
 DW
 DW
 nd
 DW
+DW
+DW
+DW
+DW
 nd
 DW
 DW
@@ -2211,6 +2782,15 @@ DW
 DW
 DW
 DW
+nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -2224,21 +2804,19 @@ nd
 DW
 DW
 DW
-sa
-kZ
-kZ
-Yf
-WP
-WP
-dk
-du
-du
 DW
 DW
 DW
 nd
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -2250,6 +2828,10 @@ DW
 DW
 nd
 DW
+DW
+DW
+DW
+DW
 nd
 DW
 DW
@@ -2261,10 +2843,10 @@ wP
 GH
 Fj
 Jy
-ZK
+sh
 WP
 WP
-pV
+ZE
 du
 du
 DW
@@ -2292,33 +2874,31 @@ DW
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
 nd
 DW
 DW
 DW
-kZ
-HE
-jx
-oG
-kx
-Li
-Rh
-du
+Lt
+Lt
+Lt
+Lt
+OG
+OG
+OG
+OG
+OG
+OG
 du
 DW
 DW
 DW
 nd
 DW
+DW
+DW
+DW
+DW
+DW
 nd
 nd
 nd
@@ -2330,6 +2910,19 @@ nd
 nd
 nd
 nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+DW
+DW
+DW
+DW
 DW
 nd
 DW
@@ -2342,10 +2935,10 @@ kZ
 kZ
 HE
 UO
-Lp
+Qu
 kx
 Li
-FS
+xX
 du
 du
 DW
@@ -2373,27 +2966,20 @@ DW
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
 nd
 DW
 DW
 DW
 Lt
-qS
-qS
+kZ
+kZ
 Lt
-Vv
-YK
 Lt
-du
+Lt
+Lt
+Qw
+Qw
+OG
 du
 DW
 DW
@@ -2412,6 +2998,24 @@ DW
 DW
 DW
 DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 nd
 DW
 DW
@@ -2454,44 +3058,55 @@ DW
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
 nd
 DW
 DW
 DW
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-du
+dA
+kZ
+kZ
+gi
+di
+EY
+oR
+ik
+Qw
+OG
 du
 DW
 DW
 DW
 nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 nd
 DW
@@ -2535,12 +3150,21 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
-DW
-DW
-DW
+kZ
+vW
+Cu
+wb
+qz
+jM
+Ri
+TW
+Qw
+OG
+du
 DW
 DW
 DW
@@ -2572,7 +3196,9 @@ DW
 DW
 DW
 DW
-nd
+DW
+DW
+DW
 DW
 nd
 DW
@@ -2616,12 +3242,21 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
-DW
-DW
-DW
+Lt
+bx
+bx
+Lt
+Lt
+Lt
+Lt
+Qw
+Qw
+OG
+du
 DW
 DW
 DW
@@ -2653,7 +3288,9 @@ DW
 DW
 DW
 DW
-nd
+DW
+DW
+DW
 DW
 nd
 DW
@@ -2697,12 +3334,21 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
-DW
-DW
-DW
+Lt
+Lt
+Lt
+Lt
+OG
+OG
+OG
+OG
+OG
+OG
+du
 DW
 DW
 DW
@@ -2734,7 +3380,9 @@ DW
 DW
 DW
 DW
-nd
+DW
+DW
+DW
 DW
 nd
 DW
@@ -2778,6 +3426,15 @@ DW
 DW
 DW
 DW
+nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -2791,31 +3448,33 @@ nd
 DW
 DW
 DW
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-du
-du
 DW
 DW
 DW
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-du
-du
 DW
 DW
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 nd
 DW
@@ -2859,6 +3518,15 @@ DW
 DW
 DW
 DW
+nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -2872,31 +3540,33 @@ nd
 DW
 DW
 DW
-Lt
-kZ
-kZ
-Lt
-WP
-Yr
-Lt
-du
-du
 DW
 DW
 DW
-Lt
-kZ
-kZ
-Lt
-WP
-Yr
-Lt
-du
-du
 DW
 DW
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 nd
 DW
@@ -2940,6 +3610,15 @@ DW
 DW
 DW
 DW
+nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -2953,31 +3632,33 @@ nd
 DW
 DW
 DW
-sa
-kZ
-kZ
-Wz
-WP
-WP
-cH
-du
-du
 DW
 DW
 DW
-sa
-kZ
-kZ
-YW
-WP
-WP
-KX
-du
-du
 DW
 DW
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 nd
 DW
@@ -2990,7 +3671,7 @@ DW
 dA
 kZ
 kZ
-ZK
+sh
 WP
 WP
 aw
@@ -3021,12 +3702,21 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
-DW
-DW
-DW
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+OG
+OG
+OG
+du
 DW
 DW
 DW
@@ -3034,31 +3724,33 @@ nd
 DW
 DW
 DW
-kZ
-HE
-jx
-wa
-kx
-Li
-Wc
-du
-du
 DW
 DW
 DW
-kZ
-HE
-jx
-Bt
-kx
-Li
-Ht
-du
-du
 DW
 DW
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 nd
 DW
@@ -3074,7 +3766,7 @@ Cu
 NH
 zn
 Vo
-FS
+xX
 du
 du
 DW
@@ -3102,12 +3794,21 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
-DW
-DW
-DW
+Lt
+kZ
+kZ
+Lt
+Qs
+Qs
+Lt
+Nt
+uU
+OG
+du
 DW
 DW
 DW
@@ -3115,31 +3816,33 @@ nd
 DW
 DW
 DW
-Lt
-qS
-qS
-Lt
-Vv
-YK
-Lt
-du
-du
 DW
 DW
 DW
-Lt
-qS
-qS
-Lt
-Vv
-Vv
-Lt
-du
-du
 DW
 DW
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 nd
 DW
@@ -3183,43 +3886,54 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
-DW
-DW
-DW
+dA
+kZ
+kZ
+sh
+pm
+Qt
+Xv
+YM
+Ib
+OG
+du
 DW
 DW
 DW
 nd
 DW
-DW
-DW
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-du
-du
-DW
-DW
-DW
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-Lt
-du
-du
-DW
-DW
-DW
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
 nd
 DW
 nd
@@ -3264,14 +3978,25 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
+kZ
+vW
+Cu
+Bl
+zn
+Vo
+xX
+Qw
+Qw
+OG
+du
 DW
 DW
 DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -3345,14 +4070,25 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
+Lt
+bx
+bx
+Lt
+SH
+Rv
+Lt
+Qw
+Qw
+OG
+du
 DW
 DW
 DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -3426,14 +4162,25 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+OG
+OG
+OG
+du
 DW
 DW
 DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -3507,15 +4254,6 @@ DW
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
 nd
 DW
 DW
@@ -3532,6 +4270,26 @@ DW
 DW
 DW
 DW
+DW
+DW
+nd
+DW
+nd
+DW
+DW
+DW
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+du
+du
+DW
+DW
+DW
 Lt
 Lt
 Lt
@@ -3588,15 +4346,6 @@ DW
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
 nd
 DW
 DW
@@ -3613,11 +4362,31 @@ DW
 DW
 DW
 DW
+DW
+DW
+nd
+DW
+nd
+DW
+DW
+DW
 Lt
 kZ
 kZ
 Lt
+WP
 Yr
+Lt
+du
+du
+DW
+DW
+DW
+Lt
+kZ
+kZ
+Lt
+WP
 Yr
 Lt
 du
@@ -3669,15 +4438,6 @@ DW
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
 nd
 DW
 DW
@@ -3694,6 +4454,26 @@ DW
 DW
 DW
 DW
+DW
+DW
+nd
+DW
+nd
+DW
+DW
+DW
+sa
+kZ
+kZ
+YW
+WP
+WP
+KX
+du
+du
+DW
+DW
+DW
 sa
 kZ
 kZ
@@ -3719,10 +4499,10 @@ DW
 dA
 kZ
 kZ
-ZK
+sh
 WP
 WP
-pV
+ZE
 du
 du
 DW
@@ -3750,28 +4530,39 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
-DW
-DW
-DW
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+OG
+OG
+OG
+du
 DW
 DW
 DW
 nd
 DW
+nd
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
+kZ
+HE
+jx
+Bt
+kx
+Li
+Ht
+du
+du
 DW
 DW
 DW
@@ -3803,7 +4594,7 @@ Cu
 Bl
 zn
 Vo
-FS
+xX
 du
 du
 DW
@@ -3831,28 +4622,27 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
-DW
-DW
-DW
+Lt
+kZ
+kZ
+Lt
+Qs
+Qs
+Lt
+uU
+uU
+OG
+du
 DW
 DW
 DW
 nd
 DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
+nd
 DW
 DW
 DW
@@ -3868,6 +4658,18 @@ du
 DW
 DW
 DW
+Lt
+qS
+qS
+Lt
+Vv
+Vv
+Lt
+du
+du
+DW
+DW
+DW
 nd
 DW
 nd
@@ -3912,28 +4714,39 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
-DW
-DW
-DW
+sa
+kZ
+kZ
+sh
+pm
+Qt
+Xv
+YM
+Ib
+OG
+du
 DW
 DW
 DW
 nd
 DW
+nd
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+du
+du
 DW
 DW
 DW
@@ -3993,14 +4806,25 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
+kZ
+vW
+Cu
+Bl
+zn
+Vo
+xX
+Qw
+Qw
+OG
+du
 DW
 DW
 DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -4074,14 +4898,25 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
+Lt
+bx
+bx
+Lt
+SH
+Rv
+Lt
+Qw
+Qw
+OG
+du
 DW
 DW
 DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -4155,14 +4990,25 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+OG
+OG
+OG
+du
 DW
 DW
 DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -4236,6 +5082,7 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
@@ -4245,6 +5092,16 @@ DW
 DW
 DW
 DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
 nd
 DW
 DW
@@ -4258,18 +5115,18 @@ Lt
 Lt
 du
 du
+DW
+DW
+DW
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
 du
 du
-du
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
 DW
 DW
 DW
@@ -4317,6 +5174,7 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
@@ -4326,6 +5184,16 @@ DW
 DW
 DW
 DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
 nd
 DW
 DW
@@ -4337,20 +5205,20 @@ Lt
 WP
 Yr
 Lt
-OG
-OG
-OG
 du
 du
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
+Lt
+kZ
+kZ
+Lt
+Yr
+Yr
+Lt
+du
+du
 DW
 DW
 DW
@@ -4398,6 +5266,15 @@ DW
 DW
 DW
 DW
+nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -4409,29 +5286,31 @@ DW
 DW
 nd
 DW
+nd
+DW
 DW
 DW
 sa
 kZ
 kZ
-ZK
+Yf
 WP
 WP
-pV
-Qw
-Qw
-Qw
+dk
 du
 du
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
+sa
+kZ
+kZ
+YW
+WP
+WP
+KX
+du
+du
 DW
 DW
 DW
@@ -4479,14 +5358,25 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+OG
+OG
+OG
+du
 DW
 DW
 DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -4495,24 +5385,24 @@ DW
 kZ
 HE
 jx
-Lp
+oG
 kx
 Li
-pV
-Qw
-Qw
-Qw
+Rh
 du
 du
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
+kZ
+HE
+jx
+Bt
+kx
+Li
+Ht
+du
+du
 DW
 DW
 DW
@@ -4560,14 +5450,25 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
+Lt
+kZ
+kZ
+Lt
+vf
+vf
+Lt
+Nt
+uU
+OG
+du
 DW
 DW
 DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -4580,20 +5481,20 @@ Lt
 Vv
 YK
 Lt
-Qw
-xW
-Qw
 du
 du
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
+Lt
+qS
+qS
+Lt
+Vv
+YK
+Lt
+du
+du
 DW
 DW
 DW
@@ -4641,14 +5542,25 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
+sa
+kZ
+kZ
+sh
+pm
+Qt
+Xv
+YM
+Ib
+OG
+du
 DW
 DW
 DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -4661,20 +5573,20 @@ Lt
 Lt
 Lt
 Lt
-Lt
-Lt
-Lt
 du
 du
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+du
+du
 DW
 DW
 DW
@@ -4722,14 +5634,25 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
+kZ
+vW
+Cu
+Bl
+zn
+Vo
+xX
+Qw
+Qw
+OG
+du
 DW
 DW
 DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -4768,14 +5691,14 @@ DW
 dA
 kZ
 kZ
-ZK
+sh
 WP
 WP
 WP
 WP
 WP
 WP
-pV
+ZE
 du
 du
 DW
@@ -4803,14 +5726,25 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
+Lt
+bx
+bx
+Lt
+SH
+Rv
+Lt
+Qw
+Qw
+OG
+du
 DW
 DW
 DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -4856,7 +5790,7 @@ zn
 WC
 WC
 Vo
-FS
+xX
 du
 du
 DW
@@ -4884,14 +5818,25 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+OG
+OG
+OG
+du
 DW
 DW
 DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -4965,6 +5910,7 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
@@ -4974,6 +5920,16 @@ DW
 DW
 DW
 DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
 nd
 DW
 DW
@@ -4987,18 +5943,18 @@ Lt
 Lt
 du
 du
+DW
+DW
+DW
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
 du
 du
-du
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
 DW
 DW
 DW
@@ -5046,6 +6002,7 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
@@ -5055,6 +6012,16 @@ DW
 DW
 DW
 DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
 nd
 DW
 DW
@@ -5066,20 +6033,20 @@ Lt
 WP
 Yr
 Lt
-OG
-OG
-OG
 du
 du
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
+Lt
+kZ
+kZ
+Lt
+WP
+Yr
+Lt
+du
+du
 DW
 DW
 DW
@@ -5127,6 +6094,15 @@ DW
 DW
 DW
 DW
+nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -5138,29 +6114,31 @@ DW
 DW
 nd
 DW
+nd
+DW
 DW
 DW
 sa
 kZ
 kZ
-ZK
+Wz
 WP
 WP
-pV
-Qw
-Qw
-Qw
+cH
 du
 du
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
+sa
+kZ
+kZ
+KX
+WP
+WP
+KX
+du
+du
 DW
 DW
 DW
@@ -5208,14 +6186,25 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+OG
+OG
+OG
+du
 DW
 DW
 DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -5224,24 +6213,24 @@ DW
 kZ
 HE
 jx
-Lp
+wa
 kx
 Li
-pV
-Qw
-Qw
-Qw
+Wc
 du
 du
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
+kZ
+HE
+jx
+Bt
+kx
+Li
+KX
+du
+du
 DW
 DW
 DW
@@ -5289,14 +6278,25 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
+Lt
+kZ
+kZ
+Lt
+Qs
+Qs
+Lt
+qu
+Rg
+OG
+du
 DW
 DW
 DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -5309,20 +6309,20 @@ Lt
 Vv
 YK
 Lt
-Qw
-sN
-Qw
 du
 du
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
+Lt
+qS
+qS
+Lt
+Vv
+YK
+Lt
+du
+du
 DW
 DW
 DW
@@ -5370,14 +6370,25 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
+sa
+kZ
+kZ
+sh
+pm
+Qt
+Xv
+YM
+Ib
+OG
+du
 DW
 DW
 DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -5390,20 +6401,20 @@ Lt
 Lt
 Lt
 Lt
-Lt
-Lt
-Lt
 du
 du
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+du
+du
 DW
 DW
 DW
@@ -5451,14 +6462,25 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
+kZ
+vW
+Cu
+Bl
+zn
+Vo
+xX
+Qw
+Qw
+OG
+du
 DW
 DW
 DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -5532,14 +6554,25 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
+Lt
+bx
+bx
+Lt
+SH
+Rv
+Lt
+Qw
+Qw
+OG
+du
 DW
 DW
 DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -5613,14 +6646,25 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+OG
+OG
+OG
+du
 DW
 DW
 DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -5694,6 +6738,15 @@ DW
 DW
 DW
 DW
+nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -5704,33 +6757,35 @@ DW
 DW
 DW
 nd
+DW
 nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
+DW
+DW
+DW
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+du
+du
+du
+du
+du
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 nd
 DW
 nd
@@ -5740,10 +6795,10 @@ DW
 dA
 kZ
 kZ
-ZK
+sh
 WP
 WP
-pV
+ZE
 Qw
 Qw
 Ze
@@ -5775,28 +6830,7 @@ DW
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
+nd
 DW
 DW
 DW
@@ -5816,15 +6850,47 @@ DW
 DW
 nd
 DW
+nd
+DW
+DW
+DW
+Lt
+kZ
+kZ
+Lt
+WP
+Yr
+Lt
+OG
+OG
+OG
+du
+du
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
+nd
+DW
 DW
 DW
 kZ
 HE
 jx
-Lp
+Qu
 kx
 Li
-FS
+xX
 Qw
 Qw
 Ze
@@ -5856,6 +6922,7 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
@@ -5873,6 +6940,24 @@ DW
 DW
 DW
 DW
+nd
+DW
+nd
+DW
+DW
+DW
+sa
+kZ
+kZ
+sh
+WP
+WP
+ZE
+Qw
+Qw
+Qw
+du
+du
 DW
 DW
 DW
@@ -5885,15 +6970,7 @@ DW
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -5937,6 +7014,42 @@ DW
 DW
 DW
 DW
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+DW
+nd
+DW
+DW
+DW
+kZ
+HE
+jx
+Qu
+kx
+Li
+ZE
+Qw
+Qw
+Qw
+du
+du
 DW
 DW
 DW
@@ -5949,32 +7062,7 @@ DW
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -6038,6 +7126,22 @@ DW
 DW
 DW
 DW
+nd
+DW
+DW
+DW
+Lt
+qS
+qS
+Lt
+Vv
+YK
+Lt
+Qw
+vo
+Qw
+du
+du
 DW
 DW
 DW
@@ -6050,12 +7154,7 @@ DW
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -6119,6 +7218,22 @@ DW
 DW
 DW
 DW
+nd
+DW
+DW
+DW
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+du
+du
 DW
 DW
 DW
@@ -6131,12 +7246,7 @@ DW
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -6200,6 +7310,7 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
@@ -6219,6 +7330,16 @@ DW
 DW
 DW
 DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
 nd
 DW
 DW
@@ -6281,6 +7402,7 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
@@ -6300,6 +7422,16 @@ DW
 DW
 DW
 DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
 nd
 DW
 DW
@@ -6362,6 +7494,7 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
@@ -6381,6 +7514,16 @@ DW
 DW
 DW
 DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
 nd
 DW
 DW
@@ -6443,6 +7586,22 @@ DW
 DW
 DW
 DW
+nd
+DW
+DW
+DW
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+du
+du
+du
+du
+du
 DW
 DW
 DW
@@ -6455,12 +7614,7 @@ DW
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -6524,6 +7678,22 @@ DW
 DW
 DW
 DW
+nd
+DW
+DW
+DW
+Lt
+kZ
+kZ
+Lt
+WP
+Yr
+Lt
+OG
+OG
+OG
+du
+du
 DW
 DW
 DW
@@ -6536,12 +7706,7 @@ DW
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -6605,13 +7770,22 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
-DW
-DW
-DW
-DW
+sa
+kZ
+kZ
+sh
+WP
+WP
+ZE
+Qw
+Qw
+Qw
+du
+du
 DW
 DW
 DW
@@ -6626,6 +7800,8 @@ DW
 DW
 nd
 DW
+nd
+DW
 DW
 DW
 dA
@@ -6634,7 +7810,7 @@ kZ
 dk
 WP
 WP
-pV
+ZE
 Qw
 Qw
 Qw
@@ -6686,13 +7862,22 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
-DW
-DW
-DW
-DW
+kZ
+HE
+jx
+Qu
+kx
+Li
+ZE
+Qw
+Qw
+Qw
+du
+du
 DW
 DW
 DW
@@ -6707,15 +7892,17 @@ DW
 DW
 nd
 DW
+nd
+DW
 DW
 DW
 kZ
 HE
 jx
-Lp
+Qu
 kx
 Li
-pV
+ZE
 Qw
 Qw
 Qw
@@ -6767,6 +7954,22 @@ DW
 DW
 DW
 DW
+nd
+DW
+DW
+DW
+Lt
+qS
+qS
+Lt
+Vv
+YK
+Lt
+Qw
+sN
+Qw
+du
+du
 DW
 DW
 DW
@@ -6779,12 +7982,7 @@ DW
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -6848,6 +8046,22 @@ DW
 DW
 DW
 DW
+nd
+DW
+DW
+DW
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+Lt
+du
+du
 DW
 DW
 DW
@@ -6860,12 +8074,7 @@ DW
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
+nd
 DW
 nd
 DW
@@ -6929,6 +8138,7 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
@@ -6948,6 +8158,16 @@ DW
 DW
 DW
 DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
 nd
 DW
 DW
@@ -7010,6 +8230,7 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
@@ -7029,6 +8250,16 @@ DW
 DW
 DW
 DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
 nd
 DW
 DW
@@ -7091,6 +8322,7 @@ DW
 DW
 DW
 DW
+nd
 DW
 DW
 DW
@@ -7110,6 +8342,16 @@ DW
 DW
 DW
 DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
 nd
 DW
 DW
@@ -7172,6 +8414,45 @@ DW
 DW
 DW
 DW
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+DW
+nd
+DW
+DW
+DW
+Lt
+gm
+Jy
+Lt
+Lt
 DW
 DW
 DW
@@ -7183,34 +8464,6 @@ DW
 DW
 DW
 DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-DW
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
 nd
 DW
 "}
@@ -7283,6 +8536,1029 @@ DW
 DW
 DW
 DW
+nd
+DW
+DW
+DW
+Pa
+Lt
+wE
+Lt
+Lt
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
+"}
+(80,1,1) = {"
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
+DW
+DW
+Lt
+Lt
+Da
+Lt
+Lt
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
+"}
+(81,1,1) = {"
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
+DW
+DW
+du
+Lt
+Xz
+Lt
+du
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
+"}
+(82,1,1) = {"
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
+DW
+DW
+du
+OG
+Ze
+OG
+du
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
+"}
+(83,1,1) = {"
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
+DW
+DW
+du
+OG
+Ze
+OG
+du
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
+"}
+(84,1,1) = {"
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
+DW
+DW
+du
+du
+du
+du
+du
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
+"}
+(85,1,1) = {"
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
+"}
+(86,1,1) = {"
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+DW
+"}
+(87,1,1) = {"
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+DW
+"}
+(88,1,1) = {"
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+"}
+(89,1,1) = {"
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+"}
+(90,1,1) = {"
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
diff --git a/maps/helpers/guidelines_shuttles.dmm b/maps/helpers/guidelines_shuttles.dmm
index 3cdf771ceb0..0af987f3c59 100644
--- a/maps/helpers/guidelines_shuttles.dmm
+++ b/maps/helpers/guidelines_shuttles.dmm
@@ -1,119 +1,4 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"ad" = (
-/obj/structure/shuttle_part/scc/research{
-	density = 0;
-	icon_state = "16,25";
-	outside_part = 0;
-	pixel_x = 32
-	},
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "15,25"
-	},
-/area/template_noop)
-"ah" = (
-/obj/structure/bed/padded,
-/obj/structure/bed/padded/bunk,
-/obj/item/bedsheet/yellow,
-/obj/item/bedsheet/brown{
-	pixel_y = 16
-	},
-/obj/structure/curtain/open/bed,
-/obj/item/device/radio/intercom/east,
-/turf/simulated/floor/carpet/lightblue,
-/area/template_noop)
-"ak" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "7,19"
-	},
-/area/template_noop)
-"aq" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "15,23";
-	opacity = 1
-	},
-/turf/template_noop,
-/area/template_noop)
-"ay" = (
-/obj/structure/shuttle_part/scc/research{
-	density = 0;
-	icon_state = "14,7"
-	},
-/turf/template_noop,
-/area/template_noop)
-"aB" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/effect/floor_decal/corner/dark_blue{
-	dir = 5
-	},
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"aT" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/effect/floor_decal/spline/plain{
-	dir = 4
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/template_noop)
-"aU" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "12,26";
-	opacity = 1;
-	outside_part = 0
-	},
-/obj/structure/shuttle_part/scc/scout{
-	desc = "The hull and reinforcement of a Pathfinder class corporate expedition shuttle. The phoron-purple colored bands indicate this, in bold text as the SCCV Intrepid.";
-	icon = 'icons/obj/spaceship/scc/ship_engine.dmi';
-	icon_state = "nozzle";
-	layer = 2.4;
-	name = "pathfinder class shuttle hull";
-	opacity = 1;
-	outside_part = 0
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"aY" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "7,4";
-	outside_part = 0
-	},
-/obj/structure/window/shuttle/unique/scc/research/over{
-	icon_state = "0,2"
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"bf" = (
-/obj/effect/floor_decal/industrial/outline/red,
-/obj/machinery/door/blast/shutters/open{
-	dir = 4;
-	id = "intrepid_outer";
-	name = "Intrepid Shutter"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/lattice/catwalk/indoor,
-/obj/structure/bed/handrail{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
 "bk" = (
 /obj/effect/floor_decal/industrial/hatch/red,
 /obj/effect/map_effect/map_helper/ruler_tiles_3,
@@ -125,388 +10,30 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
-"bz" = (
-/obj/effect/overmap/visitable/ship/landable/intrepid,
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
-/obj/structure/fuel_port/phoron/scc{
-	pixel_x = 5;
-	pixel_y = 23
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/dark_blue/diagonal,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"bI" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/closet/crate,
-/obj/item/device/radio,
-/obj/item/device/radio,
-/obj/item/device/radio,
-/obj/item/device/radio,
-/obj/item/device/radio,
-/obj/item/device/radio,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/structure/window/reinforced,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"bL" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "16,19"
-	},
-/area/template_noop)
-"bM" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "7,6";
-	outside_part = 0
-	},
-/obj/structure/window/shuttle/unique/scc/research/over{
-	icon_state = "0,4"
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"bN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
-	dir = 5
-	},
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1385;
-	icon_state = "door_locked";
-	id_tag = "intrepid_shuttle_cargo_in"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"bO" = (
-/obj/structure/closet/secure_closet/guncabinet{
-	name = "Emergency Weaponry";
-	req_access = list(73)
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
-	},
-/obj/effect/floor_decal/industrial/outline/security,
-/obj/item/gun/energy/laser/shotgun/research,
-/obj/item/gun/energy/laser/shotgun/research,
-/obj/item/clothing/accessory/holster/utility/machete,
-/obj/item/clothing/accessory/holster/utility/machete,
-/obj/item/material/hatchet/machete/steel,
-/obj/item/material/hatchet/machete/steel,
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"bS" = (
-/obj/effect/floor_decal/industrial/outline/red,
-/obj/machinery/door/blast/shutters/open{
-	dir = 4;
-	id = "intrepid_outer";
-	name = "Intrepid Shutter"
-	},
-/obj/structure/lattice/catwalk/indoor,
-/obj/structure/bed/handrail{
-	dir = 4
-	},
-/obj/item/hullbeacon/red,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"bV" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/shaker/salt{
-	pixel_x = -8;
-	pixel_y = 9
-	},
-/obj/item/reagent_containers/food/condiment/shaker/peppermill{
-	pixel_x = -8;
-	pixel_y = 4
-	},
-/obj/item/reagent_containers/glass/rag{
-	pixel_x = 26;
-	pixel_y = 11
-	},
-/obj/item/reagent_containers/glass/rag{
-	pixel_x = 26;
-	pixel_y = 5
-	},
-/obj/machinery/alarm/north,
-/obj/item/storage/box/snack{
-	pixel_x = 6;
-	pixel_y = 5
-	},
-/turf/simulated/floor/lino,
-/area/template_noop)
-"cc" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"cl" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "16,17"
-	},
-/area/template_noop)
-"cA" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "4,26";
-	opacity = 1;
-	outside_part = 0
-	},
-/obj/structure/shuttle_part/scc/scout{
-	desc = "The hull and reinforcement of a Pathfinder class corporate expedition shuttle. The phoron-purple colored bands indicate this, in bold text as the SCCV Intrepid.";
-	icon = 'icons/obj/spaceship/scc/ship_engine.dmi';
-	icon_state = "nozzle";
-	layer = 2.4;
-	name = "pathfinder class shuttle hull";
-	opacity = 1;
-	outside_part = 0
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"cG" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"cL" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 8
-	},
-/turf/simulated/floor/carpet/lightblue,
-/area/template_noop)
-"dt" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 9
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/lino,
-/area/template_noop)
 "du" = (
 /obj/machinery/portable_atmospherics/canister/air/airlock,
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
-"dw" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "17,20"
-	},
-/turf/template_noop,
-/area/template_noop)
-"dx" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "5,8"
-	},
-/area/template_noop)
 "dA" = (
 /obj/effect/map_effect/map_helper/mark_good,
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
-"dC" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_pump_out_external";
-	layer = 2.8
-	},
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/door/blast/shutters/open{
-	dir = 2;
-	id = "intrepid_bay_outer";
-	name = "Intrepid Shutter"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
 "dM" = (
 /obj/structure/bed/stool/chair/office/bridge/pilot,
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
-"dQ" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "10,2"
-	},
-/obj/structure/window/shuttle/unique/scc/research/over{
-	density = 0;
-	icon_state = "3,0"
-	},
-/turf/template_noop,
-/area/template_noop)
-"dW" = (
-/obj/structure/shuttle_part/scc/research{
-	density = 0;
-	icon_state = "14,12";
-	layer = 2.6;
-	outside_part = 0
-	},
-/obj/structure/table/reinforced,
-/obj/item/material/kitchen/utensil/knife/plastic{
-	pixel_x = 9
-	},
-/obj/item/material/kitchen/utensil/knife/plastic{
-	pixel_x = 7
-	},
-/obj/item/storage/box/drinkingglasses{
-	pixel_y = 6
-	},
-/obj/item/storage/box/drinkingglasses{
-	pixel_y = 6
-	},
-/obj/item/storage/box/kitchen,
-/obj/item/storage/box/kitchen,
-/obj/machinery/light/small{
-	dir = 1
-	},
-/turf/simulated/floor/lino,
-/area/template_noop)
-"ew" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/machinery/atmospherics/pipe/simple/hidden/green{
-	dir = 8
-	},
-/obj/effect/floor_decal/industrial/warning,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
 "eB" = (
 /obj/structure/bed/stool/chair/office/bridge/pilot{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
-"eH" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "7,10"
-	},
-/area/template_noop)
-"eJ" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "7,26";
-	opacity = 1;
-	outside_part = 0
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
 "eM" = (
 /obj/machinery/computer/ship{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
-"eQ" = (
-/obj/item/stack/material/phoron{
-	amount = 30
-	},
-/obj/item/stack/material/uranium{
-	amount = 10
-	},
-/obj/item/stock_parts/capacitor,
-/obj/item/stack/cable_coil{
-	amount = 5
-	},
-/obj/item/circuitboard/rtg,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/window/reinforced,
-/obj/structure/closet/crate{
-	name = "power generation supplies"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"fm" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "8,3";
-	outside_part = 0
-	},
-/obj/structure/window/shuttle/unique/scc/research/over{
-	icon_state = "1,1"
-	},
-/obj/effect/floor_decal/corner/dark_blue{
-	dir = 4
-	},
-/obj/machinery/door/firedoor,
-/obj/structure/table/reinforced,
-/turf/simulated/floor/tiled/dark,
-/area/template_noop)
-"ft" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 10
-	},
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "15,11"
-	},
-/area/template_noop)
-"fB" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "3,22";
-	opacity = 1;
-	outside_part = 0
-	},
-/turf/template_noop,
-/area/template_noop)
-"gh" = (
-/obj/machinery/shower{
-	dir = 4
-	},
-/obj/machinery/button/remote/airlock{
-	dir = 1;
-	id = "intrepid_washroom";
-	name = "Door Bolt Control";
-	pixel_x = 40;
-	pixel_y = 25;
-	specialfunctions = 4
-	},
-/obj/structure/curtain/open/shower,
-/obj/structure/closet/walllocker{
-	pixel_x = -27
-	},
-/obj/random/soap,
-/obj/random/soap,
-/obj/item/towel,
-/obj/item/towel,
-/obj/item/towel,
-/obj/item/storage/box/toothpaste,
-/obj/item/storage/box/toothpaste,
-/obj/item/reagent_containers/toothbrush,
-/obj/item/reagent_containers/toothbrush,
-/obj/item/reagent_containers/toothbrush/green,
-/obj/item/reagent_containers/toothbrush/red,
-/turf/simulated/floor/tiled/freezer,
-/area/template_noop)
-"gi" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
 "gm" = (
 /obj/effect/floor_decal/industrial/hatch/red,
 /obj/effect/shuttle_landmark{
@@ -514,515 +41,24 @@
 	},
 /turf/template_noop,
 /area/template_noop)
-"gp" = (
-/obj/machinery/door/window/westleft,
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 4
-	},
-/obj/effect/floor_decal/industrial/warning{
-	dir = 4
-	},
-/obj/structure/closet/crate/freezer/rations,
-/obj/item/storage/box/kitchen,
-/obj/item/storage/box/kitchen,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"gx" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "9,12"
-	},
-/area/template_noop)
-"gC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
-	dir = 9
-	},
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1385;
-	icon_state = "door_locked";
-	id_tag = "intrepid_shuttle_cargo_in"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"gF" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/light/small,
-/obj/effect/floor_decal/corner/blue{
-	dir = 10
-	},
-/obj/item/device/radio/intercom/south,
-/turf/simulated/floor/carpet/rubber,
-/area/template_noop)
-"gS" = (
-/obj/structure/dispenser/oxygen,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"gZ" = (
-/obj/machinery/firealarm/north,
-/obj/effect/floor_decal/spline/plain{
-	dir = 8
-	},
-/obj/machinery/light_switch{
-	pixel_x = -12;
-	pixel_y = 24
-	},
-/obj/structure/bed/stool/chair/sofa/right/red,
-/turf/simulated/floor/lino,
-/area/template_noop)
-"ha" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "7,25"
-	},
-/area/template_noop)
-"hg" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/glass_command{
-	dir = 1;
-	name = "Intrepid Cargo Bay"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/white,
-/area/template_noop)
-"hm" = (
-/obj/effect/floor_decal/corner/yellow{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/universal,
-/obj/effect/floor_decal/industrial/outline/emergency_closet,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/structure/table/rack,
-/obj/item/pipewrench,
-/obj/item/storage/toolbox/electrical{
-	pixel_y = 6
-	},
-/obj/item/storage/toolbox/mechanical,
-/obj/item/wrench{
-	pixel_y = -8
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
 "hu" = (
 /obj/structure/bed/stool/chair/office/bridge/pilot{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
-"hA" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "3,24";
-	opacity = 1
-	},
-/turf/template_noop,
-/area/template_noop)
-"id" = (
-/obj/effect/floor_decal/industrial/warning/corner{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	icon_state = "0-4"
-	},
-/obj/machinery/floodlight,
-/obj/machinery/power/apc/intrepid/west,
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"io" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "6,7"
-	},
-/area/template_noop)
-"iq" = (
-/obj/structure/lattice/catwalk/indoor,
-/obj/machinery/cryopod,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"iw" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/lime/diagonal,
-/obj/effect/floor_decal/spline/plain{
-	dir = 8
-	},
-/obj/machinery/iv_drip,
-/obj/machinery/light/small,
-/turf/simulated/floor/tiled/white,
-/area/template_noop)
-"ix" = (
-/obj/machinery/atmospherics/pipe/tank/carbon_dioxide/scc_shuttle{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/yellow{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"iJ" = (
-/obj/structure/shuttle_part/scc/research{
-	density = 0;
-	icon_state = "0,21";
-	outside_part = 0;
-	pixel_x = -32
-	},
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "1,21"
-	},
-/area/template_noop)
-"iP" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "14,9"
-	},
-/area/template_noop)
-"iT" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 4
-	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/hatch{
-	dir = 4;
-	name = "Utility and Atmosphere Control";
-	req_access = list(73)
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/dark,
-/area/template_noop)
-"iX" = (
-/obj/structure/bed/stool/chair/office/bridge,
-/obj/item/device/radio/intercom/west{
-	pixel_y = 2
-	},
-/obj/machinery/button/remote/blast_door{
-	dir = 1;
-	id = "intrepid_outer";
-	name = "side facing external blast door controller";
-	pixel_x = -34;
-	pixel_y = -2
-	},
-/obj/machinery/button/remote/airlock{
-	dir = 1;
-	id = "intrepid_cockpit";
-	name = "Cockpit Bolts";
-	pixel_x = -34;
-	pixel_y = 7;
-	specialfunctions = 4
-	},
-/obj/effect/floor_decal/corner/dark_blue/diagonal,
-/turf/simulated/floor/tiled/dark,
-/area/template_noop)
 "iY" = (
 /obj/machinery/door/airlock/external{
 	dir = 4
 	},
 /turf/simulated/floor/plating,
 /area/template_noop)
-"jb" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "2,17"
-	},
-/area/template_noop)
-"jd" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "14,24"
-	},
-/area/template_noop)
-"jf" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "6,16"
-	},
-/area/template_noop)
-"jg" = (
-/obj/effect/floor_decal/industrial/warning,
-/obj/machinery/iff_beacon/horizon/shuttle{
-	pixel_y = -15
-	},
-/turf/simulated/floor/reinforced,
-/area/template_noop)
-"jl" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "13,17"
-	},
-/area/template_noop)
-"jx" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "13,4"
-	},
-/turf/template_noop,
-/area/template_noop)
-"jA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/structure/closet/cabinet,
-/obj/structure/cable/green{
-	d2 = 2;
-	icon_state = "0-2"
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/coatrack{
-	pixel_x = -14
-	},
-/obj/item/tank/emergency_oxygen{
-	pixel_x = 5
-	},
-/obj/item/tank/emergency_oxygen,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/machinery/power/apc/intrepid/north,
-/turf/simulated/floor/lino,
-/area/template_noop)
-"jK" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "13,5"
-	},
-/turf/template_noop,
-/area/template_noop)
-"jP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 6
-	},
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "3,11"
-	},
-/area/template_noop)
-"kk" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "13,7"
-	},
-/turf/template_noop,
-/area/template_noop)
-"kn" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/fuel,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/effect/floor_decal/corner/blue{
-	dir = 10
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/template_noop)
-"kp" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "8,2"
-	},
-/obj/structure/window/shuttle/unique/scc/research/over{
-	density = 0;
-	icon_state = "1,0"
-	},
-/turf/template_noop,
-/area/template_noop)
-"kt" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/lime/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/template_noop)
-"ku" = (
-/obj/structure/shuttle_part/scc/research{
-	density = 0;
-	icon_state = "10,0"
-	},
-/turf/template_noop,
-/area/template_noop)
-"kX" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "2,9"
-	},
-/turf/template_noop,
-/area/template_noop)
 "kZ" = (
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
-"lb" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "12,4";
-	layer = 2.97;
-	outside_part = 0
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"lr" = (
-/obj/structure/shuttle_part/scc/research{
-	density = 0;
-	icon_state = "4,11";
-	layer = 2.6;
-	outside_part = 0
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
-/obj/machinery/computer/ship/navigation{
-	dir = 4
-	},
-/turf/simulated/floor/lino,
-/area/template_noop)
-"lE" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/red{
-	dir = 4
-	},
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1385;
-	icon_state = "door_locked";
-	id_tag = "intrepid_shuttle_cargo_out"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"lR" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/floor_decal/corner/lime/diagonal,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/white,
-/area/template_noop)
-"mg" = (
-/obj/effect/floor_decal/corner/dark_blue/diagonal,
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"mh" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "14,17"
-	},
-/area/template_noop)
-"mo" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
-/obj/structure/bed/stool/chair/office/dark{
-	dir = 8
-	},
-/turf/simulated/floor/lino,
-/area/template_noop)
-"ms" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "15,10"
-	},
-/area/template_noop)
-"mu" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 8
-	},
-/obj/structure/bed/padded/bunk,
-/obj/structure/bed/padded,
-/obj/item/bedsheet/black,
-/obj/item/bedsheet/blue{
-	pixel_y = 16
-	},
-/obj/structure/curtain/open/bed,
-/obj/machinery/firealarm/north,
-/turf/simulated/floor/carpet/lightblue,
-/area/template_noop)
-"mC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 8
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/structure/cable/green{
-	icon_state = "1-8"
-	},
-/obj/effect/floor_decal/corner/yellow{
-	dir = 6
-	},
-/obj/effect/floor_decal/corner/blue{
-	dir = 8
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/template_noop)
-"nb" = (
-/obj/structure/shuttle_part/scc/research{
-	density = 0;
-	icon_state = "18,21";
-	outside_part = 0;
-	pixel_x = 32
-	},
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "17,21"
-	},
-/area/template_noop)
 "nd" = (
 /turf/simulated/wall,
 /area/template_noop)
-"ng" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "10,7"
-	},
-/area/template_noop)
-"nj" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "8,13"
-	},
-/area/template_noop)
-"ny" = (
-/obj/structure/window/shuttle/unique/scc/tall{
-	icon_state = "long1-2"
-	},
-/obj/machinery/door/firedoor,
-/obj/effect/landmark/entry_point/starboard{
-	name = "starboard, center"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"nD" = (
-/obj/effect/shuttle_landmark/intrepid/hangar,
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "9,13"
-	},
-/area/template_noop)
-"nO" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "14,10"
-	},
-/area/template_noop)
-"nP" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "6,20"
-	},
-/area/template_noop)
-"nT" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/structure/cable/green{
-	icon_state = "2-8"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
 "od" = (
 /obj/effect/shuttle_landmark{
 	dir = 1
@@ -1030,264 +66,22 @@
 /obj/effect/floor_decal/industrial/hatch/red,
 /turf/template_noop,
 /area/template_noop)
-"ol" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "7,18"
-	},
-/area/template_noop)
-"oq" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "3,26"
-	},
-/turf/template_noop,
-/area/template_noop)
-"oz" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "3,10"
-	},
-/area/template_noop)
-"oG" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "7,22"
-	},
-/area/template_noop)
-"oI" = (
-/obj/machinery/door/airlock{
-	dir = 1;
-	id_tag = "intrepid_washroom";
-	name = "Washroom Compartment"
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled/freezer,
-/area/template_noop)
-"oO" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "16,22";
-	opacity = 1;
-	outside_part = 0
-	},
-/obj/machinery/atmospherics/unary/engine/scc_shuttle,
-/turf/template_noop,
-/area/template_noop)
-"pm" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/glass_command{
-	dir = 1;
-	id_tag = "intrepid_cockpit";
-	name = "Intrepid Cockpit";
-	req_access = list(73)
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"pA" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/valve/digital/open{
-	name = "airlock shutoff valve"
-	},
-/obj/effect/floor_decal/industrial/outline/emergency_closet,
-/obj/machinery/door/window/southright{
-	req_access = list(73)
-	},
-/obj/machinery/light_switch{
-	pixel_x = 21;
-	pixel_y = 9
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"pC" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = 20
-	},
-/turf/simulated/floor/wood,
-/area/template_noop)
-"pD" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/structure/bed/stool/chair/shuttle{
-	dir = 4
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/template_noop)
-"pE" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "7,17"
-	},
-/area/template_noop)
-"pO" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_pump";
-	layer = 2.8
-	},
-/obj/structure/lattice/catwalk/indoor,
-/obj/item/device/radio/intercom/east,
-/turf/simulated/floor/plating,
-/area/template_noop)
 "pQ" = (
 /obj/effect/map_effect/map_helper/mark_bad,
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
-"pR" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/door/firedoor,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"pT" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/floor_decal/corner/lime/diagonal,
-/obj/structure/table/standard,
-/obj/item/roller{
-	pixel_x = -8
-	},
-/obj/item/roller{
-	pixel_x = -8
-	},
-/obj/item/reagent_containers/spray/cleaner{
-	pixel_x = 19
-	},
-/obj/item/reagent_containers/glass/bottle/inaprovaline{
-	pixel_x = 4;
-	pixel_y = 11
-	},
-/obj/item/storage/box/gloves{
-	pixel_x = 5;
-	pixel_y = -1
-	},
-/turf/simulated/floor/tiled/white,
-/area/template_noop)
-"qa" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "3,23";
-	opacity = 1
-	},
-/turf/template_noop,
-/area/template_noop)
-"qn" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "13,8"
-	},
-/area/template_noop)
-"qp" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "12,6";
-	outside_part = 0
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
 "qD" = (
 /obj/machinery/atmospherics/unary/engine{
 	dir = 2
 	},
 /turf/template_noop,
 /area/template_noop)
-"qN" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 1
-	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/structure/window/reinforced,
-/turf/simulated/floor/plating,
-/area/template_noop)
 "qS" = (
 /obj/machinery/atmospherics/unary/vent_pump{
 	dir = 2
 	},
 /turf/simulated/floor/plating,
 /area/template_noop)
-"rc" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "15,22";
-	opacity = 1;
-	outside_part = 0
-	},
-/turf/template_noop,
-/area/template_noop)
-"ri" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/camera/network/intrepid{
-	c_tag = "Intrepid - Cargo";
-	dir = 8
-	},
-/turf/simulated/floor/tiled/dark,
-/area/template_noop)
-"rt" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "13,26";
-	opacity = 1;
-	outside_part = 0
-	},
-/obj/machinery/atmospherics/unary/engine/scc_shuttle,
-/obj/effect/landmark/entry_point/aft{
-	name = "aft, port engines"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"rw" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/fuel,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"rB" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/camera/network/intrepid{
-	c_tag = "Intrepid - Crew Area";
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/dark_blue/diagonal,
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
 "rT" = (
 /obj/effect/shuttle_landmark{
 	dir = 2
@@ -1295,521 +89,32 @@
 /obj/effect/floor_decal/industrial/hatch/red,
 /turf/template_noop,
 /area/template_noop)
-"sf" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/machinery/atmospherics/pipe/manifold/hidden{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"so" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/dark_blue/diagonal,
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
 "sw" = (
 /obj/machinery/atmospherics/unary/engine{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
-"sA" = (
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/aux,
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "11,17"
-	},
-/area/template_noop)
-"sG" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "12,24"
-	},
-/area/template_noop)
-"ta" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "4,9"
-	},
-/area/template_noop)
-"tc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/template_noop)
-"tl" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "7,23"
-	},
-/area/template_noop)
 "ty" = (
 /obj/effect/map_effect/map_helper/ruler_tiles_3,
 /turf/template_noop,
 /area/template_noop)
-"tE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/hatch{
-	dir = 1;
-	name = "Thruster Compartment";
-	req_access = list(73)
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"tO" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "7,16"
-	},
-/area/template_noop)
-"tP" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_pump_out_external";
-	layer = 2.8
-	},
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/structure/bed/handrail{
-	dir = 8
-	},
-/obj/machinery/door/blast/shutters/open{
-	dir = 2;
-	id = "intrepid_bay_outer";
-	name = "Intrepid Shutter"
-	},
-/obj/item/device/radio/intercom/east,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"tT" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/obj/structure/cable/green{
-	icon_state = "1-4"
-	},
-/obj/effect/floor_decal/corner/dark_blue/diagonal,
-/turf/simulated/floor/tiled/dark,
-/area/template_noop)
-"tU" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "9,1";
-	outside_part = 0
-	},
-/obj/effect/landmark/entry_point/fore{
-	name = "fore, bridge"
-	},
-/turf/template_noop,
-/area/template_noop)
-"tW" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "7,5";
-	outside_part = 0
-	},
-/obj/structure/window/shuttle/unique/scc/research/over{
-	icon_state = "0,3"
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"tX" = (
-/obj/structure/shuttle_part/scc/research{
-	density = 0;
-	icon_state = "2,25";
-	outside_part = 0;
-	pixel_x = -32
-	},
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "3,25"
-	},
-/area/template_noop)
-"ug" = (
-/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{
-	cycle_to_external_air = 1;
-	dir = 8;
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo";
-	layer = 3.3;
-	master_tag = "intrepid_shuttle";
-	pixel_x = 24;
-	tag_airpump = "intrepid_shuttle_cargo_pump";
-	tag_chamber_sensor = "intrepid_shuttle_cargo_sensor";
-	tag_exterior_door = "intrepid_shuttle_cargo_out";
-	tag_exterior_sensor = "intrepid_shuttle_cargo_exterior_sensor";
-	tag_interior_door = "intrepid_shuttle_cargo_in";
-	tag_interior_sensor = "intrepid_shuttle_cargo_interior_sensor"
-	},
-/obj/machinery/light/small/red{
-	dir = 4
-	},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 1;
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_pump_out_internal";
-	layer = 2.8
-	},
-/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"un" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"uw" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "17,19"
-	},
-/turf/template_noop,
-/area/template_noop)
-"uB" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "1,20"
-	},
-/turf/template_noop,
-/area/template_noop)
-"uM" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "15,13"
-	},
-/area/template_noop)
-"uR" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "2,10"
-	},
-/turf/template_noop,
-/area/template_noop)
-"uU" = (
-/obj/machinery/airlock_sensor{
-	dir = 4;
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_sensor";
-	pixel_x = -24;
-	pixel_y = -6
-	},
-/obj/structure/bed/handrail{
-	dir = 4
-	},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_pump";
-	layer = 2.8
-	},
-/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"uX" = (
-/obj/effect/floor_decal/corner/dark_blue{
-	dir = 9
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
-	},
-/obj/machinery/embedded_controller/radio/docking_port_multi{
-	child_names_txt = "Cargo Airlock";
-	child_tags_txt = "intrepid_shuttle_cargo";
-	frequency = 1385;
-	id_tag = "intrepid_shuttle";
-	pixel_x = -9;
-	pixel_y = 23
-	},
-/obj/machinery/camera/network/intrepid{
-	c_tag = "Intrepid - Cockpit";
-	dir = 8
-	},
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "0-8"
-	},
-/obj/machinery/power/apc/intrepid/north,
-/turf/simulated/floor/tiled/dark,
-/area/template_noop)
-"uY" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "8,13"
-	},
-/area/template_noop)
-"vb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 4
-	},
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"vc" = (
-/obj/machinery/shipsensors/weak/scc_shuttle{
-	pixel_y = -15
-	},
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/reinforced,
-/area/template_noop)
-"vi" = (
-/obj/effect/floor_decal/corner/yellow{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/tank/air/scc_shuttle{
-	dir = 8
-	},
-/obj/structure/closet/walllocker/emerglocker/east,
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/machinery/alarm/north,
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"vz" = (
-/obj/structure/window/shuttle/unique/scc/tall{
-	icon_state = "long2-2"
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
-/area/template_noop)
 "vG" = (
 /obj/effect/map_effect/map_helper/ruler_tiles_3{
 	dir = 4
 	},
 /turf/template_noop,
 /area/template_noop)
-"vL" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "6,26";
-	opacity = 1;
-	outside_part = 0
-	},
-/obj/structure/shuttle_part/scc/scout{
-	desc = "The hull and reinforcement of a Pathfinder class corporate expedition shuttle. The phoron-purple colored bands indicate this, in bold text as the SCCV Intrepid.";
-	icon = 'icons/obj/spaceship/scc/ship_engine.dmi';
-	icon_state = "nozzle";
-	layer = 2.4;
-	name = "pathfinder class shuttle hull";
-	opacity = 1;
-	outside_part = 0
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"vR" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "1,19"
-	},
-/turf/template_noop,
-/area/template_noop)
-"vX" = (
-/obj/effect/floor_decal/corner/yellow{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/obj/structure/cable/green{
-	icon_state = "1-4"
-	},
-/obj/effect/floor_decal/industrial/outline/emergency_closet,
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/structure/table/rack,
-/obj/item/stack/material/glass/full,
-/obj/item/stack/material/glass/full,
-/obj/item/stack/rods{
-	amount = 50
-	},
-/obj/item/stack/rods{
-	amount = 50
-	},
-/obj/item/stack/material/glass/reinforced{
-	amount = 50
-	},
-/obj/item/stack/material/glass/reinforced{
-	amount = 50
-	},
-/obj/item/stack/material/steel/full,
-/obj/item/stack/material/steel/full,
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"vY" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "5,7"
-	},
-/turf/template_noop,
-/area/template_noop)
-"wc" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "16,18"
-	},
-/area/template_noop)
-"wA" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "7,7"
-	},
-/area/template_noop)
-"wD" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_pump_out_external";
-	layer = 2.8
-	},
-/obj/machinery/access_button{
-	command = "cycle_exterior";
-	dir = 4;
-	frequency = 1385;
-	layer = 3.1;
-	master_tag = "intrepid_shuttle_cargo";
-	name = "exterior access button";
-	pixel_x = -22;
-	pixel_y = 2
-	},
-/obj/machinery/airlock_sensor/airlock_exterior{
-	dir = 4;
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_exterior_sensor";
-	pixel_x = -21;
-	pixel_y = 10
-	},
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/structure/bed/handrail{
-	dir = 4
-	},
-/obj/machinery/door/blast/shutters/open{
-	dir = 2;
-	id = "intrepid_bay_outer";
-	name = "Intrepid Shutter"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"wP" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin{
-	pixel_x = 4;
-	pixel_y = 2
-	},
-/obj/item/pen{
-	pixel_x = 4;
-	pixel_y = 2
-	},
-/obj/item/flame/candle{
-	pixel_x = -7;
-	pixel_y = 3
-	},
-/obj/item/device/radio/intercom/north,
-/turf/simulated/floor/lino,
-/area/template_noop)
 "wS" = (
 /obj/machinery/atmospherics/unary/engine{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
-"xb" = (
-/obj/item/bodybag/cryobag,
-/obj/item/bodybag/cryobag,
-/obj/item/clothing/mask/surgical,
-/obj/item/clothing/mask/surgical,
-/obj/item/clothing/glasses/hud/health,
-/obj/item/storage/firstaid/o2,
-/obj/effect/floor_decal/corner/lime/diagonal,
-/obj/item/reagent_containers/inhaler/pneumalin,
-/obj/item/reagent_containers/inhaler/pneumalin,
-/obj/effect/floor_decal/industrial/outline/medical,
-/obj/structure/table/standard,
-/obj/item/storage/firstaid/regular,
-/obj/item/storage/firstaid/fire,
-/obj/item/storage/firstaid/toxin,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/white,
-/area/template_noop)
-"xc" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "6,5";
-	outside_part = 0
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"xf" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "4,13"
-	},
-/area/template_noop)
-"xh" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "11,6";
-	outside_part = 0
-	},
-/obj/structure/window/shuttle/unique/scc/research/over{
-	icon_state = "4,4"
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"xm" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "5,4"
-	},
-/turf/template_noop,
-/area/template_noop)
-"xC" = (
-/obj/structure/window/shuttle/unique/scc/tall,
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"xG" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
-/obj/effect/floor_decal/industrial/warning/corner{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/closet/emcloset,
-/obj/effect/floor_decal/industrial/outline/engineering,
-/obj/machinery/alarm/north,
-/turf/simulated/floor/carpet/rubber,
-/area/template_noop)
 "yc" = (
 /obj/machinery/computer/ship,
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
-"yk" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "14,13"
-	},
-/area/template_noop)
-"yv" = (
-/obj/structure/shuttle_part/scc/research{
-	density = 0;
-	icon_state = "8,4";
-	outside_part = 0
-	},
-/obj/structure/window/shuttle/unique/scc/research/over{
-	density = 0;
-	icon_state = "1,2"
-	},
-/obj/effect/floor_decal/corner/dark_blue{
-	dir = 6
-	},
-/obj/structure/table/reinforced,
-/turf/simulated/floor/tiled/dark,
-/area/template_noop)
 "zb" = (
 /obj/machinery/atmospherics/unary/vent_pump{
 	dir = 1
@@ -1822,20 +127,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/template_noop)
-"zq" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "4,24"
-	},
-/area/template_noop)
-"zt" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_pump";
-	layer = 2.8
-	},
-/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor/plating,
-/area/template_noop)
 "zG" = (
 /obj/effect/shuttle_landmark{
 	dir = 4
@@ -1843,230 +134,18 @@
 /obj/effect/floor_decal/industrial/hatch/red,
 /turf/template_noop,
 /area/template_noop)
-"zL" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "15,24";
-	opacity = 1
-	},
-/turf/template_noop,
-/area/template_noop)
-"zO" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "11,4";
-	outside_part = 0
-	},
-/obj/structure/window/shuttle/unique/scc/research/over{
-	density = 0;
-	icon_state = "4,2"
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"zU" = (
-/obj/effect/floor_decal/industrial/warning/corner{
-	dir = 4
-	},
-/obj/machinery/power/portgen/basic,
-/obj/structure/cable{
-	d2 = 4;
-	icon_state = "0-4"
-	},
-/obj/item/stack/material/graphite/full,
-/obj/item/stack/material/graphite/full,
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = -12;
-	pixel_y = 24
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/template_noop)
-"zZ" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "4,22"
-	},
-/area/template_noop)
 "Ad" = (
 /obj/structure/bed/stool/chair/office/bridge/pilot{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
-"Ar" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/simulated/floor/carpet/lightblue,
-/area/template_noop)
 "Az" = (
 /obj/machinery/atmospherics/unary/engine{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
-"AA" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "12,8"
-	},
-/area/template_noop)
-"AT" = (
-/obj/structure/shuttle_part/scc/research{
-	density = 0;
-	icon_state = "1,13";
-	outside_part = 0;
-	pixel_x = -32
-	},
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "2,13"
-	},
-/area/template_noop)
-"Bm" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "13,3"
-	},
-/turf/template_noop,
-/area/template_noop)
-"Bo" = (
-/obj/structure/shuttle_part/scc/research{
-	density = 0;
-	icon_state = "4,7"
-	},
-/turf/template_noop,
-/area/template_noop)
-"Bq" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "9,11"
-	},
-/area/template_noop)
-"Bx" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "2,19"
-	},
-/area/template_noop)
-"BD" = (
-/obj/machinery/atmospherics/pipe/tank/air/scc_shuttle{
-	dir = 8;
-	name = "Pressure Tank (Air - Main Airlock)"
-	},
-/obj/effect/floor_decal/corner/yellow{
-	dir = 6
-	},
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"BF" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/command{
-	dir = 1;
-	name = "Fore Crew Compartment"
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/lino,
-/area/template_noop)
-"BW" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 8
-	},
-/turf/simulated/floor/lino,
-/area/template_noop)
-"Cr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 4
-	},
-/obj/effect/floor_decal/industrial/warning/corner{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/access_button{
-	command = "cycle_interior";
-	frequency = 1385;
-	master_tag = "intrepid_shuttle_cargo";
-	name = "interior access button";
-	pixel_x = -5;
-	pixel_y = 20
-	},
-/obj/machinery/airlock_sensor/airlock_interior{
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_interior_sensor";
-	pixel_x = -5;
-	pixel_y = 25
-	},
-/obj/machinery/button/remote/blast_door{
-	dir = 1;
-	id = "intrepid_bay_outer";
-	name = "inner cargo hold blast doors";
-	pixel_x = 7;
-	pixel_y = 25
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"CB" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "11,17"
-	},
-/area/template_noop)
-"CH" = (
-/obj/effect/floor_decal/corner/yellow{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 6
-	},
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
-/obj/structure/cable/green{
-	d2 = 2;
-	icon_state = "0-2"
-	},
-/obj/structure/closet/firecloset/full,
-/obj/effect/floor_decal/industrial/outline/firefighting_closet,
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/machinery/power/apc/intrepid/north,
-/obj/machinery/vending/wallmed1{
-	pixel_x = -23;
-	req_access = null
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"CJ" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "16,13"
-	},
-/obj/structure/shuttle_part/scc/research{
-	density = 0;
-	icon_state = "17,13";
-	outside_part = 0;
-	pixel_x = 32
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"CO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 4
-	},
-/obj/effect/floor_decal/industrial/warning{
-	dir = 9
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
 "CY" = (
 /obj/effect/floor_decal/industrial/hatch/red,
 /obj/effect/shuttle_landmark{
@@ -2074,396 +153,9 @@
 	},
 /turf/template_noop,
 /area/template_noop)
-"Db" = (
-/turf/simulated/wall/shuttle/unique/scc/research,
-/area/template_noop)
-"De" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "7,2"
-	},
-/turf/template_noop,
-/area/template_noop)
-"Do" = (
-/obj/effect/floor_decal/industrial/warning,
-/obj/machinery/atmospherics/portables_connector/fuel{
-	dir = 1
-	},
-/turf/simulated/floor/reinforced,
-/area/template_noop)
-"Du" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "4,23"
-	},
-/area/template_noop)
-"Dy" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/structure/platform_stairs/full/east_west_cap{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"DB" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/blast/shutters/open{
-	dir = 2;
-	id = "intrepid_inner";
-	name = "Intrepid Shutter"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"DC" = (
-/obj/structure/lattice/catwalk/indoor,
-/obj/structure/closet/firecloset/full,
-/obj/machinery/light/small/red{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"DE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/aux,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
 "DW" = (
 /turf/template_noop,
 /area/template_noop)
-"DZ" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "16,10"
-	},
-/turf/template_noop,
-/area/template_noop)
-"Eb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 5
-	},
-/obj/structure/lattice/catwalk/indoor,
-/obj/machinery/light/small/red{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Eg" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "14,26";
-	opacity = 1;
-	outside_part = 0
-	},
-/obj/structure/shuttle_part/scc/scout{
-	desc = "The hull and reinforcement of a Pathfinder class corporate expedition shuttle. The phoron-purple colored bands indicate this, in bold text as the SCCV Intrepid.";
-	icon = 'icons/obj/spaceship/scc/ship_engine.dmi';
-	icon_state = "nozzle";
-	layer = 2.4;
-	name = "pathfinder class shuttle hull";
-	opacity = 1;
-	outside_part = 0
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Ei" = (
-/obj/effect/floor_decal/industrial/outline/red,
-/obj/machinery/door/blast/shutters/open{
-	dir = 8;
-	id = "intrepid_outer";
-	name = "Intrepid Shutter"
-	},
-/obj/structure/lattice/catwalk/indoor,
-/obj/structure/bed/handrail{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Ej" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "9,0"
-	},
-/turf/template_noop,
-/area/template_noop)
-"El" = (
-/obj/structure/cable/green{
-	icon_state = "1-8"
-	},
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Eu" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/lime/diagonal,
-/obj/machinery/sleeper,
-/obj/machinery/vending/wallmed1{
-	pixel_x = -4;
-	pixel_y = 26;
-	req_access = null
-	},
-/turf/simulated/floor/tiled/white,
-/area/template_noop)
-"Ey" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "5,3"
-	},
-/turf/template_noop,
-/area/template_noop)
-"ES" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "5,5"
-	},
-/turf/template_noop,
-/area/template_noop)
-"Fb" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "11,8"
-	},
-/area/template_noop)
-"Fe" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/button/remote/blast_door{
-	dir = 1;
-	id = "intrepid_inner";
-	name = "inner cargo hold blast doors";
-	pixel_x = -24;
-	pixel_y = 26
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/template_noop)
-"Fk" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/power/smes/buildable/horizon_shuttle{
-	RCon_tag = "Intrepid"
-	},
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/item/device/radio/intercom/east{
-	pixel_y = 21
-	},
-/obj/structure/cable/green{
-	icon_state = "0-8"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Fm" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/lime/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/template_noop)
-"Fs" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 5
-	},
-/obj/structure/cable/green{
-	icon_state = "1-4"
-	},
-/obj/effect/floor_decal/corner/blue{
-	dir = 10
-	},
-/obj/structure/bed/stool/chair/shuttle{
-	dir = 4
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/template_noop)
-"FE" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "7,3";
-	outside_part = 0
-	},
-/obj/structure/window/shuttle/unique/scc/research/over{
-	density = 0;
-	icon_state = "0,1"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"FG" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "12,5";
-	outside_part = 0
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"FO" = (
-/obj/machinery/door/window/eastright,
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 4
-	},
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"FQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 9
-	},
-/obj/structure/lattice/catwalk/indoor,
-/obj/machinery/light/small/red{
-	dir = 4
-	},
-/obj/structure/reagent_dispensers/watertank,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"FV" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "14,23"
-	},
-/area/template_noop)
-"Go" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "9,2";
-	outside_part = 0
-	},
-/obj/structure/window/shuttle/unique/scc/research/over{
-	icon_state = "2,0"
-	},
-/obj/machinery/door/firedoor,
-/turf/template_noop,
-/area/template_noop)
-"Gv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/effect/floor_decal/corner/lime/diagonal,
-/obj/structure/bed/roller,
-/obj/item/device/radio/intercom/south,
-/turf/simulated/floor/tiled/white,
-/area/template_noop)
-"GA" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "6,24"
-	},
-/area/template_noop)
-"GC" = (
-/obj/structure/window/shuttle/unique/scc/research/over{
-	density = 0;
-	icon_state = "1,3"
-	},
-/obj/structure/bed/stool/chair/office/bridge{
-	dir = 8
-	},
-/obj/machinery/computer/ship/sensors/cockpit{
-	layer = 3;
-	pixel_x = -22;
-	pixel_y = 7
-	},
-/obj/effect/floor_decal/corner/dark_blue{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/dark,
-/area/template_noop)
-"GE" = (
-/obj/structure/shuttle_part/scc/research{
-	density = 0;
-	icon_state = "9,3";
-	outside_part = 0
-	},
-/obj/structure/window/shuttle/unique/scc/research/over{
-	density = 0
-	},
-/obj/machinery/computer/ship/helm/cockpit{
-	layer = 3.1
-	},
-/obj/effect/floor_decal/corner/dark_blue{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/dark,
-/area/template_noop)
-"GG" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "3,12";
-	outside_part = 0
-	},
-/obj/structure/window/shuttle/unique/scc/tall{
-	icon_state = "short1_top";
-	layer = 3
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"GK" = (
-/obj/effect/floor_decal/industrial/warning,
-/obj/machinery/atmospherics/portables_connector{
-	dir = 1;
-	layer = 2.8
-	},
-/turf/simulated/floor/reinforced,
-/area/template_noop)
-"GP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
-	icon_state = "2-8"
-	},
-/obj/structure/cable/green{
-	icon_state = "1-8"
-	},
-/obj/effect/floor_decal/spline/plain{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/blue{
-	dir = 10
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/template_noop)
-"Hc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
-/obj/machinery/firealarm/north,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Hi" = (
-/obj/machinery/hologram/holopad/long_range,
-/obj/effect/floor_decal/corner/dark_blue/diagonal,
-/turf/simulated/floor/tiled/dark,
-/area/template_noop)
 "Hq" = (
 /obj/machinery/computer/ship{
 	dir = 8
@@ -2474,689 +166,34 @@
 /obj/effect/floor_decal/industrial/hatch/red,
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/template_noop)
-"Hu" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "4,16"
-	},
-/area/template_noop)
-"HD" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "3,13"
-	},
-/area/template_noop)
-"HS" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/effect/floor_decal/corner/lime/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/template_noop)
-"HT" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 6
-	},
-/obj/machinery/atmospherics/binary/pump{
-	dir = 1;
-	name = "External Ports to Air Reserve"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"HV" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "2,11"
-	},
-/turf/template_noop,
-/area/template_noop)
-"If" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "2,18"
-	},
-/area/template_noop)
-"In" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "5,26";
-	opacity = 1;
-	outside_part = 0
-	},
-/obj/machinery/atmospherics/unary/engine/scc_shuttle,
-/obj/effect/landmark/entry_point/aft{
-	name = "aft, starboard engines"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Io" = (
-/obj/machinery/atmospherics/portables_connector{
-	dir = 4
-	},
-/obj/machinery/portable_atmospherics/canister/empty,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/effect/floor_decal/industrial/warning/corner,
-/obj/structure/closet/walllocker/emerglocker/west,
-/turf/simulated/floor/plating,
-/area/template_noop)
 "IL" = (
 /obj/effect/floor_decal/industrial/hatch/red,
 /turf/template_noop,
 /area/template_noop)
-"IT" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "12,7"
-	},
-/area/template_noop)
-"Jj" = (
-/obj/machinery/atmospherics/portables_connector/fuel{
-	dir = 4
-	},
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Jt" = (
-/obj/machinery/atmospherics/portables_connector/aux,
-/obj/machinery/portable_atmospherics/canister/air/airlock,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/firealarm/north,
-/obj/machinery/light/small{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/dark,
-/area/template_noop)
-"JA" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/red{
-	dir = 8
-	},
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1385;
-	icon_state = "door_locked";
-	id_tag = "intrepid_shuttle_cargo_out"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"JO" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/aux{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	icon_state = "2-8"
-	},
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"JP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/structure/lattice/catwalk/indoor,
-/obj/machinery/computer/cryopod{
-	pixel_x = 28;
-	pixel_y = 7
-	},
-/obj/structure/bed/handrail{
-	dir = 8
-	},
-/obj/machinery/alarm/west,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"JS" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "11,2"
-	},
-/turf/template_noop,
-/area/template_noop)
-"Kc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 5
-	},
-/obj/machinery/atmospherics/binary/passive_gate/supply{
-	dir = 4;
-	target_pressure = 250
-	},
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/template_noop)
-"Kh" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "11,5";
-	outside_part = 0
-	},
-/obj/structure/window/shuttle/unique/scc/research/over{
-	icon_state = "4,3"
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"KG" = (
-/obj/structure/shuttle_part/scc/research{
-	density = 0;
-	icon_state = "4,12";
-	layer = 2.6;
-	outside_part = 0
-	},
-/obj/structure/table/wood,
-/obj/item/device/binoculars{
-	pixel_x = 12
-	},
-/obj/machinery/recharger{
-	pixel_x = 1;
-	pixel_y = 6
-	},
-/obj/machinery/light/small{
-	dir = 1
-	},
-/turf/simulated/floor/lino,
-/area/template_noop)
-"KN" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/dark_blue/diagonal,
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"KV" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "7,24"
-	},
-/area/template_noop)
 "KX" = (
 /obj/machinery/door/airlock/external{
 	dir = 2
 	},
 /turf/simulated/floor/plating,
 /area/template_noop)
-"KZ" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "8,7"
-	},
-/area/template_noop)
-"Ld" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 10
-	},
-/obj/effect/map_effect/map_helper/mark_good,
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
 "Lt" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/template_noop)
-"Lv" = (
-/obj/structure/bed/stool/chair/sofa/left/red,
-/obj/item/device/radio/intercom/north,
-/turf/simulated/floor/lino,
-/area/template_noop)
-"Lw" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 1
-	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 4
-	},
-/obj/structure/bed/stool/chair/office/dark{
-	dir = 4
-	},
-/obj/machinery/alarm/west,
-/turf/simulated/floor/wood,
-/area/template_noop)
-"LG" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "6,23"
-	},
-/area/template_noop)
-"LH" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
-	dir = 9
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/effect/floor_decal/corner/dark_blue{
-	dir = 6
-	},
-/obj/structure/bed/handrail{
-	dir = 8
-	},
-/obj/structure/table/rack,
-/obj/item/hoist_kit,
-/obj/item/device/multitool,
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"Mc" = (
-/obj/item/device/gps/stationary/sccv_intrepid{
-	pixel_x = 3;
-	pixel_y = 24
-	},
-/obj/effect/floor_decal/industrial/warning/corner{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/floor_decal/corner/lime/diagonal,
-/obj/effect/floor_decal/spline/plain{
-	dir = 8
-	},
-/obj/machinery/camera/network/intrepid{
-	c_tag = "Intrepid - Medbay"
-	},
-/obj/structure/bedsheetbin,
-/obj/structure/table/standard,
-/turf/simulated/floor/tiled/white,
-/area/template_noop)
-"Md" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "10,1"
-	},
-/turf/template_noop,
-/area/template_noop)
-"Mp" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/fuel,
-/obj/effect/floor_decal/industrial/outline/engineering,
-/obj/machinery/atmospherics/binary/pump{
-	name = "Air Reserve to Airlock Cycling"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Mq" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/effect/floor_decal/corner/dark_blue{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"Mv" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "7,8"
-	},
-/area/template_noop)
-"Mz" = (
-/obj/structure/lattice/catwalk/indoor,
-/obj/machinery/camera/network/intrepid{
-	c_tag = "Intrepid - Engine Compartment";
-	dir = 1
-	},
-/obj/machinery/recharge_station,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"MM" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "11,3";
-	outside_part = 0
-	},
-/obj/structure/window/shuttle/unique/scc/research/over{
-	density = 0;
-	icon_state = "4,1"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"MO" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "8,1"
-	},
-/turf/template_noop,
-/area/template_noop)
-"Ng" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 4
-	},
-/obj/machinery/power/terminal{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/structure/bed/handrail{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Nn" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "11,24"
-	},
-/area/template_noop)
-"NF" = (
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/red,
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "11,17"
-	},
-/area/template_noop)
-"Og" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "4,20"
-	},
-/area/template_noop)
-"On" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/structure/closet/walllocker/emerglocker/west,
-/obj/effect/floor_decal/corner/dark_blue/diagonal,
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"Oq" = (
-/obj/structure/lattice/catwalk/indoor,
-/obj/machinery/portable_atmospherics/powered/pump/filled,
-/obj/machinery/light/small/red{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Ot" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "16,11"
-	},
-/turf/template_noop,
-/area/template_noop)
-"OQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
-	dir = 5
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"OT" = (
-/obj/structure/shuttle_part/scc/research{
-	density = 0;
-	icon_state = "14,11";
-	layer = 2.6;
-	outside_part = 0
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 8
-	},
-/obj/structure/sink/kitchen{
-	dir = 8;
-	name = "sink";
-	pixel_x = 21
-	},
-/turf/simulated/floor/lino,
-/area/template_noop)
 "Pb" = (
 /obj/effect/floor_decal/industrial/hatch/red,
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
-"Px" = (
-/obj/structure/window/shuttle/unique/scc/tall{
-	icon_state = "long2-1"
-	},
-/obj/machinery/door/firedoor,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/landmark/entry_point/port{
-	name = "port, medbay"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Py" = (
-/obj/machinery/door/airlock/command{
-	dir = 4;
-	name = "Crew Quarters and Office"
-	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/wood,
-/area/template_noop)
-"PA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/obj/structure/cable/green{
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/effect/floor_decal/corner/dark_blue/diagonal,
-/obj/structure/extinguisher_cabinet/east,
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"PP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	d2 = 2;
-	icon_state = "0-2"
-	},
-/obj/effect/floor_decal/corner/yellow{
-	dir = 6
-	},
-/obj/effect/floor_decal/industrial/outline/engineering,
-/obj/machinery/cell_charger,
-/obj/structure/table/reinforced,
-/obj/random/powercell,
-/obj/random/powercell,
-/obj/machinery/power/apc/intrepid/north,
-/turf/simulated/floor/carpet/rubber,
-/area/template_noop)
-"PV" = (
-/obj/structure/shuttle_part/scc/research{
-	density = 0;
-	icon_state = "10,4";
-	outside_part = 0
-	},
-/obj/structure/window/shuttle/unique/scc/research/over{
-	density = 0;
-	icon_state = "3,2"
-	},
-/obj/effect/floor_decal/corner/dark_blue{
-	dir = 9
-	},
-/obj/machinery/computer/shuttle_control/explore/intrepid,
-/obj/structure/table/reinforced,
-/turf/simulated/floor/tiled/dark,
-/area/template_noop)
 "Qa" = (
 /obj/machinery/atmospherics/unary/vent_pump{
 	dir = 4
 	},
 /turf/simulated/floor/plating,
 /area/template_noop)
-"Qm" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/blast/shutters/open{
-	dir = 2;
-	id = "intrepid_inner";
-	name = "Intrepid Shutter"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/effect/floor_decal/spline/plain/corner,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Qz" = (
-/obj/effect/floor_decal/industrial/outline/red,
-/obj/machinery/door/blast/shutters/open{
-	dir = 8;
-	id = "intrepid_outer";
-	name = "Intrepid Shutter"
-	},
-/obj/structure/lattice/catwalk/indoor,
-/obj/structure/bed/handrail{
-	dir = 8
-	},
-/obj/item/hullbeacon/red,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"QF" = (
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel,
-/obj/machinery/meter{
-	name = "Fuel Reserve";
-	pixel_x = 7;
-	pixel_y = 10
-	},
-/obj/structure/cable/green{
-	icon_state = "1-8"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"QI" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "6,6";
-	outside_part = 0
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"QR" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "1,22";
-	opacity = 1
-	},
-/turf/template_noop,
-/area/template_noop)
-"QT" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "2,22";
-	opacity = 1;
-	outside_part = 0
-	},
-/obj/machinery/atmospherics/unary/engine/scc_shuttle,
-/turf/template_noop,
-/area/template_noop)
 "Rh" = (
 /obj/effect/floor_decal/industrial/hatch/red,
 /obj/effect/map_effect/map_helper/ruler_tiles_3,
 /turf/simulated/floor/tiled/dark/full,
 /area/template_noop)
-"Rl" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "16,16"
-	},
-/area/template_noop)
-"Rp" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"RE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/aux,
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"RN" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "11,22"
-	},
-/area/template_noop)
-"RO" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "7,20"
-	},
-/area/template_noop)
-"RP" = (
-/obj/structure/bed/handrail{
-	dir = 4
-	},
-/obj/machinery/camera/network/intrepid{
-	c_tag = "Intrepid - Airlock Aft";
-	dir = 4
-	},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 1;
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_pump_out_internal";
-	layer = 2.8
-	},
-/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"RX" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "6,4";
-	layer = 2.97;
-	outside_part = 0
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Sg" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "2,16"
-	},
-/area/template_noop)
-"Sh" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/effect/floor_decal/spline/plain{
-	dir = 4
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/template_noop)
 "Si" = (
 /obj/effect/floor_decal/industrial/hatch/red,
 /obj/effect/map_effect/map_helper/ruler_tiles_3{
@@ -3164,141 +201,6 @@
 	},
 /turf/template_noop,
 /area/template_noop)
-"Sl" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
-	},
-/obj/machinery/firealarm/north{
-	pixel_x = -20
-	},
-/obj/effect/floor_decal/corner/lime/diagonal,
-/obj/item/reagent_containers/blood/OMinus,
-/obj/item/reagent_containers/blood/OMinus,
-/obj/item/reagent_containers/blood/OMinus,
-/obj/machinery/light/small{
-	dir = 1
-	},
-/obj/structure/closet/walllocker/medical{
-	name = "Blood Locker";
-	pixel_y = 32
-	},
-/turf/simulated/floor/tiled/white,
-/area/template_noop)
-"So" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "9,10"
-	},
-/area/template_noop)
-"Sp" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "17,22"
-	},
-/turf/template_noop,
-/area/template_noop)
-"Sy" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "11,23"
-	},
-/area/template_noop)
-"SF" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 8
-	},
-/obj/effect/floor_decal/spline/plain{
-	dir = 8
-	},
-/turf/simulated/floor/lino,
-/area/template_noop)
-"SK" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "16,12"
-	},
-/turf/template_noop,
-/area/template_noop)
-"SM" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"Tb" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "4,8"
-	},
-/turf/template_noop,
-/area/template_noop)
-"Tk" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/atmospherics/binary/pump/fuel{
-	dir = 1;
-	name = "Fuel Tank to Thrusters"
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/camera/network/intrepid{
-	c_tag = "Intrepid - Atmos Compartment";
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"TB" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
-	},
-/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp{
-	pixel_y = 4
-	},
-/turf/simulated/floor/wood,
-/area/template_noop)
-"TF" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "14,22"
-	},
-/area/template_noop)
-"TM" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 10
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/effect/floor_decal/corner/blue{
-	dir = 10
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/template_noop)
-"TN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"TW" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "11,26";
-	layer = 2.91;
-	opacity = 1;
-	outside_part = 0
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Us" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"UD" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "6,8"
-	},
-/area/template_noop)
 "UG" = (
 /obj/effect/shuttle_landmark{
 	dir = 8
@@ -3306,286 +208,9 @@
 /obj/effect/floor_decal/industrial/hatch/red,
 /turf/template_noop,
 /area/template_noop)
-"UL" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "4,10"
-	},
-/area/template_noop)
-"Vg" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/dark_blue/diagonal,
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"Vj" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "2,12"
-	},
-/turf/template_noop,
-/area/template_noop)
-"VA" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "10,3";
-	outside_part = 0
-	},
-/obj/structure/window/shuttle/unique/scc/research/over{
-	icon_state = "3,1"
-	},
-/obj/effect/floor_decal/corner/dark_blue{
-	dir = 1
-	},
-/obj/machinery/door/firedoor,
-/obj/structure/table/reinforced,
-/turf/simulated/floor/tiled/dark,
-/area/template_noop)
-"VG" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/machinery/bluespace_beacon,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/template_noop)
-"VX" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "12,23"
-	},
-/area/template_noop)
-"Wh" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "15,26";
-	outside_part = 0
-	},
-/turf/template_noop,
-/area/template_noop)
-"Wu" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 1;
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_pump_out_internal";
-	layer = 2.8
-	},
-/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Ww" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/structure/lattice/catwalk/indoor,
-/obj/structure/cable/green{
-	d2 = 2;
-	icon_state = "0-2"
-	},
-/obj/structure/bed/handrail{
-	dir = 4
-	},
-/obj/machinery/alarm/west,
-/obj/machinery/power/apc/intrepid/east,
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Wx" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/machinery/atmospherics/pipe/simple/hidden/green{
-	dir = 8
-	},
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"Wz" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/structure/toilet{
-	dir = 8
-	},
-/obj/structure/sink{
-	layer = 3;
-	pixel_x = -7;
-	pixel_y = 23
-	},
-/obj/structure/mirror{
-	pixel_x = -7;
-	pixel_y = 32
-	},
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/freezer,
-/area/template_noop)
-"Xa" = (
-/obj/machinery/atmospherics/binary/pump/fuel{
-	dir = 8;
-	name = "External Ports to Fuel Tank"
-	},
-/obj/effect/floor_decal/industrial/outline/engineering,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Xf" = (
-/obj/effect/floor_decal/corner/dark_blue{
-	dir = 6
-	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 4
-	},
-/obj/item/device/binoculars/high_power{
-	pixel_x = -2;
-	pixel_y = -4
-	},
-/obj/structure/table/reinforced,
-/obj/item/paper_bin{
-	pixel_x = 4;
-	pixel_y = 2
-	},
-/obj/item/pen{
-	pixel_x = 4;
-	pixel_y = 2
-	},
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/machinery/recharger{
-	pixel_x = -8;
-	pixel_y = 6
-	},
-/obj/machinery/alarm/north,
-/turf/simulated/floor/tiled/dark,
-/area/template_noop)
-"Xt" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "11,7"
-	},
-/area/template_noop)
-"Xw" = (
-/obj/structure/window/shuttle/unique/scc/research/over{
-	density = 0;
-	icon_state = "3,3"
-	},
-/obj/structure/bed/stool/chair/office/bridge{
-	dir = 4
-	},
-/obj/machinery/computer/ship/engines/cockpit{
-	layer = 3;
-	pixel_x = 24;
-	pixel_y = 7
-	},
-/obj/effect/floor_decal/corner/dark_blue{
-	dir = 9
-	},
-/turf/simulated/floor/tiled/dark,
-/area/template_noop)
-"Xy" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/hatch{
-	dir = 1;
-	name = "Thruster Compartment";
-	req_access = list(73)
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"XJ" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "16,9"
-	},
-/turf/template_noop,
-/area/template_noop)
-"XS" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/lime/diagonal,
-/obj/effect/floor_decal/spline/plain{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/white,
-/area/template_noop)
-"Ym" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "14,8"
-	},
-/turf/template_noop,
-/area/template_noop)
-"Yr" = (
-/obj/structure/shuttle_part/scc/research{
-	icon_state = "15,12";
-	outside_part = 0
-	},
-/obj/structure/window/shuttle/unique/scc/tall{
-	icon_state = "short2_top";
-	layer = 3
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"Yy" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "2,20"
-	},
-/area/template_noop)
-"Yz" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/obj/structure/cable/green{
-	icon_state = "1-4"
-	},
-/turf/simulated/floor/wood,
-/area/template_noop)
 "YK" = (
 /turf/simulated/floor/plating,
 /area/template_noop)
-"YY" = (
-/obj/machinery/meter{
-	name = "Air Reserve"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	icon_state = "1-8"
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
-"YZ" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "11,25"
-	},
-/area/template_noop)
-"Zh" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 4
-	},
-/obj/machinery/alarm/north,
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
-"Zi" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/dark_blue{
-	dir = 6
-	},
-/obj/structure/bed/handrail{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
 "ZA" = (
 /obj/effect/floor_decal/industrial/hatch/red,
 /obj/effect/shuttle_landmark{
@@ -3593,28 +218,6 @@
 	},
 /turf/template_noop,
 /area/template_noop)
-"ZL" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "16,20"
-	},
-/area/template_noop)
-"ZM" = (
-/obj/structure/shuttle_part/scc/research{
-	density = 0;
-	icon_state = "8,0"
-	},
-/turf/template_noop,
-/area/template_noop)
-"ZS" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal{
-	dir = 4
-	},
-/obj/effect/floor_decal/industrial/warning/corner{
-	dir = 8
-	},
-/obj/machinery/light/small,
-/turf/simulated/floor/tiled/dark/full,
-/area/template_noop)
 
 (1,1,1) = {"
 DW
@@ -8885,42 +5488,42 @@ DW
 DW
 DW
 DW
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -9037,7 +5640,6 @@ DW
 DW
 DW
 DW
-nd
 DW
 DW
 DW
@@ -9072,7 +5674,8 @@ DW
 DW
 DW
 DW
-nd
+DW
+DW
 DW
 DW
 DW
@@ -9189,42 +5792,42 @@ DW
 DW
 DW
 DW
-nd
 DW
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -9341,9 +5944,6 @@ DW
 DW
 DW
 DW
-nd
-DW
-IL
 DW
 DW
 DW
@@ -9374,9 +5974,12 @@ DW
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -9493,9 +6096,6 @@ DW
 DW
 DW
 DW
-nd
-DW
-bk
 DW
 DW
 DW
@@ -9526,9 +6126,12 @@ DW
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -9645,17 +6248,6 @@ DW
 DW
 DW
 DW
-nd
-DW
-IL
-DW
-DW
-DW
-DW
-QR
-iJ
-uB
-vR
 DW
 DW
 DW
@@ -9678,9 +6270,20 @@ DW
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -9797,27 +6400,6 @@ DW
 DW
 DW
 DW
-nd
-DW
-IL
-DW
-DW
-DW
-DW
-QT
-Eb
-Yy
-Bx
-If
-jb
-Sg
-Qz
-Ei
-AT
-Vj
-HV
-uR
-kX
 DW
 DW
 DW
@@ -9830,9 +6412,30 @@ DW
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -9949,27 +6552,6 @@ DW
 DW
 DW
 DW
-nd
-DW
-bk
-oq
-tX
-hA
-qa
-fB
-FO
-Og
-CH
-hm
-vX
-Hu
-ny
-xC
-HD
-GG
-jP
-oz
-GK
 DW
 DW
 DW
@@ -9982,9 +6564,30 @@ DW
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -10101,29 +6704,6 @@ DW
 DW
 DW
 DW
-nd
-DW
-IL
-cA
-Oq
-zq
-Du
-zZ
-Hc
-pR
-YY
-HT
-nT
-qN
-pD
-Fs
-xf
-KG
-lr
-UL
-ta
-Tb
-Bo
 DW
 DW
 DW
@@ -10134,9 +6714,32 @@ DW
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -10253,42 +6856,42 @@ DW
 DW
 DW
 DW
-nd
-DW
-IL
-In
-TN
-JP
-tE
-cG
-QF
-Tk
-sf
-Mp
-Rp
-pA
-Kc
-gF
-nj
-wP
-mo
-Lw
-TB
-dx
-vY
-DW
-ES
-xm
-Ey
 DW
 DW
 DW
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -10405,42 +7008,42 @@ DW
 DW
 DW
 DW
-nd
-DW
-bk
-vL
-iq
-GA
-LG
-Fk
-Ng
-nP
-vi
-ix
-BD
-jf
-xG
-TM
-uY
-jA
-dt
-pC
-Yz
-UD
-io
-QI
-xc
-RX
-jg
 DW
 DW
 DW
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -10557,42 +7160,42 @@ DW
 DW
 DW
 DW
-nd
-DW
-IL
-eJ
-ha
-KV
-tl
-oG
-iT
-RO
-ak
-ol
-pE
-tO
-PP
-mC
-nj
-mu
-cL
-eH
-Py
-Mv
-wA
-bM
-tW
-aY
-FE
-De
 DW
 DW
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -10709,42 +7312,42 @@ DW
 DW
 DW
 DW
-nd
-DW
-IL
-wD
-JA
-RP
-uU
-bN
-CO
-id
-Jj
-Io
-Og
-zU
-tc
-Xa
-nj
-ah
-Ar
-Db
-Dy
-bO
-KZ
-Xf
-GC
-yv
-fm
-kp
-MO
-ZM
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -10861,42 +7464,42 @@ DW
 DW
 DW
 DW
-nd
-DW
-od
-dC
-NF
-Wu
-zt
-sA
-DE
-OQ
-Ld
-Wx
-DB
-Fe
-VG
-kn
-nD
-gx
-Bq
-So
-bz
-KN
-pm
-tT
-Hi
-iX
-GE
-Go
-tU
-Ej
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -11013,42 +7616,42 @@ DW
 DW
 DW
 DW
-nd
-DW
-IL
-tP
-lE
-ug
-pO
-gC
-vb
-JO
-Us
-ew
-Qm
-Sh
-aT
-GP
-BF
-aB
-On
-rB
-PA
-so
-ng
-uX
-Xw
-PV
-VA
-dQ
-Md
-ku
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -11165,42 +7768,42 @@ DW
 DW
 DW
 DW
-nd
-DW
-bk
-TW
-YZ
-Nn
-Sy
-RN
-Cr
-gi
-SM
-ZS
-CB
-Mc
-XS
-iw
-jl
-gZ
-SF
-eH
-gx
-Fb
-Xt
-xh
-Kh
-zO
-MM
-JS
 DW
 DW
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -11317,42 +7920,42 @@ DW
 DW
 DW
 DW
-nd
-DW
-IL
-aU
-Mz
-sG
-VX
-Jt
-RE
-LH
-Mq
-Zi
-hg
-HS
-lR
-Gv
-nj
-Lv
-BW
-oI
-gh
-AA
-IT
-qp
-FG
-lb
-vc
 DW
 DW
 DW
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -11469,42 +8072,42 @@ DW
 DW
 DW
 DW
-nd
-DW
-IL
-rt
-TN
-Ww
-Xy
-ri
-rw
-El
-so
-un
-jl
-Eu
-kt
-pT
-mh
-bV
-BW
-nj
-Wz
-qn
-kk
-DW
-jK
-jx
-Bm
 DW
 DW
 DW
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -11621,29 +8224,6 @@ DW
 DW
 DW
 DW
-nd
-DW
-bk
-Eg
-DC
-jd
-FV
-TF
-Zh
-cc
-mg
-eQ
-mh
-Sl
-Fm
-xb
-yk
-dW
-OT
-nO
-iP
-Ym
-ay
 DW
 DW
 DW
@@ -11654,9 +8234,32 @@ DW
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -11773,27 +8376,6 @@ DW
 DW
 DW
 DW
-nd
-DW
-IL
-Wh
-ad
-zL
-aq
-rc
-gp
-gS
-Vg
-bI
-RO
-gx
-vz
-Px
-uM
-Yr
-ft
-ms
-Do
 DW
 DW
 DW
@@ -11806,9 +8388,30 @@ DW
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -11925,27 +8528,6 @@ DW
 DW
 DW
 DW
-nd
-DW
-IL
-DW
-DW
-DW
-DW
-oO
-FQ
-ZL
-bL
-wc
-cl
-Rl
-bS
-bf
-CJ
-SK
-Ot
-DZ
-XJ
 DW
 DW
 DW
@@ -11958,9 +8540,30 @@ DW
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -12077,17 +8680,6 @@ DW
 DW
 DW
 DW
-nd
-DW
-bk
-DW
-DW
-DW
-DW
-Sp
-nb
-dw
-uw
 DW
 DW
 DW
@@ -12110,9 +8702,20 @@ DW
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -12229,9 +8832,6 @@ DW
 DW
 DW
 DW
-nd
-DW
-IL
 DW
 DW
 DW
@@ -12262,9 +8862,12 @@ DW
 DW
 DW
 DW
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -12381,42 +8984,42 @@ DW
 DW
 DW
 DW
-nd
 DW
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
 DW
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
@@ -12533,7 +9136,6 @@ DW
 DW
 DW
 DW
-nd
 DW
 DW
 DW
@@ -12568,7 +9170,8 @@ DW
 DW
 DW
 DW
-nd
+DW
+DW
 DW
 DW
 DW
@@ -12685,42 +9288,42 @@ DW
 DW
 DW
 DW
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
-nd
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
+DW
 DW
 DW
 DW
diff --git a/maps/sccv_horizon/code/_sccv_horizon_shuttle_landmarks.dm b/maps/sccv_horizon/code/_sccv_horizon_shuttle_landmarks.dm
index 8cf3f8eb4e2..89d04205113 100644
--- a/maps/sccv_horizon/code/_sccv_horizon_shuttle_landmarks.dm
+++ b/maps/sccv_horizon/code/_sccv_horizon_shuttle_landmarks.dm
@@ -27,43 +27,42 @@
 /obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_1
 	name = "Third Deck Starboard Dock 1"
 	landmark_tag = "nav_horizon_dock_deck_3_starboard_1"
-	docking_controller = "nuke_shuttle_dock_airlock"
+	docking_controller = "airlock_horizon_dock_deck_3_starboard_1"
 	base_turf = /turf/simulated/floor/reinforced/airless
 	base_area = /area/space
 
-
 /obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_2
 	name = "Third Deck Starboard Dock 2"
 	landmark_tag = "nav_horizon_dock_deck_3_starboard_2"
-	docking_controller = "dock_horizon_1_airlock"
+	docking_controller = "airlock_horizon_dock_deck_3_starboard_2"
 	base_turf = /turf/simulated/floor/reinforced/airless
 	base_area = /area/space
 
 /obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_3
 	name = "Third Deck Starboard Dock 3"
 	landmark_tag = "nav_horizon_dock_deck_3_starboard_3"
-	docking_controller = "dock_horizon_3_airlock"
+	docking_controller = "airlock_horizon_dock_deck_3_starboard_3"
 	base_turf = /turf/simulated/floor/reinforced/airless
 	base_area = /area/space
 
 /obj/effect/shuttle_landmark/horizon/dock/deck_3/port_1
 	name = "Third Deck Port Dock 1"
 	landmark_tag = "nav_horizon_dock_deck_3_port_2"
-	docking_controller = "green_dock_aft_airlock"
+	docking_controller = "airlock_horizon_dock_deck_3_port_2"
 	base_turf = /turf/simulated/floor/reinforced/airless
 	base_area = /area/space
 
 /obj/effect/shuttle_landmark/horizon/dock/deck_3/port_2
 	name = "Third Deck Port Dock 2"
 	landmark_tag = "nav_horizon_dock_deck_3_port_4"
-	docking_controller = "dock_horizon_4_airlock"
+	docking_controller = "airlock_horizon_dock_deck_3_port_4"
 	base_turf = /turf/simulated/floor/reinforced/airless
 	base_area = /area/space
 
 /obj/effect/shuttle_landmark/horizon/dock/deck_3/port_3
 	name = "Third Deck Port Dock 3"
 	landmark_tag = "nav_horizon_dock_deck_3_port_5"
-	docking_controller = "specops_dock_airlock"
+	docking_controller = "airlock_horizon_dock_deck_3_port_5"
 	base_turf = /turf/simulated/floor/reinforced/airless
 	base_area = /area/space
 
diff --git a/maps/sccv_horizon/code/sccv_horizon_shuttles.dm b/maps/sccv_horizon/code/sccv_horizon_shuttles.dm
index 14126769b9b..8012906fde1 100644
--- a/maps/sccv_horizon/code/sccv_horizon_shuttles.dm
+++ b/maps/sccv_horizon/code/sccv_horizon_shuttles.dm
@@ -109,7 +109,7 @@
 	name = "Intrepid"
 	move_time = 20
 	shuttle_area = list(/area/shuttle/intrepid/crew_compartment, /area/shuttle/intrepid/cargo_bay, /area/shuttle/intrepid/engine_compartment, /area/shuttle/intrepid/atmos_compartment, /area/shuttle/intrepid/cockpit, /area/shuttle/intrepid/quarters)
-	dock_target = "intrepid_shuttle"
+	dock_target = "airlock_shuttle_intrepid"
 	current_location = "nav_hangar_intrepid"
 	landmark_transition = "nav_transit_intrepid"
 	range = 2
@@ -157,7 +157,7 @@
 	name = "Spark"
 	move_time = 20
 	shuttle_area = /area/shuttle/mining
-	dock_target = "mining_shuttle_controller"
+	dock_target = "airlock_shuttle_spark"
 	current_location = "nav_hangar_mining"
 	landmark_transition = "nav_transit_mining"
 	range = 1
diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
index bce79c5a2f4..270ee5e1c71 100644
--- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
+++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
@@ -2352,7 +2352,7 @@
 /obj/machinery/embedded_controller/radio/simple_docking_controller{
 	dir = 8;
 	frequency = 1386;
-	id_tag = "canary";
+	id_tag = "canary_dock";
 	name = "\improper Canary docking port controller";
 	pixel_x = 22;
 	pixel_y = -19;
@@ -2812,20 +2812,20 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/aux,
 /obj/machinery/access_button{
-	command = "cycle_interior";
-	frequency = 1380;
-	master_tag = "mining_shuttle_controller";
-	name = "interior access button";
 	pixel_x = -25;
-	pixel_y = 20;
-	req_one_access = list(31,48,67)
+	pixel_y = 20
 	},
 /obj/machinery/airlock_sensor/airlock_interior{
-	frequency = 1380;
-	id_tag = "mining_shuttle_interior_sensor";
 	pixel_x = -25;
 	pixel_y = 27
 	},
+/obj/effect/map_effect/marker/airlock/shuttle{
+	master_tag = "airlock_shuttle_spark";
+	name = "airlock_shuttle_spark";
+	shuttle_tag = "Spark";
+	req_one_access = list(31,48,67)
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/mining)
 "bZR" = (
@@ -4520,13 +4520,19 @@
 	},
 /area/engineering/atmos/propulsion)
 "dir" = (
+/obj/structure/lattice/catwalk/indoor,
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 1;
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_pump_out_internal";
 	layer = 2.8
 	},
-/obj/structure/lattice/catwalk/indoor,
+/obj/effect/map_effect/marker/airlock/shuttle{
+	cycle_to_external_air = 1;
+	master_tag = "airlock_shuttle_intrepid";
+	name = "airlock_shuttle_intrepid";
+	shuttle_tag = "Intrepid";
+	req_one_access = null
+	},
+/obj/effect/map_effect/marker_helper/airlock/out,
 /turf/simulated/floor/plating,
 /area/shuttle/intrepid/cargo_bay)
 "diJ" = (
@@ -6987,10 +6993,7 @@
 "eTV" = (
 /obj/machinery/door/airlock/external{
 	dir = 1;
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "mining_shuttle_external";
-	req_access = list(13)
+	icon_state = "door_locked"
 	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -6998,16 +7001,18 @@
 /obj/effect/landmark/entry_point/aft{
 	name = "aft, airlock"
 	},
-/obj/machinery/access_button{
-	command = "cycle_exterior";
-	dir = 1;
-	frequency = 1380;
-	master_tag = "mining_shuttle_controller";
-	name = "exterior access button";
-	pixel_x = -21;
-	pixel_y = 11;
+/obj/effect/map_effect/marker/airlock/shuttle{
+	master_tag = "airlock_shuttle_spark";
+	name = "airlock_shuttle_spark";
+	shuttle_tag = "Spark";
 	req_one_access = list(31,48,67)
 	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/machinery/access_button{
+	pixel_x = 28;
+	pixel_y = 12;
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/mining)
 "eVk" = (
@@ -7308,6 +7313,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+	dir = 5
+	},
 /turf/simulated/wall/shuttle/unique/scc/research{
 	icon_state = "11,17"
 	},
@@ -8076,9 +8084,6 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/red{
-	dir = 5
-	},
 /turf/simulated/floor/reinforced{
 	blocks_air = 1;
 	density = 1;
@@ -8796,24 +8801,16 @@
 /area/shuttle/mining)
 "fZQ" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_pump_out_external";
 	layer = 2.8
 	},
 /obj/machinery/access_button{
-	command = "cycle_exterior";
 	dir = 4;
-	frequency = 1385;
 	layer = 3.1;
-	master_tag = "intrepid_shuttle_cargo";
-	name = "exterior access button";
 	pixel_x = -22;
 	pixel_y = 2
 	},
 /obj/machinery/airlock_sensor/airlock_exterior{
 	dir = 4;
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_exterior_sensor";
 	pixel_x = -21;
 	pixel_y = 10
 	},
@@ -8826,6 +8823,14 @@
 	id = "intrepid_bay_outer";
 	name = "Intrepid Shutter"
 	},
+/obj/effect/map_effect/marker/airlock/shuttle{
+	cycle_to_external_air = 1;
+	master_tag = "airlock_shuttle_intrepid";
+	name = "airlock_shuttle_intrepid";
+	shuttle_tag = "Intrepid";
+	req_one_access = null
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
 /turf/simulated/floor/plating,
 /area/shuttle/intrepid/cargo_bay)
 "fZX" = (
@@ -12251,16 +12256,10 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/access_button{
-	command = "cycle_interior";
-	frequency = 1385;
-	master_tag = "intrepid_shuttle_cargo";
-	name = "interior access button";
 	pixel_x = -5;
 	pixel_y = 20
 	},
 /obj/machinery/airlock_sensor/airlock_interior{
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_interior_sensor";
 	pixel_x = -5;
 	pixel_y = 25
 	},
@@ -12271,6 +12270,14 @@
 	pixel_x = 7;
 	pixel_y = 25
 	},
+/obj/effect/map_effect/marker/airlock/shuttle{
+	cycle_to_external_air = 1;
+	master_tag = "airlock_shuttle_intrepid";
+	name = "airlock_shuttle_intrepid";
+	shuttle_tag = "Intrepid";
+	req_one_access = null
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
 /turf/simulated/floor/tiled/dark/full,
 /area/shuttle/intrepid/cargo_bay)
 "iDk" = (
@@ -12949,6 +12956,16 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+	dir = 1;
+	frequency = 1380;
+	id_tag = "mining_shuttle_dock";
+	name = "\improper Spark docking port controller";
+	pixel_x = 6;
+	pixel_y = -19;
+	req_one_access = list(31,48,67);
+	tag_door = "mining_shuttle_dock_doors"
+	},
 /turf/simulated/floor/tiled,
 /area/hangar/operations)
 "jbR" = (
@@ -14270,10 +14287,16 @@
 	},
 /obj/machinery/door/airlock/external{
 	dir = 1;
-	frequency = 1385;
-	icon_state = "door_locked";
-	id_tag = "intrepid_shuttle_cargo_out"
+	icon_state = "door_locked"
 	},
+/obj/effect/map_effect/marker/airlock/shuttle{
+	cycle_to_external_air = 1;
+	master_tag = "airlock_shuttle_intrepid";
+	name = "airlock_shuttle_intrepid";
+	shuttle_tag = "Intrepid";
+	req_one_access = null
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
 /turf/simulated/floor/plating,
 /area/shuttle/intrepid/cargo_bay)
 "jYy" = (
@@ -14572,13 +14595,19 @@
 	c_tag = "Intrepid - Airlock Aft";
 	dir = 4
 	},
+/obj/structure/lattice/catwalk/indoor,
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 1;
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_pump_out_internal";
 	layer = 2.8
 	},
-/obj/structure/lattice/catwalk/indoor,
+/obj/effect/map_effect/marker/airlock/shuttle{
+	cycle_to_external_air = 1;
+	master_tag = "airlock_shuttle_intrepid";
+	name = "airlock_shuttle_intrepid";
+	shuttle_tag = "Intrepid";
+	req_one_access = null
+	},
+/obj/effect/map_effect/marker_helper/airlock/out,
 /turf/simulated/floor/plating,
 /area/shuttle/intrepid/cargo_bay)
 "kkS" = (
@@ -14960,8 +14989,6 @@
 /area/horizon/custodial/disposals)
 "kxk" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_pump_out_external";
 	layer = 2.8
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
@@ -14974,6 +15001,14 @@
 	name = "Intrepid Shutter"
 	},
 /obj/item/device/radio/intercom/expedition/east,
+/obj/effect/map_effect/marker/airlock/shuttle{
+	cycle_to_external_air = 1;
+	master_tag = "airlock_shuttle_intrepid";
+	name = "airlock_shuttle_intrepid";
+	shuttle_tag = "Intrepid";
+	req_one_access = null
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
 /turf/simulated/floor/plating,
 /area/shuttle/intrepid/cargo_bay)
 "kyq" = (
@@ -15695,8 +15730,14 @@
 /turf/simulated/floor/plating,
 /area/maintenance/engineering)
 "kVu" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
-	dir = 5
+/obj/effect/map_effect/marker/airlock/shuttle{
+	master_tag = "airlock_shuttle_spark";
+	name = "airlock_shuttle_spark";
+	shuttle_tag = "Spark";
+	req_one_access = list(31,48,67)
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/aux{
+	dir = 8
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/mining)
@@ -17921,10 +17962,16 @@
 	},
 /obj/machinery/door/airlock/external{
 	dir = 1;
-	frequency = 1385;
-	icon_state = "door_locked";
-	id_tag = "intrepid_shuttle_cargo_in"
+	icon_state = "door_locked"
 	},
+/obj/effect/map_effect/marker/airlock/shuttle{
+	cycle_to_external_air = 1;
+	master_tag = "airlock_shuttle_intrepid";
+	name = "airlock_shuttle_intrepid";
+	shuttle_tag = "Intrepid";
+	req_one_access = null
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
 /turf/simulated/floor/plating,
 /area/shuttle/intrepid/cargo_bay)
 "mxq" = (
@@ -19397,8 +19444,6 @@
 /area/hangar/control)
 "nvn" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_pump_out_external";
 	layer = 2.8
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
@@ -19407,6 +19452,14 @@
 	id = "intrepid_bay_outer";
 	name = "Intrepid Shutter"
 	},
+/obj/effect/map_effect/marker/airlock/shuttle{
+	cycle_to_external_air = 1;
+	master_tag = "airlock_shuttle_intrepid";
+	name = "airlock_shuttle_intrepid";
+	shuttle_tag = "Intrepid";
+	req_one_access = null
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
 /turf/simulated/floor/plating,
 /area/shuttle/intrepid/cargo_bay)
 "nvV" = (
@@ -19494,10 +19547,16 @@
 	},
 /obj/machinery/door/airlock/external{
 	dir = 1;
-	frequency = 1385;
-	icon_state = "door_locked";
-	id_tag = "intrepid_shuttle_cargo_in"
+	icon_state = "door_locked"
 	},
+/obj/effect/map_effect/marker/airlock/shuttle{
+	cycle_to_external_air = 1;
+	master_tag = "airlock_shuttle_intrepid";
+	name = "airlock_shuttle_intrepid";
+	shuttle_tag = "Intrepid";
+	req_one_access = null
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
 /turf/simulated/floor/plating,
 /area/shuttle/intrepid/cargo_bay)
 "nyl" = (
@@ -19615,9 +19674,6 @@
 	},
 /area/shuttle/intrepid/engine_compartment)
 "nBA" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	name = "Spark scrubber vent"
-	},
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
@@ -19744,9 +19800,23 @@
 /turf/simulated/floor/plating,
 /area/engineering/drone_fabrication)
 "nIP" = (
-/turf/simulated/wall/shuttle/unique/scc/research{
-	icon_state = "11,17"
+/obj/machinery/access_button{
+	dir = 1;
+	pixel_x = -28;
+	pixel_y = 11
 	},
+/obj/machinery/door/airlock/external{
+	dir = 1;
+	icon_state = "door_locked"
+	},
+/obj/effect/map_effect/marker/airlock/shuttle{
+	master_tag = "airlock_shuttle_spark";
+	name = "airlock_shuttle_spark";
+	shuttle_tag = "Spark";
+	req_one_access = list(31,48,67)
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/turf/simulated/floor/plating,
 /area/shuttle/mining)
 "nJB" = (
 /turf/simulated/wall/shuttle/unique/scc/research{
@@ -22876,12 +22946,17 @@
 /turf/simulated/floor/reinforced/phoron,
 /area/engineering/atmos)
 "pTp" = (
+/obj/structure/lattice/catwalk/indoor,
 /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_pump";
 	layer = 2.8
 	},
-/obj/structure/lattice/catwalk/indoor,
+/obj/effect/map_effect/marker/airlock/shuttle{
+	cycle_to_external_air = 1;
+	master_tag = "airlock_shuttle_intrepid";
+	name = "airlock_shuttle_intrepid";
+	shuttle_tag = "Intrepid";
+	req_one_access = null
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/intrepid/cargo_bay)
 "pTw" = (
@@ -25322,20 +25397,16 @@
 /turf/simulated/floor/reinforced,
 /area/rnd/isolation_c)
 "rBI" = (
-/obj/effect/floor_decal/corner/brown{
-	dir = 10
-	},
-/obj/machinery/embedded_controller/radio/simple_docking_controller{
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/door/airlock/external{
 	dir = 1;
 	frequency = 1380;
-	id_tag = "mining_shuttle_dock";
-	name = "\improper Spark docking port controller";
-	pixel_x = 6;
-	pixel_y = -25;
-	req_one_access = list(31,48,67);
-	tag_door = "mining_shuttle_dock_doors"
+	icon_state = "door_locked";
+	id_tag = "mining_shuttle_dock_doors";
+	req_access = list(13)
 	},
-/turf/simulated/floor/tiled,
+/obj/structure/plasticflaps/airtight,
+/turf/simulated/floor/tiled/full,
 /area/hangar/operations)
 "rBR" = (
 /obj/structure/cable/green{
@@ -25496,10 +25567,16 @@
 	},
 /obj/machinery/door/airlock/external{
 	dir = 1;
-	frequency = 1385;
-	icon_state = "door_locked";
-	id_tag = "intrepid_shuttle_cargo_out"
+	icon_state = "door_locked"
 	},
+/obj/effect/map_effect/marker/airlock/shuttle{
+	cycle_to_external_air = 1;
+	master_tag = "airlock_shuttle_intrepid";
+	name = "airlock_shuttle_intrepid";
+	shuttle_tag = "Intrepid";
+	req_one_access = null
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
 /turf/simulated/floor/plating,
 /area/shuttle/intrepid/cargo_bay)
 "rKM" = (
@@ -25553,20 +25630,26 @@
 /turf/simulated/floor/tiled/dark,
 /area/turret_protected/ai_upload)
 "rMm" = (
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "mining_shuttle_internal";
-	req_access = list(13)
-	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/aux,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 8
 	},
+/obj/effect/map_effect/marker/airlock/shuttle{
+	master_tag = "airlock_shuttle_spark";
+	name = "airlock_shuttle_spark";
+	shuttle_tag = "Spark";
+	req_one_access = list(31,48,67)
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+	dir = 10
+	},
+/obj/machinery/door/airlock/external{
+	dir = 1;
+	icon_state = "door_locked"
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/mining)
 "rNe" = (
@@ -25962,9 +26045,11 @@
 /obj/structure/bed/handrail{
 	dir = 8
 	},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
-	frequency = 1380;
-	id_tag = "mining_shuttle_pump"
+/obj/effect/map_effect/marker/airlock/shuttle{
+	master_tag = "airlock_shuttle_spark";
+	name = "airlock_shuttle_spark";
+	shuttle_tag = "Spark";
+	req_one_access = list(31,48,67)
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/mining)
@@ -27297,29 +27382,25 @@
 /obj/structure/bed/handrail{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/aux{
-	dir = 4
-	},
 /obj/machinery/embedded_controller/radio/airlock/docking_port{
 	dir = 8;
-	frequency = 1380;
-	id_tag = "mining_shuttle_controller";
 	pixel_x = 25;
-	pixel_y = 5;
-	req_one_access = list(31,48,67);
-	tag_airpump = "mining_shuttle_pump";
-	tag_chamber_sensor = "mining_shuttle_sensor";
-	tag_exterior_door = "mining_shuttle_external";
-	tag_interior_door = "mining_shuttle_internal";
-	tag_interior_sensor = "mining_shuttle_interior_sensor"
+	pixel_y = 5
 	},
 /obj/machinery/airlock_sensor{
 	dir = 8;
-	frequency = 1380;
-	id_tag = "mining_shuttle_sensor";
 	pixel_x = 25;
 	pixel_y = -7
 	},
+/obj/effect/map_effect/marker/airlock/shuttle{
+	master_tag = "airlock_shuttle_spark";
+	name = "airlock_shuttle_spark";
+	shuttle_tag = "Spark";
+	req_one_access = list(31,48,67)
+	},
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/mining)
 "sYf" = (
@@ -30098,7 +30179,9 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/red,
+/obj/machinery/atmospherics/pipe/simple/hidden/red{
+	dir = 5
+	},
 /turf/simulated/floor/reinforced{
 	blocks_air = 1;
 	density = 1;
@@ -31216,10 +31299,13 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
-	frequency = 1380;
-	id_tag = "mining_shuttle_pump"
+/obj/effect/map_effect/marker/airlock/shuttle{
+	master_tag = "airlock_shuttle_spark";
+	name = "airlock_shuttle_spark";
+	shuttle_tag = "Spark";
+	req_one_access = list(31,48,67)
 	},
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux,
 /turf/simulated/floor/plating,
 /area/shuttle/mining)
 "vFL" = (
@@ -33485,20 +33571,23 @@
 "xjL" = (
 /obj/machinery/airlock_sensor{
 	dir = 4;
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_sensor";
 	pixel_x = -24;
 	pixel_y = -6
 	},
 /obj/structure/bed/handrail{
 	dir = 4
 	},
+/obj/structure/lattice/catwalk/indoor,
 /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_pump";
 	layer = 2.8
 	},
-/obj/structure/lattice/catwalk/indoor,
+/obj/effect/map_effect/marker/airlock/shuttle{
+	cycle_to_external_air = 1;
+	master_tag = "airlock_shuttle_intrepid";
+	name = "airlock_shuttle_intrepid";
+	shuttle_tag = "Intrepid";
+	req_one_access = null
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/intrepid/cargo_bay)
 "xjQ" = (
@@ -33849,12 +33938,17 @@
 /area/operations/storage)
 "xqo" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_pump";
 	layer = 2.8
 	},
 /obj/structure/lattice/catwalk/indoor,
 /obj/item/device/radio/intercom/expedition/east,
+/obj/effect/map_effect/marker/airlock/shuttle{
+	cycle_to_external_air = 1;
+	master_tag = "airlock_shuttle_intrepid";
+	name = "airlock_shuttle_intrepid";
+	shuttle_tag = "Intrepid";
+	req_one_access = null
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/intrepid/cargo_bay)
 "xqv" = (
@@ -35170,31 +35264,27 @@
 /turf/simulated/floor/tiled/dark,
 /area/operations/loading)
 "yib" = (
-/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{
-	cycle_to_external_air = 1;
-	dir = 8;
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo";
-	layer = 3.3;
-	master_tag = "intrepid_shuttle";
-	pixel_x = 24;
-	tag_airpump = "intrepid_shuttle_cargo_pump";
-	tag_chamber_sensor = "intrepid_shuttle_cargo_sensor";
-	tag_exterior_door = "intrepid_shuttle_cargo_out";
-	tag_exterior_sensor = "intrepid_shuttle_cargo_exterior_sensor";
-	tag_interior_door = "intrepid_shuttle_cargo_in";
-	tag_interior_sensor = "intrepid_shuttle_cargo_interior_sensor"
-	},
 /obj/machinery/light/small/red{
 	dir = 4
 	},
+/obj/structure/lattice/catwalk/indoor,
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 1;
-	frequency = 1385;
-	id_tag = "intrepid_shuttle_cargo_pump_out_internal";
 	layer = 2.8
 	},
-/obj/structure/lattice/catwalk/indoor,
+/obj/effect/map_effect/marker/airlock/shuttle{
+	cycle_to_external_air = 1;
+	master_tag = "airlock_shuttle_intrepid";
+	name = "airlock_shuttle_intrepid";
+	shuttle_tag = "Intrepid";
+	req_one_access = null
+	},
+/obj/effect/map_effect/marker_helper/airlock/out,
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 8;
+	pixel_y = 6;
+	pixel_x = 20
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/intrepid/cargo_bay)
 "yiT" = (
@@ -50822,8 +50912,8 @@ tPr
 dNk
 jyX
 rcA
+oXD
 rBI
-ukS
 nIP
 vFD
 kVu
diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
index 9559ceebc4d..71e2db9b9ae 100644
--- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
+++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
@@ -27,29 +27,6 @@
 /obj/machinery/alarm/north,
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
-"abx" = (
-/obj/structure/sign/securearea{
-	desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
-	name = "KEEP CLEAR: DOCKING AREA";
-	pixel_y = 32
-	},
-/obj/machinery/door/airlock/external{
-	dir = 4;
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "specops_dock_airlock_outer";
-	locked = 1;
-	name = "Port Docking Hatch";
-	req_access = list(13)
-	},
-/obj/effect/landmark/entry_point/port{
-	name = "port, deck 3 port docks"
-	},
-/obj/effect/shuttle_landmark/horizon/dock/deck_3/port_3{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/port/docks)
 "abD" = (
 /obj/machinery/button/switch/windowtint{
 	dir = 8;
@@ -432,14 +409,6 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/bridge/aibunker)
-"ajU" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 4;
-	frequency = 1337;
-	id_tag = "nuke_shuttle_dock_pump"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "ajV" = (
 /obj/structure/sink/kitchen{
 	layer = 3.5;
@@ -450,24 +419,17 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/horizon/cafeteria)
-"akf" = (
-/obj/effect/floor_decal/corner/dark_blue{
-	dir = 10
+"ajW" = (
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_2";
+	name = "airlock_horizon_dock_deck_3_starboard_2";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_2"
 	},
-/obj/machinery/access_button{
-	command = "cycle_interior";
-	frequency = 1380;
-	master_tag = "dock_horizon_4_airlock";
-	name = "interior access button";
-	pixel_x = -24;
-	pixel_y = -20;
-	req_one_access = list(13)
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/light/small/emergency{
 	dir = 4
 	},
-/turf/simulated/floor/tiled,
-/area/horizon/hallway/deck_three/primary/port/docks)
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "akQ" = (
 /turf/simulated/floor/tiled/dark,
 /area/horizon/longbow)
@@ -550,9 +512,6 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/longbow)
-"anT" = (
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/port/docks)
 "aob" = (
 /obj/machinery/newscaster/east,
 /obj/effect/floor_decal/corner/teal/diagonal,
@@ -677,15 +636,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/horizon/cafeteria)
-"avm" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden,
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "airlock_horizon_deck_3_fore_starboard_1";
-	name = "airlock_horizon_deck_3_fore_starboard_1";
-	frequency = 1002
-	},
-/turf/simulated/floor,
-/area/maintenance/bridge)
 "avR" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/effect/floor_decal/industrial/warning,
@@ -921,6 +871,37 @@
 	},
 /turf/simulated/floor/plating,
 /area/crew_quarters/lounge)
+"aEm" = (
+/obj/machinery/light/small/emergency{
+	dir = 8
+	},
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 2
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_2";
+	name = "airlock_horizon_dock_deck_3_port_2";
+	landmark_tag = "nav_horizon_dock_deck_3_port_2"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
+"aEU" = (
+/obj/machinery/door/airlock/external{
+	dir = 4
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_5";
+	name = "airlock_horizon_dock_deck_3_port_5";
+	landmark_tag = "nav_horizon_dock_deck_3_port_5"
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/machinery/access_button{
+	pixel_x = -22;
+	pixel_y = 32;
+	dir = 2
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "aFa" = (
 /obj/structure/bed/stool/chair/office/bridge{
 	dir = 1
@@ -991,18 +972,6 @@
 /obj/structure/extinguisher_cabinet/east,
 /turf/simulated/floor/tiled,
 /area/horizon/security/investigations_hallway)
-"aGy" = (
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "dock_horizon_4_outer";
-	locked = 1;
-	name = "Docking Port Airlock";
-	req_access = list(13)
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
 "aGG" = (
 /obj/effect/floor_decal/corner/beige{
 	dir = 6
@@ -1065,6 +1034,12 @@
 	},
 /turf/simulated/floor/tiled/full,
 /area/horizon/cafeteria)
+"aLK" = (
+/obj/effect/map_effect/map_helper/ruler_tiles_3{
+	dir = 4
+	},
+/turf/template_noop,
+/area/template_noop)
 "aLT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/wood,
@@ -1111,31 +1086,6 @@
 /obj/machinery/telecomms/server/presets/service,
 /turf/simulated/floor/bluegrid,
 /area/tcommsat/chamber)
-"aOx" = (
-/obj/machinery/airlock_sensor{
-	frequency = 1380;
-	id_tag = "dock_horizon_3_sensor";
-	master_tag = "dock_horizon_3_airlock";
-	pixel_x = 25;
-	pixel_y = -32
-	},
-/obj/machinery/embedded_controller/radio/airlock/docking_port{
-	frequency = 1380;
-	id_tag = "dock_horizon_3_airlock";
-	pixel_x = 26;
-	req_one_access = list(13);
-	tag_airpump = "dock_horizon_3_pump";
-	tag_chamber_sensor = "dock_horizon_3_sensor";
-	tag_exterior_door = "dock_horizon_3_outer";
-	tag_interior_door = "dock_horizon_3_inner"
-	},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 8;
-	frequency = 1380;
-	id_tag = "dock_horizon_3_pump"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "aOA" = (
 /obj/effect/floor_decal/corner/dark_blue{
 	dir = 9
@@ -1361,17 +1311,6 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/security_starboard)
-"aXd" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
-	dir = 8
-	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "airlock_horizon_deck_3_fore_starboard_1";
-	name = "airlock_horizon_deck_3_fore_starboard_1";
-	frequency = 1002
-	},
-/turf/simulated/floor,
-/area/maintenance/bridge)
 "aXo" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 8
@@ -1488,9 +1427,6 @@
 "bas" = (
 /turf/simulated/floor/tiled,
 /area/security/vacantoffice)
-"baz" = (
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "baO" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -1694,13 +1630,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/break_room)
-"bgl" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/obj/effect/map_effect/map_helper/ruler_tiles_3,
-/turf/simulated/floor/reinforced/airless,
-/area/template_noop)
 "bgx" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -2048,21 +1977,6 @@
 	},
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/horizon/hallway/deck_three/primary/port/docks)
-"bxp" = (
-/obj/machinery/door/airlock/external{
-	dir = 4;
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "specops_dock_airlock_inner";
-	locked = 1;
-	name = "Port Docking Hatch";
-	req_access = list(13)
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/port/docks)
 "bxN" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
@@ -2085,6 +1999,11 @@
 /obj/machinery/alarm/north,
 /turf/simulated/floor/tiled/freezer,
 /area/medical/washroom)
+"byz" = (
+/obj/effect/floor_decal/industrial/warning,
+/obj/effect/map_effect/map_helper/ruler_tiles_3,
+/turf/simulated/floor/reinforced/airless,
+/area/template_noop)
 "bzq" = (
 /obj/effect/floor_decal/corner/dark_blue/full{
 	dir = 8
@@ -2108,27 +2027,12 @@
 "bzT" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/crew_quarters/lounge/secondary)
-"bCg" = (
-/obj/machinery/access_button{
-	command = "cycle_interior";
-	frequency = 1337;
-	master_tag = "nuke_shuttle_dock_airlock";
-	name = "interior access button";
-	pixel_x = -28;
-	pixel_y = 26;
-	req_one_access = list(13)
+"bBn" = (
+/obj/effect/map_effect/map_helper/ruler_tiles_3{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 10
-	},
-/obj/effect/floor_decal/corner/dark_blue{
-	dir = 5
-	},
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
+/turf/simulated/floor/reinforced/airless,
+/area/template_noop)
 "bCr" = (
 /obj/machinery/power/apc/low/north,
 /obj/structure/cable/green{
@@ -2365,6 +2269,32 @@
 	},
 /turf/simulated/floor/plating,
 /area/horizon/security/autopsy_laboratory)
+"bOz" = (
+/obj/machinery/atmospherics/pipe/manifold4w/hidden,
+/obj/effect/map_effect/marker/airlock{
+	master_tag = "airlock_horizon_deck_3_aft_1";
+	name = "airlock_horizon_deck_3_aft_1";
+	frequency = 1001
+	},
+/turf/simulated/floor,
+/area/horizon/maintenance/deck_three/aft/starboard)
+"bOE" = (
+/obj/structure/grille,
+/obj/machinery/door/firedoor,
+/obj/structure/window/shuttle/scc_space_ship/cardinal,
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
+/obj/machinery/door/blast/regular/open{
+	dir = 2;
+	id = "shutters_deck3_longbow";
+	name = "Safety Blast Door"
+	},
+/obj/effect/map_effect/map_helper/ruler_tiles_3{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/longbow)
 "bOL" = (
 /obj/structure/filingcabinet/filingcabinet{
 	pixel_x = -9;
@@ -2383,6 +2313,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/horizon/security/autopsy_laboratory)
+"bQR" = (
+/obj/effect/map_effect/map_helper/ruler_tiles_3,
+/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "bRc" = (
 /obj/effect/floor_decal/spline/fancy/wood/cee{
 	dir = 1
@@ -2478,6 +2412,10 @@
 /obj/structure/railing/mapped,
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
+"bUU" = (
+/obj/effect/shuttle_landmark/horizon/exterior/deck_3/portaft,
+/turf/template_noop,
+/area/template_noop)
 "bVX" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
@@ -2690,6 +2628,24 @@
 	},
 /turf/simulated/floor/wood,
 /area/bridge/minibar)
+"ceE" = (
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/machinery/access_button{
+	pixel_x = -28;
+	pixel_y = 12;
+	dir = 1
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_3";
+	name = "airlock_horizon_dock_deck_3_starboard_3";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_3"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "ceU" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -2911,30 +2867,6 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/interrogation)
-"csI" = (
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "dock_horizon_3_outer";
-	locked = 1;
-	name = "Docking Port Airlock";
-	req_access = list(13)
-	},
-/obj/machinery/access_button{
-	command = "cycle_exterior";
-	frequency = 1380;
-	master_tag = "dock_horizon_3_airlock";
-	name = "exterior access button";
-	pixel_x = 21;
-	pixel_y = -12;
-	req_one_access = list(13)
-	},
-/obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_3{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "csY" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -2952,6 +2884,19 @@
 "cth" = (
 /turf/simulated/floor/wood,
 /area/bridge/meeting_room)
+"ctq" = (
+/obj/effect/floor_decal/corner/dark_blue{
+	dir = 10
+	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "ctB" = (
 /obj/machinery/computer/message_monitor{
 	dir = 4
@@ -3039,18 +2984,6 @@
 /obj/structure/ship_weapon_dummy/barrel,
 /turf/template_noop,
 /area/template_noop)
-"czd" = (
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "dock_horizon_1_inner";
-	locked = 1;
-	name = "Docking Port Airlock";
-	req_access = list(13)
-	},
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "czo" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 10
@@ -3601,12 +3534,17 @@
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/reinforced/airless,
 /area/template_noop)
-"cWl" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
+"cWo" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/port/docks)
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_3";
+	name = "airlock_horizon_dock_deck_3_starboard_3";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_3"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "cXq" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -3978,6 +3916,17 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/vacantoffice)
+"dmB" = (
+/obj/machinery/light/small/emergency{
+	dir = 8
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_4";
+	name = "airlock_horizon_dock_deck_3_port_4";
+	landmark_tag = "nav_horizon_dock_deck_3_port_4"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "dmU" = (
 /obj/machinery/power/apc/super/critical/north,
 /obj/structure/cable/green{
@@ -4270,17 +4219,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/central)
-"dCv" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 8
-	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "airlock_horizon_deck_3_fore_starboard_1";
-	name = "airlock_horizon_deck_3_fore_starboard_1";
-	frequency = 1002
-	},
-/turf/simulated/floor,
-/area/maintenance/bridge)
 "dCR" = (
 /obj/structure/table/steel,
 /obj/item/stock_parts/subspace/amplifier,
@@ -4364,6 +4302,10 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge/controlroom)
+"dGE" = (
+/obj/effect/shuttle_landmark/horizon/exterior/deck_3/aft,
+/turf/template_noop,
+/area/template_noop)
 "dGO" = (
 /obj/effect/floor_decal/corner_wide/yellow/diagonal,
 /obj/structure/table/steel,
@@ -4457,6 +4399,17 @@
 /obj/machinery/power/apc/north,
 /turf/simulated/floor/carpet,
 /area/crew_quarters/captain)
+"dKk" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 1
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_4";
+	name = "airlock_horizon_dock_deck_3_port_4";
+	landmark_tag = "nav_horizon_dock_deck_3_port_4"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "dKv" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/corner/red/diagonal,
@@ -4573,10 +4526,6 @@
 /obj/effect/floor_decal/corner/dark_blue/full,
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/central)
-"dOV" = (
-/obj/effect/shuttle_landmark/horizon/exterior/deck_3/aft,
-/turf/template_noop,
-/area/template_noop)
 "dQq" = (
 /obj/machinery/body_scanconsole{
 	dir = 4;
@@ -4646,6 +4595,22 @@
 	},
 /turf/simulated/floor/plating,
 /area/horizon/hallway/deck_three/primary/port/docks)
+"dSv" = (
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/machinery/access_button{
+	pixel_x = -28;
+	dir = 2
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_3";
+	name = "airlock_horizon_dock_deck_3_starboard_3";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_3"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "dSw" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 5
@@ -4693,6 +4658,10 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/full,
 /area/horizon/security/firing_range)
+"dUx" = (
+/obj/effect/map_effect/map_helper/ruler_tiles_3,
+/turf/template_noop,
+/area/template_noop)
 "dVW" = (
 /turf/simulated/open,
 /area/hallway/medical/upper)
@@ -4791,6 +4760,18 @@
 /obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/firing_range)
+"ecm" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 8
+	},
+/obj/effect/map_effect/marker/airlock{
+	master_tag = "airlock_horizon_deck_3_aft_1";
+	name = "airlock_horizon_deck_3_aft_1";
+	frequency = 1001
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor,
+/area/horizon/maintenance/deck_three/aft/starboard)
 "ecr" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -5260,6 +5241,18 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/starboard)
+"enU" = (
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_4";
+	name = "airlock_horizon_dock_deck_3_port_4";
+	landmark_tag = "nav_horizon_dock_deck_3_port_4"
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "eod" = (
 /obj/machinery/light{
 	dir = 1
@@ -5336,6 +5329,15 @@
 	},
 /turf/simulated/floor/plating,
 /area/bridge/minibar)
+"erp" = (
+/obj/structure/window/shuttle/scc_space_ship,
+/obj/structure/grille,
+/obj/machinery/door/firedoor,
+/obj/effect/map_effect/map_helper/ruler_tiles_3{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/crew_quarters/lounge)
 "ert" = (
 /obj/structure/bed/stool/chair/padded/brown{
 	dir = 1
@@ -5785,22 +5787,6 @@
 /obj/machinery/alarm/east,
 /turf/simulated/floor/carpet/rubber,
 /area/tcommsat/entrance)
-"eGh" = (
-/obj/machinery/embedded_controller/radio/airlock/docking_port{
-	frequency = 1380;
-	id_tag = "dock_horizon_4_airlock";
-	pixel_x = 26;
-	req_one_access = list(13);
-	tag_airpump = "dock_horizon_4_pump";
-	tag_chamber_sensor = "dock_horizon_4_sensor";
-	tag_exterior_door = "dock_horizon_4_outer";
-	tag_interior_door = "dock_horizon_4_inner"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/port/docks)
 "eGq" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/railing/mapped,
@@ -5871,6 +5857,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/central)
+"eIJ" = (
+/obj/effect/floor_decal/corner/dark_blue{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/turf/simulated/floor/tiled,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "eIO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment,
@@ -5889,6 +5882,34 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor,
 /area/horizon/maintenance/deck_three/aft/starboard)
+"eJD" = (
+/obj/structure/sign/securearea{
+	desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
+	name = "KEEP CLEAR: DOCKING AREA";
+	pixel_y = 32
+	},
+/obj/effect/landmark/entry_point/port{
+	name = "port, deck 3 port docks"
+	},
+/obj/effect/shuttle_landmark/horizon/dock/deck_3/port_3{
+	dir = 8
+	},
+/obj/machinery/door/airlock/external{
+	dir = 4
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_5";
+	name = "airlock_horizon_dock_deck_3_port_5";
+	landmark_tag = "nav_horizon_dock_deck_3_port_5"
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/machinery/access_button{
+	pixel_x = 12;
+	pixel_y = 28;
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "eJU" = (
 /obj/structure/railing/mapped,
 /obj/structure/table/rack,
@@ -6057,6 +6078,22 @@
 /obj/item/device/radio/intercom/south,
 /turf/simulated/floor/tiled/dark,
 /area/medical/smoking)
+"eUs" = (
+/obj/machinery/light/small/emergency{
+	dir = 1
+	},
+/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
+	dir = 4;
+	pixel_y = 0;
+	pixel_x = -20
+	},
+/obj/effect/map_effect/marker/airlock{
+	master_tag = "airlock_horizon_deck_3_fore_starboard_1";
+	name = "airlock_horizon_deck_3_fore_starboard_1";
+	frequency = 1002
+	},
+/turf/simulated/floor,
+/area/maintenance/bridge)
 "eUF" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -6322,14 +6359,23 @@
 	},
 /turf/simulated/floor/tiled,
 /area/bridge/controlroom)
-"ffO" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 4;
-	frequency = 1380;
-	id_tag = "dock_horizon_4_pump"
+"ffL" = (
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/door/airlock/external{
+	dir = 2
 	},
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/port/docks)
+/obj/machinery/access_button{
+	pixel_x = -24;
+	dir = 2
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_2";
+	name = "airlock_horizon_dock_deck_3_starboard_2";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_2"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "fgs" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 10
@@ -6718,18 +6764,6 @@
 /obj/machinery/light/small/emergency,
 /turf/simulated/floor,
 /area/horizon/maintenance/deck_three/aft/starboard)
-"fsY" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 8
-	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "airlock_horizon_deck_3_aft_1";
-	name = "airlock_horizon_deck_3_aft_1";
-	frequency = 1001
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
-/area/horizon/maintenance/deck_three/aft/starboard)
 "ftz" = (
 /obj/item/storage/photo_album,
 /obj/item/device/camera_film,
@@ -6924,10 +6958,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/security/meeting_room)
-"fxV" = (
-/obj/effect/shuttle_landmark/horizon/exterior/deck_3/portfore,
-/turf/template_noop,
-/area/template_noop)
 "fyw" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -7286,6 +7316,15 @@
 	},
 /turf/simulated/floor/carpet,
 /area/lawoffice/representative)
+"fKs" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden,
+/obj/effect/map_effect/marker/airlock{
+	master_tag = "airlock_horizon_deck_3_fore_starboard_1";
+	name = "airlock_horizon_deck_3_fore_starboard_1";
+	frequency = 1002
+	},
+/turf/simulated/floor,
+/area/maintenance/bridge)
 "fKQ" = (
 /obj/structure/railing/mapped,
 /obj/structure/railing/mapped{
@@ -7322,6 +7361,17 @@
 	},
 /turf/simulated/floor/reinforced/airless,
 /area/horizon/exterior)
+"fMB" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+	dir = 8
+	},
+/obj/effect/map_effect/marker/airlock{
+	master_tag = "airlock_horizon_deck_3_fore_starboard_1";
+	name = "airlock_horizon_deck_3_fore_starboard_1";
+	frequency = 1002
+	},
+/turf/simulated/floor,
+/area/maintenance/bridge)
 "fMW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -7676,22 +7726,6 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
 /area/bridge)
-"fYD" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	frequency = 1337;
-	id_tag = "green_dock_aft_pump"
-	},
-/obj/machinery/airlock_sensor{
-	frequency = 1337;
-	id_tag = "green_dock_aft_sensor";
-	layer = 3.4;
-	pixel_x = -28
-	},
-/obj/machinery/light/small/emergency{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/port/docks)
 "fZe" = (
 /obj/structure/platform/ledge{
 	dir = 8
@@ -8261,21 +8295,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/security/firing_range)
-"gwp" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 8
-	},
-/obj/machinery/airlock_sensor{
-	pixel_x = 20;
-	dir = 8
-	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "airlock_horizon_deck_3_fore_starboard_1";
-	name = "airlock_horizon_deck_3_fore_starboard_1";
-	frequency = 1002
-	},
-/turf/simulated/floor,
-/area/maintenance/bridge)
 "gxt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -8318,6 +8337,10 @@
 /obj/machinery/light/floor,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/holodeck_control/beta)
+"gxX" = (
+/obj/effect/shuttle_landmark/horizon/exterior/deck_3/portfore,
+/turf/template_noop,
+/area/template_noop)
 "gyk" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -8463,6 +8486,17 @@
 "gDJ" = (
 /turf/simulated/floor/holofloor/reinforced,
 /area/horizon/holodeck/betadeck)
+"gDL" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 4
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_1";
+	name = "airlock_horizon_dock_deck_3_starboard_1";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_1"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "gEi" = (
 /obj/machinery/telecomms/processor/preset_three,
 /turf/simulated/floor/bluegrid,
@@ -8483,6 +8517,23 @@
 /obj/structure/flora/ausbushes/sunnybush,
 /turf/simulated/floor/grass,
 /area/horizon/cafeteria)
+"gFw" = (
+/obj/machinery/door/airlock/external{
+	dir = 4
+	},
+/obj/machinery/access_button{
+	pixel_x = 24;
+	pixel_y = 32;
+	dir = 2
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_1";
+	name = "airlock_horizon_dock_deck_3_starboard_1";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_1"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "gFS" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -8513,12 +8564,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/security/evidence_storage)
-"gGV" = (
-/obj/effect/map_effect/map_helper/ruler_tiles_3{
-	dir = 4
-	},
-/turf/simulated/floor/reinforced/airless,
-/area/template_noop)
 "gHo" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
@@ -8693,6 +8738,24 @@
 /obj/effect/floor_decal/industrial/outline/red,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/crew_armoury/foyer)
+"gMl" = (
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_4";
+	name = "airlock_horizon_dock_deck_3_port_4";
+	landmark_tag = "nav_horizon_dock_deck_3_port_4"
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/machinery/access_button{
+	pixel_x = 28;
+	pixel_y = 12;
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "gMr" = (
 /obj/effect/floor_decal/corner/dark_blue{
 	dir = 6
@@ -8791,6 +8854,17 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/ward/isolation)
+"gQw" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 8
+	},
+/obj/effect/map_effect/marker/airlock{
+	master_tag = "airlock_horizon_deck_3_fore_starboard_1";
+	name = "airlock_horizon_deck_3_fore_starboard_1";
+	frequency = 1002
+	},
+/turf/simulated/floor,
+/area/maintenance/bridge)
 "gQO" = (
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 4
@@ -9422,18 +9496,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/security/interrogation)
-"hmL" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 6
-	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "airlock_horizon_deck_3_aft_1";
-	name = "airlock_horizon_deck_3_aft_1";
-	frequency = 1001
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
-/area/horizon/maintenance/deck_three/aft/starboard)
 "hmP" = (
 /obj/effect/floor_decal/corner_wide/paleblue{
 	dir = 5
@@ -10097,6 +10159,27 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/vacantoffice)
+"hNX" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 2
+	},
+/obj/machinery/airlock_sensor{
+	pixel_x = 20;
+	dir = 8;
+	pixel_y = -6
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_2";
+	name = "airlock_horizon_dock_deck_3_port_2";
+	landmark_tag = "nav_horizon_dock_deck_3_port_2"
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 8;
+	pixel_y = 6;
+	pixel_x = 20
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "hOg" = (
 /obj/effect/floor_decal/corner/dark_blue/full{
 	dir = 4
@@ -10142,6 +10225,24 @@
 /obj/item/gun/energy/rifle/laser/noctiluca,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/crew_armoury)
+"hOD" = (
+/obj/machinery/airlock_sensor{
+	dir = 2;
+	pixel_y = 28;
+	pixel_x = 6
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_5";
+	name = "airlock_horizon_dock_deck_3_port_5";
+	landmark_tag = "nav_horizon_dock_deck_3_port_5"
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 2;
+	pixel_y = 28;
+	pixel_x = -6
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "hPy" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/maintenance/engineering_ladder)
@@ -10387,6 +10488,13 @@
 "idI" = (
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/hop/xo)
+"idV" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/map_effect/map_helper/ruler_tiles_3,
+/turf/simulated/floor/reinforced/airless,
+/area/template_noop)
 "ieD" = (
 /obj/machinery/telecomms/server/presets/unused,
 /turf/simulated/floor/bluegrid,
@@ -10530,6 +10638,16 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge/aibunker)
+"ilt" = (
+/obj/effect/floor_decal/corner/dark_blue/full{
+	dir = 4
+	},
+/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "ilv" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 5
@@ -10677,6 +10795,26 @@
 /obj/effect/floor_decal/industrial/outline/emergency_closet,
 /turf/simulated/floor/tiled,
 /area/horizon/crew_quarters/fitness/changing)
+"itc" = (
+/obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_1{
+	dir = 4
+	},
+/obj/machinery/door/airlock/external{
+	dir = 4
+	},
+/obj/machinery/access_button{
+	pixel_x = -12;
+	pixel_y = -28;
+	dir = 8
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_1";
+	name = "airlock_horizon_dock_deck_3_starboard_1";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_1"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "itg" = (
 /obj/machinery/firealarm/south,
 /obj/structure/table/standard,
@@ -11074,6 +11212,18 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/security/firing_range)
+"iEF" = (
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_3";
+	name = "airlock_horizon_dock_deck_3_starboard_3";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_3"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "iFe" = (
 /obj/machinery/status_display{
 	pixel_y = 32
@@ -11235,6 +11385,22 @@
 	},
 /turf/simulated/floor/wood,
 /area/horizon/cafeteria)
+"iJS" = (
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_4";
+	name = "airlock_horizon_dock_deck_3_port_4";
+	landmark_tag = "nav_horizon_dock_deck_3_port_4"
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/machinery/access_button{
+	pixel_x = -28;
+	dir = 2
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "iKX" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -11271,13 +11437,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/crew_armoury)
-"iLW" = (
-/obj/effect/floor_decal/industrial/warning,
-/obj/effect/map_effect/map_helper/ruler_tiles_3{
-	dir = 4
-	},
-/turf/simulated/floor/reinforced/airless,
-/area/template_noop)
 "iMd" = (
 /obj/structure/bed/stool/chair/sofa/red,
 /obj/effect/floor_decal/corner/brown/diagonal,
@@ -11351,12 +11510,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/captain)
-"iPk" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "iPE" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled,
@@ -11467,6 +11620,21 @@
 	},
 /turf/simulated/floor/wood,
 /area/journalistoffice)
+"iRh" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
+/obj/machinery/door/airlock/external{
+	dir = 4
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_1";
+	name = "airlock_horizon_dock_deck_3_starboard_1";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_1"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "iRR" = (
 /obj/effect/floor_decal/corner/dark_blue{
 	dir = 9
@@ -11658,6 +11826,27 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/engineering_ladder)
+"iXL" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+	dir = 4
+	},
+/obj/machinery/airlock_sensor{
+	pixel_x = 20;
+	dir = 8;
+	pixel_y = -6
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_4";
+	name = "airlock_horizon_dock_deck_3_port_4";
+	landmark_tag = "nav_horizon_dock_deck_3_port_4"
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 8;
+	pixel_y = 6;
+	pixel_x = 20
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "iYp" = (
 /obj/machinery/light{
 	dir = 1
@@ -11673,12 +11862,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
-"iYG" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "jaj" = (
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/tiled/dark,
@@ -11921,31 +12104,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/break_room)
-"jkC" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 8;
-	frequency = 1380;
-	id_tag = "dock_horizon_1_pump"
-	},
-/obj/machinery/embedded_controller/radio/airlock/docking_port{
-	frequency = 1380;
-	id_tag = "dock_horizon_1_airlock";
-	pixel_x = 26;
-	req_one_access = list(13);
-	tag_airpump = "dock_horizon_1_pump";
-	tag_chamber_sensor = "dock_horizon_1_sensor";
-	tag_exterior_door = "dock_horizon_1_outer";
-	tag_interior_door = "dock_horizon_1_inner"
-	},
-/obj/machinery/airlock_sensor{
-	frequency = 1380;
-	id_tag = "dock_horizon_1_sensor";
-	master_tag = "dock_horizon_1_airlock";
-	pixel_x = 25;
-	pixel_y = 32
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "jlB" = (
 /obj/effect/floor_decal/corner/dark_blue{
 	dir = 6
@@ -11954,17 +12112,6 @@
 /obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/security/evidence_storage)
-"jlK" = (
-/obj/machinery/light/small/emergency{
-	dir = 8
-	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "airlock_horizon_deck_3_aft_1";
-	name = "airlock_horizon_deck_3_aft_1";
-	frequency = 1001
-	},
-/turf/simulated/floor,
-/area/horizon/maintenance/deck_three/aft/starboard)
 "jlN" = (
 /obj/effect/floor_decal/corner/dark_blue{
 	dir = 4
@@ -12048,21 +12195,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
-"joS" = (
-/obj/machinery/door/airlock/external{
-	dir = 4;
-	frequency = 1337;
-	icon_state = "door_locked";
-	id_tag = "nuke_shuttle_dock_inner";
-	locked = 1;
-	name = "Docking Port Airlock";
-	req_access = list(13)
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "jqi" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 8
@@ -12070,24 +12202,6 @@
 /obj/machinery/anti_bluespace,
 /turf/simulated/floor/wood,
 /area/crew_quarters/captain)
-"jqz" = (
-/obj/machinery/embedded_controller/radio/airlock/docking_port{
-	frequency = 1380;
-	id_tag = "specops_dock_airlock";
-	pixel_y = 30;
-	req_one_access = list(13);
-	tag_airpump = "specops_dock_airlock_airpump";
-	tag_chamber_sensor = "specops_dock_airlock_sensor";
-	tag_exterior_door = "specops_dock_airlock_outer";
-	tag_interior_door = "specops_dock_airlock_inner"
-	},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 8;
-	frequency = 1380;
-	id_tag = "specops_dock_airlock_airpump"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/port/docks)
 "jrh" = (
 /obj/effect/floor_decal/corner/beige{
 	dir = 5
@@ -12346,10 +12460,6 @@
 	},
 /turf/simulated/open/airless,
 /area/template_noop)
-"jBQ" = (
-/obj/effect/map_effect/map_helper/ruler_tiles_3,
-/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "jCl" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2;
@@ -12417,30 +12527,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/port)
-"jEr" = (
-/obj/machinery/access_button{
-	command = "cycle_exterior";
-	frequency = 1380;
-	master_tag = "dock_horizon_4_airlock";
-	name = "exterior access button";
-	pixel_x = 21;
-	pixel_y = -12;
-	req_one_access = list(13)
-	},
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "dock_horizon_4_outer";
-	locked = 1;
-	name = "Docking Port Airlock";
-	req_access = list(13)
-	},
-/obj/effect/shuttle_landmark/horizon/dock/deck_3/port_2{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/template_noop)
 "jEG" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -12539,19 +12625,6 @@
 	},
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/bridge/controlroom)
-"jIO" = (
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "dock_horizon_1_inner";
-	locked = 1;
-	name = "Docking Port Airlock";
-	req_access = list(13)
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "jIW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/green{
@@ -13010,6 +13083,18 @@
 "jZN" = (
 /turf/simulated/floor,
 /area/horizon/maintenance/deck_three/aft/starboard)
+"jZS" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 6
+	},
+/obj/effect/map_effect/marker/airlock{
+	master_tag = "airlock_horizon_deck_3_aft_1";
+	name = "airlock_horizon_deck_3_aft_1";
+	frequency = 1001
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor,
+/area/horizon/maintenance/deck_three/aft/starboard)
 "kau" = (
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 5
@@ -13265,6 +13350,17 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/holodeck_control)
+"kmt" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 2
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_5";
+	name = "airlock_horizon_dock_deck_3_port_5";
+	landmark_tag = "nav_horizon_dock_deck_3_port_5"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "kmD" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/aux{
 	dir = 1
@@ -13316,6 +13412,17 @@
 /obj/structure/railing/mapped,
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
+"koB" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 8
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_5";
+	name = "airlock_horizon_dock_deck_3_port_5";
+	landmark_tag = "nav_horizon_dock_deck_3_port_5"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "kpd" = (
 /obj/effect/floor_decal/corner/dark_blue{
 	dir = 10
@@ -13431,28 +13538,6 @@
 /obj/random/junk,
 /turf/simulated/floor,
 /area/maintenance/engineering_ladder)
-"krF" = (
-/obj/machinery/door/airlock/external{
-	dir = 4;
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "specops_dock_airlock_outer";
-	locked = 1;
-	name = "Port Docking Hatch";
-	req_access = list(13)
-	},
-/obj/machinery/access_button{
-	command = "cycle_exterior";
-	frequency = 1337;
-	layer = 3.4;
-	master_tag = "specops_shuttle_dock_airlock";
-	name = "exterior access button";
-	pixel_x = 7;
-	pixel_y = -23;
-	req_access = list(13)
-	},
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/port/docks)
 "krN" = (
 /obj/structure/cable/green{
 	icon_state = "1-8"
@@ -13689,19 +13774,6 @@
 "kxs" = (
 /turf/simulated/floor/tiled/dark,
 /area/horizon/security/meeting_room)
-"kyo" = (
-/obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_2,
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "dock_horizon_1_outer";
-	locked = 1;
-	name = "Docking Port Airlock";
-	req_access = list(13)
-	},
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "kyE" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -14336,6 +14408,17 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/ward)
+"kYO" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 2
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_2";
+	name = "airlock_horizon_dock_deck_3_starboard_2";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_2"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "kYP" = (
 /obj/machinery/photocopier,
 /obj/effect/floor_decal/corner/dark_blue{
@@ -14703,23 +14786,6 @@
 /obj/machinery/firealarm/west,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/crew_armoury/foyer)
-"liU" = (
-/obj/machinery/door/airlock/external{
-	dir = 2
-	},
-/obj/machinery/access_button{
-	pixel_x = -28;
-	pixel_y = 12;
-	dir = 1
-	},
-/obj/effect/map_effect/marker_helper/airlock/exterior,
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "airlock_horizon_deck_3_aft_1";
-	name = "airlock_horizon_deck_3_aft_1";
-	frequency = 1001
-	},
-/turf/simulated/floor,
-/area/horizon/maintenance/deck_three/aft/starboard)
 "ljj" = (
 /obj/effect/floor_decal/spline/fancy/wood/corner{
 	dir = 1
@@ -14764,6 +14830,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/hop/xo)
+"lkx" = (
+/obj/effect/floor_decal/corner/dark_blue{
+	dir = 5
+	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "lkC" = (
 /obj/effect/floor_decal/corner/dark_blue{
 	dir = 10
@@ -15476,28 +15551,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/port)
-"lJz" = (
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1337;
-	icon_state = "door_locked";
-	id_tag = "green_dock_aft_exterior";
-	locked = 1;
-	name = "Emergency Services Dock";
-	req_access = list(13)
-	},
-/obj/machinery/access_button{
-	command = "cycle_exterior";
-	frequency = 1337;
-	layer = 3.4;
-	master_tag = "green_dock_aft_airlock";
-	name = "exterior access button";
-	pixel_x = 27;
-	pixel_y = 7;
-	req_access = list(13)
-	},
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/port/docks)
 "lJJ" = (
 /obj/structure/platform/ledge{
 	dir = 8
@@ -15586,30 +15639,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/security/evidence_storage)
-"lPM" = (
-/obj/machinery/access_button{
-	command = "cycle_exterior";
-	frequency = 1337;
-	master_tag = "nuke_shuttle_dock_airlock";
-	name = "exterior access button";
-	pixel_x = -5;
-	pixel_y = 26;
-	req_one_access = list(13)
-	},
-/obj/machinery/door/airlock/external{
-	dir = 4;
-	frequency = 1337;
-	icon_state = "door_locked";
-	id_tag = "nuke_shuttle_dock_outer";
-	locked = 1;
-	name = "Docking Port Airlock";
-	req_access = list(13)
-	},
-/obj/effect/landmark/entry_point/starboard{
-	name = "starboard, visiting docks"
-	},
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "lQh" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -15691,6 +15720,16 @@
 "lTQ" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/medical/smoking)
+"lUo" = (
+/obj/machinery/light/small,
+/obj/machinery/atmospherics/pipe/manifold/hidden,
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_5";
+	name = "airlock_horizon_dock_deck_3_port_5";
+	landmark_tag = "nav_horizon_dock_deck_3_port_5"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "lUB" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -16188,6 +16227,13 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
 /area/maintenance/security_starboard)
+"mlr" = (
+/obj/effect/floor_decal/industrial/warning,
+/obj/effect/map_effect/map_helper/ruler_tiles_3{
+	dir = 4
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/template_noop)
 "mlv" = (
 /obj/machinery/power/apc/low/north,
 /obj/structure/cable/green{
@@ -16290,6 +16336,25 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/starboard)
+"mqP" = (
+/obj/effect/shuttle_landmark/horizon/dock/deck_3/port_2{
+	dir = 1
+	},
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_4";
+	name = "airlock_horizon_dock_deck_3_port_4";
+	landmark_tag = "nav_horizon_dock_deck_3_port_4"
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/machinery/access_button{
+	pixel_x = 28;
+	dir = 2
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "mrb" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -16963,11 +17028,6 @@
 /obj/machinery/telecomms/processor/preset_one,
 /turf/simulated/floor/bluegrid,
 /area/tcommsat/chamber)
-"mUu" = (
-/obj/effect/floor_decal/industrial/warning,
-/obj/effect/map_effect/map_helper/ruler_tiles_3,
-/turf/simulated/floor/reinforced/airless,
-/area/template_noop)
 "mUv" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/railing/mapped{
@@ -17089,21 +17149,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/horizon/security/autopsy_laboratory)
-"mWT" = (
-/obj/machinery/door/airlock/external{
-	dir = 4;
-	frequency = 1337;
-	icon_state = "door_locked";
-	id_tag = "nuke_shuttle_dock_outer";
-	locked = 1;
-	name = "Docking Port Airlock";
-	req_access = list(13)
-	},
-/obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_1{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "mXh" = (
 /obj/structure/table/standard,
 /obj/item/device/binoculars,
@@ -17371,6 +17416,17 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/security/firing_range)
+"niZ" = (
+/obj/machinery/light/small/emergency{
+	dir = 8
+	},
+/obj/effect/map_effect/marker/airlock{
+	master_tag = "airlock_horizon_deck_3_aft_1";
+	name = "airlock_horizon_deck_3_aft_1";
+	frequency = 1001
+	},
+/turf/simulated/floor,
+/area/horizon/maintenance/deck_three/aft/starboard)
 "nji" = (
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 9
@@ -17899,6 +17955,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/crew_quarters/fitness/changing)
+"nBV" = (
+/obj/effect/floor_decal/corner/dark_blue/full{
+	dir = 1
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "nCx" = (
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 5
@@ -17952,21 +18017,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/vacantoffice)
-"nDk" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 5
-	},
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1337;
-	icon_state = "door_locked";
-	id_tag = "green_dock_aft_interior";
-	locked = 1;
-	name = "Emergency Services Dock";
-	req_access = list(13)
-	},
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/port/docks)
 "nDn" = (
 /obj/effect/floor_decal/corner/dark_blue{
 	dir = 6
@@ -18058,24 +18108,6 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/port)
-"nGd" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/machinery/door/airlock/external{
-	dir = 2
-	},
-/obj/machinery/access_button{
-	pixel_x = -28;
-	pixel_y = 12;
-	dir = 1
-	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "airlock_horizon_deck_3_fore_starboard_1";
-	name = "airlock_horizon_deck_3_fore_starboard_1";
-	frequency = 1002
-	},
-/obj/effect/map_effect/marker_helper/airlock/interior,
-/turf/simulated/floor,
-/area/maintenance/bridge)
 "nGE" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -18096,18 +18128,6 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
 /area/medical/ward/isolation)
-"nHe" = (
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "dock_horizon_4_inner";
-	locked = 1;
-	name = "Docking Port Airlock";
-	req_access = list(13)
-	},
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/port/docks)
 "nHC" = (
 /obj/effect/floor_decal/corner/dark_green,
 /turf/simulated/floor/tiled,
@@ -18129,6 +18149,22 @@
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/wood,
 /area/crew_quarters/lounge)
+"nJR" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 8
+	},
+/obj/machinery/airlock_sensor{
+	pixel_x = 20;
+	dir = 8
+	},
+/obj/effect/map_effect/marker/airlock{
+	master_tag = "airlock_horizon_deck_3_aft_1";
+	name = "airlock_horizon_deck_3_aft_1";
+	frequency = 1001
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor,
+/area/horizon/maintenance/deck_three/aft/starboard)
 "nJT" = (
 /obj/machinery/power/smes/buildable/substation{
 	RCon_tag = "Shield Substation";
@@ -18544,12 +18580,6 @@
 	},
 /turf/simulated/floor,
 /area/horizon/maintenance/deck_three/aft/starboard)
-"nZi" = (
-/obj/effect/map_effect/map_helper/ruler_tiles_3{
-	dir = 4
-	},
-/turf/template_noop,
-/area/template_noop)
 "nZt" = (
 /obj/machinery/door/airlock/maintenance{
 	dir = 4;
@@ -18624,6 +18654,24 @@
 /obj/effect/floor_decal/industrial/hatch/red,
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/longbow)
+"obP" = (
+/obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_2,
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/machinery/access_button{
+	pixel_x = -28;
+	pixel_y = 12;
+	dir = 1
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_2";
+	name = "airlock_horizon_dock_deck_3_starboard_2";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_2"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "ocK" = (
 /obj/structure/flora/ausbushes/genericbush,
 /obj/structure/railing/mapped,
@@ -18827,17 +18875,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/captain)
-"ojm" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden,
-/obj/effect/floor_decal/corner/dark_blue{
-	dir = 10
-	},
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
-	},
-/obj/machinery/light,
-/turf/simulated/floor/tiled,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "ojt" = (
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 9
@@ -18879,6 +18916,17 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/security/interrogation/monitoring)
+"oks" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 4
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_4";
+	name = "airlock_horizon_dock_deck_3_port_4";
+	landmark_tag = "nav_horizon_dock_deck_3_port_4"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "okz" = (
 /obj/effect/floor_decal/corner/green/diagonal,
 /obj/structure/table/standard,
@@ -19247,18 +19295,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/hop/xo)
-"oAl" = (
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "dock_horizon_3_outer";
-	locked = 1;
-	name = "Docking Port Airlock";
-	req_access = list(13)
-	},
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "oAx" = (
 /obj/structure/cable/green{
 	icon_state = "2-8"
@@ -19452,6 +19488,15 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/hallway/deck_three/primary/port)
+"oFX" = (
+/obj/effect/floor_decal/corner/dark_blue{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "oGZ" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -19695,29 +19740,25 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/ward)
-"oQV" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	frequency = 1337;
-	id_tag = "green_dock_aft_pump"
+"oQv" = (
+/obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_3{
+	dir = 1
 	},
-/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{
-	frequency = 1337;
-	id_tag = "green_dock_aft_airlock";
-	layer = 3.4;
-	master_tag = "legion_shuttle_dock";
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/machinery/access_button{
 	pixel_x = 28;
-	tag_airpump = "green_dock_aft_pump";
-	tag_chamber_sensor = "green_dock_aft_sensor";
-	tag_exterior_door = "green_dock_aft_exterior";
-	tag_interior_door = "green_dock_aft_interior"
+	dir = 2
 	},
-/obj/machinery/camera/network/civilian_surface{
-	c_tag = "Surface - Emergency Services Dock - Aft";
-	dir = 8;
-	network = list("Civilian        Surface","Emergency        Dock")
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_3";
+	name = "airlock_horizon_dock_deck_3_starboard_3";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_3"
 	},
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/port/docks)
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "oRi" = (
 /obj/item/hullbeacon/red,
 /obj/structure/sign/securearea{
@@ -19728,24 +19769,6 @@
 	},
 /turf/simulated/floor/reinforced/airless,
 /area/horizon/exterior)
-"oRv" = (
-/obj/effect/floor_decal/corner/dark_blue{
-	dir = 10
-	},
-/obj/machinery/access_button{
-	command = "cycle_interior";
-	frequency = 1380;
-	master_tag = "dock_horizon_3_airlock";
-	name = "interior access button";
-	pixel_x = -24;
-	pixel_y = -20;
-	req_one_access = list(13)
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden{
-	dir = 1
-	},
-/turf/simulated/floor/tiled,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "oRM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -19771,6 +19794,17 @@
 	},
 /turf/simulated/floor/carpet/rubber,
 /area/tcommsat/entrance)
+"oSL" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+	dir = 8
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_2";
+	name = "airlock_horizon_dock_deck_3_starboard_2";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_2"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "oSO" = (
 /obj/machinery/light,
 /obj/machinery/washing_machine,
@@ -19884,21 +19918,6 @@
 "oWf" = (
 /turf/simulated/wall/r_wall,
 /area/operations/office_aux)
-"oWq" = (
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1337;
-	icon_state = "door_locked";
-	id_tag = "green_dock_aft_exterior";
-	locked = 1;
-	name = "Emergency Services Dock";
-	req_access = list(13)
-	},
-/obj/effect/shuttle_landmark/horizon/dock/deck_3/port_1{
-	dir = 2
-	},
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/port/docks)
 "oWu" = (
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 10
@@ -19984,6 +20003,17 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/lounge/secondary)
+"pah" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_1";
+	name = "airlock_horizon_dock_deck_3_starboard_1";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_1"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "paE" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -20297,6 +20327,24 @@
 /obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/security/evidence_storage)
+"pwL" = (
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/machinery/access_button{
+	pixel_x = -28;
+	pixel_y = 12;
+	dir = 1
+	},
+/obj/effect/map_effect/marker/airlock{
+	master_tag = "airlock_horizon_deck_3_fore_starboard_1";
+	name = "airlock_horizon_deck_3_fore_starboard_1";
+	frequency = 1002
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/turf/simulated/floor,
+/area/maintenance/bridge)
 "pwO" = (
 /obj/effect/floor_decal/corner/green/diagonal,
 /obj/structure/closet/secure_closet/personal,
@@ -20478,6 +20526,17 @@
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hop/xo)
+"pHC" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_3";
+	name = "airlock_horizon_dock_deck_3_starboard_3";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_3"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "pHG" = (
 /obj/structure/flora/ausbushes/lavendergrass,
 /turf/simulated/floor/grass,
@@ -20593,6 +20652,13 @@
 	},
 /turf/simulated/floor/tiled/full,
 /area/horizon/holodeck_control/beta)
+"pOI" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/map_effect/map_helper/ruler_tiles_3,
+/turf/simulated/floor/reinforced/airless,
+/area/template_noop)
 "pOM" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 5
@@ -20754,6 +20820,24 @@
 /obj/machinery/telecomms/processor/preset_two,
 /turf/simulated/floor/bluegrid,
 /area/tcommsat/chamber)
+"pVj" = (
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/machinery/access_button{
+	pixel_x = 28;
+	pixel_y = 0;
+	dir = 2
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker/airlock{
+	master_tag = "airlock_horizon_deck_3_aft_1";
+	name = "airlock_horizon_deck_3_aft_1";
+	frequency = 1001
+	},
+/turf/simulated/floor,
+/area/horizon/maintenance/deck_three/aft/starboard)
 "pWL" = (
 /obj/structure/table/wood,
 /obj/item/paper_bin,
@@ -20895,18 +20979,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/wood,
 /area/crew_quarters/captain)
-"qcA" = (
-/obj/machinery/door/airlock/external{
-	dir = 4;
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "specops_dock_airlock_inner";
-	locked = 1;
-	name = "Port Docking Hatch";
-	req_access = list(13)
-	},
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/port/docks)
 "qcE" = (
 /obj/effect/floor_decal/corner/beige{
 	dir = 10
@@ -21331,22 +21403,6 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/bridge/minibar)
-"qsI" = (
-/obj/machinery/door/airlock/external{
-	dir = 2
-	},
-/obj/machinery/access_button{
-	pixel_x = 28;
-	dir = 2
-	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "airlock_horizon_deck_3_fore_starboard_1";
-	name = "airlock_horizon_deck_3_fore_starboard_1";
-	frequency = 1002
-	},
-/obj/effect/map_effect/marker_helper/airlock/exterior,
-/turf/simulated/floor,
-/area/maintenance/bridge)
 "qub" = (
 /obj/structure/lattice,
 /obj/structure/railing/mapped,
@@ -21545,10 +21601,6 @@
 	},
 /turf/simulated/floor/reinforced/airless,
 /area/horizon/exterior)
-"qCN" = (
-/obj/effect/map_effect/map_helper/ruler_tiles_3,
-/turf/simulated/floor/reinforced/airless,
-/area/template_noop)
 "qDc" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -21667,22 +21719,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/port)
-"qHx" = (
-/obj/machinery/light/small/emergency{
-	dir = 1
-	},
-/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
-	dir = 4;
-	pixel_y = 0;
-	pixel_x = -20
-	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "airlock_horizon_deck_3_fore_starboard_1";
-	name = "airlock_horizon_deck_3_fore_starboard_1";
-	frequency = 1002
-	},
-/turf/simulated/floor,
-/area/maintenance/bridge)
 "qIl" = (
 /obj/effect/floor_decal/industrial/outline/grey,
 /obj/structure/filingcabinet/filingcabinet{
@@ -22096,18 +22132,6 @@
 	},
 /turf/simulated/open/airless,
 /area/template_noop)
-"rcX" = (
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "dock_horizon_3_inner";
-	locked = 1;
-	name = "Docking Port Airlock";
-	req_access = list(13)
-	},
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "rdm" = (
 /obj/machinery/disposal/small/west,
 /obj/structure/disposalpipe/trunk{
@@ -22272,6 +22296,27 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/maintenance/deck_three/aft/starboard)
+"rmh" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 8
+	},
+/obj/machinery/airlock_sensor{
+	pixel_x = 20;
+	dir = 8;
+	pixel_y = -6
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_2";
+	name = "airlock_horizon_dock_deck_3_starboard_2";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_2"
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 8;
+	pixel_y = 6;
+	pixel_x = 20
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "rml" = (
 /obj/effect/floor_decal/spline/plain,
 /obj/effect/floor_decal/spline/plain{
@@ -22683,6 +22728,21 @@
 	},
 /turf/simulated/open,
 /area/horizon/hallway/deck_three/primary/central)
+"rxZ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
+/obj/machinery/door/airlock/external{
+	dir = 4
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_5";
+	name = "airlock_horizon_dock_deck_3_port_5";
+	landmark_tag = "nav_horizon_dock_deck_3_port_5"
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "rzm" = (
 /obj/effect/floor_decal/spline/plain/cee{
 	dir = 1
@@ -22716,6 +22776,10 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/maintenance/security_starboard)
+"rAd" = (
+/obj/effect/map_effect/map_helper/ruler_tiles_3,
+/turf/simulated/floor/reinforced/airless,
+/area/template_noop)
 "rAA" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -22772,20 +22836,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/crew_armoury/foyer)
-"rBK" = (
-/obj/machinery/airlock_sensor{
-	frequency = 1380;
-	id_tag = "specops_dock_airlock_sensor";
-	pixel_y = -25
-	},
-/obj/machinery/light/small,
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 1;
-	frequency = 1380;
-	id_tag = "specops_dock_airlock_airpump"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/port/docks)
 "rBT" = (
 /obj/effect/landmark/entry_point/aft{
 	name = "aft, visiting docks"
@@ -22948,6 +22998,20 @@
 	},
 /turf/simulated/open,
 /area/horizon/hallway/deck_three/primary/central)
+"rJL" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+	dir = 8
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_3";
+	name = "airlock_horizon_dock_deck_3_starboard_3";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_3"
+	},
+/obj/machinery/light/small/emergency{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "rKd" = (
 /obj/effect/floor_decal/spline/fancy/wood,
 /turf/simulated/floor/wood,
@@ -23159,6 +23223,23 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/central)
+"rQB" = (
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/machinery/access_button{
+	pixel_x = -28;
+	pixel_y = 12;
+	dir = 1
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock{
+	master_tag = "airlock_horizon_deck_3_aft_1";
+	name = "airlock_horizon_deck_3_aft_1";
+	frequency = 1001
+	},
+/turf/simulated/floor,
+/area/horizon/maintenance/deck_three/aft/starboard)
 "rQI" = (
 /obj/effect/floor_decal/corner/brown/diagonal,
 /obj/machinery/light/spot{
@@ -23472,15 +23553,6 @@
 	},
 /turf/simulated/floor/carpet/rubber,
 /area/tcommsat/chamber)
-"scs" = (
-/obj/machinery/airlock_sensor{
-	frequency = 1337;
-	id_tag = "nuke_shuttle_dock_sensor";
-	master_tag = "nuke_shuttle_dock_airlock";
-	pixel_y = -25
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "scL" = (
 /obj/effect/floor_decal/corner/brown{
 	dir = 10
@@ -23700,13 +23772,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/medical/ward/isolation)
-"shm" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	frequency = 1380;
-	id_tag = "dock_horizon_1_pump"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "shr" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -23860,22 +23925,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge/controlroom)
-"smM" = (
-/obj/effect/floor_decal/corner/dark_blue{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/machinery/access_button{
-	command = "cycle_interior";
-	frequency = 1380;
-	master_tag = "dock_horizon_1_airlock";
-	name = "interior access button";
-	pixel_x = -24;
-	pixel_y = 21;
-	req_one_access = list(13)
-	},
-/turf/simulated/floor/tiled,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "snv" = (
 /obj/machinery/door/window/northright,
 /obj/effect/floor_decal/industrial/hatch/yellow,
@@ -23916,27 +23965,6 @@
 	},
 /turf/simulated/floor/lino,
 /area/horizon/cafeteria)
-"spn" = (
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "dock_horizon_1_outer";
-	locked = 1;
-	name = "Docking Port Airlock";
-	req_access = list(13)
-	},
-/obj/machinery/access_button{
-	command = "cycle_exterior";
-	frequency = 1380;
-	master_tag = "dock_horizon_1_airlock";
-	name = "exterior access button";
-	pixel_x = 21;
-	pixel_y = 11;
-	req_one_access = list(13)
-	},
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "spy" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -23947,12 +23975,6 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
 /area/horizon/hallway/deck_three/primary/port)
-"spJ" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "spL" = (
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 10
@@ -24581,22 +24603,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/maintenance/deck_three/aft/starboard)
-"sOT" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 8
-	},
-/obj/machinery/airlock_sensor{
-	pixel_x = 20;
-	dir = 8
-	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "airlock_horizon_deck_3_aft_1";
-	name = "airlock_horizon_deck_3_aft_1";
-	frequency = 1001
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
-/area/horizon/maintenance/deck_three/aft/starboard)
 "sPe" = (
 /obj/effect/floor_decal/corner/dark_blue{
 	dir = 5
@@ -24688,22 +24694,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/horizon/crew_quarters/cryo/washroom)
-"sRP" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 4
-	},
-/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
-	dir = 4;
-	pixel_y = 0;
-	pixel_x = -20
-	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "airlock_horizon_deck_3_aft_1";
-	name = "airlock_horizon_deck_3_aft_1";
-	frequency = 1001
-	},
-/turf/simulated/floor,
-/area/horizon/maintenance/deck_three/aft/starboard)
 "sSi" = (
 /obj/structure/table/standard,
 /obj/item/paper_bin{
@@ -24734,6 +24724,22 @@
 	},
 /turf/simulated/floor/lino,
 /area/horizon/security/investigators_office)
+"sUT" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 4
+	},
+/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
+	dir = 4;
+	pixel_y = 0;
+	pixel_x = -20
+	},
+/obj/effect/map_effect/marker/airlock{
+	master_tag = "airlock_horizon_deck_3_aft_1";
+	name = "airlock_horizon_deck_3_aft_1";
+	frequency = 1001
+	},
+/turf/simulated/floor,
+/area/horizon/maintenance/deck_three/aft/starboard)
 "sVv" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 4
@@ -24810,6 +24816,10 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge/meeting_room)
+"sXh" = (
+/obj/effect/shuttle_landmark/horizon/exterior/deck_3/fore,
+/turf/template_noop,
+/area/template_noop)
 "sXJ" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 10
@@ -24885,6 +24895,18 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/security/evidence_storage)
+"tcb" = (
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_2";
+	name = "airlock_horizon_dock_deck_3_starboard_2";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_2"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "tcA" = (
 /obj/structure/table/wood,
 /obj/effect/floor_decal/spline/fancy/wood,
@@ -24910,6 +24932,23 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/substation/command)
+"teq" = (
+/obj/machinery/door/airlock/external{
+	dir = 4
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_5";
+	name = "airlock_horizon_dock_deck_3_port_5";
+	landmark_tag = "nav_horizon_dock_deck_3_port_5"
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/machinery/access_button{
+	pixel_x = 12;
+	pixel_y = -28;
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "tez" = (
 /obj/machinery/door/airlock/glass_command{
 	dir = 1;
@@ -24923,14 +24962,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/bridge/controlroom)
-"teR" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 1;
-	frequency = 1380;
-	id_tag = "dock_horizon_4_pump"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/port/docks)
 "tfg" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 6
@@ -25122,10 +25153,6 @@
 /obj/effect/floor_decal/corner/red/full,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/crew_armoury)
-"tmK" = (
-/obj/effect/shuttle_landmark/horizon/exterior/deck_3/starboardfore,
-/turf/template_noop,
-/area/template_noop)
 "tmU" = (
 /obj/effect/floor_decal/corner/dark_blue{
 	dir = 6
@@ -25341,6 +25368,27 @@
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/white,
 /area/horizon/security/forensic_laboratory)
+"ttI" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 8
+	},
+/obj/machinery/airlock_sensor{
+	pixel_x = 20;
+	dir = 8;
+	pixel_y = -6
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_3";
+	name = "airlock_horizon_dock_deck_3_starboard_3";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_3"
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 8;
+	pixel_y = 6;
+	pixel_x = 20
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "tuB" = (
 /turf/simulated/floor/wood,
 /area/crew_quarters/lounge/secondary)
@@ -25438,6 +25486,10 @@
 /obj/structure/bed/stool/chair/padded/beige,
 /turf/simulated/floor/wood,
 /area/bridge/minibar)
+"tyk" = (
+/obj/effect/shuttle_landmark/horizon/exterior/deck_3/starboardfore,
+/turf/template_noop,
+/area/template_noop)
 "tyx" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -25617,6 +25669,27 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/hop/xo)
+"tFM" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 2
+	},
+/obj/machinery/airlock_sensor{
+	dir = 2;
+	pixel_y = 28;
+	pixel_x = 6
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_1";
+	name = "airlock_horizon_dock_deck_3_starboard_1";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_1"
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	dir = 2;
+	pixel_y = 28;
+	pixel_x = -6
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "tGl" = (
 /obj/structure/toilet{
 	pixel_y = 16
@@ -25672,31 +25745,6 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/full,
 /area/horizon/holodeck_control)
-"tIt" = (
-/obj/machinery/access_button{
-	command = "cycle_interior";
-	frequency = 1337;
-	layer = 3.4;
-	master_tag = "green_dock_aft_airlock";
-	name = "interior access button";
-	pixel_x = 26;
-	pixel_y = -7;
-	req_access = list(13)
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden{
-	dir = 4
-	},
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1337;
-	icon_state = "door_locked";
-	id_tag = "green_dock_aft_interior";
-	locked = 1;
-	name = "Emergency Services Dock";
-	req_access = list(13)
-	},
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/port/docks)
 "tIL" = (
 /obj/effect/floor_decal/corner/beige/diagonal,
 /obj/structure/table/glass,
@@ -26223,10 +26271,6 @@
 "uba" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/crew_quarters/lounge)
-"ubP" = (
-/obj/effect/shuttle_landmark/horizon/exterior/deck_3/fore,
-/turf/template_noop,
-/area/template_noop)
 "ubX" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 8
@@ -26700,19 +26744,6 @@
 /obj/random/loot,
 /turf/simulated/floor,
 /area/maintenance/security_starboard)
-"uyH" = (
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "dock_horizon_4_inner";
-	locked = 1;
-	name = "Docking Port Airlock";
-	req_access = list(13)
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/port/docks)
 "uzK" = (
 /obj/structure/toilet{
 	dir = 8
@@ -27258,17 +27289,6 @@
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hop/xo)
-"uPJ" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 4
-	},
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "airlock_horizon_deck_3_fore_starboard_1";
-	name = "airlock_horizon_deck_3_fore_starboard_1";
-	frequency = 1002
-	},
-/turf/simulated/floor,
-/area/maintenance/bridge)
 "uPO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -27349,6 +27369,22 @@
 	},
 /turf/simulated/open/airless,
 /area/template_noop)
+"uRU" = (
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/machinery/access_button{
+	pixel_x = 28;
+	dir = 2
+	},
+/obj/effect/map_effect/marker/airlock{
+	master_tag = "airlock_horizon_deck_3_fore_starboard_1";
+	name = "airlock_horizon_deck_3_fore_starboard_1";
+	frequency = 1002
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/turf/simulated/floor,
+/area/maintenance/bridge)
 "uSE" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/portable_atmospherics/canister/oxygen,
@@ -27844,6 +27880,21 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/central)
+"vlj" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 8
+	},
+/obj/machinery/airlock_sensor{
+	pixel_x = 20;
+	dir = 8
+	},
+/obj/effect/map_effect/marker/airlock{
+	master_tag = "airlock_horizon_deck_3_fore_starboard_1";
+	name = "airlock_horizon_deck_3_fore_starboard_1";
+	frequency = 1002
+	},
+/turf/simulated/floor,
+/area/maintenance/bridge)
 "vlC" = (
 /turf/simulated/wall,
 /area/horizon/hallway/deck_three/primary/starboard)
@@ -28564,6 +28615,23 @@
 	},
 /turf/simulated/floor/tiled,
 /area/bridge)
+"vNF" = (
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_2";
+	name = "airlock_horizon_dock_deck_3_port_2";
+	landmark_tag = "nav_horizon_dock_deck_3_port_2"
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/machinery/access_button{
+	pixel_x = 28;
+	pixel_y = 12;
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "vNY" = (
 /obj/effect/floor_decal/corner_wide/yellow/diagonal,
 /obj/structure/cable{
@@ -28870,6 +28938,26 @@
 "vZO" = (
 /turf/simulated/floor/wood,
 /area/bridge/minibar)
+"wab" = (
+/obj/effect/landmark/entry_point/starboard{
+	name = "starboard, visiting docks"
+	},
+/obj/machinery/door/airlock/external{
+	dir = 4
+	},
+/obj/machinery/access_button{
+	pixel_x = -12;
+	pixel_y = 28;
+	dir = 8
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_1";
+	name = "airlock_horizon_dock_deck_3_starboard_1";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_1"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "waj" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/aux{
 	dir = 4
@@ -28955,19 +29043,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/bridge/controlroom)
-"wev" = (
-/obj/machinery/door/airlock/external{
-	dir = 1;
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "dock_horizon_3_inner";
-	locked = 1;
-	name = "Docking Port Airlock";
-	req_access = list(13)
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/plating,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "weN" = (
 /obj/machinery/meter{
 	name = "Air Reserve"
@@ -29064,14 +29139,6 @@
 /obj/effect/floor_decal/corner/dark_green/diagonal,
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/starboard)
-"wiJ" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 1;
-	frequency = 1380;
-	id_tag = "dock_horizon_3_pump"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/starboard/docks)
 "wjl" = (
 /obj/structure/morgue{
 	dir = 2;
@@ -29179,6 +29246,23 @@
 	},
 /turf/simulated/floor/carpet,
 /area/lawoffice/consular)
+"wmW" = (
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/machinery/access_button{
+	pixel_x = 28;
+	pixel_y = 12;
+	dir = 1
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_2";
+	name = "airlock_horizon_dock_deck_3_starboard_2";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_2"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/starboard/docks)
 "wnD" = (
 /obj/structure/table/steel,
 /obj/effect/floor_decal/spline/plain,
@@ -29365,6 +29449,17 @@
 /obj/item/book/manual/wiki/security_space_law,
 /turf/simulated/floor/carpet,
 /area/bridge/meeting_room)
+"wtx" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 4
+	},
+/obj/effect/map_effect/marker/airlock{
+	master_tag = "airlock_horizon_deck_3_fore_starboard_1";
+	name = "airlock_horizon_deck_3_fore_starboard_1";
+	frequency = 1002
+	},
+/turf/simulated/floor,
+/area/maintenance/bridge)
 "wtM" = (
 /obj/machinery/door/airlock/security{
 	dir = 4;
@@ -30046,27 +30141,6 @@
 /obj/structure/railing/mapped,
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/central)
-"wSJ" = (
-/obj/machinery/access_button{
-	command = "cycle_interior";
-	frequency = 1380;
-	master_tag = "specops_shuttle_dock_airlock";
-	name = "interior access button";
-	pixel_x = 25;
-	pixel_y = 25;
-	req_access = list(13)
-	},
-/obj/effect/floor_decal/corner/dark_blue/full{
-	dir = 1
-	},
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 6
-	},
-/turf/simulated/floor/tiled,
-/area/horizon/hallway/deck_three/primary/port/docks)
 "wTc" = (
 /obj/effect/floor_decal/corner/dark_blue{
 	dir = 6
@@ -30391,6 +30465,45 @@
 	},
 /turf/simulated/floor/tiled,
 /area/bridge/meeting_room)
+"xdy" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+	dir = 4
+	},
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_2";
+	name = "airlock_horizon_dock_deck_3_port_2";
+	landmark_tag = "nav_horizon_dock_deck_3_port_2"
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/machinery/access_button{
+	pixel_x = 28;
+	dir = 2
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
+"xek" = (
+/obj/effect/shuttle_landmark/horizon/dock/deck_3/port_1{
+	dir = 2
+	},
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_2";
+	name = "airlock_horizon_dock_deck_3_port_2";
+	landmark_tag = "nav_horizon_dock_deck_3_port_2"
+	},
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/machinery/access_button{
+	pixel_x = -28;
+	pixel_y = 12;
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "xeV" = (
 /obj/effect/floor_decal/corner/beige/full{
 	dir = 8
@@ -30460,6 +30573,21 @@
 	},
 /turf/simulated/floor/carpet/rubber,
 /area/bridge/controlroom)
+"xhG" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 5
+	},
+/obj/machinery/door/airlock/external{
+	dir = 2
+	},
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_port_2";
+	name = "airlock_horizon_dock_deck_3_port_2";
+	landmark_tag = "nav_horizon_dock_deck_3_port_2"
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/turf/simulated/floor/plating,
+/area/horizon/hallway/deck_three/primary/port/docks)
 "xhM" = (
 /obj/machinery/camera/network/third_deck{
 	c_tag = "Third Deck - Crew Lounge Starboard"
@@ -30793,19 +30921,6 @@
 /obj/machinery/firealarm/north,
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
-"xsC" = (
-/obj/effect/shuttle_landmark/horizon/exterior/deck_3/portaft,
-/turf/template_noop,
-/area/template_noop)
-"xtq" = (
-/obj/machinery/atmospherics/pipe/manifold4w/hidden,
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "airlock_horizon_deck_3_aft_1";
-	name = "airlock_horizon_deck_3_aft_1";
-	frequency = 1001
-	},
-/turf/simulated/floor,
-/area/horizon/maintenance/deck_three/aft/starboard)
 "xuf" = (
 /obj/effect/floor_decal/spline/fancy/wood/cee{
 	dir = 1
@@ -30966,24 +31081,6 @@
 /obj/machinery/vending/cola,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/hallway/deck_three/primary/port)
-"xAB" = (
-/obj/machinery/door/airlock/external{
-	dir = 2
-	},
-/obj/machinery/access_button{
-	pixel_x = 28;
-	pixel_y = 0;
-	dir = 2
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/effect/map_effect/marker_helper/airlock/interior,
-/obj/effect/map_effect/marker/airlock{
-	master_tag = "airlock_horizon_deck_3_aft_1";
-	name = "airlock_horizon_deck_3_aft_1";
-	frequency = 1001
-	},
-/turf/simulated/floor,
-/area/horizon/maintenance/deck_three/aft/starboard)
 "xAE" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 1
@@ -31238,23 +31335,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/horizon/security/forensic_laboratory)
-"xMZ" = (
-/obj/machinery/embedded_controller/radio/airlock/docking_port{
-	frequency = 1337;
-	id_tag = "nuke_shuttle_dock_airlock";
-	pixel_y = 30;
-	req_one_access = list(13);
-	tag_airpump = "nuke_shuttle_dock_pump";
-	tag_chamber_sensor = "nuke_shuttle_dock_sensor";
-	tag_exterior_door = "nuke_shuttle_dock_outer";
-	tag_interior_door = "nuke_shuttle_dock_inner"
+"xNi" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden,
+/obj/effect/map_effect/marker/airlock/docking{
+	master_tag = "airlock_horizon_dock_deck_3_starboard_1";
+	name = "airlock_horizon_dock_deck_3_starboard_1";
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_1"
 	},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 4;
-	frequency = 1337;
-	id_tag = "nuke_shuttle_dock_pump"
-	},
-/turf/simulated/floor/tiled/dark/full,
+/turf/simulated/floor/plating,
 /area/horizon/hallway/deck_three/primary/starboard/docks)
 "xNv" = (
 /obj/effect/floor_decal/corner/green/diagonal,
@@ -31413,16 +31501,6 @@
 /obj/structure/railing/mapped,
 /turf/simulated/floor/grass,
 /area/horizon/cafeteria)
-"xXh" = (
-/obj/effect/floor_decal/corner/dark_blue/full{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 9
-	},
-/obj/machinery/light,
-/turf/simulated/floor/tiled,
-/area/horizon/hallway/deck_three/primary/port/docks)
 "xXk" = (
 /obj/machinery/door/firedoor,
 /obj/structure/sign/directions/all{
@@ -31485,18 +31563,6 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/lawoffice/representative)
-"yce" = (
-/obj/machinery/airlock_sensor{
-	frequency = 1380;
-	id_tag = "dock_horizon_4_sensor";
-	master_tag = "dock_horizon_4_airlock";
-	pixel_x = -28
-	},
-/obj/machinery/light/small/emergency{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/horizon/hallway/deck_three/primary/port/docks)
 "ycu" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -39644,7 +39710,7 @@ wGH
 wGH
 wGH
 wGH
-wGH
+bBn
 wGH
 wGH
 wGH
@@ -39689,7 +39755,7 @@ dSF
 dSF
 dSF
 dSF
-tmK
+tyk
 dSF
 dSF
 dSF
@@ -40050,7 +40116,7 @@ wGH
 wGH
 wGH
 wGH
-qCN
+rAd
 wGH
 wGH
 wGH
@@ -40246,6 +40312,7 @@ wGH
 wGH
 wGH
 wGH
+rAd
 wGH
 wGH
 wGH
@@ -40262,11 +40329,10 @@ wGH
 wGH
 wGH
 wGH
-wGH
-wGH
+bBn
 wGH
 vkb
-dSF
+dUx
 dSF
 dSF
 dSF
@@ -40652,24 +40718,24 @@ wGH
 wGH
 wGH
 wGH
-gGV
+bBn
 wGH
 wGH
-gGV
-qCN
+bBn
+rAd
 wGH
-gGV
+bBn
 ebZ
-lPM
-mWT
+wab
+itc
 ebZ
-gGV
+bBn
 wGH
-qCN
-gGV
+rAd
+bBn
 wGH
 wGH
-iLW
+mlr
 dSF
 dSF
 dSF
@@ -40862,8 +40928,8 @@ wGH
 wGH
 wGH
 dce
-spJ
-scs
+pah
+gDL
 ebZ
 wGH
 wGH
@@ -41064,8 +41130,8 @@ wGH
 wGH
 wGH
 ebZ
-xMZ
-ajU
+tFM
+xNi
 dce
 wGH
 wGH
@@ -41262,16 +41328,16 @@ wGH
 wGH
 wGH
 wGH
-qCN
+rAd
 wGH
 wGH
 ebZ
-joS
-joS
+gFw
+iRh
 ebZ
 wGH
 wGH
-qCN
+rAd
 wGH
 vkb
 dSF
@@ -41468,8 +41534,8 @@ ebZ
 dce
 dce
 ebZ
-bCg
-ojm
+lkx
+ctq
 ebZ
 wGH
 wGH
@@ -41666,11 +41732,11 @@ wGH
 wGH
 wGH
 wGH
-kyo
-shm
-iPk
-jIO
-smM
+obP
+kYO
+oSL
+ffL
+eIJ
 khe
 ebZ
 wGH
@@ -41868,16 +41934,16 @@ wGH
 wGH
 wGH
 wGH
-spn
-baz
-jkC
-czd
+wmW
+ajW
+rmh
+tcb
 pTP
 xPy
 ebZ
 wGH
 wGH
-qCN
+rAd
 wGH
 wGH
 vBY
@@ -42272,16 +42338,16 @@ wGH
 wGH
 wGH
 wGH
-qCN
+rAd
 wGH
 wGH
 ebZ
 epz
-oRv
-wev
-iPk
-wiJ
-oAl
+oFX
+ceE
+rJL
+cWo
+dSv
 wGH
 wGH
 wGH
@@ -42480,10 +42546,10 @@ wGH
 dce
 unw
 xyA
-rcX
-aOx
-iYG
-csI
+iEF
+ttI
+pHC
+oQv
 wGH
 wGH
 wGH
@@ -42878,7 +42944,7 @@ wGH
 wGH
 wGH
 wGH
-qCN
+rAd
 wGH
 wGH
 ebZ
@@ -42887,7 +42953,7 @@ sEe
 ebZ
 wGH
 wGH
-qCN
+rAd
 wGH
 wGH
 wGH
@@ -43484,7 +43550,7 @@ wGH
 wGH
 wGH
 wGH
-qCN
+rAd
 wGH
 wGH
 dce
@@ -43493,7 +43559,7 @@ ccL
 ebZ
 wGH
 wGH
-qCN
+rAd
 wGH
 wGH
 wGH
@@ -43886,7 +43952,7 @@ wGH
 wGH
 wGH
 wGH
-wGH
+bBn
 otI
 tJH
 wGH
@@ -44099,7 +44165,7 @@ sgv
 rdE
 pfL
 lbB
-jBQ
+bQR
 wGH
 wGH
 wGH
@@ -44505,7 +44571,7 @@ uba
 uba
 uba
 wMr
-wMr
+erp
 wMr
 aDE
 bIm
@@ -48094,8 +48160,8 @@ wGH
 wGH
 wGH
 oXs
-jlK
-sRP
+niZ
+sUT
 oXs
 aQZ
 bYI
@@ -48295,10 +48361,10 @@ wGH
 wGH
 muk
 vcD
-liU
-hmL
-xtq
-xAB
+rQB
+jZS
+bOz
+pVj
 qDU
 nHY
 pAw
@@ -48345,8 +48411,8 @@ mrm
 eGw
 aoA
 vaL
-qHx
-uPJ
+eUs
+wtx
 ivg
 wGH
 vkb
@@ -48498,8 +48564,8 @@ wGH
 wGH
 wGH
 oXs
-sOT
-fsY
+nJR
+ecm
 oXs
 mxO
 hxX
@@ -48546,10 +48612,10 @@ gRw
 jFW
 gmN
 lUC
-nGd
-aXd
-avm
-qsI
+pwL
+fMB
+fKs
+uRU
 wGH
 vBY
 otI
@@ -48749,8 +48815,8 @@ tSR
 sly
 jvH
 vaL
-gwp
-dCv
+vlj
+gQw
 ivg
 wGH
 wGH
@@ -52834,7 +52900,7 @@ dSF
 dSF
 dSF
 dSF
-ubP
+sXh
 dSF
 dSF
 dSF
@@ -53301,7 +53367,7 @@ dSF
 dSF
 dSF
 dSF
-dOV
+dGE
 dSF
 dSF
 dSF
@@ -59441,7 +59507,7 @@ wGH
 wGH
 wGH
 wGH
-wGH
+bBn
 leE
 oCi
 wGH
@@ -59453,7 +59519,7 @@ oIT
 noc
 nsP
 nsP
-kJB
+bOE
 hcx
 nbm
 nsP
@@ -59847,7 +59913,7 @@ wGH
 wGH
 wGH
 wGH
-qCN
+rAd
 wGH
 mIx
 fGN
@@ -59855,7 +59921,7 @@ rPg
 mIx
 wGH
 wGH
-qCN
+rAd
 wGH
 wGH
 wGH
@@ -60453,7 +60519,7 @@ wGH
 wGH
 wGH
 wGH
-qCN
+rAd
 wGH
 tcM
 fgF
@@ -60461,7 +60527,7 @@ rFk
 tcM
 wGH
 wGH
-qCN
+rAd
 wGH
 wGH
 wGH
@@ -61059,7 +61125,7 @@ wGH
 wGH
 wGH
 wGH
-bgl
+pOI
 wGH
 tcM
 cMi
@@ -61067,7 +61133,7 @@ nKD
 tcM
 wGH
 wGH
-mUu
+byz
 wGH
 wGH
 wGH
@@ -61269,7 +61335,7 @@ oLM
 tcM
 nFG
 tcM
-rRe
+tcM
 wGH
 wGH
 wGH
@@ -61463,15 +61529,15 @@ wGH
 wGH
 wGH
 wGH
-oWq
-fYD
-nDk
+xek
+aEm
+xhG
 ssw
-akf
-nHe
-ffO
-yce
-aGy
+oLM
+enU
+oks
+dmB
+iJS
 wGH
 wGH
 wGH
@@ -61665,15 +61731,15 @@ wGH
 wGH
 wGH
 wGH
-lJz
-oQV
-tIt
+vNF
+hNX
+xdy
 aCP
 bZV
-uyH
-eGh
-teR
-jEr
+gMl
+iXL
+dKk
+mqP
 wGH
 wGH
 wGH
@@ -61875,7 +61941,7 @@ oLM
 tcM
 tcM
 nFG
-rRe
+tcM
 wGH
 wGH
 bEW
@@ -62069,15 +62135,15 @@ wGH
 wGH
 wGH
 wGH
-bgl
+pOI
 wGH
 njG
-wSJ
-xXh
+nBV
+ilt
 mIx
 wGH
 wGH
-mUu
+byz
 wGH
 wGH
 vkb
@@ -62274,8 +62340,8 @@ wGH
 wGH
 wGH
 tcM
-bxp
-qcA
+aEU
+rxZ
 tcM
 wGH
 wGH
@@ -62476,8 +62542,8 @@ wGH
 wGH
 wGH
 mIx
-cWl
-rBK
+kmt
+lUo
 tcM
 wGH
 wGH
@@ -62511,7 +62577,7 @@ dSF
 dSF
 dSF
 jJq
-fxV
+gxX
 dSF
 dSF
 dSF
@@ -62675,15 +62741,15 @@ wGH
 wGH
 wGH
 wGH
-qCN
+rAd
 wGH
 tcM
-jqz
-anT
+hOD
+koB
 mIx
 wGH
 wGH
-qCN
+rAd
 bEW
 kMe
 dSF
@@ -62872,24 +62938,24 @@ wGH
 wGH
 wGH
 wGH
-gGV
+bBn
 wGH
 wGH
-gGV
+bBn
 wGH
 uLF
-gGV
+bBn
 tcM
-abx
-krF
+eJD
+teq
 tcM
-gGV
+bBn
 wGH
 wGH
-iLW
+mlr
 dSF
 dSF
-nZi
+aLK
 dSF
 dSF
 dSF
@@ -63274,14 +63340,14 @@ wGH
 wGH
 wGH
 vBY
-otI
+idV
 wGH
 wGH
 wGH
 wGH
 wGH
 opC
-qCN
+rAd
 wGH
 wGH
 wGH
@@ -63289,13 +63355,13 @@ wGH
 wGH
 wGH
 wGH
-mUu
-dSF
+byz
 dSF
 dSF
 dSF
 dSF
 dSF
+dUx
 dSF
 dSF
 dSF
@@ -63683,7 +63749,7 @@ wGH
 wGH
 wGH
 wGH
-wGH
+bBn
 wGH
 wGH
 wGH
@@ -63695,7 +63761,7 @@ wGH
 vkb
 dSF
 dSF
-dSF
+aLK
 dSF
 dSF
 dSF
@@ -63824,7 +63890,7 @@ dSF
 dSF
 dSF
 dSF
-xsC
+bUU
 dSF
 dSF
 dSF
diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm
index 48a6892dc04..952d58f378e 100644
--- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm
+++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm
@@ -4660,7 +4660,7 @@
 "akr" = (
 /obj/machinery/door/airlock/external{
 	dir = 1;
-	frequency = 1332;
+	frequency = 1380;
 	icon_state = "door_locked";
 	id_tag = "pirate_hideout_door";
 	locked = 1;
@@ -21411,7 +21411,7 @@
 	req_access = list(150)
 	},
 /obj/machinery/embedded_controller/radio/simple_docking_controller{
-	frequency = 1337;
+	frequency = 1380;
 	id_tag = "burglar_shuttle";
 	name = "airlock controller";
 	pixel_x = 23;
@@ -24362,17 +24362,17 @@
 	},
 /obj/machinery/door/airlock/hatch{
 	dir = 4;
-	frequency = 1337;
+	frequency = 1380;
 	id_tag = "burglar_shuttle_hatch";
 	locked = 1;
 	req_access = list(150)
 	},
 /obj/machinery/button/remote/blast_door{
-	dir = 1;
+	dir = 2;
 	id = "burglar_blast";
 	layer = 3;
 	name = "blast door";
-	pixel_y = -21;
+	pixel_y = -19;
 	req_access = list(150)
 	},
 /turf/simulated/floor/shuttle/black,
@@ -25019,15 +25019,15 @@
 /area/antag/burglar)
 "bjs" = (
 /obj/structure/shuttle/engine/propulsion/burst/left,
-/turf/unsimulated/floor/plating,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
 /area/shuttle/burglar)
 "bjt" = (
 /obj/structure/shuttle/engine/propulsion/burst,
-/turf/unsimulated/floor/plating,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
 /area/shuttle/burglar)
 "bju" = (
 /obj/structure/shuttle/engine/propulsion/burst/right,
-/turf/unsimulated/floor/plating,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
 /area/shuttle/burglar)
 "bjw" = (
 /obj/machinery/light/small/emergency,
@@ -26640,7 +26640,7 @@
 /area/template_noop)
 "boa" = (
 /obj/machinery/embedded_controller/radio/simple_docking_controller{
-	frequency = 1337;
+	frequency = 1380;
 	id_tag = "merc_base";
 	pixel_x = -25;
 	pixel_y = -5
@@ -27238,7 +27238,7 @@
 "boT" = (
 /obj/machinery/door/airlock/external{
 	dir = 4;
-	frequency = 1337;
+	frequency = 1380;
 	id_tag = "merc_shuttle_inner";
 	name = "Ship External Access";
 	req_access = list(0)
@@ -27247,8 +27247,9 @@
 /obj/machinery/button/remote/blast_door{
 	id = "smindicate2";
 	name = "internal blast door";
-	pixel_y = 23;
-	req_access = list(150)
+	pixel_y = 26;
+	req_access = list(150);
+	dir = 1
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -27262,7 +27263,7 @@
 "boU" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 4;
-	frequency = 1337;
+	frequency = 1380;
 	id_tag = "merc_shuttle_pump"
 	},
 /obj/effect/floor_decal/industrial/warning{
@@ -27275,7 +27276,7 @@
 	dir = 1
 	},
 /obj/machinery/airlock_sensor{
-	frequency = 1337;
+	frequency = 1380;
 	id_tag = "merc_shuttle_sensor";
 	pixel_x = 8;
 	pixel_y = 25
@@ -27286,11 +27287,11 @@
 "boW" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 8;
-	frequency = 1337;
+	frequency = 1380;
 	id_tag = "merc_shuttle_pump"
 	},
 /obj/machinery/embedded_controller/radio/airlock/docking_port{
-	frequency = 1337;
+	frequency = 1380;
 	id_tag = "merc_shuttle";
 	pixel_x = -8;
 	pixel_y = 25;
@@ -27304,7 +27305,7 @@
 "boX" = (
 /obj/machinery/door/airlock/external{
 	dir = 4;
-	frequency = 1337;
+	frequency = 1380;
 	id_tag = "merc_shuttle_outer";
 	name = "Ship External Access";
 	req_access = list(150)
@@ -27320,15 +27321,16 @@
 /obj/machinery/button/remote/blast_door{
 	id = "smindicate";
 	name = "external blast door";
-	pixel_y = 23;
-	req_access = list(150)
+	pixel_y = 26;
+	req_access = list(150);
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/mercenary)
 "boY" = (
 /obj/machinery/door/airlock/external{
 	dir = 4;
-	frequency = 1337;
+	frequency = 1380;
 	id_tag = "merc_base_hatch";
 	req_access = list(150)
 	},
@@ -27584,7 +27586,7 @@
 "bpE" = (
 /obj/machinery/door/airlock/external{
 	dir = 4;
-	frequency = 1337;
+	frequency = 1380;
 	id_tag = "merc_shuttle_inner";
 	name = "Ship External Access";
 	req_access = list(0)
@@ -27592,7 +27594,7 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/access_button{
 	command = "cycle_interior";
-	frequency = 1337;
+	frequency = 1380;
 	master_tag = "merc_shuttle";
 	name = "interior access button";
 	pixel_x = -1;
@@ -27616,7 +27618,7 @@
 "bpG" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 8;
-	frequency = 1337;
+	frequency = 1380;
 	id_tag = "merc_shuttle_pump"
 	},
 /obj/effect/floor_decal/industrial/warning{
@@ -27627,7 +27629,7 @@
 "bpH" = (
 /obj/machinery/door/airlock/external{
 	dir = 4;
-	frequency = 1337;
+	frequency = 1380;
 	id_tag = "merc_shuttle_outer";
 	name = "Ship External Access";
 	req_access = list(150)
@@ -27642,7 +27644,7 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/access_button{
 	command = "cycle_exterior";
-	frequency = 1337;
+	frequency = 1380;
 	master_tag = "merc_shuttle";
 	name = "exterior access button";
 	pixel_x = 1;
@@ -27654,7 +27656,7 @@
 "bpI" = (
 /obj/machinery/door/airlock/external{
 	dir = 4;
-	frequency = 1337;
+	frequency = 1380;
 	id_tag = "merc_base_hatch";
 	req_access = list(150)
 	},
@@ -28651,7 +28653,7 @@
 	reversed = 1
 	},
 /obj/machinery/embedded_controller/radio/simple_docking_controller{
-	frequency = 1332;
+	frequency = 1380;
 	id_tag = "pirate_hideout";
 	layer = 3.5;
 	pixel_x = 28;
@@ -29049,7 +29051,7 @@
 "bsD" = (
 /obj/machinery/door/airlock/external{
 	dir = 1;
-	frequency = 1332;
+	frequency = 1380;
 	icon_state = "door_locked";
 	id_tag = "pirate_hideout_door";
 	locked = 1;
@@ -29064,7 +29066,7 @@
 	},
 /obj/machinery/door/airlock/external{
 	dir = 1;
-	frequency = 1332;
+	frequency = 1380;
 	icon_state = "door_locked";
 	id_tag = "pirate_hideout_door";
 	locked = 1;
@@ -30325,18 +30327,19 @@
 "bvn" = (
 /obj/machinery/door/airlock/hatch{
 	dir = 1;
-	frequency = 1332;
+	frequency = 1380;
 	id_tag = "raider_northeast_lock";
 	locked = 1;
 	req_access = list(150)
 	},
 /obj/machinery/access_button{
 	command = "cycle_exterior";
-	frequency = 1332;
+	frequency = 1380;
 	master_tag = "raider_east_control";
 	pixel_x = -26;
 	pixel_y = 12;
-	req_access = list(150)
+	req_access = list(150);
+	dir = 1
 	},
 /obj/machinery/door/blast/regular/open{
 	dir = 2;
@@ -30344,11 +30347,12 @@
 	name = "blast door"
 	},
 /obj/machinery/button/remote/blast_door{
-	dir = 8;
+	dir = 2;
 	id = "raiderblastdoor";
 	name = "blast door";
 	pixel_x = 25;
-	req_access = list(150)
+	req_access = list(150);
+	pixel_y = 13
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/skipjack)
@@ -30429,9 +30433,10 @@
 /area/shuttle/skipjack)
 "bwc" = (
 /obj/machinery/airlock_sensor{
-	frequency = 1332;
+	frequency = 1380;
 	id_tag = "raider_east_sensor";
-	pixel_x = -25
+	pixel_x = -25;
+	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small{
@@ -30445,7 +30450,7 @@
 "bwd" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 0;
-	frequency = 1332;
+	frequency = 1380;
 	id_tag = "raider_east_vent"
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -30669,18 +30674,19 @@
 "bxd" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 4;
-	frequency = 1332;
+	frequency = 1380;
 	id_tag = "raider_east_vent"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/embedded_controller/radio/airlock/docking_port{
-	frequency = 1332;
+	frequency = 1380;
 	id_tag = "raider_east_control";
 	pixel_x = -24;
 	tag_airpump = "raider_east_vent";
 	tag_chamber_sensor = "raider_east_sensor";
 	tag_exterior_door = "raider_northeast_lock";
-	tag_interior_door = "raider_southeast_lock"
+	tag_interior_door = "raider_southeast_lock";
+	dir = 4
 	},
 /obj/vehicle/bike{
 	dir = 4
@@ -30696,7 +30702,7 @@
 "bxf" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 8;
-	frequency = 1332;
+	frequency = 1380;
 	id_tag = "raider_east_vent"
 	},
 /turf/simulated/floor/plating,
@@ -30869,7 +30875,7 @@
 "bxU" = (
 /obj/machinery/door/airlock/hatch{
 	dir = 1;
-	frequency = 1332;
+	frequency = 1380;
 	id_tag = "raider_southeast_lock";
 	locked = 1;
 	req_access = list(150)
@@ -31011,10 +31017,10 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/machinery/access_button{
 	command = "cycle_interior";
-	frequency = 1332;
+	frequency = 1380;
 	master_tag = "raider_east_control";
-	pixel_x = 22;
-	pixel_y = 24;
+	pixel_x = 26;
+	pixel_y = 32;
 	req_access = list(150)
 	},
 /turf/simulated/floor/plating,