diff --git a/code/game/mecha/combat/fighter.dm b/code/game/mecha/combat/fighter.dm
index 37632c88b46..8080722b351 100644
--- a/code/game/mecha/combat/fighter.dm
+++ b/code/game/mecha/combat/fighter.dm
@@ -337,6 +337,9 @@
 	icon_state = "baron"
 	initial_icon = "baron"
 
+	integrity = 600
+	integrity_max = 600
+
 	catalogue_data = list(/datum/category_item/catalogue/technology/baron)
 	wreckage = /obj/effect/decal/mecha_wreckage/baron
 
@@ -387,8 +390,8 @@
 
 	step_in = 3 //slightly slower than a baron (this shit doesnt actually work atm, likely due to the whole equipment weight nonsense)
 
-	integrity = 800
-	integrity_max = 800 //double baron HP, only room for one defensive upgrade. No specials(cloaking, speed, ect) or universals.
+	integrity = 1200
+	integrity_max = 1200 //double baron HP, only room for one defensive upgrade. No specials(cloaking, speed, ect) or universals.
 
 	max_hull_equip = 1
 	max_weapon_equip = 4
diff --git a/code/game/turfs/simulated/wall_types/wall_types.dm b/code/game/turfs/simulated/wall_types/wall_types.dm
index dce5db87a5f..f70ae755cb3 100644
--- a/code/game/turfs/simulated/wall_types/wall_types.dm
+++ b/code/game/turfs/simulated/wall_types/wall_types.dm
@@ -418,6 +418,11 @@
 /turf/simulated/shuttle/wall/voidcraft/red
 	stripe_color = "#FF0000"
 
+/turf/simulated/shuttle/wall/voidcraft/red/hard_corner
+	name = "hardcorner wall"
+	icon_state = "void-hc"
+	hard_corner = 1
+
 /turf/simulated/shuttle/wall/voidcraft/blue
 	stripe_color = "#0000FF"
 
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index bacb973f0e3..e154c1b4602 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -176,6 +176,10 @@ CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc, 22)
 	/// tracks how behind we arre in charging TODO: literally rewrite apcs entirely to use a proper accumulator-cell system with an internal buffer, ffs
 	var/lazy_draw_accumulator = 0
 
+	//Used for shuttles, workaround for broken mounting
+	//TODO: Remove when legacy walls are nuked
+	var/old_wall = FALSE
+
 /obj/machinery/power/apc/updateDialog()
 	if (machine_stat & (BROKEN|MAINT))
 		return
@@ -259,6 +263,9 @@ CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc, 22)
 /obj/machinery/power/apc/setDir(new_dir)
 	. = ..()
 
+	if(old_wall)
+		return
+
 	base_pixel_x = 0
 	base_pixel_y = 0
 	var/turf/T = get_step(src, turn(dir, 180))
diff --git a/code/modules/power/lighting/lighting.dm b/code/modules/power/lighting/lighting.dm
index 26319b49770..0d8144581ae 100644
--- a/code/modules/power/lighting/lighting.dm
+++ b/code/modules/power/lighting/lighting.dm
@@ -296,6 +296,10 @@ var/global/list/light_type_cache = list()
 	var/brightness_power_ns
 	var/brightness_color_ns
 
+	//Used for shuttles, workaround for broken mounting
+	//TODO: Remove when legacy walls are nuked
+	var/old_wall = FALSE
+
 	#ifdef IN_MAP_EDITOR // So its actually visible in the mapping editor
 	icon_state = "tube_map"
 	#endif
@@ -502,6 +506,10 @@ var/global/list/light_type_cache = list()
 
 /obj/machinery/light/setDir(ndir)
 	. = ..()
+
+	if(old_wall)
+		return
+
 	base_pixel_y = 0
 	base_pixel_x = 0
 	var/turf/T = get_step(get_turf(src), src.dir)
diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm
index f69df86ecd8..6660df6a9fc 100644
--- a/maps/rift/levels/rift-05-surface2.dmm
+++ b/maps/rift/levels/rift-05-surface2.dmm
@@ -705,11 +705,13 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/security_equiptment_storage)
 "ayE" = (
-/obj/machinery/door/airlock/voidcraft/vertical,
 /obj/map_helper/airlock/door/int_door,
 /obj/effect/floor_decal/corner_techfloor_gray{
 	dir = 8
 	},
+/obj/machinery/door/airlock/glass_external{
+	name = "NPB Hammerhead"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/hammerhead/general)
 "ayG" = (
@@ -735,15 +737,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/research/rnd)
-"azT" = (
-/obj/machinery/door/blast/regular{
-	dir = 4;
-	id = "hammerheadfport";
-	name = "Port Fighter Entrance"
-	},
-/obj/machinery/atmospheric_field_generator/perma,
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/hammerhead/general)
 "aAG" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/firstaid/surgery,
@@ -811,6 +804,24 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/heads/hos)
+"aBu" = (
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/railing,
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/glass,
+/obj/structure/lattice,
+/obj/structure/cable/green{
+	icon_state = "32-1"
+	},
+/turf/simulated/open,
+/area/maintenance/lower/medsec_maintenance)
 "aBA" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
