diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index b146a865ff41a..9af74c7da1b65 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -527,21 +527,16 @@ GLOBAL_LIST_INIT(click_catchers, create_click_catcher())
 	. = 1
 
 /client/MouseDown(object, location, control, params)
-	var/delay = mob.CanMobAutoclick(object, location, params)
-	if(delay)
-		selected_target[1] = object
-		selected_target[2] = params
-		while(selected_target[1])
-			Click(selected_target[1], location, control, selected_target[2])
-			sleep(delay)
+	var/datum/click_handler/click_handler = usr.GetClickHandler()
+	click_handler.OnMouseDown(object, location, params)
 
 /client/MouseUp(object, location, control, params)
-	selected_target[1] = null
+	var/datum/click_handler/click_handler = usr.GetClickHandler()
+	click_handler.OnMouseUp(object, location, params)
 
 /client/MouseDrag(src_object,atom/over_object,src_location,over_location,src_control,over_control,params)
-	if(selected_target[1] && over_object.IsAutoclickable())
-		selected_target[1] = over_object
-		selected_target[2] = params
+	var/datum/click_handler/click_handler = usr.GetClickHandler()
+	click_handler.OnMouseDrag(over_object, params)
 
 /mob/proc/CanMobAutoclick(object, location, params)
 	return
diff --git a/code/_onclick/click_handling.dm b/code/_onclick/click_handling.dm
index adf833ac3faa6..b81ac80b4982c 100644
--- a/code/_onclick/click_handling.dm
+++ b/code/_onclick/click_handling.dm
@@ -103,12 +103,77 @@ var/global/const/CLICK_HANDLER_REMOVE_IF_NOT_TOP    = FLAG(1)
 /datum/click_handler/proc/OnDblClick(atom/A, params)
 	return
 
+/**
+ * Called on MouseDown by `/client/MouseDown()` when this is the mob's currently active click handler.
+ *
+ * **Parameters**:
+ * - `object` - The atom mouse is underneath.
+ * - `location` - the turf, stat panel, grid cell, etc. containing the object where it was clicked
+ * - `params` (list of strings) - List of click parameters. See BYOND's `CLick()` documentation.
+ *
+ * Has no return value.
+ */
+/datum/click_handler/proc/OnMouseDown(object, location, params)
+	return
+
+/**
+ * Called on MouseUp by `/client/MouseUp()` when this is the mob's currently active click handler.
+ *
+ * **Parameters**:
+ * - `object` - The atom underneath mouse.
+ * - `location` - the turf, stat panel, grid cell, etc. containing the object where it was clicked
+ * - `params` (list of strings) - List of click parameters. See BYOND's `CLick()` documentation.
+ *
+ * Has no return value.
+ */
+/datum/click_handler/proc/OnMouseUp(object, location, params)
+	return
+
+/**
+ * Called on MouseUp by `/client/MouseDrag()` when this is the mob's currently active click handler.
+ *
+ * **Parameters**:
+ * - `over_object` - The new atom underneath mouse.
+ * - `params` (list of strings) - List of click parameters. See BYOND's `CLick()` documentation.
+ *
+ * Has no return value.
+ */
+/datum/click_handler/proc/OnMouseDrag(atom/over_object, params)
+	return
+
+/datum/click_handler/proc/CanAutoClick(object, location, params)
+	return
+
+/datum/click_handler/default
+	/// Holds click params [2] and a reference [1] to the atom under the cursor on MouseDown/Drag
+	var/list/selected_target = list(null, null)
+
 /datum/click_handler/default/OnClick(atom/A, params)
 	user.ClickOn(A, params)
 
 /datum/click_handler/default/OnDblClick(atom/A, params)
 	user.DblClickOn(A, params)
 