@@ -926,6 +937,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgery)
+"aGE" = (
+/obj/structure/closet/emcloset,
+/obj/item/clothing/glasses/sunglasses/medhud,
+/obj/random/maintenance/medical,
+/turf/simulated/floor/plating,
+/area/maintenance/medbay)
 "aHd" = (
 /obj/structure/frame{
 	anchored = 1
@@ -1018,10 +1035,12 @@
 /area/security/armory/blue)
 "aJI" = (
 /obj/machinery/light/no_nightshift{
-	dir = 1
+	dir = 1;
+	old_wall = 1
 	},
 /obj/structure/lattice,
 /obj/structure/catwalk,
+/obj/structure/marker_beacon/red,
 /turf/simulated/floor/plating,
 /area/shuttle/hammerhead/general)
 "aJX" = (
@@ -1051,7 +1070,8 @@
 "aKa" = (
 /obj/structure/table/steel_reinforced,
 /obj/machinery/light/no_nightshift{
-	dir = 8
+	dir = 8;
+	old_wall = 1
 	},
 /obj/structure/closet/medical_wall{
 	pixel_x = -32
@@ -1142,6 +1162,9 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/lower/medsec_maintenance)
+"aNv" = (
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/general)
 "aNH" = (
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 8
@@ -1284,8 +1307,20 @@
 /turf/simulated/floor/tiled/steel,
 /area/crew_quarters/heads/hor)
 "aSz" = (
-/obj/effect/floor_decal/corner_techfloor_gray,
-/turf/simulated/floor/tiled/techfloor/grid,
+/obj/machinery/mech_recharger,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/light/no_nightshift{
+	dir = 1;
+	old_wall = 1
+	},
+/turf/simulated/floor/maglev{
+	dir = 8;
+	icon_state = "maglevup";
+	name = "launch rail";
+	desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+	},
 /area/shuttle/hammerhead/general)
 "aTl" = (
 /obj/effect/floor_decal/spline/plain,
@@ -1302,6 +1337,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/machinery/light/no_nightshift{
+	dir = 1
+	},
 /turf/simulated/floor/reinforced,
 /area/security/hammerhead_bay)
 "aTy" = (
@@ -1582,6 +1620,7 @@
 /obj/effect/floor_decal/corner_techfloor_gray{
 	dir = 1
 	},
+/obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/hammerhead/general)
 "baJ" = (
@@ -2068,6 +2107,18 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/lower/medsec_maintenance)
+"bkW" = (
+/obj/machinery/light/no_nightshift{
+	dir = 1;
+	old_wall = 1
+	},
+/turf/simulated/floor/maglev{
+	dir = 8;
+	icon_state = "maglevup";
+	name = "launch rail";
+	desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+	},
+/area/shuttle/hammerhead/cockpit)
 "bli" = (
 /obj/effect/floor_decal/steeldecal/steel_decals10,
 /obj/effect/floor_decal/steeldecal/steel_decals10{
@@ -2257,7 +2308,8 @@
 /area/rift/surfacebase/outside/outside2)
 "bpb" = (
 /obj/machinery/light/no_nightshift{
-	dir = 8
+	dir = 8;
+	old_wall = 1
 	},
 /obj/structure/table/steel_reinforced,
 /obj/machinery/recharger{
@@ -2307,16 +2359,6 @@
 /obj/random/contraband,
 /turf/simulated/floor/plating/lythios43c,
 /area/rift/surfacebase/outside/outside2)
-"bru" = (
-/obj/machinery/button/remote/blast_door{
-	dir = 1;
-	id = "hammerheadfsb";
-	name = "Starboard Fighter Door";
-	pixel_x = -26;
-	pixel_y = -26
-	},
-/turf/simulated/floor/reinforced,
-/area/security/hammerhead_bay)
 "brw" = (
 /obj/structure/table/rack/shelf/steel,
 /obj/item/cell/device/weapon{
@@ -2441,6 +2483,13 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/security_lockerroom)
+"buW" = (
+/obj/effect/floor_decal/corner_techfloor_gray/full,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/hammerhead/general)
 "bvh" = (
 /obj/random/contraband,
 /turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
@@ -2508,20 +2557,6 @@
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 6
 	},
-/obj/machinery/button/remote/blast_door{
-	dir = 1;
-	id = "hammerfighterport";
-	name = "Port Fighter Bay";
-	pixel_x = -3;
-	pixel_y = -30
-	},
-/obj/machinery/button/remote/blast_door{
-	dir = 1;
-	id = "hammerfighterstarboard";
-	name = "Starboard Fighter Bay";
-	pixel_x = 5;
-	pixel_y = -30
-	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "byv" = (
@@ -2764,10 +2799,16 @@
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/corner_techfloor_gray{
+/obj/machinery/mech_recharger,
+/obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/simulated/floor/maglev{
+	dir = 8;
+	icon_state = "maglevup";
+	name = "launch rail";
+	desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+	},
 /area/shuttle/hammerhead/general)
 "bFQ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -2873,6 +2914,12 @@
 /obj/effect/floor_decal/rust,
 /turf/simulated/floor/tiled/steel_dirty,
 /area/maintenance/asmaint2)
+"bKY" = (
+/obj/effect/floor_decal/corner_techfloor_grid{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/cockpit)
 "bLy" = (
 /obj/effect/floor_decal/borderfloorblack{
 	alpha = 255;
@@ -3351,7 +3398,6 @@
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "ceM" = (
-/obj/machinery/door/airlock/voidcraft/vertical,
 /obj/map_helper/airlock/door/int_door,
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 4
@@ -3371,8 +3417,15 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/glass_external{
+	name = "NPB Hammerhead"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/hammerhead/general)
+"ceT" = (
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/hammerhead/general)
 "cfk" = (
 /turf/simulated/wall/prepainted,
 /area/crew_quarters/sleep/Dorm_4)
@@ -3719,6 +3772,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint2)
+"cpn" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/general)
 "cqn" = (
 /obj/fiftyspawner/steel,
 /turf/simulated/floor/tiled/techfloor,
@@ -4019,6 +4078,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/briefing_room)
+"cBh" = (
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/maintenance/medbay)
 "cBE" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -4082,12 +4145,13 @@
 	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/showers)
+"cED" = (
+/obj/structure/catwalk,
+/obj/structure/lattice,
+/turf/simulated/floor/reinforced,
+/area/shuttle/hammerhead/general)
 "cEL" = (
-/obj/machinery/door/airlock/voidcraft/vertical,
 /obj/map_helper/airlock/door/ext_door,
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 4
-	},
 /obj/machinery/access_button/airlock_interior{
 	dir = 4;
 	frequency = 1380;
@@ -4097,6 +4161,12 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+	dir = 4
+	},
+/obj/machinery/door/airlock/glass_external{
+	name = "NPB Hammerhead"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/hammerhead/general)
 "cFr" = (
@@ -4535,10 +4605,10 @@
 /obj/structure/cable/orange{
 	icon_state = "2-8"
 	},
-/obj/effect/floor_decal/corner_techfloor_gray/full{
+/obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/general)
 "cVK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
@@ -4661,12 +4731,6 @@
 /obj/random/maintenance/medical,
 /turf/simulated/floor/plating,
 /area/maintenance/lower/medsec_maintenance)
-"cYC" = (
-/obj/machinery/light/no_nightshift,
-/obj/structure/lattice,
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/shuttle/hammerhead/general)
 "daF" = (
 /obj/machinery/recharge_station,
 /obj/effect/floor_decal/borderfloorblack/cee,
@@ -4697,18 +4761,9 @@
 /turf/simulated/floor/wood,
 /area/rnd/breakroom)
 "dbt" = (
-/obj/structure/bed/chair/bay/shuttle{
-	dir = 8
-	},
-/obj/machinery/light/no_nightshift{
+/obj/effect/floor_decal/corner_techfloor_grid/full{
 	dir = 4
 	},
-/obj/machinery/computer/ship/navigation/telescreen{
-	pixel_x = 32
-	},
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 6
-	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "dbI" = (
@@ -4736,6 +4791,16 @@
 /obj/item/hardsuit/hazmat/equipped,
 /turf/simulated/floor/tiled/steel,
 /area/crew_quarters/heads/hor)
+"ddq" = (
+/obj/structure/bed/chair/bay/shuttle{
+	dir = 8;
+	name = "Pilot's Seat"
+	},
+/obj/effect/floor_decal/corner_techfloor_grid{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/cockpit)
 "ddZ" = (
 /turf/simulated/floor/outdoors/gravsnow/lythios43c/indoors,
 /area/rift/surfacebase/outside/outside2)
@@ -4808,6 +4873,14 @@
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
+/obj/structure/bed/chair/bay/shuttle,
+/obj/machinery/light/no_nightshift{
+	dir = 1;
+	old_wall = 1
+	},
+/obj/effect/floor_decal/corner_techfloor_grid{
+	dir = 5
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "dhE" = (
@@ -4870,29 +4943,8 @@
 /obj/machinery/fitness/punching_bag/clown,
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
-"djJ" = (
-/obj/structure/bed/chair/bay/shuttle{
-	dir = 8
-	},
-/obj/machinery/power/apc/east_mount,
-/obj/structure/cable/orange{
-	icon_state = "0-8"
-	},
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/hammerhead/cockpit)
 "djU" = (
-/obj/structure/bed/chair/bay/shuttle{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 6
-	},
-/obj/structure/panic_button{
-	pixel_x = 32
-	},
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "dke" = (
@@ -5439,7 +5491,7 @@
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/reinforced,
 /area/shuttle/hammerhead/general)
 "dzM" = (
 /obj/effect/floor_decal/steeldecal/steel_decals_central4,
@@ -5845,6 +5897,9 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
+"dIO" = (
+/turf/simulated/shuttle/wall/voidcraft/red/hard_corner,
+/area/shuttle/hammerhead/general)
 "dIR" = (
 /obj/machinery/vending,
 /turf/simulated/floor/tiled/dark,
@@ -5927,7 +5982,6 @@
 /turf/simulated/floor/tiled/monowhite,
 /area/medical/surgery_hallway)
 "dKZ" = (
-/obj/machinery/door/airlock/voidcraft/vertical,
 /obj/map_helper/airlock/door/ext_door,
 /obj/machinery/airlock_sensor/airlock_exterior/shuttle{
 	dir = 4;
@@ -5937,6 +5991,9 @@
 	pixel_y = 23
 	},
 /obj/map_helper/airlock/sensor/ext_sensor,
+/obj/machinery/door/airlock/glass_external{
+	name = "NPB Hammerhead"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/hammerhead/general)
 "dLr" = (
@@ -6488,6 +6545,9 @@
 /obj/structure/bed/chair/bay/shuttle{
 	dir = 8
 	},
+/obj/effect/floor_decal/corner_techfloor_grid{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "eho" = (
@@ -6535,6 +6595,16 @@
 /obj/spawner/window/low_wall/full/nogrille/firelocks,
 /turf/simulated/floor/plating,
 /area/crew_quarters/sleep)
+"ejz" = (
+/obj/machinery/mech_recharger,
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/hammerhead/general)
 "ejY" = (
 /obj/structure/inflatable/door,
 /turf/simulated/floor/plating,
@@ -6744,6 +6814,10 @@
 	anchored = 1
 	},
 /obj/effect/floor_decal/corner_techfloor_grid/full,
+/obj/structure/closet/hydrant{
+	dir = 4;
+	pixel_x = -32
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "eqI" = (
@@ -6998,17 +7072,6 @@
 /obj/effect/paint/purplegray,
 /turf/simulated/floor/reinforced,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
-"eBF" = (
-/obj/machinery/shipsensors,
-/obj/machinery/light/no_nightshift,
-/obj/effect/floor_decal/industrial/warning/full,
-/obj/item/gps/internal/base{
-	desc = "A tracking beacon embedded in the shuttle systems, to help explorers find where they landed.";
-	gps_tag = "BARGE";
-	name = "shuttle beacon"
-	},
-/turf/simulated/floor/plating,
-/area/shuttle/hammerhead/general)
 "eBG" = (
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 1
@@ -7550,6 +7613,7 @@
 	dir = 1
 	},
 /obj/effect/floor_decal/industrial/outline/grey,
+/obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/security/hammerhead_bay)
 "eWs" = (
@@ -7619,7 +7683,8 @@
 "eXr" = (
 /obj/structure/table/steel_reinforced,
 /obj/machinery/light/no_nightshift{
-	dir = 1
+	dir = 1;
+	old_wall = 1
 	},
 /obj/structure/closet/walllocker/emergsuit_wall{
 	dir = 4;
@@ -7859,9 +7924,6 @@
 /area/shuttle/hammerhead/general)
 "fdo" = (
 /obj/structure/catwalk,
-/obj/structure/railing{
-	dir = 4
-	},
 /obj/machinery/button/remote/blast_door{
 	dir = 1;
 	id = "hammerfighterport";
@@ -7870,13 +7932,6 @@
 	pixel_y = -26
 	},
 /obj/machinery/light/no_nightshift,
-/obj/machinery/button/remote/blast_door{
-	dir = 1;
-	id = "hammerheadpport";
-	name = "Port Personnel Door";
-	pixel_x = -5;
-	pixel_y = -26
-	},
 /turf/simulated/floor/plating,
 /area/shuttle/hammerhead/general)
 "fdT" = (
@@ -8156,6 +8211,13 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
+"fnq" = (
+/obj/structure/bed/chair/bay/shuttle,
+/obj/machinery/computer/ship/navigation/telescreen{
+	pixel_y = 24
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/general)
 "fnK" = (
 /obj/structure/barricade,
 /turf/simulated/floor/outdoors/snow/lythios43c,
@@ -8175,6 +8237,20 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/research/xenobio)
+"foa" = (
+/obj/machinery/atmospheric_field_generator/perma,
+/obj/machinery/door/blast/regular{
+	dir = 4;
+	id = "hammerheadfsb";
+	name = "Fighter Launch Tube"
+	},
+/turf/simulated/floor/maglev{
+	dir = 8;
+	icon_state = "maglevup";
+	name = "launch rail";
+	desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+	},
+/area/shuttle/hammerhead/cockpit)
 "fof" = (
 /obj/machinery/light{
 	dir = 1
@@ -8213,14 +8289,17 @@
 /turf/simulated/floor/tiled,
 /area/security/briefing_room)
 "fpW" = (
-/obj/machinery/door/airlock/voidcraft/vertical{
-	name = "Control Room";
-	req_one_access = list(1,38)
+/obj/machinery/mech_recharger,
+/obj/machinery/light/no_nightshift{
+	dir = 1;
+	old_wall = 1
 	},
-/obj/effect/floor_decal/corner_techfloor_gray{
-	dir = 5
+/turf/simulated/floor/maglev{
+	dir = 8;
+	icon_state = "maglevup";
+	name = "launch rail";
+	desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
 	},
-/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/general)
 "fqf" = (
 /turf/simulated/wall/prepainted,
@@ -8439,12 +8518,6 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/security/hammerhead_bay)
-"fyj" = (
-/obj/effect/floor_decal/corner_techfloor_grid/diagonal{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/hammerhead/cockpit)
 "fyx" = (
 /turf/simulated/floor/tiled/steel,
 /area/security/range)
@@ -9188,13 +9261,13 @@
 /obj/effect/floor_decal/corner_techfloor_gray/full{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
-	dir = 8
-	},
 /obj/structure/cable/green{
 	icon_state = "2-4"
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/general)
 "fZA" = (
 /obj/effect/floor_decal/borderfloor{
@@ -9638,6 +9711,15 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/hos)
+"goD" = (
+/obj/machinery/door/airlock/voidcraft/vertical{
+	name = "Passenger Bay and Holding Cell";
+	req_one_access = list(1,38)
+	},
+/obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/general)
 "goH" = (
 /obj/structure/barricade,
 /obj/effect/floor_decal/rust,
@@ -9743,9 +9825,15 @@
 /area/medical/medbay_primary_storage)
 "grT" = (
 /obj/machinery/mech_recharger,
-/obj/machinery/atmospherics/portables_connector{
+/obj/mecha/combat/fighter/baron/sec/loaded{
 	dir = 1
 	},
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/hammerhead/general)
 "grW" = (
@@ -9878,24 +9966,6 @@
 /obj/item/pen,
 /turf/simulated/floor/tiled,
 /area/security/briefing_room)
-"guy" = (
-/obj/structure/railing{
-	dir = 4
-	},
-/obj/structure/railing{
-	dir = 8
-	},
-/obj/structure/railing,
-/obj/structure/railing{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/glass,
-/obj/structure/lattice,
-/obj/structure/cable/green{
-	icon_state = "32-1"
-	},
-/turf/simulated/open,
-/area/maintenance/lower/medsec_maintenance)
 "guD" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -10074,15 +10144,10 @@
 /turf/simulated/floor/tiled/monowhite,
 /area/medical/medbay_primary_storage)
 "gyO" = (
-/obj/structure/bed/chair/bay/shuttle{
-	dir = 8
-	},
 /obj/effect/floor_decal/corner_techfloor_grid/full{
 	dir = 4
 	},
-/obj/structure/closet/hydrant{
-	pixel_x = 32
-	},
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "gza" = (
@@ -10113,16 +10178,6 @@
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/rift/trade_shop/loading)
-"gzZ" = (
-/obj/machinery/light/no_nightshift{
-	dir = 8
-	},
-/obj/structure/bed/chair/bay/shuttle,
-/obj/effect/floor_decal/corner_techfloor_grid/full{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/hammerhead/cockpit)
 "gBj" = (
 /turf/simulated/wall/r_wall/prepainted/security,
 /area/security/interrogation)
@@ -10420,9 +10475,10 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/surgery_hallway)
 "gHJ" = (
-/obj/machinery/mech_recharger,
-/obj/machinery/atmospherics/portables_connector,
-/turf/simulated/floor/tiled/techmaint,
+/obj/structure/handrail{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/general)
 "gIF" = (
 /obj/structure/girder,
@@ -10593,6 +10649,18 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/rift/turbolift/maint)
+"gOT" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+	dir = 4
+	},
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/reinforced,
+/area/shuttle/hammerhead/general)
 "gPk" = (
 /obj/structure/closet/crate/medical/blood,
 /obj/item/reagent_containers/blood/empty,
@@ -11007,10 +11075,10 @@
 /turf/simulated/floor/tiled/steel,
 /area/rift/stairwell/primary/surfacetwo)
 "hhM" = (
-/obj/machinery/computer/shuttle_control/explore/hammerhead{
+/obj/effect/floor_decal/corner_techfloor_grid/full,
+/obj/machinery/computer/secure_data{
 	dir = 1
 	},
-/obj/effect/floor_decal/corner_techfloor_grid/full,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "hhN" = (
@@ -11145,19 +11213,9 @@
 /turf/simulated/floor/tiled/steel,
 /area/assembly/robotics)
 "hnx" = (
-/obj/structure/railing{
-	dir = 8
-	},
 /obj/effect/floor_decal/industrial/warning/corner,
-/obj/structure/catwalk,
 /obj/machinery/light/no_nightshift,
-/obj/machinery/button/remote/blast_door{
-	dir = 1;
-	id = "hammerfighterport";
-	name = "Port Fighter Bay";
-	pixel_x = -5;
-	pixel_y = -26
-	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/shuttle/hammerhead/general)
 "hnY" = (
@@ -11314,11 +11372,8 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/warden)
 "hsv" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/turf/simulated/floor/tiled/techfloor/grid,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/general)
 "hsO" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on,
@@ -11681,22 +11736,13 @@
 /turf/simulated/floor/plating,
 /area/maintenance/dormitory)
 "hFZ" = (
-/obj/machinery/light/no_nightshift{
-	dir = 8
-	},
-/obj/machinery/air_alarm{
-	dir = 4;
-	pixel_x = -24
-	},
-/obj/structure/table/rack/shelf/steel,
-/obj/item/storage/toolbox/electrical{
-	pixel_y = -4
-	},
-/obj/item/storage/toolbox/mechanical{
-	pixel_y = 10
+/obj/machinery/door/airlock/voidcraft/vertical{
+	name = "Flight Operations";
+	req_one_access = list(1,38)
 	},
+/obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/tiled/techfloor,
-/area/shuttle/hammerhead/general)
+/area/shuttle/hammerhead/cockpit)
 "hGo" = (
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/showers)
@@ -11886,6 +11932,10 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/rift/station/public_garden/stairwell)
+"hKF" = (
+/obj/structure/sign/warning/docking_area,
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/hammerhead_bay)
 "hKO" = (
 /obj/machinery/light_switch{
 	dir = 1;
@@ -11949,10 +11999,12 @@
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "hMP" = (
-/obj/structure/closet/secure_closet/security,
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/structure/table/rack/shelf/steel,
+/obj/item/gps/security,
+/obj/item/hardsuit/hazard/equipped,
 /turf/simulated/floor/tiled/red,
 /area/security/evastorage)
 "hMQ" = (
@@ -12099,6 +12151,13 @@
 /obj/effect/floor_decal/corner_techfloor_grid/full{
 	dir = 4
 	},
+/obj/machinery/button/remote/blast_door{
+	dir = 1;
+	id = "hammerfighterport";
+	name = "Port Fighter Bay";
+	pixel_x = 6;
+	pixel_y = -26
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "hOZ" = (
@@ -12120,7 +12179,7 @@
 /obj/machinery/atmospherics/portables_connector{
 	dir = 1
 	},
-/obj/effect/floor_decal/industrial/outline/blue,
+/obj/effect/floor_decal/industrial/outline/red,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/security/hammerhead_bay)
 "hPi" = (
@@ -12424,6 +12483,20 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/wood,
 /area/triumph/surfacebase/sauna)
+"hYB" = (
+/obj/machinery/door/blast/regular{
+	dir = 4;
+	id = "hammerheadfsb";
+	name = "Fighter Launch Tube"
+	},
+/obj/machinery/atmospheric_field_generator/perma,
+/turf/simulated/floor/maglev{
+	dir = 8;
+	icon_state = "maglevup";
+	name = "launch rail";
+	desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+	},
+/area/shuttle/hammerhead/cockpit)
 "hYR" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 5
@@ -12485,10 +12558,17 @@
 /turf/simulated/floor/tiled/red,
 /area/security/evastorage)
 "iag" = (
-/obj/effect/floor_decal/corner_techfloor_grid/full{
-	dir = 1
+/obj/machinery/door/blast/regular{
+	dir = 4;
+	id = "hammerheadfsb";
+	name = "Fighter Launch Tube"
+	},
+/turf/simulated/floor/maglev{
+	dir = 8;
+	icon_state = "maglevup";
+	name = "launch rail";
+	desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
 	},
-/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "iaY" = (
 /obj/machinery/holopad,
@@ -12558,6 +12638,9 @@
 /obj/structure/cable/orange{
 	icon_state = "1-2"
 	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/general)
 "iek" = (
@@ -12899,6 +12982,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 4
 	},
+/obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/hammerhead/general)
 "ijR" = (
@@ -13003,10 +13087,11 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_5)
 "iqw" = (
-/obj/machinery/computer/ship/helm{
+/obj/effect/floor_decal/corner_techfloor_grid/full,
+/obj/machinery/computer/security{
+	icon_state = "computer";
 	dir = 4
 	},
-/obj/effect/floor_decal/corner_techfloor_grid/full,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "iqx" = (
@@ -13638,6 +13723,23 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
+"iOM" = (
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/obj/structure/handrail{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner_techfloor_grid{
+	dir = 10
+	},
+/obj/structure/closet/walllocker/emergsuit_wall{
+	dir = 8;
+	pixel_x = -32;
+	pixel_y = -24
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/cockpit)
 "iPh" = (
 /obj/structure/stairs/spawner/east,
 /turf/simulated/floor/plating/lythios43c,
@@ -13872,6 +13974,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/handrail{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/hammerhead/general)
 "iYa" = (
@@ -14003,19 +14108,6 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/rnd/research/researchdivision)
-"iZI" = (
-/obj/machinery/button/remote/blast_door{
-	dir = 1;
-	id = "hammerheadpsb";
-	name = "Starboard personnel Door";
-	pixel_x = -5;
-	pixel_y = -25
-	},
-/obj/machinery/light/no_nightshift,
-/obj/structure/lattice,
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/shuttle/hammerhead/general)
 "iZJ" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -14232,17 +14324,28 @@
 /obj/random/tool,
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint2)
+"jgM" = (
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/machinery/shipsensors,
+/obj/item/gps/internal/base{
+	desc = "A tracking beacon embedded in the shuttle systems, to help explorers find where they landed.";
+	gps_tag = "BARGE";
+	name = "shuttle beacon"
+	},
+/obj/machinery/light/no_nightshift,
+/turf/simulated/floor/plating,
+/area/shuttle/hammerhead/cockpit)
 "jhd" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan,
 /obj/machinery/light/no_nightshift{
-	dir = 4
+	dir = 4;
+	old_wall = 1
 	},
-/obj/effect/floor_decal/corner_techfloor_gray/full,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/general)
 "jho" = (
 /obj/machinery/bioscan_antenna/permanent{
@@ -14342,6 +14445,13 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/tactical)
+"jmy" = (
+/obj/machinery/mech_recharger,
+/obj/mecha/combat/fighter/baron/sec/loaded{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/hammerhead/general)
 "jmA" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -14572,12 +14682,6 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/rift/station/public_garden/stairwell)
-"jug" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/hammerhead/general)
 "jul" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -14729,10 +14833,6 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/rift/station/public_garden/stairwell)
-"jyv" = (
-/obj/effect/floor_decal/corner_techfloor_grid/diagonal,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/hammerhead/cockpit)
 "jyL" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 4
@@ -14897,7 +14997,8 @@
 	dir = 4
 	},
 /obj/machinery/light/no_nightshift{
-	dir = 8
+	dir = 8;
+	old_wall = 1
 	},
 /obj/structure/fuel_port{
 	pixel_x = 1;
@@ -15052,6 +15153,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 4
 	},
+/obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/hammerhead/general)
 "jOg" = (
@@ -15281,7 +15383,8 @@
 /area/rnd/research/researchdivision)
 "jTU" = (
 /obj/machinery/light/no_nightshift{
-	dir = 4
+	dir = 4;
+	old_wall = 1
 	},
 /obj/effect/floor_decal/corner_techfloor_gray/full{
 	dir = 8
@@ -16273,14 +16376,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
-"kwh" = (
-/obj/machinery/mech_recharger,
-/obj/machinery/atmospherics/portables_connector,
-/obj/mecha/combat/fighter/baron/sec/loaded{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/hammerhead/general)
 "kws" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -16471,7 +16566,9 @@
 /area/maintenance/security/upper)
 "kCx" = (
 /obj/structure/cable/orange,
-/obj/machinery/power/apc/west_mount,
+/obj/machinery/power/apc/west_mount{
+	old_wall = 1
+	},
 /obj/machinery/meter{
 	pixel_x = 16
 	},
@@ -16501,7 +16598,8 @@
 /obj/effect/floor_decal/corner_techfloor_gray/full{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
 /area/shuttle/hammerhead/general)
 "kFB" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -16589,15 +16687,6 @@
 /obj/effect/floor_decal/corner/red/bordercorner,
 /turf/simulated/floor/tiled/dark,
 /area/security/armory/blue)
-"kJk" = (
-/obj/machinery/door/blast/regular{
-	dir = 4;
-	id = "hammerheadpport";
-	name = "Port Personnel Entrance"
-	},
-/obj/machinery/atmospheric_field_generator/perma,
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/hammerhead/general)
 "kJS" = (
 /turf/simulated/wall/r_wall/prepainted,
 /area/maintenance/medbay)
@@ -16661,20 +16750,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/telescience_lab/storage)
-"kMS" = (
-/obj/machinery/door/airlock/maintenance/medical{
-	name = "Medical Maintenance Access";
-	req_access = list(5)
-	},
-/obj/machinery/atmospherics/pipe/simple/visible/supply,
-/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
-/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/plating,
-/area/medical/surgery_hallway)
 "kMU" = (
 /obj/machinery/door/airlock/voidcraft/vertical{
 	name = "Air Management";
@@ -16686,6 +16761,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/hammerhead/general)
 "kNo" = (
@@ -16700,28 +16776,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/lower/medsec_maintenance)
-"kNL" = (
-/obj/structure/catwalk,
-/obj/structure/railing{
-	dir = 4
-	},
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/machinery/button/remote/blast_door{
-	id = "hammerfighterstarboard";
-	name = "Starboard Fighter Bay";
-	pixel_x = 5;
-	pixel_y = 26
-	},
-/obj/machinery/button/remote/blast_door{
-	id = "hammerheadpsb";
-	name = "Starboard Personnel Door";
-	pixel_x = -6;
-	pixel_y = 26
-	},
-/turf/simulated/floor/plating,
-/area/shuttle/hammerhead/general)
 "kNQ" = (
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 1
@@ -17059,6 +17113,7 @@
 /obj/item/tank/oxygen{
 	pixel_y = -4
 	},
+/obj/item/hardsuit/hazard/equipped,
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/hos)
 "kWZ" = (
@@ -17262,13 +17317,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/warden)
-"kYZ" = (
-/obj/machinery/door/airlock/maintenance/medical{
-	name = "Medbay Auxillary Storage"
-	},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating,
-/area/maintenance/medbay)
 "kZx" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -17501,8 +17549,8 @@
 "lhE" = (
 /obj/machinery/door/blast/regular{
 	dir = 4;
-	id = "hammerheadfsb";
-	name = "Starboard Fighter Entrance"
+	id = "hammerheadsbc";
+	name = "Starboard Cargo Door"
 	},
 /obj/machinery/atmospheric_field_generator/perma,
 /turf/simulated/floor/tiled/techmaint,
@@ -17575,9 +17623,17 @@
 /obj/structure/cable/orange{
 	icon_state = "1-2"
 	},
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 5
+/obj/machinery/door/window/brigdoor/southright{
+	dir = 1;
+	icon_state = "rightsecure";
+	name = "Cockpit Access";
+	req_access = list(2);
+	req_one_access = list(2)
 	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "liF" = (
@@ -17740,6 +17796,17 @@
 /obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/tiled/dark,
 /area/security/armory/red)
+"lqt" = (
+/obj/machinery/light/no_nightshift{
+	old_wall = 1
+	},
+/turf/simulated/floor/maglev{
+	dir = 8;
+	icon_state = "maglevup";
+	name = "launch rail";
+	desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+	},
+/area/shuttle/hammerhead/cockpit)
 "lqA" = (
 /obj/machinery/status_display{
 	pixel_x = 32
@@ -17748,16 +17815,19 @@
 /area/security/warden)
 "lrj" = (
 /obj/machinery/light/no_nightshift{
-	dir = 1
+	dir = 1;
+	old_wall = 1
 	},
+/obj/structure/lattice,
+/obj/structure/catwalk,
+/obj/structure/marker_beacon/red,
 /obj/machinery/button/remote/blast_door{
-	id = "hammerheadpport";
-	name = "Port Personnel Door";
-	pixel_x = -6;
+	dir = 1;
+	id = "hammerfighterport";
+	name = "Port Fighter Bay";
+	pixel_x = 6;
 	pixel_y = 26
 	},
-/obj/structure/lattice,
-/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/shuttle/hammerhead/general)
 "lrw" = (
@@ -18147,12 +18217,11 @@
 /obj/structure/cable/orange{
 	icon_state = "1-2"
 	},
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 10
-	},
-/obj/structure/cable/orange{
-	icon_state = "2-4"
+/obj/machinery/door/window/brigdoor/southright{
+	name = "Cockpit Access"
 	},
+/obj/effect/floor_decal/industrial/warning,
+/obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "lCv" = (
@@ -18363,10 +18432,6 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/crew_quarters/sleep)
-"lKw" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/hammerhead/general)
 "lKB" = (
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 8
@@ -18793,6 +18858,18 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/resleeving)
+"lVu" = (
+/obj/machinery/air_alarm{
+	dir = 4;
+	pixel_x = -24
+	},
+/obj/structure/bed/chair/bay/shuttle,
+/obj/machinery/light/no_nightshift{
+	dir = 1;
+	old_wall = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/general)
 "lWx" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 4
@@ -18815,9 +18892,18 @@
 /turf/simulated/floor/tiled/steel,
 /area/crew_quarters/sleep)
 "lXc" = (
-/obj/effect/floor_decal/industrial/warning,
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/turf/simulated/floor/tiled/techfloor/grid,
+/obj/machinery/mech_recharger,
+/obj/machinery/atmospherics/portables_connector{
+	dir = 1
+	},
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/floor_decal/industrial/warning{
+	icon_state = "warning";
+	dir = 9
+	},
+/turf/simulated/floor/tiled/techmaint,
 /area/shuttle/hammerhead/general)
 "lXv" = (
 /obj/effect/floor_decal/borderfloorwhite{
@@ -19067,6 +19153,18 @@
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/assembly/chargebay)
+"mgb" = (
+/obj/machinery/atmospheric_field_generator/perma,
+/obj/machinery/door/blast/regular{
+	dir = 4;
+	id = "hammerfighterport";
+	name = "Port Fighter Bay"
+	},
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/hammerhead/general)
 "mgD" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
@@ -19097,16 +19195,6 @@
 /obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/tiled/steel,
 /area/crew_quarters/recreation_area)
-"mhJ" = (
-/obj/structure/closet/walllocker/emergsuit_wall{
-	dir = 8;
-	pixel_x = -32
-	},
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 9
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/hammerhead/cockpit)
 "mhS" = (
 /obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/visible/supply,
@@ -19266,13 +19354,6 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
-"mkP" = (
-/obj/structure/catwalk,
-/obj/structure/railing{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/shuttle/hammerhead/general)
 "mlx" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
@@ -19623,10 +19704,17 @@
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/corner_techfloor_grid/full{
-	dir = 4
+/obj/machinery/door/blast/regular{
+	dir = 4;
+	id = "hammerheadfsb";
+	name = "Fighter Launch Tube"
+	},
+/turf/simulated/floor/maglev{
+	dir = 8;
+	icon_state = "maglevup";
+	name = "launch rail";
+	desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
 	},
-/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "mvo" = (
 /obj/effect/floor_decal/borderfloor{
@@ -19670,15 +19758,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_6)
-"mxh" = (
-/obj/effect/floor_decal/corner_techfloor_grid/full{
-	dir = 1
-	},
-/obj/effect/floor_decal/industrial/warning/corner{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/hammerhead/general)
 "myF" = (
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/airlock/glass/security{
@@ -19774,6 +19853,16 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/security/upper)
+"mAj" = (
+/obj/structure/handrail{
+	dir = 1
+	},
+/obj/machinery/door/window/brigdoor/northleft{
+	dir = 8;
+	name = "Holding Cell"
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/general)
 "mAG" = (
 /obj/machinery/door/firedoor/glass{
 	dir = 1
@@ -20042,7 +20131,8 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/industrial/warning/corner,
-/turf/simulated/floor/tiled/techfloor,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
 /area/shuttle/hammerhead/general)
 "mFI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -21293,6 +21383,18 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/security/hammerhead_bay)
+"nxi" = (
+/obj/machinery/atmospheric_field_generator/perma,
+/obj/machinery/door/blast/regular{
+	dir = 4;
+	id = "hammerfighterport";
+	name = "Port Fighter Bay"
+	},
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/hammerhead/general)
 "nxk" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -21711,9 +21813,6 @@
 /area/crew_quarters/sleep/Dorm_4)
 "nLz" = (
 /obj/structure/catwalk,
-/obj/structure/railing{
-	dir = 4
-	},
 /turf/simulated/floor/plating,
 /area/shuttle/hammerhead/general)
 "nLU" = (
@@ -21803,16 +21902,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/briefing_room)
-"nNP" = (
-/obj/machinery/light/no_nightshift{
-	dir = 8
-	},
-/obj/structure/bed/chair/bay/shuttle{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner_techfloor_grid/full,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/hammerhead/cockpit)
 "nOt" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -21881,6 +21970,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/machinery/light/no_nightshift{
+	dir = 1
+	},
 /turf/simulated/floor/reinforced,
 /area/security/hammerhead_bay)
 "nSn" = (
@@ -22009,10 +22101,15 @@
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint2)
 "nVS" = (
-/obj/effect/floor_decal/corner_techfloor_grid/diagonal{
-	dir = 4
+/obj/machinery/door/blast/regular{
+	dir = 4;
+	id = "hammerheadtba";
+	name = "Fighter Launch Tube Access"
 	},
-/turf/simulated/floor/tiled/techfloor,
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/turf/simulated/floor/reinforced,
 /area/shuttle/hammerhead/general)
 "nWU" = (
 /obj/structure/table/rack/shelf/steel,
@@ -22465,15 +22562,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/brig)
-"ojI" = (
-/obj/structure/cable/orange{
-	icon_state = "1-2"
-	},
-/obj/effect/floor_decal/corner_techfloor_gray/full{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/hammerhead/general)
 "ojJ" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
@@ -23039,6 +23127,12 @@
 /obj/machinery/transhuman/synthprinter,
 /turf/simulated/floor/tiled/steel,
 /area/assembly/robotics)
+"oIx" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 1
+	},
+/turf/simulated/floor/reinforced,
+/area/shuttle/hammerhead/general)
 "oJr" = (
 /obj/machinery/computer/rdconsole/robotics{
 	dir = 4
@@ -23057,6 +23151,14 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/assembly/robotics)
+"oJx" = (
+/obj/machinery/door/airlock/voidcraft/vertical{
+	name = "Hammerhead Cockpit";
+	req_one_access = list(1,38)
+	},
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/cockpit)
 "oJG" = (
 /turf/simulated/wall/prepainted,
 /area/crew_quarters/sleep/Dorm_2)
@@ -23207,15 +23309,6 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/rnd/telescience_lab/foyer)
-"oPv" = (
-/obj/machinery/atmospheric_field_generator/perma,
-/obj/machinery/door/blast/regular{
-	dir = 4;
-	id = "hammerfighterstarboard";
-	name = "Starboard Fighter Bay Exit"
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/hammerhead/general)
 "oPH" = (
 /obj/machinery/computer/security{
 	dir = 1
@@ -23402,6 +23495,17 @@
 /obj/structure/disposalpipe/trunk,
 /turf/simulated/floor/tiled/steel,
 /area/rnd/research/testingrange)
+"oSs" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/floor_decal/industrial/warning{
+	icon_state = "warning";
+	dir = 6
+	},
+/obj/effect/floor_decal/sign/dock/two,
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/hammerhead/general)
 "oSM" = (
 /obj/machinery/button/remote/airlock{
 	id = "maint_cell_1";
@@ -23787,6 +23891,17 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/interrogation)
+"pcN" = (
+/obj/machinery/mech_recharger,
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 4
+	},
+/obj/effect/floor_decal/industrial/warning{
+	icon_state = "warning";
+	dir = 5
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/hammerhead/general)
 "pcO" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 5
@@ -23952,6 +24067,9 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/research/xenobio)
+"pgr" = (
+/turf/simulated/shuttle/wall/voidcraft/red/hard_corner,
+/area/shuttle/hammerhead/cockpit)
 "pgI" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 10
@@ -24124,6 +24242,16 @@
 /obj/random/trash,
 /turf/simulated/floor/plating,
 /area/maintenance/security/upper)
+"pmF" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 10
+	},
+/obj/effect/floor_decal/sign/dock/one,
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/hammerhead/general)
 "pnl" = (
 /obj/structure/table/steel,
 /obj/item/storage/box/evidence,
@@ -24247,6 +24375,20 @@
 	},
 /turf/simulated/floor/wood,
 /area/security/breakroom)
+"prf" = (
+/obj/machinery/door/airlock/maintenance/medical{
+	name = "Medical Maintenance Access";
+	req_access = list(5)
+	},
+/obj/machinery/atmospherics/pipe/simple/visible/supply,
+/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/plating,
+/area/medical/surgery_hallway)
 "pru" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 6
@@ -24419,6 +24561,10 @@
 /turf/simulated/floor/wood,
 /area/maintenance/security/upper)
 "pxC" = (
+/obj/effect/floor_decal/corner_techfloor_gray/full{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner_techfloor_grid/diagonal,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/general)
 "pyc" = (
@@ -24827,7 +24973,8 @@
 /area/maintenance/substation/research)
 "pPV" = (
 /obj/effect/floor_decal/corner_techfloor_gray/full,
-/turf/simulated/floor/tiled/techfloor/grid,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
 /area/shuttle/hammerhead/general)
 "pPZ" = (
 /obj/machinery/door/firedoor/glass,
@@ -24850,15 +24997,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgery)
-"pQK" = (
-/obj/machinery/atmospheric_field_generator/perma,
-/obj/machinery/door/blast/regular{
-	dir = 4;
-	id = "hammerheadpsb";
-	name = "Starboard Personnel Entrance"
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/hammerhead/general)
 "pRj" = (
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/purple/border,
@@ -25027,6 +25165,10 @@
 /obj/structure/closet/largecardboard,
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/security/upper)
+"pXD" = (
+/obj/structure/table/rack/shelf/steel,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/cockpit)
 "pXN" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -25324,6 +25466,18 @@
 /obj/structure/cable/orange{
 	icon_state = "2-8"
 	},
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/obj/machinery/button/remote/blast_door{
+	id = "hammerheadfsb";
+	name = "Fighter Tube Door";
+	pixel_x = -27;
+	pixel_y = -26
+	},
+/obj/effect/floor_decal/corner_techfloor_grid{
+	dir = 10
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "qiJ" = (
@@ -25416,8 +25570,13 @@
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/corner_techfloor_grid/diagonal,
-/turf/simulated/floor/tiled/techfloor,
+/obj/machinery/door/blast/regular{
+	dir = 4;
+	id = "hammerheadtba";
+	name = "Fighter Launch Tube Access"
+	},
+/obj/effect/floor_decal/borderfloorblack,
+/turf/simulated/floor/reinforced,
 /area/shuttle/hammerhead/general)
 "qly" = (
 /turf/simulated/floor/reinforced,
@@ -25536,15 +25695,11 @@
 /turf/simulated/floor/tiled/steel,
 /area/maintenance/medbay)
 "qnJ" = (
-/obj/machinery/light/no_nightshift{
-	dir = 8
-	},
-/obj/structure/closet/secure_closet/guncabinet{
-	anchored = 1
+/obj/structure/handrail{
+	dir = 1
 	},
 /obj/item/radio/intercom/department/security{
-	dir = 8;
-	pixel_x = -24
+	pixel_y = -24
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/general)
@@ -25666,6 +25821,13 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/crew_quarters/pool/emergency_closet)
+"qtd" = (
+/obj/machinery/computer/ship/navigation/telescreen{
+	pixel_x = 32
+	},
+/obj/structure/table/rack/shelf/steel,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/cockpit)
 "qtI" = (
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -26027,12 +26189,20 @@
 /turf/simulated/floor/plating,
 /area/maintenance/lower/medsec_maintenance)
 "qDr" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
 /obj/effect/shuttle_landmark/rift/deck2/hammerhead,
 /obj/overmap/entity/visitable/ship/landable/hammerhead,
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+	dir = 9
+	},
+/obj/structure/handrail{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/hammerhead/general)
 "qDA" = (
@@ -26058,11 +26228,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgery_hallway)
-"qFo" = (
-/obj/structure/table/steel,
-/obj/item/material/ashtray/glass,
-/turf/simulated/floor/plating,
-/area/maintenance/medbay)
 "qFG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/tiled,
@@ -26169,6 +26334,9 @@
 /obj/structure/cable/orange{
 	icon_state = "1-8"
 	},
+/obj/effect/floor_decal/corner_techfloor_grid/full{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "qJo" = (
@@ -26274,6 +26442,19 @@
 /obj/effect/paint/purplegray,
 /turf/simulated/floor/plating,
 /area/rnd/lockers)
+"qLw" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/obj/structure/table/rack/shelf/steel,
+/obj/item/storage/toolbox/mechanical{
+	pixel_y = 10
+	},
+/obj/item/storage/toolbox/electrical{
+	pixel_y = -4
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/general)
 "qMG" = (
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 1
@@ -26723,6 +26904,14 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/crew_quarters/pool)
+"raP" = (
+/obj/structure/bed/chair/bay/shuttle,
+/obj/machinery/light/no_nightshift{
+	dir = 1;
+	old_wall = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/general)
 "rba" = (
 /obj/structure/railing{
 	dir = 4
@@ -26764,23 +26953,10 @@
 /turf/simulated/floor/tiled/steel,
 /area/crew_quarters/sleep)
 "rcg" = (
-/obj/structure/railing{
-	dir = 8
-	},
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
 	},
-/obj/structure/catwalk,
-/obj/machinery/light/no_nightshift{
-	dir = 1
-	},
-/obj/machinery/button/remote/blast_door{
-	id = "hammerfighterstarboard";
-	name = "Starboard Fighter Bay";
-	pixel_x = -6;
-	pixel_y = 26
-	},
-/turf/simulated/floor/plating,
+/turf/simulated/shuttle/wall/voidcraft/red,
 /area/shuttle/hammerhead/general)
 "rcB" = (
 /obj/machinery/door_timer/cell_3{
@@ -26802,15 +26978,15 @@
 /turf/simulated/wall/r_wall/prepainted,
 /area/medical/chemistry)
 "rda" = (
-/obj/machinery/button/remote/blast_door{
-	id = "hammerheadfsb";
-	name = "Starboard Fighter Door";
-	pixel_x = -27;
-	pixel_y = 26
-	},
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
+/obj/machinery/button/remote/blast_door{
+	id = "hammerheadsbc";
+	name = "Starboard Cargo Door";
+	pixel_x = -24;
+	pixel_y = 26
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/general)
 "rdE" = (
@@ -26963,6 +27139,11 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/hos)
+"rin" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/machinery/computer/secure_data,
+/turf/simulated/floor/plating,
+/area/shuttle/hammerhead/cockpit)
 "riA" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
@@ -27280,6 +27461,15 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/dormitory)
+"rpT" = (
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/obj/effect/floor_decal/corner_techfloor_grid{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/cockpit)
 "rqo" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -27378,6 +27568,14 @@
 /obj/item/bedsheet/bluedouble,
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_2)
+"rtv" = (
+/obj/machinery/door/window/brigdoor/northright{
+	dir = 8;
+	name = "Holding Cell"
+	},
+/obj/structure/handrail,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/general)
 "rtU" = (
 /obj/structure/table/steel,
 /obj/item/gps/security,
@@ -27869,10 +28067,8 @@
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/corner_techfloor_grid/diagonal{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
+/obj/effect/floor_decal/borderfloorblack,
+/turf/simulated/floor/reinforced,
 /area/shuttle/hammerhead/general)
 "rMp" = (
 /obj/machinery/holoposter{
@@ -28117,12 +28313,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
-"rSm" = (
-/obj/structure/closet/emcloset,
-/obj/item/clothing/glasses/sunglasses/medhud,
-/obj/random/maintenance/medical,
-/turf/simulated/floor/plating,
-/area/maintenance/medbay)
 "rSM" = (
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -28439,23 +28629,15 @@
 /obj/machinery/light/no_nightshift{
 	dir = 8
 	},
-/obj/structure/table/steel_reinforced,
-/obj/machinery/recharger{
-	pixel_x = -5;
-	pixel_y = 3
-	},
-/obj/machinery/recharger{
-	pixel_x = 5;
-	pixel_y = 3
-	},
-/obj/structure/cable/orange{
-	icon_state = "0-4"
-	},
 /obj/effect/floor_decal/corner_techfloor_grid/full,
 /obj/item/radio/intercom/department/security{
 	dir = 8;
 	pixel_x = -24
 	},
+/obj/machinery/computer/shuttle_control/explore/hammerhead{
+	icon_state = "computer";
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "sfs" = (
@@ -28627,7 +28809,9 @@
 /turf/simulated/floor/reinforced,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
 "smO" = (
-/obj/structure/closet/secure_closet/security,
+/obj/structure/table/rack/shelf/steel,
+/obj/item/gps/security,
+/obj/item/hardsuit/hazard/equipped,
 /turf/simulated/floor/tiled/red,
 /area/security/evastorage)
 "snv" = (
@@ -28721,6 +28905,13 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/chemistry)
+"srt" = (
+/obj/structure/bed/chair/bay/shuttle,
+/obj/structure/closet/hydrant{
+	pixel_y = 32
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/general)
 "srw" = (
 /obj/structure/railing,
 /turf/simulated/open/lythios43c,
@@ -29119,6 +29310,21 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/maintenance/medbay)
+"sFh" = (
+/obj/machinery/button/remote/blast_door{
+	id = "hammerheadtba";
+	name = "Fighter Tube Access";
+	pixel_x = 8;
+	pixel_y = 26
+	},
+/obj/machinery/button/remote/blast_door{
+	id = "hammerheadfsb";
+	name = "Fighter Tube Door";
+	pixel_x = -8;
+	pixel_y = 26
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/cockpit)
 "sGv" = (
 /obj/structure/curtain/medical,
 /obj/structure/cable/green{
@@ -29387,6 +29593,12 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_1)
+"sQe" = (
+/obj/structure/bed/chair/bay/shuttle{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/general)
 "sQt" = (
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
@@ -29432,32 +29644,17 @@
 /turf/simulated/floor/plating,
 /area/maintenance/medbay)
 "sUa" = (
-/obj/structure/closet/secure_closet/guncabinet{
-	anchored = 1
-	},
 /obj/effect/floor_decal/corner_techfloor_grid/full{
 	dir = 8
 	},
+/obj/machinery/computer/ship/helm{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "sUg" = (
 /turf/simulated/floor/tiled/white,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
-"sUJ" = (
-/obj/machinery/door/window/brigdoor/southright{
-	dir = 4;
-	name = "Holding Room";
-	req_access = list(2);
-	req_one_access = list(2)
-	},
-/obj/structure/handrail{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 10
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/hammerhead/cockpit)
 "sUU" = (
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/purple/border,
@@ -29529,12 +29726,21 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_4)
 "sYU" = (
-/obj/structure/cable/orange{
-	icon_state = "4-8"
-	},
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 10
 	},
+/obj/structure/table/steel_reinforced,
+/obj/structure/cable/orange{
+	icon_state = "0-4"
+	},
+/obj/machinery/recharger{
+	pixel_x = 5;
+	pixel_y = 3
+	},
+/obj/machinery/recharger{
+	pixel_x = -5;
+	pixel_y = 3
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "sZb" = (
@@ -29596,6 +29802,11 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
+"taO" = (
+/obj/structure/table/steel,
+/obj/item/material/ashtray/glass,
+/turf/simulated/floor/plating,
+/area/maintenance/medbay)
 "tbz" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 4
@@ -29609,10 +29820,6 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/rnd/workshop)
-"tbE" = (
-/obj/machinery/light/small,
-/turf/simulated/floor/plating,
-/area/maintenance/medbay)
 "tca" = (
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/purple/border,
@@ -29935,15 +30142,6 @@
 "tnj" = (
 /turf/simulated/wall/prepainted,
 /area/crew_quarters/coffee_shop)
-"tnu" = (
-/obj/effect/floor_decal/corner_techfloor_grid/full{
-	dir = 8
-	},
-/obj/effect/floor_decal/industrial/warning/corner{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/hammerhead/general)
 "tny" = (
 /obj/structure/catwalk,
 /obj/structure/stairs/spawner/north,
@@ -30166,6 +30364,18 @@
 "tui" = (
 /turf/simulated/floor/reinforced,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
+"tuq" = (
+/obj/effect/floor_decal/corner_techfloor_grid{
+	dir = 6
+	},
+/obj/machinery/power/apc/east_mount{
+	old_wall = 1
+	},
+/obj/structure/cable/orange{
+	icon_state = "0-2"
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/cockpit)
 "tut" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
@@ -30693,6 +30903,7 @@
 	},
 /obj/machinery/atmospherics/component/unary/vent_pump/high_volume,
 /obj/map_helper/airlock/atmos/chamber_pump,
+/obj/structure/handrail,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/hammerhead/general)
 "tLc" = (
@@ -30700,6 +30911,16 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/plating,
 /area/maintenance/locker)
+"tLv" = (
+/obj/structure/bed/chair/bay/shuttle{
+	dir = 8;
+	name = "Copilot's Seat"
+	},
+/obj/effect/floor_decal/corner_techfloor_grid{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/cockpit)
 "tLz" = (
 /obj/effect/floor_decal/rust,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -30721,6 +30942,16 @@
 "tNc" = (
 /turf/simulated/wall/prepainted/security,
 /area/security/briefing_room)
+"tNt" = (
+/obj/structure/bed/chair/bay/shuttle{
+	dir = 1
+	},
+/obj/machinery/air_alarm{
+	dir = 8;
+	pixel_x = 22
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/general)
 "tOd" = (
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hos)
@@ -31166,19 +31397,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
-"ufs" = (
-/obj/machinery/door/window/brigdoor/southleft{
-	dir = 4;
-	name = "Holding Room";
-	req_access = list(2);
-	req_one_access = list(2)
-	},
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 5
-	},
-/obj/structure/handrail,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/hammerhead/cockpit)
 "ufF" = (
 /obj/effect/overlay/snow/floor,
 /turf/simulated/floor/plating/lythios43c,
@@ -31228,6 +31446,7 @@
 /obj/structure/closet/walllocker/emergsuit_wall{
 	pixel_y = 32
 	},
+/obj/structure/handrail,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/hammerhead/general)
 "uht" = (
@@ -31287,6 +31506,9 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/chemistry)
 "ujL" = (
+/obj/structure/panic_button{
+	pixel_x = 32
+	},
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 6
 	},
@@ -31459,6 +31681,16 @@
 "uom" = (
 /turf/simulated/wall/prepainted,
 /area/maintenance/research/xenobio)
+"uoE" = (
+/obj/machinery/door/window/brigdoor/southright{
+	dir = 8;
+	icon_state = "rightsecure";
+	name = "Flight Operations Access";
+	req_access = list(2);
+	req_one_access = list(2)
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/cockpit)
 "upg" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -31522,6 +31754,16 @@
 /obj/item/storage/bag/trash,
 /turf/simulated/floor/tiled/dark,
 /area/security/range)
+"usH" = (
+/obj/machinery/mech_recharger,
+/obj/machinery/atmospherics/portables_connector{
+	dir = 1
+	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/hammerhead/general)
 "usM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -31563,13 +31805,6 @@
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/rift/station/public_garden/gantry)
-"uuN" = (
-/obj/structure/bed/chair/bay/shuttle,
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/hammerhead/cockpit)
 "uuX" = (
 /obj/effect/floor_decal/industrial/loading{
 	dir = 8
@@ -31668,6 +31903,12 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /turf/simulated/floor/tiled/dark,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
+"uAi" = (
+/obj/effect/floor_decal/borderfloorblack{
+	dir = 5
+	},
+/turf/simulated/floor/reinforced,
+/area/shuttle/hammerhead/general)
 "uAn" = (
 /turf/simulated/wall/r_wall/prepainted/security,
 /area/security/hammerhead_bay)
@@ -32228,6 +32469,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
+"uRH" = (
+/obj/structure/bed/chair/bay/shuttle,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/hammerhead/general)
 "uRJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -32240,11 +32485,6 @@
 	},
 /turf/simulated/floor/tiled/monowhite,
 /area/medical/chemistry)
-"uRN" = (
-/obj/machinery/mech_recharger,
-/obj/mecha/combat/fighter/baron/sec/loaded,
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/hammerhead/general)
 "uRP" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 4
@@ -32330,11 +32570,13 @@
 /turf/simulated/floor/tiled/monotile,
 /area/hallway/primary/surfacetwo)
 "uSS" = (
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/cyan,
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled/techfloor,
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+	dir = 1
+	},
+/turf/simulated/floor/reinforced,
 /area/shuttle/hammerhead/general)
 "uSV" = (
 /obj/effect/floor_decal/borderfloor{
@@ -33062,15 +33304,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/security_equiptment_storage)
-"vnt" = (
-/obj/machinery/button/remote/blast_door{
-	id = "hammerheadfport";
-	name = "Port Fighter door";
-	pixel_x = -27;
-	pixel_y = 26
-	},
-/turf/simulated/floor/reinforced,
-/area/security/hammerhead_bay)
 "vnE" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/plating,
@@ -33457,10 +33690,12 @@
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/corner_techfloor_grid/diagonal{
-	dir = 4
+/turf/simulated/floor/maglev{
+	dir = 8;
+	icon_state = "maglevup";
+	name = "launch rail";
+	desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
 	},
-/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "vBG" = (
 /turf/simulated/floor/plating,
@@ -33530,10 +33765,12 @@
 /obj/structure/cable/orange{
 	icon_state = "2-4"
 	},
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 5
+/turf/simulated/floor/maglev{
+	dir = 8;
+	icon_state = "maglevup";
+	name = "launch rail";
+	desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
 	},
-/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "vFi" = (
 /obj/machinery/door/blast/regular{
@@ -33641,17 +33878,13 @@
 /turf/simulated/floor/plating,
 /area/maintenance/research/xenobio)
 "vIN" = (
-/obj/machinery/button/remote/blast_door{
-	dir = 1;
-	id = "hammerheadfport";
-	name = "Port Fighter door";
-	pixel_x = -26;
-	pixel_y = -26
-	},
 /obj/structure/cable/orange{
 	icon_state = "1-4"
 	},
 /obj/effect/floor_decal/industrial/warning,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/general)
 "vJe" = (
@@ -33672,14 +33905,13 @@
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/voidcraft/vertical{
-	name = "Control Room";
-	req_one_access = list(1,38)
-	},
-/obj/effect/floor_decal/corner_techfloor_gray{
-	dir = 10
+/obj/machinery/mech_recharger,
+/turf/simulated/floor/maglev{
+	dir = 8;
+	icon_state = "maglevup";
+	name = "launch rail";
+	desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
 	},
-/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/general)
 "vKj" = (
 /obj/machinery/door/firedoor/glass,
@@ -34103,8 +34335,11 @@
 /turf/simulated/floor/plating,
 /area/maintenance/dormitory)
 "wcF" = (
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/tiled/techfloor/grid,
+/obj/machinery/mech_recharger,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techmaint,
 /area/shuttle/hammerhead/general)
 "wcJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -34123,13 +34358,8 @@
 	dir = 8;
 	pixel_x = -32
 	},
-/obj/effect/floor_decal/corner_techfloor_gray{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 9
-	},
-/turf/simulated/floor/tiled/techfloor,
+/obj/structure/sign/warning/high_voltage,
+/turf/simulated/shuttle/wall/voidcraft/red,
 /area/shuttle/hammerhead/cockpit)
 "wdP" = (
 /obj/item/clothing/head/sombrero,
@@ -34469,7 +34699,15 @@
 	dir = 8;
 	pixel_x = -24
 	},
-/obj/structure/closet/secure_closet/security,
+/obj/structure/table/rack/shelf/steel,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/suit_cooling_unit,
+/obj/item/gps/security,
+/obj/item/tank/oxygen{
+	pixel_y = -4
+	},
+/obj/item/clothing/suit/space/void/security,
+/obj/item/clothing/head/helmet/space/void/security,
 /turf/simulated/floor/tiled/red,
 /area/security/evastorage)
 "wpj" = (
@@ -34532,13 +34770,12 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "wqC" = (
-/obj/structure/bed/chair/bay/shuttle{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 10
+/turf/simulated/floor/maglev{
+	dir = 8;
+	icon_state = "maglevup";
+	name = "launch rail";
+	desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
 	},
-/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "wrb" = (
 /obj/structure/table,
@@ -35036,13 +35273,16 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "wJB" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
-	dir = 8
-	},
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled/techfloor,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+	dir = 6
+	},
+/obj/effect/floor_decal/borderfloorblack/corner{
+	dir = 8
+	},
+/turf/simulated/floor/reinforced,
 /area/shuttle/hammerhead/general)
 "wKw" = (
 /obj/machinery/light/small{
@@ -35444,6 +35684,7 @@
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 5
 	},
+/obj/structure/bed/chair/bay/shuttle,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "xba" = (
@@ -35460,6 +35701,18 @@
 /area/security/evastorage)
 "xbD" = (
 /obj/effect/floor_decal/corner_techfloor_grid/diagonal,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/button/remote/blast_door{
+	id = "hammerheadtba";
+	name = "Fighter Tube Access";
+	pixel_x = -26;
+	pixel_y = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/general)
 "xbW" = (
@@ -36196,10 +36449,12 @@
 /obj/structure/cable/orange{
 	icon_state = "1-2"
 	},
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 10
+/turf/simulated/floor/maglev{
+	dir = 8;
+	icon_state = "maglevup";
+	name = "launch rail";
+	desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
 	},
-/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/cockpit)
 "xFu" = (
 /obj/structure/catwalk,
@@ -36401,6 +36656,9 @@
 /area/rnd/breakroom)
 "xIV" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/obj/effect/floor_decal/corner_techfloor_grid/diagonal{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/hammerhead/general)
 "xKy" = (
@@ -36449,6 +36707,13 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/hor)
+"xLy" = (
+/obj/machinery/door/airlock/maintenance/medical{
+	name = "Medbay Auxillary Storage"
+	},
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating,
+/area/maintenance/medbay)
 "xLB" = (
 /obj/structure/closet/secure_closet/medical3{
 	name = "surgeon's locker"
@@ -36942,7 +37207,8 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/light/no_nightshift{
-	dir = 1
+	dir = 1;
+	old_wall = 1
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/hammerhead/general)
@@ -37119,7 +37385,8 @@
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/techfloor,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
 /area/shuttle/hammerhead/general)
 "ybH" = (
 /obj/machinery/atmospherics/pipe/zpipe/down/supply{
@@ -49350,7 +49617,7 @@ kPS
 aqF
 aqF
 kez
-qFo
+taO
 kIL
 pvE
 gFN
@@ -49738,7 +50005,7 @@ xTV
 mEd
 hBC
 sEV
-tbE
+cBh
 kIL
 pdw
 sop
@@ -50708,7 +50975,7 @@ gVs
 hOw
 qzf
 jHS
-kMS
+prf
 veK
 cMx
 sqp
@@ -51290,7 +51557,7 @@ wNZ
 uJC
 dtc
 hga
-rSm
+aGE
 cRS
 iWe
 iWe
@@ -52066,7 +52333,7 @@ rls
 ouY
 rRc
 oVk
-kYZ
+xLy
 dAe
 dAe
 nqW
@@ -52227,11 +52494,11 @@ qly
 qly
 qly
 qly
+iCM
 oOw
-oOw
-oOw
-oOw
-oOw
+hYB
+foa
+pgr
 oOw
 qly
 qly
@@ -52420,11 +52687,11 @@ qly
 qly
 qly
 oOw
+iCM
+iCM
 oOw
-oOw
-oOw
-gzZ
-nNP
+wqC
+wqC
 oOw
 oOw
 oOw
@@ -52617,13 +52884,13 @@ oOw
 sUa
 seE
 oOw
-uuN
-wqC
+bkW
+lqt
 oOw
 bpb
 eqt
 oOw
-iCM
+rin
 iCM
 qly
 qly
@@ -52808,11 +53075,11 @@ iCM
 iCM
 xjH
 aKa
-sQt
+ddq
 sYU
 oOw
-ufs
-sUJ
+wqC
+wqC
 oOw
 xaM
 sQt
@@ -53000,13 +53267,13 @@ qly
 qly
 iCM
 uuY
-ehg
+tLv
 sQt
 ffG
-dhC
-mhJ
-fyj
-jyv
+iOM
+oOw
+wqC
+wqC
 wdn
 dhC
 pBz
@@ -53195,15 +53462,15 @@ qly
 oOw
 eXr
 tUK
-ujL
-sQt
+tuq
+rpT
 qij
 lCs
 xEQ
 vEO
 liE
 qJl
-sQt
+bKY
 ujL
 byu
 hOS
@@ -53386,17 +53653,17 @@ kvr
 swv
 qly
 qly
-ilr
 oOw
 oOw
 oOw
+pgr
 oUW
 dbt
-djJ
-jyv
+djU
+wqC
 vAW
 djU
-dbt
+uoE
 gyO
 oOw
 oOw
@@ -53424,7 +53691,7 @@ szQ
 diz
 kXq
 jBV
-guy
+aBu
 ora
 xco
 lTc
@@ -53584,14 +53851,14 @@ qly
 qly
 oOw
 oOw
-oOw
-oOw
+pgr
+sQt
 oOw
 iag
 mvg
 oOw
-oOw
-oOw
+sFh
+pXD
 oOw
 oOw
 qly
@@ -53777,16 +54044,16 @@ pkX
 qly
 qly
 qly
-qly
-eBF
-ilr
-ilr
+jgM
+oOw
+oJx
+oOw
 fpW
 vKi
-ilr
-ilr
-qly
-qly
+iCM
+sQt
+pXD
+oOw
 qly
 qly
 qly
@@ -53971,16 +54238,16 @@ eqc
 qly
 qly
 qly
-qly
-ilr
 ilr
+dIO
+aNv
 ilr
 aSz
 bFP
-ilr
-ilr
-ilr
-qly
+iCM
+sQt
+qtd
+oOw
 qly
 qly
 qly
@@ -54166,15 +54433,15 @@ qly
 qly
 qly
 ilr
-ilr
+lVu
 qnJ
-nVS
+ilr
 nVS
 qkS
-xbD
+oOw
 hFZ
-ilr
-ilr
+oOw
+oOw
 qly
 qly
 qly
@@ -54359,16 +54626,16 @@ aTs
 qly
 qly
 qly
-pQK
-pxC
-pxC
-xbD
-xbD
+ilr
+fnq
+gHJ
+hsv
+oIx
 rLY
 xbD
-pxC
-pxC
-kJk
+cpn
+qLw
+ilr
 qly
 qly
 qly
@@ -54552,12 +54819,12 @@ rrr
 cWw
 qly
 qly
-iZI
+qly
 ilr
-kNL
-nLz
-mxh
-xbD
+uRH
+aNv
+goD
+oIx
 rLY
 mFf
 nLz
@@ -54746,19 +55013,19 @@ rrr
 cWw
 qly
 qly
-vDu
-oPv
-fSv
+qly
+ilr
+srt
 gHJ
 hsv
-lKw
+oIx
 wJB
 lXc
 grT
-fSv
-njk
+pmF
+mgb
 vDu
-qly
+cED
 qly
 qly
 cVK
@@ -54940,19 +55207,19 @@ rrr
 cWw
 qly
 qly
-vDu
-oPv
-fSv
-fSv
-jug
-pxC
+qly
+ilr
+rtv
+mAj
+ilr
+oIx
 dzD
 wcF
 fSv
-fSv
+ceT
 njk
 vDu
-qly
+cED
 qly
 qly
 cVK
@@ -55134,19 +55401,19 @@ rrr
 cWw
 qly
 qly
-vDu
-oPv
-fSv
-kwh
-hsv
-lKw
+qly
+ilr
+uRH
+sQe
+ilr
+oIx
 uSS
-lXc
-grT
-uRN
+usH
+jmy
+ceT
 njk
 vDu
-qly
+cED
 qly
 qly
 cVK
@@ -55328,24 +55595,24 @@ rrr
 cWw
 qly
 qly
-vDu
-oPv
-fSv
-fSv
-jug
-pxC
-dzD
-wcF
-fSv
-fSv
-njk
-vDu
 qly
+ilr
+raP
+tNt
+ilr
+uAi
+gOT
+pcN
+ejz
+oSs
+nxi
+vDu
+cED
 qly
 qly
 cVK
 tVi
-uAn
+hKF
 lEq
 nxk
 nAo
@@ -55522,15 +55789,15 @@ cnl
 nSi
 qly
 qly
-cYC
-ilr
+qly
+dIO
 rcg
-mkP
-tnu
+ilr
+ilr
 pPV
 kDT
 ybB
-mkP
+nLz
 hnx
 ilr
 aJI
@@ -55716,24 +55983,24 @@ cnl
 eqc
 qly
 qly
-bru
+qly
 lhE
 rda
 pxC
 trq
-pPV
+buW
 cVx
-ojI
+ieh
 ieh
 vIN
-azT
-vnt
+ilr
+qly
 qly
 qly
 qly
 nxh
 qly
-uAn
+hKF
 meA
 rPy
 vrz
@@ -55920,7 +56187,7 @@ fZv
 jhd
 vfd
 jwp
-azT
+ilr
 qly
 qly
 qly
@@ -56108,10 +56375,10 @@ ilr
 ilr
 ijJ
 bap
-ilr
+dIO
 ayE
 ceM
-ilr
+dIO
 kMU
 jNS
 ilr