+/datum/click_handler/default/OnMouseDown(object, location, params)
+	var/delay = CanAutoClick(object, location, params)
+	if(delay)
+		selected_target[1] = object
+		selected_target[2] = params
+		while(selected_target[1])
+			OnClick(selected_target[1], selected_target[2])
+			sleep(delay)
+
+/datum/click_handler/default/OnMouseUp(object, location, params)
+	selected_target[1] = null
+
+/datum/click_handler/default/OnMouseDrag(atom/over_object, params)
+	if(selected_target[1] && over_object && over_object.IsAutoclickable()) //Over object could be null, for example if dragging over darkness
+		selected_target[1] = over_object
+		selected_target[2] = params
+
+/datum/click_handler/default/CanAutoClick(object, location, params)
+	return user.CanMobAutoclick(object, location, params)
+
 /**
  * Returns the mob's currently active click handler.
  *
diff --git a/code/game/antagonist/station/changeling.dm b/code/game/antagonist/station/changeling.dm
index 77f60752c282f..b207bc29fe5d6 100644
--- a/code/game/antagonist/station/changeling.dm
+++ b/code/game/antagonist/station/changeling.dm
@@ -74,13 +74,13 @@ GLOBAL_DATUM_INIT(changelings, /datum/antagonist/changeling, new)
 				var/mob/living/carbon/human/H = player.current
 				if(H.isSynthetic() || H.isFBP())
 					return 0
-				if(H.species.species_flags & SPECIES_FLAG_NO_SCAN)
+				if(H.species.species_flags & (SPECIES_FLAG_NO_SCAN|SPECIES_FLAG_NEED_DIRECT_ABSORB))
 					return 0
 				return 1
 			else if(isnewplayer(player.current))
 				if(player.current.client && player.current.client.prefs)
 					var/datum/species/S = all_species[player.current.client.prefs.species]
-					if(S && (S.species_flags & SPECIES_FLAG_NO_SCAN))
+					if(S?.species_flags & SPECIES_FLAG_NO_SCAN|SPECIES_FLAG_NEED_DIRECT_ABSORB)
 						return 0
 					if(player.current.client.prefs.organ_data[BP_CHEST] == "cyborg") // Full synthetic.
 						return 0
diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm
index cff697465fd48..168acff1755b7 100644
--- a/code/modules/client/client_defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -30,9 +30,6 @@
 	/// A message to show to online staff when joining, if any
 	var/staffwarn
 
-	/// Holds click params [2] and a reference [1] to the atom under the cursor on MouseDown/Drag
-	var/list/selected_target = list(null, null)
-
 	/// Whether or not the client is currently playing the "ship hum" ambience sound
 	var/playing_vent_ambience = FALSE
 
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 67a791d07e82f..02e62edd50e30 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -249,6 +249,7 @@
 	item_state = "bandana"
 	item_flags = ITEM_FLAG_FLEXIBLEMATERIAL | ITEM_FLAG_WASHER_ALLOWED
 	w_class = ITEM_SIZE_SMALL
+	use_alt_layer = TRUE
 
 /obj/item/clothing/mask/bandana/equipped(mob/user, slot)
 	switch(slot)
diff --git a/code/modules/mechs/equipment/utility.dm b/code/modules/mechs/equipment/utility.dm
index 176ba2bfbd14b..c5cfc44824d63 100644
--- a/code/modules/mechs/equipment/utility.dm
+++ b/code/modules/mechs/equipment/utility.dm
@@ -712,11 +712,12 @@
 	use_external_power = TRUE
 	has_safety = FALSE
 	max_shots = 10
+	projectile_type = /obj/item/projectile/beam/plasmacutter/mech
 
 
 /obj/item/mech_equipment/mounted_system/taser/plasma
 	name = "mounted plasma cutter"
-	desc = "An industrial plasma cutter mounted onto the chassis of the mech. "
+	desc = "An industrial plasma cutter mounted onto the chassis of the mech. The additional size means increased coherency at longer range. "
 	icon_state = "mech_plasma"
 	holding_type = /obj/item/gun/energy/plasmacutter/mounted/mech
 	restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND, HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER)
diff --git a/code/modules/mechs/mech_interaction.dm b/code/modules/mechs/mech_interaction.dm
index b387f612fa95f..5e2e49a650c98 100644
--- a/code/modules/mechs/mech_interaction.dm
+++ b/code/modules/mechs/mech_interaction.dm
@@ -41,6 +41,26 @@
 	if(selected_system)
 		return selected_system.MouseDragInteraction(src_object, over_object, src_location, over_location, src_control, over_control, params, user)
 
+/datum/click_handler/default/mech/CanAutoClick(object, location, params)
+	var/mob/living/exosuit/E = user.loc
+	if(!user || E.incapacitated() || user.incapacitated())
+		return 0
+
+	if(!(user in E.pilots) && user != E)
+		return 0
+	//Ask mech if given its current active item it wants to handle autoclick
+	return E.CanMobAutoclick(object, location, params)
+
+/mob/living/exosuit/CanMobAutoclick(atom/object, location, params)
+	if(!object.IsAutoclickable())
+		return
+
+	if (!istype(selected_system, /obj/item/mech_equipment))
+		return
+	var/obj/item/mech_equipment/mech_equipment = selected_system
+	var/obj/item/effective = mech_equipment.get_effective_obj()
+	return effective.CanItemAutoclick(object, location, params)
+
 /datum/click_handler/default/mech/OnClick(atom/A, params)
 	var/mob/living/exosuit/E = user.loc
 	if(!istype(E))
@@ -209,10 +229,12 @@
 				admin_attack_log(user, A, "Attacked using \a [temp_system] (MECH)", "Was attacked with \a [temp_system] (MECH)", "used \a [temp_system] (MECH) to attack")
 			//Mech equipment subtypes can add further click delays
 			var/extra_delay = 0
+			var/automatic = temp_system?.CanItemAutoclick() //Items that can autoclick do not add arm delay (else it defeats point).
 			if(!isnull(selected_system))
 				ME = selected_system
 				extra_delay = ME.equipment_delay
-			setClickCooldown(arms ? arms.action_delay + extra_delay : 15 + extra_delay)
+			var/arm_delay = arms ? arms.action_delay : 15
+			setClickCooldown(automatic ? extra_delay : arm_delay + extra_delay)
 			if(system_moved)
 				temp_system.forceMove(selected_system)
 			return
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 356e64e6b906c..287d7c564d550 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -163,7 +163,7 @@
 			msg += "The message \"[robohead.display_text]\" is displayed on its screen.\n"
 
 	//splints
-	for(var/organ in list(BP_L_LEG, BP_R_LEG, BP_L_ARM, BP_R_ARM))
+	for(var/organ in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT, BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND))
 		var/obj/item/organ/external/o = get_organ(organ)
 		if(o && o.splinted && o.splinted.loc == o)
 			msg += "[SPAN_WARNING("[P.He] [P.has] \a [o.splinted] on [P.his] [o.name]!")]\n"
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index c32aeef4f2a36..303d61dc1c194 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -143,17 +143,19 @@ Please contact me on #coderbus IRC. ~Carn x
 #define HO_SUIT_STORE_LAYER 16
 #define HO_BACK_LAYER       17
 #define HO_HAIR_LAYER       18 //TODO: make part of head layer?
-#define HO_GOGGLES_LAYER    19
-#define HO_EARS_LAYER       20
-#define HO_FACEMASK_LAYER   21
-#define HO_HEAD_LAYER       22
-#define HO_COLLAR_LAYER     23
-#define HO_HANDCUFF_LAYER   24
-#define HO_L_HAND_LAYER     25
-#define HO_R_HAND_LAYER     26
-#define HO_FIRE_LAYER       27 //If you're on fire
-#define HO_EFFECTS_LAYER 28
-#define TOTAL_LAYERS        29
+#define HO_EARS_LAYER       19
+#define HO_ALT_HEAD_LAYER   20
+#define HO_GOGGLES_LAYER    21
+#define HO_FACEMASK_LAYER   22
+#define HO_HEAD_LAYER       23
+#define HO_COLLAR_LAYER     24
+#define HO_HANDCUFF_LAYER   25
+#define HO_L_HAND_LAYER     26
+#define HO_R_HAND_LAYER     27
+#define HO_FIRE_LAYER       28 //If you're on fire
+#define HO_EFFECTS_LAYER    29
+#define TOTAL_LAYERS        30
+
 //////////////////////////////////
 
 /mob/living/carbon/human
@@ -576,9 +578,11 @@ var/global/list/damage_icon_parts = list()
 
 /mob/living/carbon/human/update_inv_head(update_icons=1)
 	if(head)
-		overlays_standing[HO_HEAD_LAYER] = head.get_mob_overlay(src,slot_head_str)
+		overlays_standing[head.use_alt_layer ? HO_ALT_HEAD_LAYER : HO_HEAD_LAYER] = head.get_mob_overlay(src,slot_head_str)
+		overlays_standing[head.use_alt_layer ? HO_HEAD_LAYER : HO_ALT_HEAD_LAYER] = null
 	else
-		overlays_standing[HO_HEAD_LAYER]	= null
+		overlays_standing[HO_HEAD_LAYER]     = null
+		overlays_standing[HO_ALT_HEAD_LAYER] = null
 	if(update_icons)
 		queue_icon_update()
 
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index dbea958413f73..b5faa69e8a6a6 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -324,6 +324,14 @@
 	tracer_type = /obj/projectile/trilaser/tracer
 	impact_type = /obj/projectile/trilaser/impact
 
+//Exosuits have heavier cutters with less falloff
+/obj/item/projectile/beam/plasmacutter/mech
+		damage_falloff_list = list(
+		list(5, 0.80),
+		list(7, 0.60),
+		list(9, 0.40),
+	)
+
 /obj/item/projectile/beam/plasmacutter/on_impact(atom/A)
 	if(istype(A, /turf/simulated/mineral))
 		var/turf/simulated/mineral/M = A
diff --git a/code/modules/species/species_age_comparison.dm b/code/modules/species/species_age_comparison.dm
index 3bd3c69ac57dc..f342de74be8d8 100644
--- a/code/modules/species/species_age_comparison.dm
+++ b/code/modules/species/species_age_comparison.dm
@@ -55,8 +55,11 @@
 		if (!age_diff_descriptor)
 			age_diff_descriptor = age_diff_descriptors[length(age_diff_descriptors)]
 
+	if (observer == observed)
+		return "You are of [age_descriptor] age for \a [name]."
+
 	var/datum/pronouns/pronouns = observed.choose_from_pronouns()
 	if (age_diff_descriptor)
-		return "[pronouns.He] [pronouns.is] of [age_descriptor] age for a [name], [age_diff_descriptor] you."
+		return "[pronouns.He] [pronouns.is] of [age_descriptor] age for \a [name], [age_diff_descriptor] you."
 	else if (age_descriptor)
-		return "[pronouns.He] [pronouns.is] of [age_descriptor] age for a [name]."
+		return "[pronouns.He] [pronouns.is] of [age_descriptor] age for \a [name]."
diff --git a/html/changelogs/AutoChangeLog-sierra-pr-2987.yml b/html/changelogs/AutoChangeLog-sierra-pr-2987.yml
new file mode 100644
index 0000000000000..792af805f76b9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-sierra-pr-2987.yml
@@ -0,0 +1,4 @@
+author: Spookerton
+changes:
+  - {bugfix: GAS can't roll changeling.}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-sierra-pr-3010.yml b/html/changelogs/AutoChangeLog-sierra-pr-3010.yml
new file mode 100644
index 0000000000000..72786efad2aca
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-sierra-pr-3010.yml
@@ -0,0 +1,4 @@
+author: SierraKomodo
+changes:
+  - {tweak: Goggles now render over bandanas when worn and pushed up.}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-sierra-pr-3032.yml b/html/changelogs/AutoChangeLog-sierra-pr-3032.yml
new file mode 100644
index 0000000000000..c60b87df46e1f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-sierra-pr-3032.yml
@@ -0,0 +1,5 @@
+author: CrimsonShrike
+changes:
+  - {tweak: The exosuit plasma cutters have a little under half the fallofff of regular
+      plasma cutters.}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-sierra-pr-3074.yml b/html/changelogs/AutoChangeLog-sierra-pr-3074.yml
new file mode 100644
index 0000000000000..d8cb68038d907
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-sierra-pr-3074.yml
@@ -0,0 +1,5 @@
+author: SierraKomodo
+changes:
+  - {tweak: examining yourself now shows "You are of X age for a SPECIES" instead
+      of third person descriptions.}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-sierra-pr-3076.yml b/html/changelogs/AutoChangeLog-sierra-pr-3076.yml
new file mode 100644
index 0000000000000..b019a25a7182d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-sierra-pr-3076.yml
@@ -0,0 +1,4 @@
+author: SierraKomodo
+changes:
+  - {bugfix: Splints on hands and feet now appear in examine text when examining mobs.}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-sierra-pr-3082.yml b/html/changelogs/AutoChangeLog-sierra-pr-3082.yml
new file mode 100644
index 0000000000000..5fa06bf33128e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-sierra-pr-3082.yml
@@ -0,0 +1,5 @@
+author: Spookerton
+changes:
+  - {maptweak: Expedition prep has a console and space map.}
+  - {maptweak: Split hangar substation out into a full substation.}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-sierra-pr-3083.yml b/html/changelogs/AutoChangeLog-sierra-pr-3083.yml
new file mode 100644
index 0000000000000..54329f7d4f5e0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-sierra-pr-3083.yml
@@ -0,0 +1,5 @@
+author: LordNest
+changes:
+  - {imageadd: Добавил в биомоды лисьи уши в целях повышения числа рыжих девушек на
+      Сьерре.}
+delete-after: true
diff --git a/maps/torch/structures/closets/exploration.dm b/maps/torch/structures/closets/exploration.dm
index d258cef66a6b9..099ee0e271621 100644
--- a/maps/torch/structures/closets/exploration.dm
+++ b/maps/torch/structures/closets/exploration.dm
@@ -52,7 +52,9 @@
 		/obj/item/clothing/accessory/buddy_tag,
 		/obj/item/storage/firstaid/light,
 		/obj/item/storage/backpack/dufflebag,
-		/obj/item/device/flashlight/flare
+		/obj/item/device/flashlight/flare,
+		/obj/item/crowbar/prybar,
+		/obj/item/extinguisher/mini
 	)
 
 /obj/structure/closet/secure_closet/explorer
@@ -77,7 +79,9 @@
 		/obj/item/material/knife/folding/swiss/explorer,
 		/obj/item/device/camera,
 		/obj/item/storage/backpack/dufflebag,
-		/obj/item/device/flashlight/flare
+		/obj/item/device/flashlight/flare,
+		/obj/item/crowbar/prybar,
+		/obj/item/extinguisher/mini
 	)
 
 /obj/structure/closet/secure_closet/pilot
diff --git a/maps/torch/torch1_deck5.dmm b/maps/torch/torch1_deck5.dmm
index 76b78b79df49e..b158ea9587821 100644
--- a/maps/torch/torch1_deck5.dmm
+++ b/maps/torch/torch1_deck5.dmm
@@ -256,7 +256,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/simulated/wall/prepainted,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/maintenance/fifthdeck/aftstarboard)
 "aE" = (
 /obj/structure/disposalpipe/segment{
@@ -326,7 +326,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -335,7 +334,6 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/maintenance,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/maintenance/fifthdeck/aftstarboard)
 "aL" = (
@@ -359,11 +357,6 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /turf/simulated/floor/tiled/monotile,
 /area/hallway/primary/fifthdeck/aft)
 "aO" = (
@@ -899,18 +892,23 @@
 	icon_state = "1-4"
 	},
 /obj/structure/catwalk,
+/obj/structure/reagent_dispensers/fueltank,
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftstarboard)
 "bN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/power/smes/buildable/preset/torch/hangar{
+	RCon_tag = "Substation - Hangar"
+	},
 /obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+	d2 = 4;
+	icon_state = "0-4"
+	},
+/obj/structure/cable/cyan{
+	d2 = 8;
+	icon_state = "0-8"
 	},
-/obj/wallframe_spawn/no_grille,
 /turf/simulated/floor/plating,
-/area/maintenance/fifthdeck/aftstarboard)
+/area/maintenance/substation/hangar)
 "bP" = (
 /obj/paint/silver,
 /turf/simulated/wall/titanium,
@@ -1461,12 +1459,6 @@
 "cZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/fore)
 "da" = (
@@ -1635,13 +1627,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/guppy_hangar/start)
-"du" = (
-/obj/floor_decal/industrial/warning{
-	dir = 1;
-	icon_state = "warning"
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/fifthdeck/aftstarboard)
 "dv" = (
 /obj/floor_decal/techfloor{
 	dir = 1
@@ -2468,15 +2453,10 @@
 /turf/simulated/wall/walnut,
 /area/vacant/bar)
 "fB" = (
-/obj/catwalk_plated,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
+/obj/catwalk_plated,
 /turf/simulated/floor/plating,
 /area/quartermaster/hangar)
 "fD" = (
@@ -2976,13 +2956,17 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/expedition/eva)
 "gG" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering{
+	name = "Hangar Substation"
+	},
 /obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
 	},
-/turf/simulated/wall/prepainted,
-/area/maintenance/fifthdeck/fore)
+/turf/simulated/floor/tiled/steel_ridged,
+/area/maintenance/substation/hangar)
 "gH" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -3797,14 +3781,14 @@
 /turf/simulated/floor/plating,
 /area/quartermaster/hangar)
 "iW" = (
+/obj/catwalk_plated,
 /obj/structure/cable/cyan{
 	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+	d2 = 8;
+	icon_state = "1-8"
 	},
-/obj/structure/catwalk,
 /turf/simulated/floor/plating,
-/area/maintenance/fifthdeck/fore)
+/area/quartermaster/hangar)
 "iX" = (
 /obj/random/torchcloset,
 /obj/random/maintenance/solgov,
@@ -3814,11 +3798,6 @@
 /area/quartermaster/hangar)
 "iY" = (
 /obj/machinery/door/firedoor,
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/airlock/maintenance,
@@ -4399,6 +4378,11 @@
 /obj/machinery/light/spot{
 	dir = 1
 	},
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
 /area/quartermaster/hangar)
 "ke" = (
@@ -4944,11 +4928,6 @@
 /turf/simulated/floor/tiled/steel_ridged,
 /area/quartermaster/hangar)
 "lm" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/portables_connector{
 	dir = 4
 	},
@@ -4957,11 +4936,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/expedition/atmos)
 "ln" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/techfloor,
@@ -5041,16 +5015,6 @@
 /obj/wallframe_spawn/reinforced/no_grille,
 /turf/simulated/floor/plating,
 /area/quartermaster/hangar)
-"lw" = (
-/obj/machinery/door/firedoor,
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/wallframe_spawn/reinforced/no_grille,
-/turf/simulated/floor/plating,
-/area/quartermaster/hangar)
 "lx" = (
 /obj/floor_decal/industrial/outline/yellow,
 /obj/machinery/anomaly_container,
@@ -5110,11 +5074,6 @@
 /obj/floor_decal/industrial/warning{
 	dir = 1
 	},
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
@@ -5122,11 +5081,6 @@
 /area/quartermaster/expedition/atmos)
 "lE" = (
 /obj/floor_decal/industrial/warning,
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/expedition/atmos)
@@ -5374,36 +5328,9 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/exploration_shuttle/atmos)
-"mp" = (
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/fifthdeck/fore)
 "mq" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/fifthdeck/fore)
+/turf/simulated/floor/tiled/monotile,
+/area/quartermaster/expedition)
 "mr" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
@@ -5422,21 +5349,6 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/quartermaster/hangar)
-"mt" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/structure/catwalk,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/fifthdeck/fore)
 "mv" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{
 	id_tag = "petrov_shuttle_dock_pump"
@@ -5519,16 +5431,11 @@
 /obj/catwalk_plated,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
 /obj/machinery/tele_beacon,
 /obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
 /area/quartermaster/hangar)
@@ -5563,19 +5470,10 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/fore)
 "mI" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
-/area/maintenance/fifthdeck/fore)
+/area/maintenance/fifthdeck/aftstarboard)
 "mJ" = (
 /obj/structure/cable/green{
 	d1 = 2;
@@ -6110,13 +6008,20 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftport)
 "nI" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/structure/catwalk,
 /obj/structure/cable/cyan{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/simulated/wall/prepainted,
-/area/quartermaster/expedition/atmos)
+/turf/simulated/floor/plating,
+/area/maintenance/fifthdeck/aftstarboard)
 "nJ" = (
 /obj/machinery/light/spot,
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -6151,34 +6056,23 @@
 /turf/simulated/floor/tiled/monotile,
 /area/quartermaster/hangar)
 "nN" = (
-/obj/catwalk_plated,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
+/obj/catwalk_plated,
 /turf/simulated/floor/plating,
 /area/quartermaster/hangar)
 "nO" = (
-/obj/catwalk_plated,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
+/obj/catwalk_plated,
 /turf/simulated/floor/plating,
 /area/quartermaster/hangar)
 "nP" = (
-/obj/catwalk_plated,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
@@ -6186,10 +6080,11 @@
 	dir = 4
 	},
 /obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
 	},
+/obj/catwalk_plated,
 /turf/simulated/floor/plating,
 /area/quartermaster/hangar)
 "nQ" = (
@@ -6536,20 +6431,19 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftport)
 "or" = (
-/obj/structure/cable/cyan{
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
 /obj/structure/catwalk,
+/obj/structure/sign/warning/high_voltage{
+	dir = 4;
+	pixel_x = -32
+	},
 /turf/simulated/floor/plating,
-/area/maintenance/fifthdeck/fore)
+/area/maintenance/fifthdeck/aftstarboard)
 "os" = (
 /obj/machinery/firealarm{
 	pixel_y = 24
@@ -6686,6 +6580,14 @@
 /obj/machinery/camera/network/fifth_deck{
 	c_tag = "Hangar - Aft Starboard"
 	},
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/sign/warning/high_voltage{
+	pixel_y = 32
+	},
 /turf/simulated/floor/plating,
 /area/quartermaster/hangar)
 "oJ" = (
@@ -6831,25 +6733,30 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftstarboard)
 "pe" = (
-/obj/structure/cable,
+/obj/floor_decal/industrial/warning{
+	dir = 1;
+	icon_state = "warning"
+	},
+/obj/machinery/power/apc{
+	name = "south bump";
+	pixel_y = -24
+	},
 /obj/structure/cable{
 	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/alarm{
-	dir = 4;
-	pixel_x = -32
+	d2 = 8;
+	icon_state = "1-8"
 	},
-/obj/floor_decal/industrial/warning{
-	dir = 4;
-	icon_state = "warning"
+/obj/structure/cable{
+	d2 = 8;
+	icon_state = "0-8"
 	},
-/obj/machinery/power/terminal{
-	dir = 4
+/obj/structure/cable{
+	d2 = 4;
+	icon_state = "0-4"
 	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
-/area/maintenance/substation/fifthdeck)
+/area/maintenance/substation/hangar)
 "pf" = (
 /obj/structure/sign/warning/high_voltage{
 	dir = 8
@@ -6944,7 +6851,7 @@
 	dir = 4;
 	icon_state = "pipe-c"
 	},
-/obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftstarboard)
 "ps" = (
@@ -7064,6 +6971,11 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
+/obj/structure/cable{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftstarboard)
 "pH" = (
@@ -7089,6 +7001,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftstarboard)
 "pK" = (
@@ -7271,14 +7188,11 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/fore)
 "qa" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/structure/railing/mapped,
-/turf/simulated/floor/plating,
-/area/maintenance/fifthdeck/fore)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/table/steel,
+/obj/item/modular_computer/laptop/preset/custom_loadout/standard,
+/turf/simulated/floor/tiled,
+/area/quartermaster/expedition)
 "qb" = (
 /obj/structure/fuel_port{
 	pixel_x = 32
@@ -7291,14 +7205,19 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/guppy_hangar/start)
 "qc" = (
-/obj/structure/catwalk,
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/structure/railing/mapped{
+	dir = 4;
+	icon_state = "railing0-1"
 	},
+/obj/random/trash,
 /turf/simulated/floor/plating,
-/area/maintenance/fifthdeck/fore)
+/area/maintenance/fifthdeck/aftstarboard)
 "qd" = (
 /obj/structure/dispenser/oxygen,
 /turf/simulated/floor/tiled/monotile,
@@ -7521,11 +7440,6 @@
 /obj/floor_decal/corner/brown/half,
 /obj/floor_decal/industrial/outline/yellow,
 /obj/machinery/light,
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /obj/structure/closet/firecloset,
 /turf/simulated/floor/tiled/monotile,
 /area/hallway/primary/fifthdeck/aft)
@@ -7533,11 +7447,6 @@
 /obj/floor_decal/corner/brown{
 	dir = 10
 	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/fifthdeck/aft)
 "qF" = (
@@ -7545,11 +7454,6 @@
 	dir = 10
 	},
 /obj/machinery/light,
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/fifthdeck/aft)
 "qH" = (
@@ -7661,20 +7565,9 @@
 	dir = 4;
 	icon_state = "warning"
 	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/substation/fifthdeck)
-"qQ" = (
-/obj/machinery/door/blast/shutters{
-	id_tag = "hanger_atmos_storage";
-	name = "Storage Shutters"
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/dark,
-/area/quartermaster/expedition/atmos)
 "qR" = (
 /obj/floor_decal/corner/mauve{
 	dir = 6
@@ -7713,6 +7606,11 @@
 /obj/machinery/power/terminal{
 	dir = 4
 	},
+/obj/machinery/alarm{
+	dir = 4;
+	pixel_x = -32
+	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/substation/fifthdeck)
 "qU" = (
@@ -7725,11 +7623,6 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/fifthdeck)
 "qV" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
@@ -7755,11 +7648,6 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/fore)
 "qX" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/catwalk,
@@ -7784,6 +7672,7 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/substation/fifthdeck)
 "qZ" = (
@@ -7833,6 +7722,7 @@
 	dir = 1;
 	icon_state = "warning"
 	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/substation/fifthdeck)
 "re" = (
@@ -8053,37 +7943,35 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftport)
 "rA" = (
-/obj/structure/cable/green{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/alarm{
+	dir = 4;
+	pixel_x = -24
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/fifthdeck/aftstarboard)
+"rB" = (
+/obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/fore)
-"rB" = (
-/obj/structure/cable/cyan{
+"rC" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering{
+	name = "Hangar Substation"
+	},
+/obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/fifthdeck/fore)
-"rC" = (
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/fifthdeck/fore)
+/turf/simulated/floor/tiled/steel_ridged,
+/area/maintenance/substation/hangar)
 "rD" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -8108,10 +7996,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/fore)
 "rF" = (
-/obj/machinery/power/smes/buildable/preset/torch/hangar{
-	RCon_tag = "Substation - Hangar"
-	},
-/obj/structure/cable/cyan,
+/obj/wallframe_spawn/reinforced,
 /turf/simulated/floor/plating,
 /area/maintenance/substation/fifthdeck)
 "rG" = (
@@ -8277,11 +8162,6 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/fore)
 "rV" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -8509,20 +8389,43 @@
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/fore)
-"sw" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/floor_decal/industrial/outline/grey,
-/turf/simulated/floor/tiled/techfloor,
-/area/maintenance/fifthdeck/aftstarboard)
 "sx" = (
-/obj/floor_decal/industrial/outline/grey,
-/turf/simulated/floor/tiled/techfloor,
-/area/maintenance/fifthdeck/aftstarboard)
+/obj/structure/sign/warning/high_voltage{
+	pixel_y = 32
+	},
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/obj/floor_decal/industrial/warning{
+	dir = 8;
+	icon_state = "warning"
+	},
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/maintenance/substation/hangar)
 "sz" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/floor_decal/industrial/outline/grey,
-/turf/simulated/floor/tiled/techfloor,
-/area/maintenance/fifthdeck/aftstarboard)
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
+/obj/machinery/power/sensor{
+	name = "Powernet Sensor - Hangar Subgrid";
+	name_tag = "Hangar Subgrid"
+	},
+/obj/structure/cable/cyan,
+/obj/structure/cable/cyan{
+	d2 = 2;
+	icon_state = "0-2"
+	},
+/obj/floor_decal/industrial/warning/corner{
+	dir = 1
+	},
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/maintenance/substation/hangar)
 "sA" = (
 /obj/structure/cable/cyan{
 	d1 = 4;
@@ -8800,14 +8703,8 @@
 /turf/simulated/floor/plating,
 /area/rnd/canister)
 "tm" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/wallframe_spawn/reinforced,
-/turf/simulated/floor/plating,
-/area/maintenance/substation/fifthdeck)
+/turf/simulated/floor/tiled/monotile,
+/area/quartermaster/expedition/eva)
 "tn" = (
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /obj/machinery/alarm{
@@ -8826,12 +8723,12 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/fore)
 "tp" = (
-/obj/machinery/door/airlock/maintenance{
-	name = "Expedition EVA Maintenance"
-	},
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/airlock/maintenance{
+	name = "Expedition EVA Maintenance"
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/quartermaster/expedition/eva)
 "tr" = (
@@ -9024,11 +8921,6 @@
 /obj/floor_decal/corner/brown{
 	dir = 10
 	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /obj/machinery/camera/network/fifth_deck{
 	c_tag = "Fifth Deck Hallway - Aft";
 	dir = 1
@@ -9258,7 +9150,6 @@
 /turf/simulated/floor/tiled/monotile,
 /area/hallway/primary/fifthdeck/aft)
 "uo" = (
-/obj/catwalk_plated,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
 	},
@@ -9280,6 +9171,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/catwalk_plated,
 /turf/simulated/floor/plating,
 /area/hallway/primary/fifthdeck/aft)
 "up" = (
@@ -9290,11 +9182,6 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/fifthdeck/aft)
 "uq" = (
@@ -9450,11 +9337,6 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftport)
 "uI" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
@@ -9508,16 +9390,12 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/exploration_shuttle/atmos)
 "uO" = (
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/railing/mapped,
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/fore)
 "uP" = (
@@ -9526,11 +9404,6 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -9539,14 +9412,10 @@
 	icon_state = "railing0-1"
 	},
 /obj/structure/railing/mapped,
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/fore)
 "uQ" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -9555,11 +9424,6 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/fore)
 "uS" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
@@ -9665,7 +9529,7 @@
 "vj" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
-/obj/wallframe_spawn/no_grille,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftstarboard)
 "vm" = (
@@ -9972,16 +9836,17 @@
 /turf/simulated/wall/r_wall/hull,
 /area/maintenance/fifthdeck/aftport)
 "wt" = (
-/obj/floor_decal/industrial/warning{
-	dir = 1
+/obj/machinery/door/airlock/engineering{
+	name = "Hangar Substation"
 	},
 /obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/hangar)
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled/steel_ridged,
+/area/maintenance/substation/hangar)
 "wu" = (
 /obj/floor_decal/industrial/outline/yellow,
 /obj/machinery/hologram/holopad/longrange,
@@ -10368,6 +10233,7 @@
 	dir = 4;
 	icon_state = "railing0-1"
 	},
+/obj/random/junk,
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftstarboard)
 "xN" = (
@@ -10392,11 +10258,6 @@
 /turf/simulated/floor/reinforced,
 /area/shuttle/petrov/cell1)
 "xP" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /obj/structure/railing/mapped,
 /obj/structure/railing/mapped{
 	dir = 4;
@@ -10463,18 +10324,6 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/white,
 /area/shuttle/petrov/eva)
-"ya" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/door/airlock/maintenance,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/maintenance/fifthdeck/fore)
 "yc" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
@@ -10523,13 +10372,12 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/structure/cable/cyan{
+/obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/maintenance/fifthdeck/aftstarboard)
 "yl" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -10671,18 +10519,17 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/structure/catwalk,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftstarboard)
 "yA" = (
@@ -10994,12 +10841,11 @@
 /turf/simulated/floor/tiled/dark/monotile,
 /area/shuttle/petrov/control)
 "zL" = (
-/obj/structure/table/steel,
-/obj/item/device/flashlight/lamp/green,
-/turf/simulated/floor/wood/walnut{
-	icon_state = "walnut_broken0"
+/obj/machinery/computer/ship/navigation/telescreen{
+	pixel_y = 28
 	},
-/area/vacant/bar)
+/turf/simulated/floor/tiled,
+/area/quartermaster/expedition)
 "zO" = (
 /obj/floor_decal/industrial/hatch/yellow,
 /obj/machinery/r_n_d/destructive_analyzer,
@@ -11017,14 +10863,14 @@
 /turf/simulated/wall/r_wall/hull,
 /area/hallway/primary/fifthdeck/aft)
 "zW" = (
-/obj/structure/cable/cyan{
-	d2 = 2;
-	icon_state = "0-2"
-	},
 /obj/item/frame/apc,
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/structure/cable{
+	d2 = 2;
+	icon_state = "0-2"
+	},
 /turf/simulated/floor/wood/walnut,
 /area/vacant/bar)
 "zZ" = (
@@ -11592,6 +11438,11 @@
 /area/shuttle/petrov/maint)
 "CB" = (
 /obj/random/trash,
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/fifthdeck/aftstarboard)
 "CC" = (
@@ -11667,11 +11518,6 @@
 	dir = 4;
 	icon_state = "warningcorner"
 	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 9
 	},
@@ -11768,16 +11614,6 @@
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/shuttle/petrov/maint)
-"Df" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/fifthdeck/aftstarboard)
 "Dh" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 1
@@ -11806,7 +11642,7 @@
 /turf/simulated/floor/plating,
 /area/vacant/bar)
 "Dm" = (
-/obj/structure/cable/cyan{
+/obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
@@ -11938,11 +11774,6 @@
 /turf/simulated/floor/tiled/white/monotile,
 /area/shuttle/petrov/eva)
 "DF" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -12992,13 +12823,12 @@
 /area/maintenance/fifthdeck/aftport)
 "HU" = (
 /obj/floor_decal/industrial/outline/grey,
+/obj/random/tech_supply,
 /obj/structure/cable/cyan{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/structure/table/steel,
-/obj/random/tech_supply,
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/fifthdeck/aftstarboard)
 "HV" = (
@@ -13043,10 +12873,6 @@
 	},
 /turf/simulated/floor/tiled/white/monotile,
 /area/shuttle/petrov/equipment)
-"Ia" = (
-/obj/structure/table/steel,
-/turf/simulated/floor/plating,
-/area/vacant/bar)
 "Ib" = (
 /turf/simulated/floor/tiled/white/monotile,
 /area/shuttle/petrov/analysis)
@@ -13067,6 +12893,9 @@
 	},
 /turf/simulated/floor/tiled/white/monotile,
 /area/shuttle/petrov/rnd)
+"Ig" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/substation/hangar)
 "Ih" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/catwalk,
@@ -13103,15 +12932,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/fore)
-"Iq" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/fifthdeck/aftstarboard)
 "It" = (
 /obj/paint/silver,
 /turf/simulated/wall/titanium,
@@ -13328,6 +13148,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/catwalk,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftstarboard)
 "Ju" = (
@@ -13726,11 +13551,11 @@
 /area/shuttle/petrov/isolation)
 "KW" = (
 /obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
 	},
-/obj/structure/cable/cyan{
+/obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
@@ -13818,6 +13643,8 @@
 /turf/simulated/floor/plating,
 /area/shuttle/petrov/phoron)
 "Lj" = (
+/obj/structure/table/steel,
+/obj/item/device/flashlight/lamp/green,
 /turf/simulated/floor/wood/walnut{
 	icon_state = "walnut_broken5"
 	},
@@ -13911,7 +13738,7 @@
 "LB" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/random/trash,
-/obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftstarboard)
 "LC" = (
@@ -13964,18 +13791,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/shuttle/petrov/phoron)
-"LL" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/fifthdeck/aftstarboard)
 "LM" = (
 /obj/structure/shuttle/engine/propulsion{
 	dir = 4
@@ -14001,15 +13816,15 @@
 /turf/simulated/floor/reinforced,
 /area/shuttle/petrov/cell2)
 "LT" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/machinery/light_switch{
 	pixel_x = 22;
 	pixel_y = -22
 	},
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/wood/walnut{
 	icon_state = "walnut_broken0"
 	},
@@ -14342,7 +14157,6 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftstarboard)
 "Ni" = (
@@ -14652,6 +14466,16 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/shuttle/petrov/cell1)
+"Ov" = (
+/obj/machinery/alarm{
+	pixel_y = 23;
+	req_access = list(list("ACCESS_ENGINE_EQUIP","ACCESS_ATMOS"))
+	},
+/obj/machinery/power/breakerbox/activated{
+	RCon_tag = "Hangar Substation Bypass"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/substation/hangar)
 "Oy" = (
 /obj/machinery/requests_console{
 	department = "Cargo Bay";
@@ -14922,9 +14746,16 @@
 /turf/simulated/floor/tiled/white/monotile,
 /area/shuttle/petrov/isolation)
 "PM" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating,
+/obj/structure/sign/warning/high_voltage{
+	dir = 8;
+	pixel_x = 32
+	},
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/maintenance/fifthdeck/aftstarboard)
 "PO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -15220,20 +15051,21 @@
 /turf/simulated/floor/tiled/white/monotile,
 /area/shuttle/petrov/hallwaya)
 "QX" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+/obj/floor_decal/industrial/warning{
+	dir = 1;
+	icon_state = "warning"
 	},
-/obj/structure/catwalk,
-/obj/structure/cable/cyan{
-	d1 = 4;
+/obj/machinery/light/small,
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/structure/cable{
 	d2 = 8;
-	icon_state = "4-8"
+	icon_state = "0-8"
 	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
-/area/maintenance/fifthdeck/fore)
+/area/maintenance/substation/hangar)
 "QY" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -15386,11 +15218,6 @@
 /obj/floor_decal/industrial/warning{
 	dir = 1
 	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -15539,11 +15366,6 @@
 /obj/floor_decal/corner/brown{
 	dir = 5
 	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/fifthdeck/aft)
 "Ss" = (
@@ -15662,9 +15484,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -15673,13 +15492,15 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/structure/cable/cyan{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable{
 	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+	d2 = 4;
+	icon_state = "1-4"
 	},
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/maintenance/fifthdeck/aftstarboard)
 "SN" = (
 /obj/structure/table/rack{
@@ -15725,15 +15546,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftstarboard)
-"SW" = (
-/obj/catwalk_plated,
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
-/turf/simulated/floor/plating,
-/area/quartermaster/hangar)
 "Tc" = (
 /obj/floor_decal/industrial/warning,
 /obj/machinery/atmospherics/binary/pump,
@@ -15838,11 +15650,6 @@
 /turf/simulated/floor/tiled/white,
 /area/shuttle/petrov/isolation)
 "Tw" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /obj/structure/railing/mapped,
 /obj/machinery/atmospherics/pipe/simple/hidden/universal,
 /turf/simulated/floor/plating,
@@ -16115,16 +15922,6 @@
 /obj/random/maintenance/solgov,
 /turf/simulated/floor/plating,
 /area/shuttle/petrov/isolation)
-"UE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/random/junk,
-/turf/simulated/floor/plating,
-/area/maintenance/fifthdeck/aftstarboard)
 "UF" = (
 /obj/structure/table/standard,
 /obj/item/device/integrated_circuit_printer,
@@ -16132,6 +15929,7 @@
 /area/shuttle/petrov/equipment)
 "UG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/bed/chair/office/dark,
 /turf/simulated/floor/tiled,
 /area/quartermaster/expedition)
 "UH" = (
@@ -16225,17 +16023,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/petrov/hallwaya)
-"Ve" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/random/trash,
-/obj/structure/railing/mapped,
-/turf/simulated/floor/plating,
-/area/maintenance/fifthdeck/aftstarboard)
 "Vk" = (
 /obj/structure/bed/chair/office/light{
 	dir = 4
@@ -16456,6 +16243,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
 /obj/random/junk,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/railing/mapped,
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftstarboard)
@@ -16475,6 +16263,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
+/obj/structure/reagent_dispensers/watertank,
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftstarboard)
 "VZ" = (
@@ -16495,15 +16284,13 @@
 /area/space)
 "Wg" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable{
 	d1 = 2;
 	d2 = 4;
 	icon_state = "2-4"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftstarboard)
@@ -16585,7 +16372,6 @@
 	pixel_x = -24
 	},
 /obj/structure/cable/green,
-/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftstarboard)
 "WF" = (
@@ -16714,16 +16500,10 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftstarboard)
 "Xp" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/catwalk,
-/obj/machinery/alarm{
-	dir = 4;
-	pixel_x = -24
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftstarboard)
@@ -16759,13 +16539,16 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/fore)
 "Xz" = (
+/obj/catwalk_plated,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
 	},
-/turf/simulated/floor/tiled,
-/area/hallway/primary/fifthdeck/aft)
+/turf/simulated/floor/plating,
+/area/quartermaster/hangar)
 "XB" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 4
@@ -16789,11 +16572,6 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/fore)
 "XE" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/structure/sign/warning/compressed_gas,
 /turf/simulated/wall/prepainted,
 /area/hallway/primary/fifthdeck/aft)
@@ -17085,7 +16863,7 @@
 /area/shuttle/petrov/hallwaya)
 "YH" = (
 /obj/random/obstruction,
-/obj/structure/cable/cyan{
+/obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
@@ -17267,7 +17045,6 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/guppy_hangar/start)
 "Zo" = (
-/obj/catwalk_plated,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -17282,11 +17059,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
+/obj/catwalk_plated,
 /turf/simulated/floor/plating,
 /area/hallway/primary/fifthdeck/aft)
 "Zp" = (
@@ -17372,6 +17145,7 @@
 "ZE" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/maintenance/fifthdeck/aftstarboard)
@@ -29671,15 +29445,15 @@ pO
 uL
 uO
 cZ
-ya
+iY
 ln
-or
-iW
-iW
-iW
-iW
-iW
-iW
+rH
+mh
+mh
+mh
+mh
+mh
+mh
 qV
 iY
 qX
@@ -29884,7 +29658,7 @@ pl
 OW
 qW
 tb
-rA
+uT
 ri
 rk
 pm
@@ -30086,7 +29860,7 @@ wF
 wF
 wF
 wF
-rB
+mh
 mh
 mh
 mh
@@ -30288,9 +30062,9 @@ iI
 lj
 jG
 wF
-rB
 mh
-ph
+mh
+mh
 ph
 pf
 ph
@@ -30490,10 +30264,10 @@ iK
 jw
 jH
 wF
-rB
+mh
 mk
+rB
 re
-pe
 qP
 qT
 qY
@@ -30670,7 +30444,7 @@ aa
 aa
 an
 an
-mp
+qV
 rV
 uI
 uI
@@ -30692,9 +30466,9 @@ ac
 jx
 jQ
 wF
-rC
-mI
-tm
+mh
+nk
+mh
 rF
 qU
 qZ
@@ -30872,7 +30646,7 @@ aa
 aa
 an
 an
-mq
+rI
 pT
 mh
 yq
@@ -30896,7 +30670,7 @@ wF
 wF
 fl
 nk
-ph
+mh
 ph
 ph
 ph
@@ -31074,7 +30848,7 @@ aa
 aa
 an
 an
-mq
+rI
 cd
 VA
 Zj
@@ -31276,7 +31050,7 @@ aa
 an
 an
 an
-mt
+rq
 QY
 ZN
 ZN
@@ -31478,7 +31252,7 @@ an
 an
 an
 an
-gG
+yq
 hS
 ce
 ce
@@ -31680,7 +31454,7 @@ an
 an
 Lf
 YW
-qa
+eN
 MP
 ce
 iw
@@ -32286,7 +32060,7 @@ an
 an
 aL
 mh
-qc
+mh
 gU
 ce
 hn
@@ -32488,7 +32262,7 @@ an
 ar
 aO
 mg
-QX
+mg
 Om
 ce
 iD
@@ -32690,7 +32464,7 @@ an
 bU
 lY
 lY
-nI
+lY
 lY
 ce
 ce
@@ -33500,9 +33274,9 @@ lY
 Zl
 lD
 lE
-qQ
-wt
-SW
+lZ
+EC
+aX
 ee
 bi
 ag
@@ -33704,7 +33478,7 @@ QA
 SE
 lZ
 EC
-ih
+aX
 ee
 ag
 ag
@@ -33906,7 +33680,7 @@ tV
 Hm
 lY
 hY
-ih
+aX
 ee
 aA
 aR
@@ -34108,7 +33882,7 @@ tV
 lz
 lY
 UH
-ih
+aX
 ee
 aA
 bf
@@ -34310,7 +34084,7 @@ lY
 lY
 lY
 md
-ih
+aX
 ee
 ag
 bg
@@ -34512,7 +34286,7 @@ iX
 fX
 aJ
 UH
-ih
+aX
 ee
 aB
 bh
@@ -34714,7 +34488,7 @@ ju
 fX
 lk
 UH
-ih
+aX
 ee
 aB
 bj
@@ -34916,7 +34690,7 @@ jX
 li
 aJ
 UH
-ih
+aX
 ee
 aB
 bk
@@ -35118,7 +34892,7 @@ aJ
 aJ
 aJ
 UH
-ih
+aX
 ee
 aB
 bh
@@ -35320,7 +35094,7 @@ fi
 hp
 aJ
 FZ
-ih
+aX
 ee
 aB
 bm
@@ -36329,7 +36103,7 @@ aW
 hi
 uF
 ms
-mF
+Xz
 nP
 mw
 mw
@@ -36531,7 +36305,7 @@ aW
 hi
 hb
 aJ
-aX
+ih
 cy
 Ho
 Ho
@@ -36545,7 +36319,7 @@ Ho
 Ho
 Ho
 nM
-ih
+aX
 kW
 Ho
 Ho
@@ -36747,7 +36521,7 @@ cj
 cj
 Gq
 fS
-ih
+aX
 ee
 bi
 bi
@@ -36935,7 +36709,7 @@ aW
 gT
 Ge
 aJ
-aX
+ih
 ee
 aZ
 bG
@@ -36949,7 +36723,7 @@ lU
 cj
 cj
 fS
-ih
+aX
 ee
 bi
 bi
@@ -37135,9 +36909,9 @@ mf
 Xk
 WD
 Ea
-Ea
+FR
 aJ
-aX
+ih
 ee
 aZ
 br
@@ -37151,7 +36925,7 @@ dE
 dM
 ef
 fS
-ih
+aX
 ee
 bi
 bi
@@ -37336,10 +37110,10 @@ ZG
 MC
 pG
 pI
-Ea
+PM
 CB
 aJ
-aX
+ih
 ee
 aZ
 gr
@@ -37353,7 +37127,7 @@ dF
 dN
 ef
 fS
-ih
+aX
 ee
 bi
 bi
@@ -37537,11 +37311,11 @@ ZG
 ZG
 MC
 pH
-du
-FR
-Ea
-aJ
-aX
+Ig
+Ig
+rC
+Ig
+ih
 ee
 aY
 qb
@@ -37555,7 +37329,7 @@ dG
 cj
 cj
 fS
-ih
+aX
 ee
 bi
 bi
@@ -37739,10 +37513,10 @@ ZG
 ZG
 aH
 Jf
-aW
-aW
-aW
-aJ
+Ig
+Ov
+pe
+Ig
 kd
 ee
 aY
@@ -37757,7 +37531,7 @@ cj
 cj
 bi
 fS
-ih
+aX
 ee
 bi
 bi
@@ -37941,10 +37715,10 @@ ZG
 ZG
 aH
 Um
-Ea
-sw
-sw
-aJ
+Ig
+bN
+QX
+Ig
 oI
 eH
 eT
@@ -37959,7 +37733,7 @@ eT
 eT
 eT
 fT
-ih
+aX
 eH
 eT
 eT
@@ -38143,11 +37917,11 @@ ZG
 ZG
 aH
 Um
-Ea
+Ig
 sx
 sz
-aJ
-aX
+gG
+iW
 aX
 aX
 il
@@ -38161,7 +37935,7 @@ kV
 oL
 HY
 Gw
-ih
+aX
 pb
 IO
 il
@@ -38345,11 +38119,11 @@ ZG
 ZG
 aH
 Um
-Ea
-aW
+Ig
+Ig
+wt
+Ig
 aW
-aJ
-aJ
 Qn
 Qn
 Qn
@@ -38363,7 +38137,7 @@ WU
 WU
 lv
 iS
-lw
+lv
 Fk
 Fk
 Fk
@@ -38548,8 +38322,8 @@ ZG
 KI
 al
 Cq
-Cq
-Cq
+or
+nI
 Cq
 bM
 Qn
@@ -38953,7 +38727,7 @@ fz
 NL
 fz
 fz
-fz
+Xp
 EX
 Es
 Qn
@@ -39154,8 +38928,8 @@ QL
 Ct
 Ne
 Lj
-zL
 fz
+Xp
 EX
 Xb
 tp
@@ -39166,12 +38940,12 @@ qr
 qq
 Lp
 UG
-UG
+qa
 sp
 WU
 qz
 um
-Xz
+UO
 hF
 xg
 UO
@@ -39355,21 +39129,21 @@ Xi
 QL
 MG
 av
-Ne
-Ia
+HE
 fz
+Xp
 EX
 Es
 Qn
-qd
-qj
-qm
-qp
+tm
+hq
+hq
+tm
 WU
-qe
-qf
-qh
-Eg
+zL
+gE
+gE
+mq
 ql
 qA
 un
@@ -39559,19 +39333,19 @@ TC
 HE
 yI
 XI
-XI
+Xp
 aD
 aK
 Qn
-Qn
-Qn
-Qn
-Qn
-WU
-WU
-WU
-WU
+qd
+qj
+qm
+qp
 WU
+qf
+qe
+qh
+Eg
 WU
 qB
 Sc
@@ -39764,16 +39538,16 @@ YH
 KW
 yk
 SM
-Df
-Xp
-Df
-Df
-bN
-Iq
-UE
-Ve
-Df
-LL
+aW
+aW
+aW
+aW
+aW
+aW
+aW
+aW
+aW
+aW
 XE
 Sr
 Zo
@@ -39966,13 +39740,13 @@ fz
 HU
 Nh
 yz
-AU
-AU
+mI
+rA
 LB
 pr
 vj
-PM
-PM
+vj
+vj
 VX
 ZE
 Wg
@@ -40174,7 +39948,7 @@ JY
 Hv
 wX
 xL
-xL
+qc
 sC
 ps
 Qg
diff --git a/maps/torch/torch_areas.dm b/maps/torch/torch_areas.dm
index ca0dfc1144691..3a44963a13fec 100644
--- a/maps/torch/torch_areas.dm
+++ b/maps/torch/torch_areas.dm
@@ -43,6 +43,9 @@
 /area/maintenance/substation/fifthdeck
 	name = "Fifth Deck Substation"
 
+/area/maintenance/substation/hangar
+	name = "Hangar Substation"
+
 //Fourth Deck (Z-1)
 /area/hallway/primary/fourthdeck/fore
 	name = "\improper Fourth Deck Fore Hallway"
diff --git a/mods/sprite_accessories/_sprite_accessories.dme b/mods/sprite_accessories/_sprite_accessories.dme
index f8dbd4deaf955..6ab2fc8aefcc5 100644
--- a/mods/sprite_accessories/_sprite_accessories.dme
+++ b/mods/sprite_accessories/_sprite_accessories.dme
@@ -3,5 +3,6 @@
 
 #include "_sprite_accessories.dm"
 #include "code/accessory_unathi.dm"
+#include "code/accessory_human.dm"
 
 #endif
diff --git a/mods/sprite_accessories/code/accessory_human.dm b/mods/sprite_accessories/code/accessory_human.dm
new file mode 100644
index 0000000000000..41775f41fbcff
--- /dev/null
+++ b/mods/sprite_accessories/code/accessory_human.dm
@@ -0,0 +1,9 @@
+/datum/sprite_accessory/marking/human/ears/fox_l
+	icon_state = "ears_fox_l"
+	icon = 'mods/sprite_accessories/icons/bodymods.dmi'
+	name = "Ear Biomods (Large Fox)"
+
+/datum/sprite_accessory/marking/human/ears/fox_s
+	icon_state = "ears_fox_s"
+	icon = 'mods/sprite_accessories/icons/bodymods.dmi'
+	name = "Ear Biomods (Small Fox)"
diff --git a/mods/sprite_accessories/icons/bodymods.dmi b/mods/sprite_accessories/icons/bodymods.dmi
new file mode 100644
index 0000000000000..d77794c1d377d
Binary files /dev/null and b/mods/sprite_accessories/icons/bodymods.dmi differ