diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm
index f58d50f3a8cf..da4ad01c086b 100644
--- a/code/game/machinery/doors/multi_tile.dm
+++ b/code/game/machinery/doors/multi_tile.dm
@@ -377,7 +377,8 @@
 /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor/proc/vacate_premises()
 	for(var/turf/self_turf as anything in locs)
 		var/turf/near_turf = get_step(self_turf, throw_dir)
-		var/turf/projected = get_ranged_target_turf(near_turf, throw_dir, 50)
+		var/turf/space_turf = get_step(near_turf, throw_dir)
+		var/turf/projected = get_ranged_target_turf(space_turf, EAST, 50)
 		for(var/atom/movable/atom_movable in near_turf)
 			if(ismob(atom_movable) && !isobserver(atom_movable))
 				var/mob/mob = atom_movable
@@ -389,7 +390,9 @@
 					continue
 			else
 				continue
-			INVOKE_ASYNC(atom_movable, TYPE_PROC_REF(/atom/movable, throw_atom), projected, 50, SPEED_FAST, null, TRUE)
+			atom_movable.forceMove(space_turf)
+			INVOKE_ASYNC(atom_movable, TYPE_PROC_REF(/atom/movable, throw_atom), projected, 50, SPEED_FAST, null, TRUE, HIGH_LAUNCH)
+			addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), atom_movable), 3 SECONDS)
 
 /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor/proc/bolt_explosion()
 	var/turf/turf = get_step(src, throw_dir|dir)
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index e96d6b18a31e..dc1d7b2418c2 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -1110,6 +1110,19 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/aft_hallway)
+"adC" = (
+/obj/structure/surface/rack,
+/obj/item/stock_parts/manipulator/nano{
+	pixel_y = -9
+	},
+/obj/item/stock_parts/scanning_module/adv{
+	pixel_y = 15;
+	pixel_x = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "adD" = (
 /obj/structure/window/reinforced{
 	dir = 1;
@@ -1431,6 +1444,15 @@
 	allow_construction = 0
 	},
 /area/almayer/stair_clone)
+"aeM" = (
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "aeN" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 10
@@ -3493,6 +3515,18 @@
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/living/commandbunks)
+"alk" = (
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	dir = 4;
+	id = "W_Containment Cell 1";
+	name = "\improper Containment Cell 5";
+	unacidable = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
+	dir = 4
+	},
+/turf/closed/wall/almayer/research/containment/wall/purple,
+/area/almayer/medical/containment/cell)
 "all" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -3732,23 +3766,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/repair_bay)
-"amq" = (
-/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "red"
-	},
-/area/almayer/command/lifeboat)
-"ams" = (
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "red"
-	},
-/area/almayer/command/lifeboat)
 "amw" = (
 /turf/open/floor/almayer{
 	dir = 9;
@@ -4475,6 +4492,20 @@
 	icon_state = "red"
 	},
 /area/almayer/lifeboat_pumps/north1)
+"aoJ" = (
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	dir = 4;
+	id = "W_Containment Cell 1";
+	name = "\improper Containment Cell 5";
+	unacidable = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
+	dir = 4
+	},
+/turf/closed/wall/almayer/research/containment/wall/purple{
+	dir = 1
+	},
+/area/almayer/medical/containment/cell)
 "aoK" = (
 /obj/structure/surface/table/almayer,
 /obj/effect/decal/warning_stripes{
@@ -4909,6 +4940,20 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/engineering/engineering_workshop/hangar)
+"apU" = (
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	dir = 4;
+	id = "W_Containment Cell 2";
+	name = "\improper Containment Cell 5";
+	unacidable = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
+	dir = 4
+	},
+/turf/closed/wall/almayer/research/containment/wall/purple{
+	dir = 8
+	},
+/area/almayer/medical/containment/cell)
 "apV" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -5133,12 +5178,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/living/pilotbunks)
-"aqC" = (
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 5
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/command/lifeboat)
 "aqD" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/machinery/door_control{
@@ -5184,6 +5223,12 @@
 	icon_state = "red"
 	},
 /area/almayer/command/lifeboat)
+"aqK" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "aqM" = (
 /obj/effect/projector{
 	name = "Almayer_Up2";
@@ -5200,6 +5245,32 @@
 	icon_state = "plate"
 	},
 /area/almayer/command/cic)
+"aqP" = (
+/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
+	dir = 1;
+	id = "Containment Cell 1";
+	locked = 1;
+	name = "\improper Containment Cell 1"
+	},
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	id = "Containment Cell 1";
+	name = "\improper Containment Cell 1";
+	unacidable = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
+/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/containment/cell)
 "aqS" = (
 /obj/structure/pipes/standard/simple/hidden/supply/no_boom,
 /turf/open/floor/almayer{
@@ -5568,16 +5639,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/engineering/engineering_workshop/hangar)
-"asb" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{
-	id_tag = "Boat2-D2";
-	linked_dock = "almayer-lifeboat2";
-	throw_dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/command/lifeboat)
 "asc" = (
 /turf/open/floor/almayer{
 	dir = 1;
@@ -5664,6 +5725,14 @@
 	allow_construction = 0
 	},
 /area/almayer/stair_clone/upper)
+"asn" = (
+/obj/structure/window/framed/almayer/white,
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+	dir = 2
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
+/turf/open/floor/plating,
+/area/almayer/medical/upper_medical)
 "aso" = (
 /turf/open/floor/almayer{
 	dir = 8;
@@ -7751,14 +7820,6 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/upper_engineering)
-"ayg" = (
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 5
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/lifeboat)
 "ayh" = (
 /obj/structure/machinery/power/smes/buildable,
 /obj/structure/sign/safety/hazard{
@@ -8063,6 +8124,20 @@
 	icon_state = "sterile_green"
 	},
 /area/almayer/medical/medical_science)
+"ayZ" = (
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 10
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/medical/medical_science)
 "azb" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -8723,6 +8798,20 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/morgue)
+"aBe" = (
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	dir = 4;
+	id = "W_Containment Cell 2";
+	name = "\improper Containment Cell 5";
+	unacidable = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
+	dir = 4
+	},
+/turf/closed/wall/almayer/research/containment/wall/purple{
+	dir = 4
+	},
+/area/almayer/medical/containment/cell)
 "aBf" = (
 /obj/structure/machinery/door/airlock/almayer/secure/reinforced{
 	name = "Telecommunications";
@@ -10455,6 +10544,19 @@
 	icon_state = "silver"
 	},
 /area/almayer/command/cichallway)
+"aIo" = (
+/obj/structure/window/framed/almayer/white,
+/obj/structure/machinery/door/firedoor/border_only/almayer,
+/obj/structure/machinery/door/poddoor/shutters/almayer/open{
+	dir = 8;
+	id = "researchlockdownext_windoor";
+	name = "\improper Research Windoor Shutter"
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/almayer/medical/medical_science)
 "aIq" = (
 /obj/structure/machinery/power/apc/almayer{
 	dir = 1
@@ -10536,10 +10638,6 @@
 	icon_state = "mono"
 	},
 /area/almayer/medical/hydroponics)
-"aIM" = (
-/obj/structure/largecrate/random,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_a_s)
 "aIP" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -11495,20 +11593,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha)
-"aMR" = (
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/lifeboat)
-"aMS" = (
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 4
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/command/lifeboat)
 "aMT" = (
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -11565,6 +11649,12 @@
 	icon_state = "plating"
 	},
 /area/almayer/hull/lower_hull/l_f_s)
+"aNl" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer,
+/area/almayer/command/lifeboat)
 "aNm" = (
 /turf/open/floor/wood/ship,
 /area/almayer/living/chapel)
@@ -11943,15 +12033,6 @@
 	icon_state = "red"
 	},
 /area/almayer/squads/alpha)
-"aPk" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer,
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/command/lifeboat)
 "aPl" = (
 /obj/structure/machinery/cm_vending/clothing/marine/alpha{
 	density = 0;
@@ -12270,6 +12351,26 @@
 	icon_state = "mono"
 	},
 /area/almayer/medical/hydroponics)
+"aRd" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/machinery/door/window/westright,
+/obj/structure/machinery/door/firedoor/border_only/almayer,
+/obj/structure/machinery/door/window/westright{
+	dir = 4;
+	req_access_txt = "28"
+	},
+/obj/structure/machinery/door/poddoor/shutters/almayer/open{
+	dir = 8;
+	id = "researchlockdownext_windoor";
+	name = "\improper Research Windoor Shutter"
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/medical_science)
 "aRi" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 1
@@ -13225,6 +13326,13 @@
 /obj/structure/largecrate/random/barrel/blue,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_m_s)
+"aVC" = (
+/obj/structure/machinery/vending/cigarette,
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "aVF" = (
 /obj/structure/closet/secure_closet/engineering_electrical,
 /obj/structure/machinery/light/small,
@@ -16286,6 +16394,11 @@
 	icon_state = "orange"
 	},
 /area/almayer/squads/bravo)
+"blJ" = (
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "blZ" = (
 /obj/structure/surface/table/reinforced/prison,
 /obj/structure/machinery/computer/med_data/laptop,
@@ -20360,14 +20473,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/bridgebunks)
-"bFD" = (
-/obj/structure/pipes/vents/pump/no_boom{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/lifeboat)
 "bFJ" = (
 /obj/docking_port/stationary/marine_dropship/almayer_hangar_2,
 /turf/open/floor/plating,
@@ -20385,6 +20490,15 @@
 "bGb" = (
 /turf/closed/wall/almayer,
 /area/almayer/hallways/port_hallway)
+"bGc" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	dir = 8;
+	icon_state = "red"
+	},
+/area/almayer/command/lifeboat)
 "bGe" = (
 /obj/structure/machinery/light{
 	dir = 1
@@ -23396,6 +23510,25 @@
 "bSy" = (
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/engineering/engine_core)
+"bSD" = (
+/obj/item/reagent_container/glass/bucket{
+	pixel_x = -4;
+	pixel_y = -3
+	},
+/obj/item/reagent_container/glass/bucket{
+	pixel_x = 4;
+	pixel_y = -3
+	},
+/obj/item/reagent_container/glass/bucket{
+	pixel_x = -4
+	},
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "bSG" = (
 /obj/structure/machinery/power/smes/buildable,
 /turf/open/floor/almayer{
@@ -24391,6 +24524,14 @@
 "bXe" = (
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/lifeboat_pumps/south2)
+"bXf" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 5
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/lifeboat)
 "bXl" = (
 /obj/structure/stairs/perspective{
 	dir = 1;
@@ -26459,20 +26600,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hallways/port_hallway)
-"chJ" = (
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	dir = 4;
-	id = "W_Containment Cell 3";
-	name = "\improper Containment Cell 5";
-	unacidable = 1
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
-	dir = 4
-	},
-/turf/closed/wall/almayer/research/containment/wall/purple{
-	dir = 4
-	},
-/area/almayer/medical/containment/cell)
 "chL" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -26966,10 +27093,6 @@
 	icon_state = "red"
 	},
 /area/almayer/hallways/port_hallway)
-"ckn" = (
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
-/turf/open/floor/almayer,
-/area/almayer/command/lifeboat)
 "ckr" = (
 /obj/structure/machinery/disposal,
 /obj/structure/disposalpipe/trunk,
@@ -28696,6 +28819,14 @@
 	icon_state = "plate"
 	},
 /area/almayer/shipboard/weapon_room)
+"cFn" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 8
+	},
+/turf/open/floor/almayer{
+	icon_state = "red"
+	},
+/area/almayer/command/lifeboat)
 "cFA" = (
 /obj/structure/surface/rack,
 /obj/item/tool/weldpack,
@@ -28725,12 +28856,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_f_p)
-"cFZ" = (
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/lifeboat)
 "cGr" = (
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -28787,18 +28912,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/engineering/lower_engineering)
-"cHS" = (
-/obj/structure/window/framed/almayer/white,
-/obj/structure/machinery/door/poddoor/shutters/almayer/open{
-	id = "researchlockdownext_se_2";
-	name = "\improper Research Window Shutter"
-	},
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 1
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
-/turf/open/floor/plating,
-/area/almayer/medical/medical_science)
 "cIe" = (
 /obj/structure/machinery/light{
 	dir = 4
@@ -28825,6 +28938,14 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/delta)
+"cIG" = (
+/obj/structure/closet/emcloset,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "cII" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -29023,6 +29144,15 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/processing)
+"cMN" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	dir = 8;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "cMV" = (
 /obj/structure/sign/prop1{
 	pixel_x = -32;
@@ -29098,6 +29228,19 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_a_p)
+"cOK" = (
+/obj/structure/prop/invuln{
+	desc = "An inflated membrane. This one is puncture proof. Wow!";
+	icon = 'icons/obj/items/inflatable.dmi';
+	icon_state = "wall";
+	name = "umbilical wall"
+	},
+/obj/structure/blocker/invisible_wall,
+/turf/open/floor/almayer_hull{
+	dir = 4;
+	icon_state = "outerhull_dir"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "cOM" = (
 /obj/structure/sign/safety/medical{
 	pixel_x = 8;
@@ -29496,12 +29639,26 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/upper_medical)
+"cXY" = (
+/obj/item/stack/catwalk,
+/turf/open/floor/almayer{
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "cXZ" = (
 /obj/structure/sign/safety/maint{
 	pixel_x = -17
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_f_s)
+"cYu" = (
+/obj/structure/pipes/vents/pump{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/lifeboat)
 "cYT" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -29629,6 +29786,12 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/living/port_emb)
+"dbq" = (
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "plating_striped"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "dbv" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/structure/machinery/prop/almayer/computer{
@@ -29800,6 +29963,21 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/port_umbilical)
+"dfg" = (
+/obj/structure/flora/pottedplant{
+	icon_state = "pottedplant_22"
+	},
+/obj/structure/pipes/vents/pump{
+	dir = 1
+	},
+/obj/item/tool/mop{
+	pixel_x = -6;
+	pixel_y = 24
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "dfk" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -29919,6 +30097,16 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hallways/starboard_umbilical)
+"diz" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{
+	id_tag = "Boat1-D4";
+	linked_dock = "almayer-lifeboat1";
+	throw_dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "diF" = (
 /obj/structure/pipes/standard/simple/visible{
 	dir = 4
@@ -29947,12 +30135,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/almayer/squads/alpha_bravo_shared)
-"djc" = (
-/obj/structure/machinery/constructable_frame,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hull/upper_hull/u_a_p)
 "djm" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -30712,6 +30894,15 @@
 	allow_construction = 0
 	},
 /area/almayer/stair_clone/upper)
+"dxK" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 8
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "red"
+	},
+/area/almayer/command/lifeboat)
 "dxL" = (
 /obj/structure/sign/safety/fire_haz{
 	pixel_x = 8;
@@ -31471,6 +31662,20 @@
 /obj/structure/bed/chair/comfy/black,
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/chief_mp_office)
+"dPm" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/lifeboat)
+"dPC" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 9
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/command/lifeboat)
 "dPU" = (
 /obj/structure/sign/safety/nonpress_ag{
 	pixel_x = 32
@@ -31927,6 +32132,20 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
 /area/almayer/living/port_emb)
+"ean" = (
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	dir = 4;
+	id = "W_Containment Cell 3";
+	name = "\improper Containment Cell 5";
+	unacidable = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
+	dir = 4
+	},
+/turf/closed/wall/almayer/research/containment/wall/purple{
+	dir = 4
+	},
+/area/almayer/medical/containment/cell)
 "eas" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -31943,6 +32162,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/shipboard/port_point_defense)
+"eaX" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "ebd" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/plating_catwalk,
@@ -32463,15 +32688,6 @@
 	icon_state = "mono"
 	},
 /area/almayer/hallways/aft_hallway)
-"ejr" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 10
-	},
-/turf/open/floor/almayer{
-	dir = 6;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/medical_science)
 "ejt" = (
 /turf/open/floor/almayer/uscm/directional{
 	dir = 4
@@ -32919,28 +33135,6 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/gym)
-"esP" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/obj/structure/machinery/door/airlock/almayer/research/reinforced{
-	dir = 8;
-	name = "\improper Containment Airlock"
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/medical/medical_science)
 "esT" = (
 /turf/open/floor/almayer/uscm/directional{
 	dir = 9
@@ -33049,6 +33243,12 @@
 	icon_state = "logo_c"
 	},
 /area/almayer/command/cic)
+"euY" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "eva" = (
 /obj/structure/sign/safety/distribution_pipes{
 	pixel_x = 32
@@ -33131,6 +33331,10 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hull/lower_hull/l_f_s)
+"exi" = (
+/obj/structure/pipes/standard/manifold/hidden/supply,
+/turf/open/floor/almayer,
+/area/almayer/command/lifeboat)
 "exr" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 5
@@ -33275,6 +33479,13 @@
 	icon_state = "plate"
 	},
 /area/almayer/command/lifeboat)
+"eAL" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "red"
+	},
+/area/almayer/command/lifeboat)
 "eAU" = (
 /obj/structure/bed/chair{
 	dir = 8
@@ -33327,6 +33538,12 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/starboard_umbilical)
+"eBO" = (
+/obj/structure/bed,
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/medical_science)
 "eBV" = (
 /obj/structure/window/reinforced{
 	dir = 8;
@@ -33958,20 +34175,6 @@
 "eRL" = (
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/main_office)
-"eRM" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
-	},
-/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research{
-	name = "\improper Research Hydroponics Workshop"
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/medical/hydroponics)
 "eRR" = (
 /obj/structure/surface/rack,
 /obj/effect/spawner/random/tool,
@@ -34307,6 +34510,15 @@
 /obj/effect/landmark/start/synthetic,
 /turf/open/floor/almayer,
 /area/almayer/living/synthcloset)
+"eYR" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 5
+	},
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "orangecorner"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "eYW" = (
 /obj/structure/filingcabinet/security,
 /turf/open/floor/wood/ship,
@@ -34462,17 +34674,6 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/shipboard/brig/execution)
-"fce" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/poddoor/shutters/almayer/open{
-	id = "researchlockdownext_door";
-	name = "\improper Research Doorway Shutter"
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/medical/medical_science)
 "fcf" = (
 /obj/structure/pipes/vents/pump{
 	dir = 4
@@ -34762,20 +34963,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/grunt_rnr)
-"fhW" = (
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	dir = 4;
-	id = "W_Containment Cell 1";
-	name = "\improper Containment Cell 5";
-	unacidable = 1
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
-	dir = 4
-	},
-/turf/closed/wall/almayer/research/containment/wall/purple{
-	dir = 1
-	},
-/area/almayer/medical/containment/cell)
 "fiq" = (
 /turf/closed/wall/almayer,
 /area/almayer/hull/lower_hull/l_m_p)
@@ -34953,12 +35140,6 @@
 	icon_state = "cargo"
 	},
 /area/almayer/hull/upper_hull/u_a_s)
-"foI" = (
-/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/almayer/command/lifeboat)
 "foL" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -35564,6 +35745,12 @@
 	icon_state = "mono"
 	},
 /area/almayer/medical/medical_science)
+"fCp" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 5
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/command/lifeboat)
 "fCL" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -36691,6 +36878,18 @@
 	icon_state = "ai_floors"
 	},
 /area/almayer/command/airoom)
+"gbs" = (
+/obj/structure/surface/table/reinforced/black,
+/obj/item/ashtray/plastic{
+	icon_state = "ashtray_full_bl";
+	pixel_x = 5;
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "gbQ" = (
 /obj/structure/toilet{
 	dir = 8
@@ -36884,17 +37083,6 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/general_equipment)
-"gfh" = (
-/obj/structure/closet/crate/freezer{
-	desc = "A freezer crate. There is a note attached, it reads: Do not open, property of Pvt. Mendoza."
-	},
-/obj/item/storage/beer_pack,
-/obj/item/reagent_container/food/drinks/cans/beer,
-/obj/item/reagent_container/food/drinks/cans/beer,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hull/upper_hull/u_a_s)
 "gfk" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
@@ -37230,6 +37418,13 @@
 	icon_state = "plate"
 	},
 /area/almayer/shipboard/starboard_point_defense)
+"gms" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+	dir = 6;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "gnu" = (
 /obj/structure/surface/table/almayer,
 /obj/item/facepaint/green,
@@ -38011,12 +38206,14 @@
 	icon_state = "cargo"
 	},
 /area/almayer/squads/delta)
-"gEz" = (
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 6
+"gEv" = (
+/obj/structure/machinery/light{
+	dir = 1
 	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/command/lifeboat)
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "gEK" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -38546,6 +38743,14 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/medical/medical_science)
+"gQO" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 6
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/lifeboat)
 "gRd" = (
 /obj/structure/platform,
 /obj/structure/target{
@@ -38897,6 +39102,31 @@
 "gZK" = (
 /turf/open/floor/almayer,
 /area/almayer/living/auxiliary_officer_office)
+"gZP" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{
+	id_tag = "Boat2-D4";
+	linked_dock = "almayer-lifeboat2";
+	throw_dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/command/lifeboat)
+"had" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+	icon_state = "red"
+	},
+/area/almayer/command/lifeboat)
+"hal" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+	dir = 1
+	},
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/command/lifeboat)
 "ham" = (
 /turf/open/floor/almayer{
 	icon_state = "sterile_green"
@@ -38950,31 +39180,6 @@
 	icon_state = "green"
 	},
 /area/almayer/hallways/port_hallway)
-"hbi" = (
-/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
-	dir = 1;
-	id = "Containment Cell 5";
-	locked = 1;
-	name = "\improper Containment Cell 5"
-	},
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	id = "Containment Cell 5";
-	name = "\improper Containment Cell 5";
-	unacidable = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/medical/containment/cell)
 "hbu" = (
 /obj/structure/bed/chair{
 	dir = 1
@@ -39704,6 +39909,23 @@
 	icon_state = "redfull"
 	},
 /area/almayer/command/cic)
+"hrn" = (
+/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
+	name = "\improper Research Reception Laboratory"
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/medical_science)
 "hrF" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -39760,6 +39982,12 @@
 	icon_state = "orange"
 	},
 /area/almayer/squads/bravo)
+"htb" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "htI" = (
 /obj/structure/platform_decoration{
 	dir = 1
@@ -40267,6 +40495,12 @@
 /obj/structure/pipes/vents/pump,
 /turf/open/floor/almayer,
 /area/almayer/lifeboat_pumps/south1)
+"hFw" = (
+/obj/structure/machinery/disposal/broken,
+/turf/open/floor/almayer{
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "hFC" = (
 /obj/structure/bed/chair/comfy,
 /turf/open/floor/almayer{
@@ -40605,6 +40839,18 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/port_hallway)
+"hPe" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research,
+/obj/structure/machinery/door/poddoor/shutters/almayer/open{
+	id = "researchlockdownext_door";
+	name = "\improper Research Doorway Shutter"
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/medical_science)
 "hPg" = (
 /obj/structure/machinery/constructable_frame{
 	icon_state = "box_2"
@@ -40780,6 +41026,15 @@
 "hSk" = (
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/engineering/upper_engineering/port)
+"hSt" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	dir = 8;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "hSu" = (
 /obj/structure/machinery/door/airlock/almayer/maint{
 	dir = 1
@@ -40875,6 +41130,18 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/aft_hallway)
+"hTF" = (
+/obj/structure/machinery/suit_storage_unit/compression_suit/uscm{
+	isopen = 1;
+	starting_helmet_type = null;
+	starting_mask_type = null;
+	starting_suit_type = null;
+	starting_tank_type = null
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "hTP" = (
 /obj/structure/machinery/door_control{
 	id = "crate_room2";
@@ -40928,6 +41195,15 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/cic_hallway)
+"hVf" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 10
+	},
+/turf/open/floor/almayer{
+	dir = 6;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "hVz" = (
 /obj/structure/machinery/light{
 	dir = 1
@@ -41003,6 +41279,12 @@
 	icon_state = "blue"
 	},
 /area/almayer/command/cichallway)
+"hWU" = (
+/obj/structure/largecrate/random/barrel/blue,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_a_s)
 "hXb" = (
 /turf/open/floor/almayer{
 	dir = 1;
@@ -41179,26 +41461,6 @@
 	icon_state = "plating_striped"
 	},
 /area/almayer/squads/req)
-"icn" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1
-	},
-/obj/structure/machinery/door/airlock/almayer/research/reinforced{
-	dir = 8;
-	name = "\improper Containment Airlock"
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/medical/containment)
 "icp" = (
 /turf/open/floor/almayer{
 	dir = 8;
@@ -41589,20 +41851,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/shipboard/brig/main_office)
-"ikN" = (
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	dir = 4;
-	id = "W_Containment Cell 2";
-	name = "\improper Containment Cell 5";
-	unacidable = 1
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
-	dir = 4
-	},
-/turf/closed/wall/almayer/research/containment/wall/purple{
-	dir = 8
-	},
-/area/almayer/medical/containment/cell)
 "ils" = (
 /obj/structure/window/framed/almayer/hull,
 /turf/open/floor/plating,
@@ -41672,6 +41920,12 @@
 	icon_state = "mono"
 	},
 /area/almayer/lifeboat_pumps/south1)
+"ins" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 1
+	},
+/turf/open/floor/almayer,
+/area/almayer/command/lifeboat)
 "inw" = (
 /obj/structure/window/framed/almayer,
 /obj/structure/machinery/door/firedoor/border_only/almayer{
@@ -42013,16 +42267,6 @@
 	icon_state = "red"
 	},
 /area/almayer/command/lifeboat)
-"iui" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/medical/hydroponics)
 "iun" = (
 /obj/effect/spawner/random/tool,
 /turf/open/floor/plating/plating_catwalk,
@@ -42465,35 +42709,6 @@
 	icon_state = "silver"
 	},
 /area/almayer/living/auxiliary_officer_office)
-"iEh" = (
-/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
-	id = "Containment Cell 3";
-	locked = 1;
-	name = "\improper Containment Cell 3";
-	unacidable = 1
-	},
-/obj/structure/machinery/door/poddoor/shutters/almayer/containment{
-	dir = 4;
-	id = "Containment Cell 3";
-	name = "\improper Containment Cell 3"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
-	dir = 4
-	},
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/medical/containment/cell)
 "iEr" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -42735,6 +42950,14 @@
 	icon_state = "orange"
 	},
 /area/almayer/hallways/hangar)
+"iKc" = (
+/obj/structure/closet/firecloset,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "iKf" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 9
@@ -42786,6 +43009,15 @@
 	icon_state = "redcorner"
 	},
 /area/almayer/shipboard/brig/general_equipment)
+"iKZ" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "iLd" = (
 /obj/structure/stairs/perspective{
 	dir = 1;
@@ -42876,17 +43108,6 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_medbay)
-"iMK" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/medical_science)
 "iNZ" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -42905,13 +43126,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/armory)
-"iOp" = (
-/obj/structure/machinery/camera/autoname/almayer{
-	name = "ship-grade camera"
-	},
-/obj/structure/pipes/vents/pump/no_boom,
-/turf/open/floor/almayer,
-/area/almayer/command/lifeboat)
 "iOD" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -42929,6 +43143,12 @@
 	icon_state = "silver"
 	},
 /area/almayer/living/briefing)
+"iPD" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/command/lifeboat)
 "iPS" = (
 /obj/structure/machinery/cryopod/right,
 /turf/open/floor/almayer{
@@ -43155,6 +43375,16 @@
 	icon_state = "mono"
 	},
 /area/almayer/medical/hydroponics)
+"iUW" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/item/tool/crowbar/red,
+/turf/open/floor/almayer{
+	dir = 8;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "iUZ" = (
 /obj/docking_port/stationary/escape_pod/cl,
 /turf/open/floor/plating,
@@ -43193,6 +43423,13 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_f_p)
+"iVY" = (
+/obj/effect/decal/hefa_cult_decals/d32,
+/turf/open/floor/almayer{
+	dir = 9;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "iVZ" = (
 /obj/structure/surface/table/woodentable/fancy,
 /obj/item/folder/black,
@@ -43368,15 +43605,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/command/lifeboat)
-"iZr" = (
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	dir = 6;
-	icon_state = "red"
-	},
-/area/almayer/command/lifeboat)
 "iZw" = (
 /obj/effect/step_trigger/teleporter_vector{
 	name = "Almayer_AresUp";
@@ -43408,12 +43636,6 @@
 	icon_state = "emerald"
 	},
 /area/almayer/hallways/port_hallway)
-"iZL" = (
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 9
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/command/lifeboat)
 "iZP" = (
 /obj/structure/platform{
 	dir = 8
@@ -43587,6 +43809,11 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_a_p)
+"jcP" = (
+/turf/open/floor/almayer{
+	icon_state = "plating_striped"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "jcZ" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -43747,20 +43974,6 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/engine_core)
-"jfV" = (
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	dir = 4;
-	id = "W_Containment Cell 5";
-	name = "\improper Containment Cell 5";
-	unacidable = 1
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
-	dir = 4
-	},
-/turf/closed/wall/almayer/research/containment/wall/purple{
-	dir = 1
-	},
-/area/almayer/medical/containment/cell)
 "jfY" = (
 /obj/structure/surface/table/almayer,
 /obj/effect/landmark/map_item,
@@ -43844,6 +44057,14 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/engineering/upper_engineering/notunnel)
+"jgC" = (
+/obj/structure/closet/emcloset,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_a_p)
 "jgF" = (
 /obj/structure/platform,
 /turf/open/floor/almayer{
@@ -44129,6 +44350,13 @@
 /obj/structure/window/framed/almayer,
 /turf/open/floor/plating,
 /area/almayer/engineering/upper_engineering/port)
+"jlT" = (
+/obj/structure/pipes/vents/pump,
+/obj/structure/machinery/camera/autoname/almayer{
+	name = "ship-grade camera"
+	},
+/turf/open/floor/almayer,
+/area/almayer/command/lifeboat)
 "jlX" = (
 /obj/structure/surface/table/almayer,
 /obj/item/tool/hand_labeler,
@@ -44622,6 +44850,15 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/shipboard/brig/surgery)
+"jAJ" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer,
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "jBy" = (
 /obj/structure/machinery/light{
 	dir = 4
@@ -44640,6 +44877,29 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_a_s)
+"jBO" = (
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	dir = 4;
+	id = "W_Containment Cell 3";
+	name = "\improper Containment Cell 5";
+	unacidable = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
+	dir = 4
+	},
+/turf/closed/wall/almayer/research/containment/wall/purple{
+	dir = 8
+	},
+/area/almayer/medical/containment/cell)
+"jBX" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/machinery/door/firedoor/border_only/almayer,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/command/lifeboat)
 "jCa" = (
 /obj/structure/machinery/disposal,
 /obj/structure/disposalpipe/trunk,
@@ -44750,34 +45010,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hull/upper_hull/u_a_s)
-"jGm" = (
-/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
-	id = "Containment Cell 2";
-	locked = 1;
-	name = "\improper Containment Cell 2"
-	},
-/obj/structure/machinery/door/poddoor/shutters/almayer/containment{
-	dir = 4;
-	id = "Containment Cell 2";
-	name = "\improper Containment Cell 2"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
-	dir = 4
-	},
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/medical/containment/cell)
 "jGn" = (
 /obj/structure/machinery/light{
 	dir = 1
@@ -44848,6 +45080,15 @@
 	icon_state = "blue"
 	},
 /area/almayer/hallways/aft_hallway)
+"jHL" = (
+/obj/structure/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/almayer{
+	dir = 8;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "jHQ" = (
 /obj/structure/machinery/crema_switch{
 	pixel_x = -24;
@@ -44904,21 +45145,6 @@
 	icon_state = "plating"
 	},
 /area/almayer/shipboard/port_missiles)
-"jKy" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{
-	name = "\improper Medical Bay";
-	req_one_access = null
-	},
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 2
-	},
-/obj/structure/disposalpipe/segment,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/medical/upper_medical)
 "jKz" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -45055,6 +45281,16 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hull/upper_hull/u_f_s)
+"jMG" = (
+/obj/structure/largecrate/random/case/small,
+/obj/structure/largecrate/random/mini/wooden{
+	pixel_x = 4;
+	pixel_y = 6
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "jMK" = (
 /obj/structure/machinery/cm_vending/sorted/medical/wall_med{
 	pixel_y = 25
@@ -45083,6 +45319,35 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/living/briefing)
+"jNc" = (
+/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
+	id = "Containment Cell 3";
+	locked = 1;
+	name = "\improper Containment Cell 3";
+	unacidable = 1
+	},
+/obj/structure/machinery/door/poddoor/shutters/almayer/containment{
+	dir = 4;
+	id = "Containment Cell 3";
+	name = "\improper Containment Cell 3"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
+	dir = 4
+	},
+/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/containment/cell)
 "jNq" = (
 /obj/structure/closet/secure_closet/personal/cabinet{
 	req_access = null
@@ -45186,6 +45451,12 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_a_s)
+"jPq" = (
+/obj/structure/reagent_dispensers/watertank,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "jQt" = (
 /turf/open/floor/almayer/research/containment/floor2{
 	dir = 8
@@ -45220,6 +45491,15 @@
 	},
 /turf/closed/wall/almayer/outer,
 /area/space)
+"jRC" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 10
+	},
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "jRK" = (
 /obj/structure/largecrate/random/case/double,
 /turf/open/floor/almayer{
@@ -45780,6 +46060,15 @@
 "kcp" = (
 /turf/closed/wall/almayer,
 /area/almayer/living/auxiliary_officer_office)
+"kcA" = (
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "kcH" = (
 /turf/closed/wall/almayer/reinforced,
 /area/almayer/living/synthcloset)
@@ -45930,6 +46219,18 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/starboard_hallway)
+"kgs" = (
+/obj/structure/window/framed/almayer/white,
+/obj/structure/machinery/door/poddoor/shutters/almayer/open{
+	id = "researchlockdownext_se_2";
+	name = "\improper Research Window Shutter"
+	},
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+	dir = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
+/turf/open/floor/plating,
+/area/almayer/medical/medical_science)
 "khd" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -46623,23 +46924,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/engineering/laundry)
-"kxx" = (
-/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
-	name = "\improper Research Reception Laboratory"
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/medical/medical_science)
 "kxL" = (
 /obj/structure/closet/coffin/woodencrate,
 /obj/structure/largecrate/random/mini/wooden{
@@ -46887,14 +47171,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/medical/containment)
-"kCP" = (
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/medical/medical_science)
 "kCS" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
@@ -47132,12 +47408,30 @@
 /obj/effect/decal/cleanable/blood,
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/execution)
+"kHS" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "kHT" = (
 /turf/open/floor/almayer{
 	dir = 5;
 	icon_state = "green"
 	},
 /area/almayer/hallways/aft_hallway)
+"kHY" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 10
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "kIm" = (
 /obj/structure/pipes/vents/pump{
 	dir = 4
@@ -47309,6 +47603,19 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/cells)
+"kMK" = (
+/obj/structure/prop/invuln{
+	desc = "An inflated membrane. This one is puncture proof. Wow!";
+	icon = 'icons/obj/items/inflatable.dmi';
+	icon_state = "wall";
+	name = "umbilical wall"
+	},
+/obj/structure/blocker/invisible_wall,
+/turf/open/floor/almayer_hull{
+	dir = 8;
+	icon_state = "outerhull_dir"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "kMU" = (
 /obj/structure/sign/safety/maint{
 	pixel_x = -17
@@ -47329,6 +47636,12 @@
 	icon_state = "redcorner"
 	},
 /area/almayer/shipboard/brig/processing)
+"kNk" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/plating/almayer,
+/area/almayer/engineering/upper_engineering/starboard)
 "kNl" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -48010,12 +48323,15 @@
 	icon_state = "cargo"
 	},
 /area/almayer/squads/charlie)
-"lbE" = (
-/obj/structure/pipes/vents/pump/no_boom,
+"lbB" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	dir = 1;
+	icon_state = "orange"
 	},
-/area/almayer/command/lifeboat)
+/area/almayer/engineering/upper_engineering/port)
 "lbX" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -48493,6 +48809,12 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/living/port_emb)
+"lne" = (
+/obj/structure/bed/chair,
+/turf/open/floor/almayer{
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "lnm" = (
 /turf/open/floor/almayer{
 	icon_state = "orangecorner"
@@ -48556,6 +48878,29 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/charlie)
+"lol" = (
+/obj/structure/machinery/status_display{
+	pixel_x = 16;
+	pixel_y = -30
+	},
+/obj/structure/sign/safety/airlock{
+	pixel_y = -32
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/port)
+"lou" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
+	dir = 5
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "loK" = (
 /obj/structure/closet/crate/medical,
 /obj/item/storage/firstaid/adv,
@@ -48942,6 +49287,13 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/grunt_rnr)
+"luY" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "luZ" = (
 /obj/structure/machinery/door/poddoor/almayer/open{
 	dir = 2;
@@ -49077,24 +49429,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/auxiliary_officer_office)
-"lyf" = (
-/obj/structure/machinery/door/airlock/almayer/research/reinforced{
-	dir = 8;
-	name = "\improper Containment Airlock"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
-	dir = 4
-	},
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/medical/medical_science)
 "lyi" = (
 /obj/structure/surface/table/almayer,
 /obj/item/trash/pistachios,
@@ -49193,18 +49527,15 @@
 	icon_state = "orange"
 	},
 /area/almayer/squads/bravo)
-"lAq" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 8
+"lAu" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer,
+/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{
+	dir = 1
 	},
 /turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_side"
+	icon_state = "test_floor4"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/engineering/upper_engineering/port)
 "lAy" = (
 /obj/structure/bed/chair/comfy/beige{
 	dir = 8
@@ -49391,14 +49722,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hull/upper_hull/u_f_p)
-"lDO" = (
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 10
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/lifeboat)
 "lDV" = (
 /obj/effect/landmark/start/marine/medic/bravo,
 /obj/effect/landmark/late_join/bravo,
@@ -49708,6 +50031,18 @@
 	icon_state = "cargo"
 	},
 /area/almayer/living/cryo_cells)
+"lJv" = (
+/obj/structure/window/framed/almayer/white,
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+	dir = 1
+	},
+/obj/structure/machinery/door/poddoor/shutters/almayer/open{
+	id = "researchlockdownext";
+	name = "\improper Research Window Shutter"
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
+/turf/open/floor/plating,
+/area/almayer/medical/medical_science)
 "lJG" = (
 /obj/structure/pipes/standard/manifold/hidden/supply,
 /obj/structure/disposalpipe/segment{
@@ -49925,6 +50260,17 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/operating_room_two)
+"lON" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/machinery/door/poddoor/shutters/almayer/open{
+	id = "researchlockdownext_door";
+	name = "\improper Research Doorway Shutter"
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/medical_science)
 "lPB" = (
 /obj/structure/surface/table/almayer,
 /obj/item/device/lightreplacer,
@@ -50551,6 +50897,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/bridgebunks)
+"mhG" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 10
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/command/lifeboat)
 "mhI" = (
 /obj/structure/machinery/vending/cigarette{
 	density = 0;
@@ -50691,6 +51043,23 @@
 	icon_state = "silver"
 	},
 /area/almayer/engineering/port_atmos)
+"mkH" = (
+/obj/structure/surface/rack{
+	density = 0;
+	pixel_y = 16
+	},
+/obj/structure/surface/rack{
+	layer = 2.5
+	},
+/obj/item/storage/fancy/candle_box{
+	pixel_x = 6;
+	pixel_y = -2
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "mlb" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S";
@@ -50741,6 +51110,18 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_f_s)
+"mmN" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+	dir = 1
+	},
+/obj/structure/machinery/door/poddoor/shutters/almayer/open{
+	id = "researchlockdownext_se_2";
+	name = "\improper Research Window Shutter"
+	},
+/obj/structure/window/framed/almayer/white,
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
+/turf/open/floor/plating,
+/area/almayer/medical/medical_science)
 "mnf" = (
 /obj/structure/window/framed/almayer,
 /obj/structure/machinery/door/firedoor/border_only/almayer,
@@ -51000,32 +51381,12 @@
 	icon_state = "orange"
 	},
 /area/almayer/squads/bravo)
-"msw" = (
-/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
-	dir = 1;
-	id = "Containment Cell 1";
-	locked = 1;
-	name = "\improper Containment Cell 1"
-	},
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	id = "Containment Cell 1";
-	name = "\improper Containment Cell 1";
-	unacidable = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
+"msP" = (
+/obj/structure/largecrate/random/case/double,
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "plate"
 	},
-/area/almayer/medical/containment/cell)
+/area/almayer/engineering/upper_engineering/starboard)
 "msV" = (
 /obj/structure/largecrate/random/case/double,
 /turf/open/floor/plating/plating_catwalk,
@@ -51612,26 +51973,6 @@
 	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
-"mHG" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/structure/machinery/door/window/westright,
-/obj/structure/machinery/door/firedoor/border_only/almayer,
-/obj/structure/machinery/door/window/westright{
-	dir = 4;
-	req_access_txt = "28"
-	},
-/obj/structure/machinery/door/poddoor/shutters/almayer/open{
-	dir = 8;
-	id = "researchlockdownext_windoor";
-	name = "\improper Research Windoor Shutter"
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/medical/medical_science)
 "mHO" = (
 /obj/structure/machinery/light,
 /turf/open/floor/almayer,
@@ -51775,19 +52116,6 @@
 "mKq" = (
 /turf/closed/wall/almayer/reinforced,
 /area/almayer/living/bridgebunks)
-"mKs" = (
-/obj/structure/window/framed/almayer/white,
-/obj/structure/machinery/door/firedoor/border_only/almayer,
-/obj/structure/machinery/door/poddoor/shutters/almayer/open{
-	dir = 8;
-	id = "researchlockdownext_windoor";
-	name = "\improper Research Windoor Shutter"
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/almayer/medical/medical_science)
 "mKw" = (
 /obj/structure/disposalpipe/junction{
 	dir = 1
@@ -52377,6 +52705,17 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/general_equipment)
+"mWs" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "mWw" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
@@ -52479,15 +52818,6 @@
 	icon_state = "mono"
 	},
 /area/almayer/lifeboat_pumps/south1)
-"mYT" = (
-/obj/structure/bed,
-/obj/structure/machinery/power/apc/almayer{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/almayer/medical/medical_science)
 "mYY" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SW-out"
@@ -52578,6 +52908,12 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/auxiliary_officer_office)
+"nau" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 8
+	},
+/turf/open/floor/almayer,
+/area/almayer/command/lifeboat)
 "naB" = (
 /turf/closed/wall/almayer/reinforced,
 /area/almayer/shipboard/brig/perma)
@@ -52589,6 +52925,17 @@
 	icon_state = "kitchen"
 	},
 /area/almayer/engineering/upper_engineering/port)
+"naR" = (
+/obj/structure/machinery/iv_drip,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "sterile_green_corner"
+	},
+/area/almayer/medical/medical_science)
 "naV" = (
 /obj/structure/machinery/door/airlock/almayer/generic{
 	dir = 2;
@@ -52611,6 +52958,15 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/grunt_rnr)
+"ncp" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 9
+	},
+/turf/open/floor/almayer{
+	dir = 6;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "ncE" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -52693,6 +53049,15 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/engineering/engineering_workshop)
+"new" = (
+/obj/item/reagent_container/glass/bucket/janibucket,
+/obj/item/reagent_container/glass/bucket/janibucket{
+	pixel_y = 11
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "neE" = (
 /obj/structure/platform_decoration{
 	dir = 1
@@ -52808,6 +53173,13 @@
 	icon_state = "redcorner"
 	},
 /area/almayer/living/briefing)
+"ngU" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/blood/oil/streak,
+/turf/open/floor/almayer,
+/area/almayer/engineering/upper_engineering/starboard)
 "nhi" = (
 /obj/structure/bed/chair/comfy,
 /obj/structure/window/reinforced/ultra,
@@ -52990,6 +53362,12 @@
 	icon_state = "cargo_arrow"
 	},
 /area/almayer/hallways/vehiclehangar)
+"nkn" = (
+/obj/structure/pipes/vents/pump{
+	dir = 8
+	},
+/turf/open/floor/almayer,
+/area/almayer/command/lifeboat)
 "nkx" = (
 /obj/structure/machinery/cm_vending/sorted/medical/wall_med{
 	pixel_y = 25
@@ -53011,15 +53389,14 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/cells)
-"nlV" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
+"nlW" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/largecrate/random/barrel/green,
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	dir = 5;
+	icon_state = "orange"
 	},
-/area/almayer/command/lifeboat)
+/area/almayer/engineering/upper_engineering/starboard)
 "nmb" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -53286,6 +53663,15 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_medbay)
+"nrO" = (
+/obj/structure/bed/chair/comfy{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "nsc" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 9
@@ -53774,6 +54160,14 @@
 	icon_state = "orange"
 	},
 /area/almayer/squads/bravo)
+"nCT" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 10
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/lifeboat)
 "nDd" = (
 /obj/structure/closet/secure_closet/guncabinet/red,
 /obj/item/ammo_magazine/smg/m39,
@@ -54437,17 +54831,6 @@
 	icon_state = "mono"
 	},
 /area/almayer/medical/medical_science)
-"nPM" = (
-/obj/structure/machinery/door/airlock/almayer/secure/reinforced{
-	dir = 2;
-	name = "\improper Lifeboat Control Bubble";
-	req_access = null
-	},
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/command/lifeboat)
 "nPT" = (
 /obj/structure/machinery/door/poddoor/shutters/almayer{
 	desc = "These shutters seem to be pretty poorly mantained and almost wedged into the room.. you're not sure if these are official.";
@@ -54662,6 +55045,16 @@
 	icon_state = "green"
 	},
 /area/almayer/hallways/starboard_hallway)
+"nVX" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{
+	id_tag = "Boat2-D1";
+	linked_dock = "almayer-lifeboat2";
+	throw_dir = 2
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "nWN" = (
 /obj/structure/surface/table/almayer,
 /turf/open/floor/wood/ship,
@@ -54914,6 +55307,27 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_a_p)
+"odb" = (
+/obj/structure/machinery/light,
+/turf/open/floor/almayer{
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
+"odl" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 8
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/engineering/upper_engineering/starboard)
+"odu" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	dir = 6;
+	icon_state = "red"
+	},
+/area/almayer/command/lifeboat)
 "odB" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -54943,6 +55357,15 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/shipboard/sea_office)
+"odV" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	dir = 5;
+	icon_state = "red"
+	},
+/area/almayer/command/lifeboat)
 "oed" = (
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -55005,6 +55428,23 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_m_p)
+"ofH" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
+"ofK" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "ofZ" = (
 /obj/structure/bed/sofa/south/grey,
 /turf/open/floor/almayer{
@@ -55047,6 +55487,16 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
+"ohH" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{
+	id_tag = "Boat2-D3";
+	linked_dock = "almayer-lifeboat2";
+	throw_dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/command/lifeboat)
 "ohJ" = (
 /obj/structure/machinery/computer/arcade,
 /turf/open/floor/wood/ship,
@@ -55057,14 +55507,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/lifeboat_pumps/north2)
-"ohR" = (
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 9
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/lifeboat)
 "oih" = (
 /obj/structure/bed{
 	icon_state = "abed"
@@ -55094,6 +55536,15 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/upper_engineering/port)
+"oir" = (
+/obj/structure/pipes/vents/pump{
+	dir = 8
+	},
+/obj/structure/machinery/power/apc/almayer/hardened{
+	dir = 4
+	},
+/turf/open/floor/almayer,
+/area/almayer/command/lifeboat)
 "oit" = (
 /obj/effect/landmark/railgun_computer{
 	dir = 1
@@ -55427,14 +55878,6 @@
 	icon_state = "green"
 	},
 /area/almayer/squads/req)
-"opy" = (
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 6
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/lifeboat)
 "opC" = (
 /obj/structure/machinery/door/airlock/almayer/command/reinforced{
 	name = "\improper Combat Information Center"
@@ -55955,6 +56398,16 @@
 	icon_state = "mono"
 	},
 /area/almayer/engineering/upper_engineering/starboard)
+"ozN" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{
+	id_tag = "Boat2-D2";
+	linked_dock = "almayer-lifeboat2";
+	throw_dir = 2
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "ozT" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 9
@@ -56026,6 +56479,15 @@
 	icon_state = "silver"
 	},
 /area/almayer/command/cichallway)
+"oCf" = (
+/obj/structure/machinery/light{
+	unacidable = 1;
+	unslashable = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "oCi" = (
 /obj/structure/sign/safety/restrictedarea{
 	pixel_x = -17
@@ -56044,12 +56506,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_f_s)
-"oCO" = (
-/obj/structure/pipes/vents/pump/no_boom{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/almayer/command/lifeboat)
 "oCX" = (
 /turf/open/floor/almayer{
 	dir = 6;
@@ -56297,6 +56753,12 @@
 	icon_state = "orange"
 	},
 /area/almayer/shipboard/brig/perma)
+"oIm" = (
+/obj/structure/prop/server_equipment/broken,
+/turf/open/floor/almayer{
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "oIn" = (
 /obj/structure/bed/chair{
 	dir = 8;
@@ -56306,6 +56768,28 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_m_s)
+"oIr" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/obj/structure/machinery/door/airlock/almayer/research/reinforced{
+	dir = 8;
+	name = "\improper Containment Airlock"
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/medical_science)
 "oIB" = (
 /turf/closed/wall/almayer,
 /area/almayer/command/combat_correspondent)
@@ -56512,16 +56996,6 @@
 /obj/structure/pipes/vents/pump,
 /turf/open/floor/almayer,
 /area/almayer/lifeboat_pumps/north1)
-"oMT" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{
-	id_tag = "Boat2-D1";
-	linked_dock = "almayer-lifeboat2";
-	throw_dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/command/lifeboat)
 "oNb" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/flora/pottedplant{
@@ -56575,6 +57049,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/command/lifeboat)
+"oPf" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 8
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/command/lifeboat)
 "oPk" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/machinery/door_control{
@@ -56831,10 +57311,6 @@
 	icon_state = "cargo"
 	},
 /area/almayer/squads/alpha)
-"oTP" = (
-/obj/structure/pipes/standard/manifold/hidden/supply/no_boom,
-/turf/open/floor/almayer,
-/area/almayer/command/lifeboat)
 "oUG" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -56948,18 +57424,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_m_p)
-"oYj" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 1
-	},
-/obj/structure/machinery/door/poddoor/shutters/almayer/open{
-	id = "researchlockdownext_se_2";
-	name = "\improper Research Window Shutter"
-	},
-/obj/structure/window/framed/almayer/white,
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
-/turf/open/floor/plating,
-/area/almayer/medical/medical_science)
 "oYp" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 8
@@ -57025,6 +57489,15 @@
 	icon_state = "plate"
 	},
 /area/almayer/shipboard/brig/main_office)
+"paI" = (
+/obj/structure/sign/safety/debark_lounge{
+	pixel_x = 15;
+	pixel_y = -32
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "paL" = (
 /turf/open/floor/almayer/uscm/directional{
 	dir = 1
@@ -57089,6 +57562,15 @@
 	icon_state = "cargo"
 	},
 /area/almayer/hallways/hangar)
+"pcv" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "pcD" = (
 /obj/structure/machinery/door/airlock/almayer/maint{
 	dir = 1
@@ -57200,6 +57682,18 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/navigation)
+"pfc" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer,
+/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{
+	dir = 1
+	},
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "pfh" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 1
@@ -57336,15 +57830,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/almayer,
 /area/almayer/command/computerlab)
-"pjh" = (
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "red"
-	},
-/area/almayer/command/lifeboat)
 "pji" = (
 /turf/closed/wall/almayer,
 /area/almayer/hallways/stern_hallway)
@@ -58010,6 +58495,12 @@
 	icon_state = "plating"
 	},
 /area/almayer/shipboard/starboard_point_defense)
+"pzJ" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/lifeboat)
 "pzO" = (
 /obj/item/tool/warning_cone{
 	pixel_y = 13
@@ -58058,12 +58549,6 @@
 	icon_state = "orangecorner"
 	},
 /area/almayer/hull/upper_hull/u_a_s)
-"pCb" = (
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/almayer/command/lifeboat)
 "pCi" = (
 /turf/closed/wall/almayer/outer,
 /area/almayer/hull/upper_hull/u_f_s)
@@ -58159,12 +58644,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/charlie)
-"pDL" = (
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 10
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/command/lifeboat)
 "pEl" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -58252,18 +58731,6 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/shipboard/brig/perma)
-"pFz" = (
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	dir = 4;
-	id = "W_Containment Cell 5";
-	name = "\improper Containment Cell 5";
-	unacidable = 1
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
-	dir = 4
-	},
-/turf/closed/wall/almayer/research/containment/wall/purple,
-/area/almayer/medical/containment/cell)
 "pFA" = (
 /obj/structure/pipes/standard/simple/visible{
 	dir = 4
@@ -58508,6 +58975,27 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/medical/lower_medical_medbay)
+"pLv" = (
+/obj/structure/device/broken_moog,
+/obj/effect/decal/cleanable/blood/splatter,
+/turf/open/floor/almayer{
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
+"pLO" = (
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	dir = 4;
+	id = "W_Containment Cell 5";
+	name = "\improper Containment Cell 5";
+	unacidable = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
+	dir = 4
+	},
+/turf/closed/wall/almayer/research/containment/wall/purple{
+	dir = 1
+	},
+/area/almayer/medical/containment/cell)
 "pLW" = (
 /obj/structure/machinery/firealarm{
 	dir = 4;
@@ -58765,6 +59253,15 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/offices)
+"pRn" = (
+/obj/structure/bed,
+/obj/structure/machinery/power/apc/almayer{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/medical_science)
 "pRy" = (
 /turf/open/floor/almayer/research/containment/corner_var1{
 	dir = 4
@@ -59409,6 +59906,22 @@
 	icon_state = "plate"
 	},
 /area/almayer/command/lifeboat)
+"qeK" = (
+/obj/structure/pipes/vents/scrubber,
+/obj/structure/surface/table/reinforced/black,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/stack/cable_coil{
+	pixel_x = -7;
+	pixel_y = 11
+	},
+/obj/item/device/helmet_visor{
+	pixel_x = 8;
+	pixel_y = 13
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "qeY" = (
 /obj/structure/surface/table/reinforced/prison,
 /obj/item/toy/beach_ball/holoball,
@@ -59432,15 +59945,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/alpha_bravo_shared)
-"qfu" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 2
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/medical/upper_medical)
 "qfy" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -59658,6 +60162,14 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/medical/lower_medical_lobby)
+"qjV" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 9
+	},
+/turf/open/floor/almayer{
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "qki" = (
 /obj/effect/landmark/start/marine/smartgunner/charlie,
 /obj/effect/landmark/late_join/charlie,
@@ -59854,20 +60366,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_a_s)
-"qnZ" = (
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	dir = 4;
-	id = "W_Containment Cell 2";
-	name = "\improper Containment Cell 5";
-	unacidable = 1
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
-	dir = 4
-	},
-/turf/closed/wall/almayer/research/containment/wall/purple{
-	dir = 4
-	},
-/area/almayer/medical/containment/cell)
 "qof" = (
 /obj/structure/window/framed/almayer,
 /obj/structure/machinery/door/poddoor/shutters/almayer/open{
@@ -60221,6 +60719,18 @@
 	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
+"qxm" = (
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	dir = 4;
+	id = "W_Containment Cell 5";
+	name = "\improper Containment Cell 5";
+	unacidable = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
+	dir = 4
+	},
+/turf/closed/wall/almayer/research/containment/wall/purple,
+/area/almayer/medical/containment/cell)
 "qxA" = (
 /obj/structure/closet/firecloset,
 /turf/open/floor/almayer{
@@ -60463,6 +60973,17 @@
 /obj/effect/landmark/late_join/bravo,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/bravo)
+"qDt" = (
+/obj/structure/machinery/door/airlock/almayer/secure/reinforced{
+	dir = 2;
+	name = "\improper Lifeboat Control Bubble";
+	req_access = null
+	},
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/command/lifeboat)
 "qDv" = (
 /obj/structure/closet,
 /obj/item/stack/sheet/glass/large_stack,
@@ -60477,12 +60998,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_f_s)
-"qDz" = (
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
-/turf/open/floor/almayer{
-	icon_state = "red"
-	},
-/area/almayer/command/lifeboat)
 "qDN" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -60514,6 +61029,20 @@
 	icon_state = "plating"
 	},
 /area/almayer/command/cic)
+"qEn" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out";
+	pixel_x = -1
+	},
+/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research{
+	name = "\improper Research Hydroponics Workshop"
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/hydroponics)
 "qEy" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/simple/hidden/supply{
@@ -61400,6 +61929,12 @@
 	icon_state = "green"
 	},
 /area/almayer/hallways/port_hallway)
+"qYu" = (
+/obj/structure/pipes/vents/pump,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/lifeboat)
 "qYC" = (
 /obj/structure/disposalpipe/down/almayer{
 	dir = 4;
@@ -61755,17 +62290,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/shipboard/port_point_defense)
-"rfY" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/medical/medical_science)
 "rgy" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 1
@@ -61899,6 +62423,12 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/cells)
+"rjG" = (
+/obj/structure/pipes/standard/tank/oxygen,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "rjH" = (
 /obj/structure/surface/rack,
 /obj/item/storage/beer_pack,
@@ -62027,6 +62557,26 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/medical/lower_medical_medbay)
+"rmc" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 8
+	},
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
+"rmf" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 6
+	},
+/turf/open/floor/almayer{
+	icon_state = "orangecorner"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "rmv" = (
 /obj/structure/machinery/door/airlock/almayer/security{
 	dir = 2;
@@ -62450,6 +63000,12 @@
 	icon_state = "emerald"
 	},
 /area/almayer/squads/charlie)
+"rwb" = (
+/obj/structure/largecrate/random/barrel/white,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_a_s)
 "rwv" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/bed/chair/comfy/bravo,
@@ -62620,6 +63176,13 @@
 	icon_state = "cargo"
 	},
 /area/almayer/squads/alpha)
+"rAP" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+	dir = 5;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "rBa" = (
 /obj/structure/machinery/cm_vending/clothing/synth,
 /obj/structure/prop/invuln/overhead_pipe{
@@ -62710,6 +63273,18 @@
 	icon_state = "ai_floors"
 	},
 /area/almayer/command/airoom)
+"rCD" = (
+/obj/structure/machinery/light/small{
+	dir = 4
+	},
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 10
+	},
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "rCK" = (
 /obj/structure/machinery/cryopod/right,
 /turf/open/floor/almayer{
@@ -62737,6 +63312,12 @@
 	icon_state = "silver"
 	},
 /area/almayer/shipboard/brig/cic_hallway)
+"rDb" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 6
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/engineering/upper_engineering/port)
 "rDd" = (
 /obj/structure/surface/table/woodentable/fancy,
 /obj/structure/machinery/computer/emails{
@@ -62898,6 +63479,12 @@
 	icon_state = "plating"
 	},
 /area/almayer/engineering/engine_core)
+"rFy" = (
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "orangecorner"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "rFB" = (
 /obj/structure/machinery/suit_storage_unit/compression_suit/uscm,
 /obj/effect/decal/warning_stripes{
@@ -63480,12 +64067,12 @@
 	icon_state = "redcorner"
 	},
 /area/almayer/shipboard/brig/chief_mp_office)
-"rTB" = (
-/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{
-	dir = 4
+"rTJ" = (
+/obj/effect/decal/cleanable/blood/oil/streak,
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/command/lifeboat)
+/area/almayer/engineering/upper_engineering/port)
 "rTV" = (
 /obj/structure/sign/safety/security{
 	pixel_x = 32
@@ -63704,18 +64291,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/port_hallway)
-"rZL" = (
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	dir = 4;
-	id = "W_Containment Cell 1";
-	name = "\improper Containment Cell 5";
-	unacidable = 1
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
-	dir = 4
-	},
-/turf/closed/wall/almayer/research/containment/wall/purple,
-/area/almayer/medical/containment/cell)
 "rZP" = (
 /obj/structure/surface/table/almayer,
 /obj/item/tool/weldpack,
@@ -64149,6 +64724,15 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/command/lifeboat)
+"skg" = (
+/obj/structure/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/almayer{
+	dir = 10;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "skl" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 8
@@ -64391,6 +64975,15 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/living/briefing)
+"spK" = (
+/obj/structure/pipes/vents/scrubber{
+	dir = 1
+	},
+/obj/structure/largecrate/random/secure,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "spS" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -64504,6 +65097,12 @@
 	icon_state = "greencorner"
 	},
 /area/almayer/hallways/port_hallway)
+"ssU" = (
+/obj/structure/machinery/constructable_frame,
+/turf/open/floor/almayer{
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "ssW" = (
 /obj/structure/closet/secure_closet/guncabinet/red,
 /obj/item/ammo_magazine/shotgun/buckshot,
@@ -64516,6 +65115,12 @@
 	icon_state = "redfull"
 	},
 /area/almayer/command/cic)
+"ssX" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 6
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/command/lifeboat)
 "ssZ" = (
 /obj/structure/surface/table/almayer,
 /obj/item/paper_bin/uscm,
@@ -64594,6 +65199,14 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/command/lifeboat)
+"svl" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/lifeboat)
 "svp" = (
 /obj/structure/closet/emcloset,
 /turf/open/floor/almayer{
@@ -64879,17 +65492,6 @@
 	icon_state = "silver"
 	},
 /area/almayer/shipboard/brig/cic_hallway)
-"sCU" = (
-/obj/structure/machinery/iv_drip,
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_corner"
-	},
-/area/almayer/medical/medical_science)
 "sDu" = (
 /obj/item/clothing/under/marine/dress,
 /turf/open/floor/almayer{
@@ -65286,12 +65888,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/lifeboat_pumps/north1)
-"sLt" = (
-/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/almayer/command/lifeboat)
 "sLE" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -65449,17 +66045,6 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_medbay)
-"sQt" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 9
-	},
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/medical_science)
 "sQF" = (
 /turf/open/floor/almayer{
 	icon_state = "red"
@@ -65472,6 +66057,12 @@
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/command/corporateliason)
+"sQO" = (
+/obj/structure/pipes/standard/manifold/hidden/supply,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/lifeboat)
 "sQS" = (
 /obj/structure/surface/table/almayer,
 /obj/item/tool/stamp{
@@ -65973,6 +66564,34 @@
 	icon_state = "red"
 	},
 /area/almayer/hallways/starboard_hallway)
+"taH" = (
+/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
+	id = "Containment Cell 2";
+	locked = 1;
+	name = "\improper Containment Cell 2"
+	},
+/obj/structure/machinery/door/poddoor/shutters/almayer/containment{
+	dir = 4;
+	id = "Containment Cell 2";
+	name = "\improper Containment Cell 2"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
+	dir = 4
+	},
+/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/containment/cell)
 "tbD" = (
 /obj/structure/ladder{
 	height = 2;
@@ -66173,6 +66792,15 @@
 	icon_state = "plating"
 	},
 /area/almayer/shipboard/brig/armory)
+"tgK" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	dir = 9;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "tgS" = (
 /obj/effect/step_trigger/clone_cleaner,
 /obj/structure/sign/safety/maint{
@@ -66278,6 +66906,19 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/upper_engineering/port)
+"tiw" = (
+/obj/structure/machinery/constructable_frame{
+	icon_state = "box_2"
+	},
+/obj/item/weapon/baseballbat/metal{
+	pixel_x = -2;
+	pixel_y = 8
+	},
+/turf/open/floor/almayer{
+	dir = 6;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "tiE" = (
 /obj/structure/window/framed/almayer,
 /obj/structure/machinery/door/firedoor/border_only/almayer,
@@ -66326,6 +66967,12 @@
 	icon_state = "mono"
 	},
 /area/almayer/lifeboat_pumps/south1)
+"tjj" = (
+/turf/open/floor/almayer{
+	dir = 5;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "tjl" = (
 /turf/open/floor/almayer{
 	dir = 1;
@@ -66450,12 +67097,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/living/briefing)
-"tmI" = (
-/obj/structure/bed,
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/almayer/medical/medical_science)
 "tmK" = (
 /obj/structure/machinery/door/airlock/almayer/maint{
 	dir = 1;
@@ -67144,6 +67785,12 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/medical/lower_medical_lobby)
+"tAh" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "tAi" = (
 /obj/structure/sign/safety/hvac_old{
 	pixel_x = 8;
@@ -67153,6 +67800,20 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_a_s)
+"tAq" = (
+/obj/structure/surface/table/reinforced/black,
+/obj/item/clothing/mask/breath{
+	pixel_y = -5;
+	pixel_x = -3
+	},
+/obj/item/clothing/head/helmet/space/compression/uscm,
+/obj/item/cell/crap{
+	pixel_x = 7
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "tAL" = (
 /obj/structure/machinery/cryopod,
 /turf/open/floor/almayer{
@@ -67226,12 +67887,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_f_s)
-"tCk" = (
-/obj/structure/pipes/standard/manifold/hidden/supply/no_boom,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/lifeboat)
 "tCN" = (
 /turf/open/floor/almayer{
 	dir = 8;
@@ -67735,6 +68390,15 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/shipboard/brig/chief_mp_office)
+"tNP" = (
+/obj/structure/sign/safety/debark_lounge{
+	pixel_x = 15;
+	pixel_y = -32
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "tNR" = (
 /obj/structure/machinery/firealarm{
 	pixel_y = 28
@@ -68197,17 +68861,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/shipboard/port_point_defense)
-"tZd" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
-	dir = 5
-	},
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/medical_science)
 "tZe" = (
 /obj/item/trash/USCMtray{
 	pixel_x = -4;
@@ -68225,6 +68878,20 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_m_s)
+"tZm" = (
+/obj/structure/closet/crate/freezer{
+	desc = "A freezer crate. There is a note attached, it reads: Do not open, property of Pvt. Mendoza."
+	},
+/obj/item/storage/beer_pack,
+/obj/item/reagent_container/food/drinks/cans/beer,
+/obj/item/reagent_container/food/drinks/cans/beer,
+/obj/structure/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_a_s)
 "tZB" = (
 /obj/structure/machinery/light{
 	dir = 1
@@ -68548,6 +69215,17 @@
 /obj/structure/machinery/cm_vending/sorted/marine_food,
 /turf/open/floor/almayer,
 /area/almayer/living/briefing)
+"ugJ" = (
+/obj/structure/largecrate/random/case/small,
+/obj/structure/largecrate/random/mini/small_case{
+	pixel_x = -1;
+	pixel_y = 9
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "ugT" = (
 /turf/open/floor/almayer{
 	icon_state = "red"
@@ -68572,6 +69250,12 @@
 	icon_state = "cargo_arrow"
 	},
 /area/almayer/living/offices)
+"uhM" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 5
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/engineering/upper_engineering/starboard)
 "uhP" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SW-out"
@@ -68600,6 +69284,19 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/upper_engineering/starboard)
+"uiR" = (
+/obj/structure/prop/invuln{
+	desc = "An inflated membrane. This one is puncture proof. Wow!";
+	icon = 'icons/obj/items/inflatable.dmi';
+	icon_state = "wall";
+	name = "umbilical wall"
+	},
+/obj/structure/blocker/invisible_wall,
+/turf/open/floor/almayer_hull{
+	dir = 8;
+	icon_state = "outerhull_dir"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "uiT" = (
 /turf/open/floor/almayer{
 	dir = 1;
@@ -68740,6 +69437,15 @@
 	icon_state = "rasputin15"
 	},
 /area/almayer/powered/agent)
+"umy" = (
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	dir = 5;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "umC" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
@@ -68962,18 +69668,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/command/lifeboat)
-"urH" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research,
-/obj/structure/machinery/door/poddoor/shutters/almayer/open{
-	id = "researchlockdownext_door";
-	name = "\improper Research Doorway Shutter"
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/medical/medical_science)
 "urM" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -69032,12 +69726,17 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/engineering/engine_core)
-"usB" = (
-/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{
-	dir = 8
+"usy" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/command/lifeboat)
+/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
+	dir = 9
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "usX" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1;
@@ -69908,21 +70607,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/main_office)
-"uJM" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1
-	},
-/obj/structure/window/framed/almayer/white,
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/almayer/medical/containment)
 "uJU" = (
 /obj/structure/machinery/cryopod/right{
 	pixel_y = 6
@@ -70292,14 +70976,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_a_s)
-"uSk" = (
-/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/command/lifeboat)
 "uSq" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NW-out";
@@ -70615,6 +71291,10 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_lobby)
+"uYg" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer,
+/area/almayer/command/lifeboat)
 "uYO" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 6
@@ -70631,6 +71311,15 @@
 	icon_state = "emerald"
 	},
 /area/almayer/living/port_emb)
+"uZH" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 9
+	},
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "uZQ" = (
 /obj/structure/window/framed/almayer,
 /turf/open/floor/plating,
@@ -70760,14 +71449,6 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/general_equipment)
-"vcV" = (
-/obj/structure/surface/rack,
-/obj/item/cell/high/empty,
-/obj/item/cell/high/empty,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hull/upper_hull/u_a_s)
 "vdJ" = (
 /obj/structure/surface/table/almayer,
 /obj/item/pipe{
@@ -71453,6 +72134,21 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/shipboard/port_missiles)
+"vqD" = (
+/obj/item/trash/candle,
+/obj/item/tool/match/paper,
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
+"vqK" = (
+/obj/structure/pipes/standard/manifold/hidden/supply,
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "vqL" = (
 /obj/item/clothing/under/shorts/black,
 /obj/structure/machinery/power/apc/almayer{
@@ -71573,6 +72269,10 @@
 	icon_state = "cargo"
 	},
 /area/almayer/living/offices)
+"vsh" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/command/lifeboat)
 "vsF" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -71923,14 +72623,6 @@
 	icon_state = "greenfull"
 	},
 /area/almayer/shipboard/brig/cells)
-"vzA" = (
-/obj/structure/window/framed/almayer/white,
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 2
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
-/turf/open/floor/plating,
-/area/almayer/medical/upper_medical)
 "vzK" = (
 /turf/open/floor/almayer,
 /area/almayer/engineering/ce_room)
@@ -72083,31 +72775,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/shipboard/brig/chief_mp_office)
-"vCM" = (
-/obj/structure/surface/table/almayer,
-/obj/item/reagent_container/glass/beaker{
-	pixel_x = 8
-	},
-/obj/item/paper_bin/wy{
-	pixel_x = -5;
-	pixel_y = 6
-	},
-/obj/item/tool/pen{
-	pixel_y = -2
-	},
-/obj/item/reagent_container/dropper{
-	pixel_x = -1;
-	pixel_y = 9
-	},
-/obj/structure/machinery/biohazard_lockdown{
-	pixel_x = 8;
-	pixel_y = 10
-	},
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
-/turf/open/floor/almayer{
-	icon_state = "sterile_green"
-	},
-/area/almayer/medical/containment)
 "vCO" = (
 /obj/effect/landmark/start/bridge,
 /turf/open/floor/plating/plating_catwalk,
@@ -72214,6 +72881,14 @@
 "vGk" = (
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_m_p)
+"vGr" = (
+/obj/structure/closet/firecloset,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/upper_hull/u_a_p)
 "vGy" = (
 /obj/structure/largecrate/supply/supplies/tables_racks,
 /turf/open/floor/plating,
@@ -72326,18 +73001,6 @@
 	icon_state = "blue"
 	},
 /area/almayer/hallways/aft_hallway)
-"vIQ" = (
-/obj/structure/window/framed/almayer/white,
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 1
-	},
-/obj/structure/machinery/door/poddoor/shutters/almayer/open{
-	id = "researchlockdownext";
-	name = "\improper Research Window Shutter"
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
-/turf/open/floor/plating,
-/area/almayer/medical/medical_science)
 "vJg" = (
 /obj/structure/machinery/light/small,
 /turf/open/floor/almayer{
@@ -72456,6 +73119,21 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_f_s)
+"vLj" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{
+	name = "\improper Medical Bay";
+	req_one_access = null
+	},
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+	dir = 2
+	},
+/obj/structure/disposalpipe/segment,
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/upper_medical)
 "vLA" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W";
@@ -72493,6 +73171,12 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/port_hallway)
+"vME" = (
+/turf/open/floor/almayer{
+	dir = 9;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "vMG" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -72554,6 +73238,15 @@
 "vOy" = (
 /turf/closed/wall/almayer/white/reinforced,
 /area/almayer/medical/medical_science)
+"vOP" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+	dir = 2
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/upper_medical)
 "vPj" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/item/device/flashlight/lamp{
@@ -72657,15 +73350,6 @@
 /obj/item/device/camera,
 /turf/open/floor/almayer,
 /area/almayer/command/computerlab)
-"vQu" = (
-/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "red"
-	},
-/area/almayer/command/lifeboat)
 "vQN" = (
 /obj/structure/machinery/door/airlock/almayer/generic{
 	dir = 1
@@ -72709,6 +73393,20 @@
 	dir = 10
 	},
 /area/almayer/command/cic)
+"vRu" = (
+/obj/structure/surface/rack{
+	layer = 2.5
+	},
+/obj/item/tool/hand_labeler{
+	pixel_x = 4;
+	pixel_y = 11
+	},
+/obj/item/storage/box/matches,
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "vRz" = (
 /turf/closed/wall/almayer/outer,
 /area/almayer/hull/lower_hull/l_f_p)
@@ -73119,6 +73817,31 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_medbay)
+"vYz" = (
+/obj/structure/surface/table/almayer,
+/obj/item/reagent_container/glass/beaker{
+	pixel_x = 8
+	},
+/obj/item/paper_bin/wy{
+	pixel_x = -5;
+	pixel_y = 6
+	},
+/obj/item/tool/pen{
+	pixel_y = -2
+	},
+/obj/item/reagent_container/dropper{
+	pixel_x = -1;
+	pixel_y = 9
+	},
+/obj/structure/machinery/biohazard_lockdown{
+	pixel_x = 8;
+	pixel_y = 10
+	},
+/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
+	},
+/area/almayer/medical/containment)
 "vYC" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -73270,10 +73993,6 @@
 	icon_state = "sterile_green_corner"
 	},
 /area/almayer/medical/operating_room_four)
-"wbR" = (
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/command/lifeboat)
 "wbX" = (
 /obj/structure/closet/secure_closet/cmdcabinet{
 	pixel_y = 24
@@ -73325,6 +74044,24 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/living/auxiliary_officer_office)
+"wdo" = (
+/obj/structure/machinery/door/airlock/almayer/research/reinforced{
+	dir = 8;
+	name = "\improper Containment Airlock"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
+	dir = 4
+	},
+/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/medical_science)
 "wdr" = (
 /obj/structure/machinery/power/apc/almayer,
 /turf/open/floor/almayer{
@@ -73359,6 +74096,16 @@
 	icon_state = "plate"
 	},
 /area/almayer/engineering/upper_engineering/starboard)
+"wei" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/hydroponics)
 "wex" = (
 /obj/structure/machinery/light{
 	dir = 4
@@ -73665,6 +74412,17 @@
 	icon_state = "sterile_green"
 	},
 /area/almayer/medical/lockerroom)
+"wky" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/medical_science)
 "wkH" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/item/device/whistle{
@@ -74553,6 +75311,19 @@
 	icon_state = "rasputin3"
 	},
 /area/almayer/powered/agent)
+"wEI" = (
+/obj/structure/surface/table/reinforced/black,
+/obj/item/tool/pen,
+/obj/item/paper_bin/uscm{
+	pixel_y = 7
+	},
+/obj/item/clipboard{
+	pixel_x = 12
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "wEO" = (
 /obj/structure/platform_decoration{
 	dir = 4
@@ -74776,6 +75547,21 @@
 	icon_state = "plate"
 	},
 /area/almayer/command/combat_correspondent)
+"wKP" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/obj/structure/window/framed/almayer/white,
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/almayer/medical/containment)
 "wLi" = (
 /obj/structure/machinery/door_control/airlock{
 	id = "s_engi";
@@ -74890,6 +75676,14 @@
 	icon_state = "cargo"
 	},
 /area/almayer/squads/alpha)
+"wMO" = (
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/medical_science)
 "wNl" = (
 /obj/structure/surface/table/almayer,
 /obj/item/trash/USCMtray{
@@ -74950,6 +75744,15 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/engineering/upper_engineering/starboard)
+"wOK" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	dir = 10;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "wPf" = (
 /obj/structure/sign/safety/reception{
 	pixel_x = 32;
@@ -75058,6 +75861,16 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/living/grunt_rnr)
+"wRP" = (
+/obj/structure/pipes/vents/pump{
+	dir = 1
+	},
+/obj/structure/machinery/camera/autoname/almayer{
+	dir = 1;
+	name = "ship-grade camera"
+	},
+/turf/open/floor/almayer,
+/area/almayer/command/lifeboat)
 "wRT" = (
 /obj/structure/largecrate/random/case/double,
 /obj/structure/pipes/standard/simple/hidden/supply{
@@ -75378,6 +76191,13 @@
 	icon_state = "containment_corner_variant_2"
 	},
 /area/almayer/medical/containment/cell)
+"wWq" = (
+/obj/structure/surface/table/reinforced/black,
+/obj/item/clothing/suit/space/compression/uscm,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "wWz" = (
 /turf/closed/wall/almayer/research/containment/wall/north,
 /area/almayer/medical/containment/cell)
@@ -75505,6 +76325,19 @@
 	icon_state = "redcorner"
 	},
 /area/almayer/shipboard/brig/general_equipment)
+"wZv" = (
+/obj/structure/prop/invuln{
+	desc = "An inflated membrane. This one is puncture proof. Wow!";
+	icon = 'icons/obj/items/inflatable.dmi';
+	icon_state = "wall";
+	name = "umbilical wall"
+	},
+/obj/structure/blocker/invisible_wall,
+/turf/open/floor/almayer_hull{
+	dir = 4;
+	icon_state = "outerhull_dir"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "wZy" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -75553,6 +76386,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_a_p)
+"wZX" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/command/lifeboat)
 "xad" = (
 /obj/item/device/radio/intercom{
 	freerange = 1;
@@ -75789,15 +76628,6 @@
 	icon_state = "sterile_green_corner"
 	},
 /area/almayer/medical/operating_room_one)
-"xgg" = (
-/obj/structure/machinery/power/apc/almayer/hardened{
-	dir = 4
-	},
-/obj/structure/pipes/vents/pump/no_boom{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/almayer/command/lifeboat)
 "xgh" = (
 /obj/structure/pipes/vents/scrubber{
 	dir = 4
@@ -75806,6 +76636,12 @@
 	icon_state = "sterile_green"
 	},
 /area/almayer/medical/lower_medical_lobby)
+"xgm" = (
+/obj/structure/reagent_dispensers/oxygentank,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "xgn" = (
 /obj/structure/ladder{
 	height = 1;
@@ -76041,20 +76877,6 @@
 	icon_state = "greencorner"
 	},
 /area/almayer/hallways/port_hallway)
-"xlf" = (
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	dir = 4;
-	id = "W_Containment Cell 3";
-	name = "\improper Containment Cell 5";
-	unacidable = 1
-	},
-/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
-	dir = 4
-	},
-/turf/closed/wall/almayer/research/containment/wall/purple{
-	dir = 8
-	},
-/area/almayer/medical/containment/cell)
 "xlk" = (
 /obj/structure/surface/table/almayer,
 /turf/open/floor/almayer,
@@ -76207,6 +77029,12 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/shipboard/port_point_defense)
+"xoO" = (
+/turf/open/floor/almayer{
+	dir = 10;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "xoS" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N"
@@ -76441,20 +77269,6 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_lobby)
-"xtT" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 10
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/medical/medical_science)
 "xuc" = (
 /obj/structure/surface/table/almayer,
 /obj/item/tool/extinguisher,
@@ -76476,6 +77290,31 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_f_p)
+"xuE" = (
+/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
+	dir = 1;
+	id = "Containment Cell 5";
+	locked = 1;
+	name = "\improper Containment Cell 5"
+	},
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	id = "Containment Cell 5";
+	name = "\improper Containment Cell 5";
+	unacidable = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white,
+/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/containment/cell)
 "xuI" = (
 /obj/structure/sign/safety/water{
 	pixel_x = 8;
@@ -76867,6 +77706,16 @@
 "xBe" = (
 /turf/closed/wall/almayer/reinforced,
 /area/almayer/engineering/upper_engineering)
+"xBn" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{
+	id_tag = "Boat1-D3";
+	linked_dock = "almayer-lifeboat1";
+	throw_dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "xBQ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -77104,13 +77953,6 @@
 	icon_state = "red"
 	},
 /area/almayer/living/briefing)
-"xGU" = (
-/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "red"
-	},
-/area/almayer/command/lifeboat)
 "xHe" = (
 /obj/structure/pipes/vents/pump{
 	dir = 4
@@ -77223,6 +78065,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_f_s)
+"xJn" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "xJC" = (
 /obj/structure/machinery/door/airlock/almayer/generic/corporate{
 	name = "Corporate Liaison's Closet"
@@ -77246,6 +78094,18 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
+"xKM" = (
+/obj/structure/machinery/status_display{
+	pixel_x = 16;
+	pixel_y = -30
+	},
+/obj/structure/sign/safety/airlock{
+	pixel_y = -32
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/starboard)
 "xKT" = (
 /obj/effect/decal/cleanable/cobweb,
 /obj/structure/machinery/power/apc/almayer{
@@ -77483,6 +78343,15 @@
 /obj/structure/largecrate/random/barrel/white,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_m_s)
+"xPZ" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 10
+	},
+/turf/open/floor/almayer{
+	dir = 5;
+	icon_state = "orange"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "xQa" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 4
@@ -77941,16 +78810,6 @@
 	icon_state = "mono"
 	},
 /area/almayer/medical/medical_science)
-"xXu" = (
-/obj/structure/machinery/camera/autoname/almayer{
-	dir = 1;
-	name = "ship-grade camera"
-	},
-/obj/structure/pipes/vents/pump/no_boom{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/almayer/command/lifeboat)
 "xYf" = (
 /obj/structure/machinery/cm_vending/clothing/sea,
 /turf/open/floor/almayer{
@@ -78202,6 +79061,16 @@
 	icon_state = "blue"
 	},
 /area/almayer/squads/delta)
+"ydh" = (
+/obj/structure/pipes/vents/pump{
+	dir = 1
+	},
+/obj/structure/surface/table/reinforced/black,
+/obj/item/tank/oxygen,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/engineering/upper_engineering/port)
 "ydx" = (
 /obj/structure/sign/safety/hvac_old{
 	pixel_x = 8;
@@ -78263,6 +79132,14 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/shipboard/brig/perma)
+"ydY" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 9
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/command/lifeboat)
 "yeo" = (
 /obj/structure/machinery/cm_vending/clothing/dress{
 	req_access = list(1)
@@ -78524,6 +79401,26 @@
 	icon_state = "plate"
 	},
 /area/almayer/shipboard/brig/main_office)
+"ylc" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/obj/structure/machinery/door/airlock/almayer/research/reinforced{
+	dir = 8;
+	name = "\improper Containment Airlock"
+	},
+/obj/structure/machinery/door/poddoor/almayer/biohazard/white{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/containment)
 "yle" = (
 /obj/effect/landmark/start/marine/engineer/delta,
 /obj/effect/landmark/late_join/delta,
@@ -108476,8 +109373,8 @@ vOy
 vOy
 vOy
 vOy
-kCP
-rfY
+wMO
+wky
 sqf
 hon
 ajt
@@ -109083,11 +109980,11 @@ vti
 gGx
 vti
 lid
-vIQ
+lJv
 aCC
 kXw
 pxo
-vzA
+asn
 ago
 asW
 cwJ
@@ -109286,11 +110183,11 @@ ueJ
 ueJ
 oDi
 trF
-vIQ
+lJv
 edv
 kXw
 pxo
-vzA
+asn
 ayT
 akU
 avj
@@ -109480,7 +110377,7 @@ hng
 dnC
 hPN
 vCk
-eRM
+qEn
 qam
 riE
 gAS
@@ -109489,11 +110386,11 @@ dVu
 eSo
 qmD
 aIC
-vIQ
+lJv
 aCt
 kXw
 pxo
-vzA
+asn
 ayT
 aii
 avm
@@ -109683,7 +110580,7 @@ xyt
 wiW
 tOr
 dBj
-iui
+wei
 kBP
 kBP
 jsx
@@ -109896,10 +110793,10 @@ kXw
 vtm
 emK
 fGu
-urH
+hPe
 sdu
 btC
-jKy
+vLj
 ahM
 kSJ
 avj
@@ -110096,13 +110993,13 @@ vkp
 cfT
 hec
 gNp
-ejr
+hVf
 dVu
-lAq
-fce
+rmc
+lON
 dVu
 oDR
-qfu
+vOP
 bYe
 bnD
 aWH
@@ -110299,12 +111196,12 @@ vkp
 aoM
 kBo
 kBP
-sCU
+naR
 vOy
-kxx
+hrn
 vOy
-mHG
-mKs
+aRd
+aIo
 vOy
 qLK
 akU
@@ -110500,11 +111397,11 @@ vOy
 dHV
 vkp
 jUM
-tZd
-tmI
-mYT
+lou
+eBO
+pRn
 vOy
-xtT
+ayZ
 aCD
 hFC
 qmy
@@ -110701,9 +111598,9 @@ mKx
 kZV
 vOy
 vOy
-esP
+oIr
 vOy
-lyf
+wdo
 vOy
 vOy
 vOy
@@ -110711,7 +111608,7 @@ qqQ
 aoM
 aoM
 vgB
-cHS
+kgs
 ayT
 aii
 avj
@@ -110906,7 +111803,7 @@ vOy
 jFf
 vkp
 jrM
-iMK
+mWs
 lmw
 vOy
 dyb
@@ -110914,7 +111811,7 @@ tsM
 prx
 fpT
 eVT
-cHS
+kgs
 ayT
 aii
 avj
@@ -111109,7 +112006,7 @@ vOy
 vqZ
 vkp
 rDr
-sQt
+usy
 nDo
 vOy
 glB
@@ -111117,7 +112014,7 @@ vkp
 ger
 aoM
 aFf
-oYj
+mmN
 ayT
 aii
 avj
@@ -111716,9 +112613,9 @@ mSK
 mSK
 vOy
 vOy
-icn
-uJM
-icn
+ylc
+wKP
+ylc
 vOy
 vOy
 rhO
@@ -112527,11 +113424,11 @@ wWz
 anw
 wLy
 jlG
-msw
+aqP
 kCE
 wLN
 npt
-hbi
+xuE
 hqh
 wLy
 eiE
@@ -112931,15 +113828,15 @@ avj
 vOy
 woh
 vgO
-fhW
-rZL
+aoJ
+alk
 xAe
 avH
 wse
 cXC
 woh
-jfV
-pFz
+pLO
+qxm
 vgO
 xAe
 vOy
@@ -113545,7 +114442,7 @@ apR
 aqS
 mnW
 nPf
-vCM
+vYz
 awR
 uoi
 vOy
@@ -114150,13 +115047,13 @@ vOy
 elR
 xXh
 xXh
-ikN
-jGm
-qnZ
+apU
+taH
+aBe
 otu
-xlf
-iEh
-chJ
+jBO
+jNc
+ean
 xXh
 xXh
 dMK
@@ -128144,7 +129041,7 @@ aag
 uMc
 vFv
 wOt
-jhx
+odl
 jhx
 keR
 jhx
@@ -128153,21 +129050,21 @@ dwI
 aTS
 wqq
 agJ
-nlV
-ckn
-foI
-ckn
-ckn
-ayg
+hal
+uYg
+nau
+uYg
+uYg
+bXf
 aDO
 aDO
 aDO
-opy
-ckn
-ckn
-foI
-ckn
-nlV
+gQO
+uYg
+uYg
+nau
+uYg
+hal
 aGC
 wqq
 aTS
@@ -128176,7 +129073,7 @@ soP
 tWi
 soP
 pDr
-pDr
+tWi
 tpd
 eim
 pql
@@ -128345,9 +129242,9 @@ aaa
 aaa
 aad
 uMc
-riJ
-kPG
-kPG
+bNM
+rmf
+uZH
 bFt
 kPG
 kPG
@@ -128358,17 +129255,17 @@ anR
 lNl
 aqq
 eky
-pCb
+aNl
 eky
 eky
-lDO
-wbR
-wbR
-wbR
-ohR
+nCT
+vsh
+vsh
+vsh
+ydY
 eky
 eky
-pCb
+aNl
 eky
 aqq
 aIe
@@ -128379,9 +129276,9 @@ tim
 uWV
 ttd
 nLk
-tim
-khE
-rID
+rCD
+eYR
+uIv
 pql
 ajZ
 aaa
@@ -128542,15 +129439,15 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aad
-cuC
-uMc
-uMc
+bdH
+bdH
+bdH
+aac
+aag
 cuC
+htb
+pfc
+ptK
 ptK
 ucp
 cIW
@@ -128560,8 +129457,8 @@ psm
 dKm
 psm
 aHe
-iOp
-oTP
+jlT
+exi
 eky
 eky
 eAC
@@ -128571,8 +129468,8 @@ aBu
 eAC
 eky
 eky
-sLt
-xXu
+ins
+wRP
 aHe
 vuv
 vuv
@@ -128582,12 +129479,12 @@ jWh
 olk
 jWh
 jWh
+jWh
+jAJ
+lAu
 bYn
-pql
-pql
-bYn
-ajZ
-aaa
+aag
+ajY
 aaa
 aaa
 aaa
@@ -128745,15 +129642,15 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aae
-aah
-aah
-aag
-uMc
+bdH
+bdH
+bdH
+cuC
+cuC
+cuC
+bNM
+ofK
+ptK
 uXL
 gPc
 trB
@@ -128764,7 +129661,7 @@ psm
 psm
 eky
 eky
-pCb
+aNl
 eky
 uNV
 aHe
@@ -128774,7 +129671,7 @@ aDQ
 aHe
 uNV
 eky
-pCb
+aNl
 eky
 rqj
 vuv
@@ -128785,12 +129682,12 @@ qCg
 xjw
 pfA
 xAC
-pql
-aag
-aah
-aah
-afm
-aaa
+jWh
+lbB
+uIv
+bYn
+bYn
+bYn
 aaa
 aaa
 aaa
@@ -128933,164 +129830,164 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aad
-uMc
-uXL
-eet
-fcP
-pDh
-ptK
-xlX
-xlX
-hSu
-aMT
-aMT
-aMR
-qeF
-aHe
-aHe
-aDX
-yge
-aEm
-aHe
-aHe
-okg
-aMR
-aMT
-aMT
-iEs
-cxo
-cxo
-jWh
-uUV
-rsW
-rsW
-fnQ
-pql
-ajZ
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aab
-aaa
-aaa
-aKQ
-aaa
-aaa
-aab
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-bdH
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aUx
-btn
-btm
-btm
-bxI
-byM
-aVl
-nmb
-aVl
-brI
-bjl
-sPA
-bkZ
-bmR
-boI
-bqe
-brx
-tzz
-jnf
-ePY
-bxr
-byD
-bkZ
-bYK
-bCI
-oAd
-aVl
-fLX
-aVl
-byQ
-ccS
-ggQ
-bLy
-bLy
-dKL
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+bdH
+bdH
+bdH
+cuC
+uiG
+tfb
+rFy
+ofK
+ptK
+uXL
+eet
+fcP
+pDh
+ptK
+xlX
+xlX
+hSu
+aMT
+aMT
+dPm
+qeF
+aHe
+aHe
+aDX
+yge
+aEm
+aHe
+aHe
+okg
+dPm
+aMT
+aMT
+iEs
+cxo
+cxo
+jWh
+uUV
+rsW
+rsW
+fnQ
+jWh
+lbB
+cKL
+xXa
+xoO
+bYn
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aab
+aaa
+aaa
+aKQ
+aaa
+aaa
+aab
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+bdH
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aUx
+btn
+btm
+btm
+bxI
+byM
+aVl
+nmb
+aVl
+brI
+bjl
+sPA
+bkZ
+bmR
+boI
+bqe
+brx
+tzz
+jnf
+ePY
+bxr
+byD
+bkZ
+bYK
+bCI
+oAd
+aVl
+fLX
+aVl
+byQ
+ccS
+ggQ
+bLy
+bLy
+dKL
 aaa
 aaa
 aaa
@@ -129151,15 +130048,15 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aad
-uMc
+bdH
+bdH
+bdH
+cuC
+bNM
+rmf
+luY
+ncp
+ptK
 cQg
 wxj
 lht
@@ -129170,7 +130067,7 @@ jBB
 psm
 svf
 arV
-aMS
+wZX
 eky
 aDQ
 ayi
@@ -129180,7 +130077,7 @@ eky
 jlX
 aDQ
 eky
-aMS
+wZX
 arV
 vUh
 vuv
@@ -129191,12 +130088,12 @@ dkS
 rsW
 naQ
 fnQ
-pql
-ajZ
-aaa
-aaa
-aaa
-aaa
+jWh
+xPZ
+pcv
+eYR
+uIv
+bYn
 aaa
 aaa
 aaa
@@ -129355,14 +130252,14 @@ aaa
 aaa
 aaa
 bdH
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aad
+bdH
+bdH
 cuC
+aeM
+ofK
+ptK
+ptK
+ptK
 ptK
 ptK
 afX
@@ -129373,7 +130270,7 @@ psm
 psm
 eky
 arV
-aMS
+wZX
 eky
 aDQ
 pyy
@@ -129383,7 +130280,7 @@ eky
 dLc
 aDQ
 eky
-aMS
+wZX
 arV
 eky
 vuv
@@ -129394,15 +130291,15 @@ jWh
 kLc
 jWh
 jWh
+jWh
+jWh
+jWh
+lbB
+oCf
 bYn
-ajZ
-aaa
-aaa
-aaa
-aaa
-aaa
 aaa
 aaa
+bdH
 aaa
 aaa
 aaa
@@ -129556,27 +130453,27 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aad
-pVZ
-gfh
-aDg
-xlX
+bdH
+bdH
+bdH
+bdH
+uMc
+bNM
+ofK
+psm
 kSd
 dmQ
+tZm
+dmQ
+xlX
+hWU
+dmQ
 aeq
 psm
 aNe
 eky
 arV
-aMS
+wZX
 eky
 aHe
 jMQ
@@ -129586,7 +130483,7 @@ eky
 dEn
 aHe
 eky
-aMS
+wZX
 arV
 eky
 aNe
@@ -129594,15 +130491,15 @@ vuv
 ahb
 cxo
 nJy
-fbx
+boC
+cxo
 iwh
 kfv
-qMu
-ajZ
-aaa
-aaa
-bdH
-bdH
+vGr
+vuv
+lbB
+uIv
+pql
 bdH
 bdH
 bdH
@@ -129759,37 +130656,37 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aad
-pVZ
+bdH
+bdH
+bdH
+bdH
+uMc
+bNM
+ofK
+psm
+kSd
+dmQ
 nwu
 dmQ
 xlX
-kSd
+rwb
 dmQ
 jXY
 psm
 atY
 aMT
 aMT
-uSk
-cFZ
-nPM
-ckn
-wbR
-usB
-wbR
-ckn
-nPM
-cFZ
-tCk
+svl
+pzJ
+qDt
+uYg
+vsh
+oPf
+vsh
+uYg
+qDt
+pzJ
+sQO
 aMT
 aMT
 atY
@@ -129798,14 +130695,14 @@ woM
 nqD
 cxo
 boC
+cxo
 qMf
 wUN
-qMu
-ajZ
-aaa
-aaa
-bdH
-bdH
+jgC
+vuv
+lbB
+uIv
+pql
 bdH
 bdH
 bdH
@@ -129962,37 +130859,37 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aad
-pVZ
-pPz
-dmQ
+bdH
+bdH
+bdH
+bdH
+uMc
+bNM
+rtd
+hSu
 xlX
-dmQ
+xlX
+xlX
+xlX
+xlX
+aiE
 dmQ
 atD
 psm
 psm
 aRp
 aRp
-aPk
+jBX
 akS
 aHe
 oxU
 bsy
-xgg
+oir
 gzw
 shh
 aHe
 tKf
-aPk
+jBX
 aRp
 edx
 vuv
@@ -130000,15 +130897,15 @@ vuv
 myC
 crP
 cxo
-boC
-cxo
-djc
-qMu
-ajZ
-aaa
-aaa
-bdH
-bdH
+fbx
+fbx
+fbx
+fbx
+fbx
+iEs
+uWV
+uIv
+pql
 bdH
 bdH
 bdH
@@ -130166,18 +131063,18 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aae
-pVZ
-pVZ
-vcV
-aIM
+bdH
+bdH
+bdH
+cuC
+htb
+pfc
+psm
+psm
+psm
+psm
+pPz
+xlX
 xlX
 xlX
 xlX
@@ -130185,7 +131082,7 @@ xlX
 hSu
 qYG
 atM
-ams
+bGc
 atK
 aHe
 aHe
@@ -130195,7 +131092,7 @@ aHe
 aHe
 aHe
 atM
-ams
+bGc
 atK
 qYG
 iEs
@@ -130205,13 +131102,13 @@ jaj
 fbx
 boC
 hPg
-qMu
-qMu
-afm
-aaa
-aaa
-bdH
-bdH
+vuv
+vuv
+vuv
+vuv
+jAJ
+lAu
+bYn
 bdH
 bdH
 bdH
@@ -130371,13 +131268,13 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aad
+bdH
+cuC
+bNM
+tgK
+tfb
+skg
+eaX
 pVZ
 pVZ
 pVZ
@@ -130388,17 +131285,17 @@ pVZ
 pVZ
 aPw
 avu
-pDL
-amq
-bFD
+mhG
+cFn
+cYu
 aHe
 fdX
 wcR
 xJh
 aHe
-lbE
-vQu
-iZL
+qYu
+dxK
+dPC
 aMU
 aPw
 qMu
@@ -130409,12 +131306,12 @@ qMu
 qMu
 qMu
 qMu
-ajZ
-aaa
-aaa
-aaa
-bdH
-bdH
+euY
+vME
+jHL
+wOK
+uIv
+bYn
 bdH
 bdH
 bdH
@@ -130571,17 +131468,17 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aad
-aag
+bdH
+bdH
+bdH
+bdH
+cuC
+riJ
+kHY
+uhM
+fcP
+xJn
+cuC
 aag
 aag
 aag
@@ -130592,7 +131489,7 @@ aag
 aPw
 aqJ
 aBu
-iZr
+odu
 aMT
 aEg
 aDO
@@ -130600,7 +131497,7 @@ aDO
 aDO
 aEg
 aMT
-pjh
+odV
 aBu
 aqp
 aPw
@@ -130611,13 +131508,13 @@ aag
 aag
 aag
 aag
-aag
-ajZ
-aaa
-aaa
-aaa
-bdH
-bdH
+bYn
+tAh
+thV
+rDb
+qjV
+rID
+bYn
 bdH
 bdH
 bdH
@@ -130774,17 +131671,17 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aae
-aah
+bdH
+bdH
+bdH
+bdH
+cuC
+cuC
+umy
+iKZ
+tiw
+cuC
+cuC
 mNX
 mNX
 mNX
@@ -130795,7 +131692,7 @@ cus
 aPw
 aPw
 atM
-ams
+bGc
 atK
 avu
 aMT
@@ -130803,7 +131700,7 @@ arV
 aMT
 aMU
 atM
-ams
+bGc
 atK
 aPw
 aPw
@@ -130814,13 +131711,13 @@ mNX
 mNX
 mNX
 qOk
-aah
-afm
-aaa
-aaa
-aaa
-bdH
-bdH
+bYn
+bYn
+tjj
+kHS
+rID
+bYn
+bYn
 bdH
 bdH
 bdH
@@ -130977,17 +131874,17 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bdH
+bdH
+bdH
+bdH
+aad
+cuC
+mkH
+rtd
+fcP
+cuC
+ajZ
 xVk
 xVk
 xVk
@@ -130998,15 +131895,15 @@ xVk
 aad
 aPw
 vgD
-pDL
-qDz
-xGU
-cFZ
-usB
-cFZ
-qDz
-xGU
-iZL
+mhG
+had
+eAL
+pzJ
+oPf
+pzJ
+had
+eAL
+dPC
 ihX
 aPw
 ajZ
@@ -131017,13 +131914,13 @@ xVk
 xVk
 xVk
 xVk
-aaa
-aaa
-aaa
-aaa
-aaa
-bdH
-bdH
+aad
+bYn
+kcA
+uWV
+uIv
+bYn
+ajZ
 bdH
 bdH
 bdH
@@ -131180,17 +132077,17 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bdH
+bdH
+bdH
+bdH
+aad
+cuC
+vRu
+ngU
+ssU
+cuC
+ajZ
 xVk
 xVk
 xVk
@@ -131205,7 +132102,7 @@ aBA
 aqp
 avu
 eky
-aMR
+dPm
 eky
 aMU
 aqJ
@@ -131220,13 +132117,13 @@ xVk
 xVk
 xVk
 xVk
-aaa
-aaa
-aaa
-aaa
-aaa
-bdH
-bdH
+aad
+bYn
+thV
+uWV
+uIv
+bYn
+ajZ
 bdH
 bdH
 bdH
@@ -131383,17 +132280,17 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bdH
+bdH
+bdH
+bdH
+aad
+uMc
+gbs
+iEr
+hFw
+uMc
+ajZ
 xVk
 xVk
 xVk
@@ -131408,7 +132305,7 @@ aHe
 aHe
 mtD
 eky
-aMS
+wZX
 eky
 nKq
 aHe
@@ -131423,13 +132320,13 @@ xVk
 xVk
 xVk
 xVk
-aaa
-aaa
-aaa
-aaa
-aaa
-bdH
-bdH
+aad
+pql
+thV
+fCL
+uIv
+pql
+ajZ
 bdH
 bdH
 bdH
@@ -131586,17 +132483,17 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bdH
+bdH
+bdH
+bdH
+aad
+uMc
+nrO
+iEr
+fcP
+uMc
+ajZ
 xVk
 xVk
 xVk
@@ -131611,7 +132508,7 @@ aHe
 aHe
 avu
 eky
-aMS
+wZX
 eky
 aMU
 aHe
@@ -131626,13 +132523,13 @@ xVk
 xVk
 xVk
 xVk
-aaa
-aaa
-aaa
-aaa
-aaa
-bdH
-bdH
+aad
+pql
+thV
+fCL
+uIv
+pql
+ajZ
 bdH
 bdH
 bdH
@@ -131789,17 +132686,17 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bdH
+bdH
+bdH
+bdH
+aad
+uMc
+aVC
+iEr
+fcP
+uMc
+ajZ
 xVk
 xVk
 xVk
@@ -131814,7 +132711,7 @@ jcZ
 aDO
 qqu
 eky
-pCb
+aNl
 eky
 dFk
 aDO
@@ -131829,13 +132726,13 @@ xVk
 xVk
 xVk
 xVk
-aaa
-aaa
-aaa
-aaa
-aaa
-bdH
-bdH
+aad
+pql
+thV
+fCL
+uIv
+pql
+ajZ
 bdH
 bdH
 bdH
@@ -131992,17 +132889,17 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bdH
+bdH
+bdH
+bdH
+aad
+cuC
+oIm
+rtd
+odb
+cuC
+ajZ
 xVk
 xVk
 xVk
@@ -132017,7 +132914,7 @@ avu
 eky
 eky
 nJu
-pCb
+aNl
 eky
 eky
 eky
@@ -132032,13 +132929,13 @@ xVk
 xVk
 xVk
 xVk
-aaa
-aaa
-aaa
-aaa
-aaa
-bdH
-bdH
+aad
+bYn
+thV
+uWV
+oCf
+bYn
+ajZ
 bdH
 bdH
 bdH
@@ -132195,17 +133092,17 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bdH
+bdH
+bdH
+bdH
+cuC
+cuC
+pLv
+rtd
+fcP
+cuC
+cOK
 xVk
 xVk
 xVk
@@ -132220,7 +133117,7 @@ dnJ
 eky
 eky
 eky
-pCb
+aNl
 eky
 eky
 eky
@@ -132235,6 +133132,107 @@ xVk
 xVk
 xVk
 xVk
+wZv
+bYn
+thV
+uWV
+uIv
+bYn
+bYn
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+aaa
+aaa
+aaa
+aab
+aaa
+aaa
+aKQ
+aaa
+aaa
+aab
+aaa
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+bdH
+aad
+aag
+aag
+aag
+wVb
+qnP
+uia
+bhB
+bhB
+blm
+bhB
+bhB
+bOi
+xcp
+kkO
+gzr
+kXK
+bhB
+bhB
+bzX
+bhB
+bhB
+ybr
+vuR
+vTK
+aag
+aag
+aag
+ajZ
 aaa
 aaa
 aaa
@@ -132244,207 +133242,106 @@ bdH
 bdH
 bdH
 bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-aaa
-aaa
-aaa
-aab
-aaa
-aaa
-aKQ
-aaa
-aaa
-aab
-aaa
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-bdH
-aad
-aag
-aag
-aag
-wVb
-qnP
-uia
-bhB
-bhB
-blm
-bhB
-bhB
-bOi
-xcp
-kkO
-gzr
-kXK
-bhB
-bhB
-bzX
-bhB
-bhB
-ybr
-vuR
-vTK
-aag
-aag
-aag
-ajZ
-aaa
-aaa
-aaa
-aaa
-aaa
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-aaa
-aaa
-aaa
-aaa
-aaa
-aab
-aaa
-aaa
-"}
-(266,1,1) = {"
-aaa
-aaa
-aab
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-xVk
-xVk
-xVk
-xVk
-xVk
-xVk
-xVk
-etf
-oMT
-atM
-aDO
-atK
-eky
-eky
-pCb
-eky
-eky
-atM
-aDO
-atK
-sjr
-xjz
-xVk
-xVk
-xVk
-xVk
-xVk
-xVk
-xVk
-aaa
-aaa
-aaa
-aaa
-aaa
-bdH
-bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+aaa
+aaa
+aaa
+aaa
+aaa
+aab
+aaa
+aaa
+"}
+(266,1,1) = {"
+aaa
+aaa
+aab
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+bdH
+bdH
+aaa
+aaa
+uMc
+iKc
+iVY
+cMN
+trB
+nVX
+jcP
+xVk
+xVk
+xVk
+xVk
+xVk
+xVk
+xVk
+etf
+ohH
+atM
+aDO
+atK
+eky
+eky
+aNl
+eky
+eky
+atM
+aDO
+atK
+sjr
+xjz
+xVk
+xVk
+xVk
+xVk
+xVk
+xVk
+xVk
+dbq
+xBn
+vME
+hSt
+xoO
+rjG
+pql
 bdH
 bdH
 bdH
@@ -132601,17 +133498,17 @@ aaa
 aaa
 aaa
 aaa
+bdH
+bdH
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+uMc
+cIG
+vqD
+iEr
+fcP
+blJ
+jcP
 xVk
 xVk
 xVk
@@ -132624,11 +133521,11 @@ aPz
 avu
 arV
 aMU
-gEz
-wbR
-rTB
-wbR
-aqC
+ssX
+vsh
+iPD
+vsh
+fCp
 avu
 arV
 aMU
@@ -132641,13 +133538,13 @@ xVk
 xVk
 xVk
 xVk
-aaa
-aaa
-aaa
-aaa
-aaa
-bdH
-bdH
+dbq
+gIJ
+thV
+fCL
+lne
+wEI
+pql
 bdH
 bdH
 bdH
@@ -132804,17 +133701,17 @@ aaa
 aaa
 aaa
 aaa
+bdH
+bdH
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+uMc
+dfg
+rAP
+vqK
+lht
+blJ
+jcP
 xVk
 xVk
 xVk
@@ -132827,11 +133724,11 @@ aPz
 aqJ
 aBu
 aqp
-oCO
+nkn
 lyw
 iZg
 lyw
-oCO
+nkn
 aqJ
 aBu
 aqp
@@ -132844,13 +133741,13 @@ xVk
 xVk
 xVk
 xVk
-aaa
-aaa
-aaa
-aaa
-aaa
-bdH
-bdH
+dbq
+gIJ
+tjj
+ofH
+gms
+ydh
+pql
 bdH
 bdH
 bdH
@@ -133007,17 +133904,17 @@ aaa
 aaa
 aaa
 aaa
+bdH
+bdH
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+cuC
+ptK
+bSD
+iEr
+xKM
+cuC
+uiR
 xVk
 xVk
 xVk
@@ -133047,15 +133944,15 @@ xVk
 xVk
 xVk
 xVk
+kMK
+bYn
+gEv
+fCL
+lol
+jWh
+bYn
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bdH
 aaa
 aaa
 aaa
@@ -133210,17 +134107,17 @@ aaa
 aaa
 aaa
 aaa
+bdH
+bdH
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+cuC
+ptK
+new
+iEr
+paI
+cuC
+cOK
 xVk
 xVk
 xVk
@@ -133250,15 +134147,15 @@ xVk
 xVk
 xVk
 xVk
+wZv
+bYn
+vVw
+fCL
+tNP
+jWh
+bYn
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bdH
 aaa
 aaa
 aaa
@@ -133413,17 +134310,17 @@ aaa
 aaa
 aaa
 aaa
+bdH
+bdH
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+uMc
+jMG
+uiG
+iUW
+trB
+ozN
+jcP
 xVk
 xVk
 xVk
@@ -133432,7 +134329,7 @@ xVk
 xVk
 xVk
 etf
-asb
+gZP
 atM
 aDO
 atK
@@ -133453,17 +134350,17 @@ xVk
 xVk
 xVk
 xVk
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+dbq
+diz
+vME
+hSt
+xoO
+adC
+pql
+bdH
+bdH
+bdH
+bdH
 aaa
 aaa
 aaa
@@ -133616,17 +134513,17 @@ aaa
 aaa
 aaa
 aaa
+bdH
+bdH
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+uMc
+msP
+ugJ
+kNk
+cXY
+blJ
+jcP
 xVk
 xVk
 xVk
@@ -133656,16 +134553,16 @@ xVk
 xVk
 xVk
 xVk
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+dbq
+gIJ
+thV
+fCL
+lne
+wWq
+pql
+bdH
+bdH
+bdH
 aaa
 aaa
 aaa
@@ -133819,17 +134716,17 @@ aaa
 aaa
 aaa
 aaa
+bdH
+bdH
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+uMc
+spK
+nlW
+uZH
+lht
+blJ
+jcP
 xVk
 xVk
 xVk
@@ -133859,16 +134756,16 @@ xVk
 xVk
 xVk
 xVk
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+dbq
+gIJ
+tjj
+jRC
+gms
+qeK
+pql
+bdH
+bdH
+bdH
 aaa
 aaa
 aaa
@@ -134022,17 +134919,17 @@ aaa
 aaa
 aaa
 aaa
+bdH
+bdH
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+cuC
+cuC
+jPq
+xgm
+aqK
+cuC
+uiR
 xVk
 xVk
 xVk
@@ -134062,16 +134959,16 @@ xVk
 xVk
 xVk
 xVk
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+kMK
+bYn
+hTF
+rTJ
+tAq
+bYn
+bYn
+bdH
+bdH
+bdH
 aaa
 aaa
 aaa
@@ -134230,11 +135127,11 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+cuC
+uMc
+uMc
+uMc
+cuC
 aaa
 xVk
 xVk
@@ -134266,15 +135163,15 @@ xVk
 xVk
 xVk
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bYn
+pql
+pql
+pql
+bYn
+bdH
+bdH
+bdH
+bdH
 aaa
 aaa
 aaa
@@ -134436,7 +135333,7 @@ aaa
 aaa
 aaa
 aaa
-aaa
+bdH
 aaa
 aaa
 xVk
@@ -134470,13 +135367,13 @@ xVk
 xVk
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
 aaa
 aaa
 aaa
@@ -134673,12 +135570,12 @@ xVk
 xVk
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
 aaa
 aaa
 aaa
@@ -134876,12 +135773,12 @@ xVk
 xVk
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
 aaa
 aaa
 aaa
@@ -135079,12 +135976,12 @@ xVk
 xVk
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
 aaa
 aaa
 aaa
@@ -135282,12 +136179,12 @@ xVk
 xVk
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
 aaa
 aaa
 aaa
@@ -135485,12 +136382,12 @@ xVk
 xVk
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
 aaa
 aaa
 aaa
diff --git a/maps/shuttles/lifeboat-port-archive.dmm b/maps/shuttles/lifeboat-port-archive.dmm
new file mode 100644
index 000000000000..cba75c63cc02
--- /dev/null
+++ b/maps/shuttles/lifeboat-port-archive.dmm
@@ -0,0 +1,701 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aF" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "1,6"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"cs" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "2,4"
+	},
+/area/shuttle/lifeboat)
+"cT" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "1,4"
+	},
+/area/shuttle/lifeboat)
+"dg" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "3,0"
+	},
+/area/shuttle/lifeboat)
+"dt" = (
+/turf/open/shuttle/lifeboat{
+	dir = 1;
+	icon_state = "plating_striped"
+	},
+/area/shuttle/lifeboat)
+"en" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "2,5"
+	},
+/area/shuttle/lifeboat)
+"ew" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "1,0"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"eL" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "1,1"
+	},
+/area/shuttle/lifeboat)
+"fa" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "3,6"
+	},
+/area/shuttle/lifeboat)
+"fr" = (
+/turf/closed/shuttle/lifeboat/transparent,
+/area/shuttle/lifeboat)
+"hY" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "26,1"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"iR" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "6,1"
+	},
+/area/shuttle/lifeboat)
+"je" = (
+/obj/structure/bed/chair/dropship/passenger/shuttle_chair{
+	dir = 4;
+	name = "pilot seat"
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"jU" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "0,6"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"jW" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "window2"
+	},
+/area/shuttle/lifeboat)
+"jX" = (
+/obj/structure/extinguisher_cabinet/lifeboat{
+	pixel_x = 8;
+	pixel_y = 27
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"lC" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "23,5"
+	},
+/area/shuttle/lifeboat)
+"mr" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "1,3"
+	},
+/area/shuttle/lifeboat)
+"mB" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "7,6"
+	},
+/area/shuttle/lifeboat)
+"nf" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "2,1"
+	},
+/area/shuttle/lifeboat)
+"nn" = (
+/turf/open/shuttle/lifeboat{
+	icon_state = "plate"
+	},
+/area/shuttle/lifeboat)
+"on" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "24,3"
+	},
+/area/shuttle/lifeboat)
+"qA" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "22,0"
+	},
+/area/shuttle/lifeboat)
+"rb" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "25,3"
+	},
+/area/shuttle/lifeboat)
+"rp" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "24,1"
+	},
+/area/shuttle/lifeboat)
+"rv" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "2,3"
+	},
+/area/shuttle/lifeboat)
+"rH" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "25,4"
+	},
+/area/shuttle/lifeboat)
+"sX" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "23,0"
+	},
+/area/shuttle/lifeboat)
+"tm" = (
+/obj/structure/bed/chair/dropship/passenger/shuttle_chair{
+	dir = 1
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"tI" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "7,0"
+	},
+/area/shuttle/lifeboat)
+"vd" = (
+/obj/structure/extinguisher_cabinet/lifeboat{
+	pixel_x = 15;
+	pixel_y = 27
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"vx" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "0,3"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"vz" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "17,1"
+	},
+/area/shuttle/lifeboat)
+"vZ" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "6,0"
+	},
+/area/shuttle/lifeboat)
+"wX" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "2,2"
+	},
+/area/shuttle/lifeboat)
+"xG" = (
+/obj/docking_port/mobile/lifeboat/port,
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "0,0"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"yf" = (
+/obj/structure/machinery/cm_vending/sorted/supplies/lifeboat{
+	pixel_x = -12;
+	pixel_y = 27
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"yE" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "25,1"
+	},
+/area/shuttle/lifeboat)
+"yS" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "26,3"
+	},
+/area/shuttle/lifeboat)
+"zd" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "0,2"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"zq" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "26,5"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"BC" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "25,6"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"Ct" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/machinery/computer/shuttle/lifeboat{
+	dir = 8
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"Cz" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat{
+	id = "Boat1-D1";
+	throw_dir = 1
+	},
+/turf/open/shuttle/lifeboat{
+	icon_state = "test_floor4"
+	},
+/area/shuttle/lifeboat)
+"CI" = (
+/turf/template_noop,
+/area/template_noop)
+"Db" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "1,5"
+	},
+/area/shuttle/lifeboat)
+"DR" = (
+/obj/structure/bed/chair/dropship/passenger/shuttle_chair{
+	dir = 4
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"FR" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/machinery/computer/communications{
+	dir = 8
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"FZ" = (
+/obj/structure/machinery/cm_vending/sorted/medical/wall_med/lifeboat{
+	pixel_x = -5;
+	pixel_y = 27
+	},
+/obj/structure/machinery/cm_vending/sorted/supplies/lifeboat{
+	pixel_x = 10;
+	pixel_y = 27
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"Gf" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "25,0"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"Hv" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "24,5"
+	},
+/area/shuttle/lifeboat)
+"HI" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "17,5"
+	},
+/area/shuttle/lifeboat)
+"Id" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "6,5"
+	},
+/area/shuttle/lifeboat)
+"Ih" = (
+/turf/closed/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"Jg" = (
+/turf/open/shuttle/escapepod{
+	icon_state = "floor8"
+	},
+/area/shuttle/lifeboat)
+"Jw" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "24,0"
+	},
+/area/shuttle/lifeboat)
+"Mk" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "17,0"
+	},
+/area/shuttle/lifeboat)
+"MF" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "0,5"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"MN" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat{
+	id = "Boat1-D2";
+	throw_dir = 1
+	},
+/turf/open/shuttle/lifeboat{
+	icon_state = "test_floor4"
+	},
+/area/shuttle/lifeboat)
+"Nm" = (
+/turf/open/shuttle/lifeboat{
+	icon_state = "test_floor4"
+	},
+/area/shuttle/lifeboat)
+"Ob" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "17,6"
+	},
+/area/shuttle/lifeboat)
+"Od" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "24,4"
+	},
+/area/shuttle/lifeboat)
+"Oe" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "12,0"
+	},
+/area/shuttle/lifeboat)
+"Ow" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "16,0"
+	},
+/area/shuttle/lifeboat)
+"OX" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "3,1"
+	},
+/area/shuttle/lifeboat)
+"PU" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "3,5"
+	},
+/area/shuttle/lifeboat)
+"Qi" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "23,6"
+	},
+/area/shuttle/lifeboat)
+"QH" = (
+/obj/structure/bed/chair/dropship/passenger/shuttle_chair,
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"Ro" = (
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"Rs" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "6,6"
+	},
+/area/shuttle/lifeboat)
+"RR" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "26,2"
+	},
+/area/shuttle/lifeboat)
+"Sn" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "25,5"
+	},
+/area/shuttle/lifeboat)
+"So" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "0,4"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"Sy" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "11,0"
+	},
+/area/shuttle/lifeboat)
+"SV" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "0,1"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"TO" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "1,2"
+	},
+/area/shuttle/lifeboat)
+"TT" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "23,1"
+	},
+/area/shuttle/lifeboat)
+"Ub" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "24,6"
+	},
+/area/shuttle/lifeboat)
+"Uf" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/machinery/computer/cameras/almayer/vehicle{
+	dir = 8
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"UG" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "24,2"
+	},
+/area/shuttle/lifeboat)
+"UU" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "25,2"
+	},
+/area/shuttle/lifeboat)
+"Ym" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "18,0"
+	},
+/area/shuttle/lifeboat)
+"Yn" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "2,6"
+	},
+/area/shuttle/lifeboat)
+"Ze" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "26,4"
+	},
+/area/shuttle/lifeboat)
+
+(1,1,1) = {"
+jU
+MF
+So
+vx
+zd
+SV
+xG
+"}
+(2,1,1) = {"
+aF
+Db
+cT
+mr
+TO
+eL
+ew
+"}
+(3,1,1) = {"
+Yn
+en
+cs
+rv
+wX
+nf
+Ih
+"}
+(4,1,1) = {"
+fa
+PU
+DR
+DR
+DR
+OX
+dg
+"}
+(5,1,1) = {"
+jW
+QH
+Ro
+Jg
+Ro
+tm
+fr
+"}
+(6,1,1) = {"
+jW
+QH
+Ro
+Jg
+Ro
+tm
+fr
+"}
+(7,1,1) = {"
+Rs
+Id
+jX
+nn
+Ro
+iR
+vZ
+"}
+(8,1,1) = {"
+mB
+PU
+yf
+nn
+Ro
+OX
+tI
+"}
+(9,1,1) = {"
+Cz
+dt
+Ro
+Jg
+Ro
+tm
+fr
+"}
+(10,1,1) = {"
+Nm
+dt
+Ro
+Jg
+Ro
+tm
+fr
+"}
+(11,1,1) = {"
+Nm
+dt
+Ro
+Jg
+Ro
+tm
+fr
+"}
+(12,1,1) = {"
+Rs
+Id
+Ro
+nn
+Ro
+iR
+Sy
+"}
+(13,1,1) = {"
+mB
+PU
+Ro
+nn
+Ro
+OX
+Oe
+"}
+(14,1,1) = {"
+MN
+dt
+Ro
+Jg
+Ro
+tm
+fr
+"}
+(15,1,1) = {"
+Nm
+dt
+Ro
+Jg
+Ro
+tm
+fr
+"}
+(16,1,1) = {"
+Nm
+dt
+Ro
+Jg
+Ro
+tm
+fr
+"}
+(17,1,1) = {"
+Rs
+Id
+vd
+nn
+Ro
+iR
+Ow
+"}
+(18,1,1) = {"
+Ob
+HI
+FZ
+nn
+Ro
+vz
+Mk
+"}
+(19,1,1) = {"
+mB
+PU
+Ro
+nn
+Ro
+OX
+Ym
+"}
+(20,1,1) = {"
+jW
+QH
+Ro
+Jg
+Ro
+tm
+fr
+"}
+(21,1,1) = {"
+jW
+QH
+Ro
+Jg
+Ro
+tm
+fr
+"}
+(22,1,1) = {"
+jW
+QH
+Ro
+Jg
+Ro
+tm
+fr
+"}
+(23,1,1) = {"
+Rs
+Id
+je
+je
+je
+iR
+qA
+"}
+(24,1,1) = {"
+Qi
+lC
+Uf
+Ct
+FR
+TT
+sX
+"}
+(25,1,1) = {"
+Ub
+Hv
+Od
+on
+UG
+rp
+Jw
+"}
+(26,1,1) = {"
+BC
+Sn
+rH
+rb
+UU
+yE
+Gf
+"}
+(27,1,1) = {"
+CI
+zq
+Ze
+yS
+RR
+hY
+CI
+"}
diff --git a/maps/shuttles/lifeboat-port.dmm b/maps/shuttles/lifeboat-port.dmm
index cba75c63cc02..4d58661e8e82 100644
--- a/maps/shuttles/lifeboat-port.dmm
+++ b/maps/shuttles/lifeboat-port.dmm
@@ -116,6 +116,11 @@
 	icon_state = "24,3"
 	},
 /area/shuttle/lifeboat)
+"pH" = (
+/turf/open/shuttle/lifeboat{
+	icon_state = "plating_striped"
+	},
+/area/shuttle/lifeboat)
 "qA" = (
 /turf/closed/shuttle/lifeboat{
 	icon_state = "22,0"
@@ -192,6 +197,13 @@
 	},
 /turf/template_noop,
 /area/shuttle/lifeboat)
+"xS" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat{
+	id = "Boat1-D4";
+	throw_dir = 2
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
 "yf" = (
 /obj/structure/machinery/cm_vending/sorted/supplies/lifeboat{
 	pixel_x = -12;
@@ -257,6 +269,13 @@
 	},
 /turf/open/shuttle/lifeboat,
 /area/shuttle/lifeboat)
+"EW" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat{
+	id = "Boat1-D3";
+	throw_dir = 2
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
 "FR" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/structure/machinery/computer/communications{
@@ -534,8 +553,8 @@ dt
 Ro
 Jg
 Ro
-tm
-fr
+pH
+EW
 "}
 (10,1,1) = {"
 Nm
@@ -543,8 +562,8 @@ dt
 Ro
 Jg
 Ro
-tm
-fr
+pH
+Ro
 "}
 (11,1,1) = {"
 Nm
@@ -552,8 +571,8 @@ dt
 Ro
 Jg
 Ro
-tm
-fr
+pH
+Ro
 "}
 (12,1,1) = {"
 Rs
@@ -579,8 +598,8 @@ dt
 Ro
 Jg
 Ro
-tm
-fr
+pH
+xS
 "}
 (15,1,1) = {"
 Nm
@@ -588,8 +607,8 @@ dt
 Ro
 Jg
 Ro
-tm
-fr
+pH
+Ro
 "}
 (16,1,1) = {"
 Nm
@@ -597,8 +616,8 @@ dt
 Ro
 Jg
 Ro
-tm
-fr
+pH
+Ro
 "}
 (17,1,1) = {"
 Rs
diff --git a/maps/shuttles/lifeboat-starboard-archive.dmm b/maps/shuttles/lifeboat-starboard-archive.dmm
new file mode 100644
index 000000000000..b1857064804c
--- /dev/null
+++ b/maps/shuttles/lifeboat-starboard-archive.dmm
@@ -0,0 +1,691 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ce" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "17,5"
+	},
+/area/shuttle/lifeboat)
+"ci" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "17,6"
+	},
+/area/shuttle/lifeboat)
+"ej" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "0,4"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"em" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "6,6"
+	},
+/area/shuttle/lifeboat)
+"ep" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "1,2"
+	},
+/area/shuttle/lifeboat)
+"ex" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "0,2"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"gp" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "25,4"
+	},
+/area/shuttle/lifeboat)
+"gS" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "26,5"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"hb" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/machinery/computer/shuttle/lifeboat{
+	dir = 8
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"ho" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "7,0"
+	},
+/area/shuttle/lifeboat)
+"hD" = (
+/obj/structure/machinery/cm_vending/sorted/medical/wall_med/lifeboat{
+	pixel_x = -5;
+	pixel_y = 27
+	},
+/obj/structure/machinery/cm_vending/sorted/supplies/lifeboat{
+	pixel_x = 10;
+	pixel_y = 27
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"hQ" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "0,3"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"ix" = (
+/obj/structure/extinguisher_cabinet/lifeboat{
+	pixel_x = 8;
+	pixel_y = 27
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"iP" = (
+/turf/closed/shuttle/lifeboat/transparent,
+/area/shuttle/lifeboat)
+"jA" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "17,0"
+	},
+/area/shuttle/lifeboat)
+"kC" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "6,5"
+	},
+/area/shuttle/lifeboat)
+"kE" = (
+/obj/structure/bed/chair/dropship/passenger/shuttle_chair,
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"lK" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "22,0"
+	},
+/area/shuttle/lifeboat)
+"lS" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat{
+	id = "Boat2-D2";
+	throw_dir = 2
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"mt" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "24,2"
+	},
+/area/shuttle/lifeboat)
+"mA" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "1,3"
+	},
+/area/shuttle/lifeboat)
+"pr" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "26,4"
+	},
+/area/shuttle/lifeboat)
+"qV" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "0,6"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"rM" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "24,6"
+	},
+/area/shuttle/lifeboat)
+"su" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "0,5"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"sO" = (
+/turf/closed/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"tB" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "23,1"
+	},
+/area/shuttle/lifeboat)
+"uJ" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "25,6"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"uN" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "26,1"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"vG" = (
+/obj/docking_port/mobile/lifeboat/starboard,
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "0,0"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"wA" = (
+/turf/template_noop,
+/area/template_noop)
+"xI" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "25,3"
+	},
+/area/shuttle/lifeboat)
+"zv" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "2,6"
+	},
+/area/shuttle/lifeboat)
+"zz" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "1,5"
+	},
+/area/shuttle/lifeboat)
+"zK" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "6,1"
+	},
+/area/shuttle/lifeboat)
+"Ax" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "2,2"
+	},
+/area/shuttle/lifeboat)
+"AF" = (
+/turf/open/shuttle/lifeboat{
+	icon_state = "plating_striped"
+	},
+/area/shuttle/lifeboat)
+"Bf" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "window2"
+	},
+/area/shuttle/lifeboat)
+"BC" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "23,0"
+	},
+/area/shuttle/lifeboat)
+"BP" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "18,0"
+	},
+/area/shuttle/lifeboat)
+"Cq" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "2,5"
+	},
+/area/shuttle/lifeboat)
+"CS" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "25,2"
+	},
+/area/shuttle/lifeboat)
+"Dj" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "1,1"
+	},
+/area/shuttle/lifeboat)
+"Dn" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "3,0"
+	},
+/area/shuttle/lifeboat)
+"Ep" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat{
+	id = "Boat2-D1";
+	throw_dir = 2
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"EI" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/machinery/computer/communications{
+	dir = 8
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"EP" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "16,0"
+	},
+/area/shuttle/lifeboat)
+"FI" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "24,3"
+	},
+/area/shuttle/lifeboat)
+"FS" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "25,0"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"GA" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "7,6"
+	},
+/area/shuttle/lifeboat)
+"GD" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "3,1"
+	},
+/area/shuttle/lifeboat)
+"GQ" = (
+/obj/structure/machinery/cm_vending/sorted/supplies/lifeboat{
+	pixel_x = -12;
+	pixel_y = 27
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"HW" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "2,1"
+	},
+/area/shuttle/lifeboat)
+"Io" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "1,4"
+	},
+/area/shuttle/lifeboat)
+"KZ" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "26,3"
+	},
+/area/shuttle/lifeboat)
+"Lk" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/machinery/computer/cameras/almayer/vehicle{
+	dir = 8
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"Mu" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "24,5"
+	},
+/area/shuttle/lifeboat)
+"NE" = (
+/obj/structure/bed/chair/dropship/passenger/shuttle_chair{
+	dir = 4;
+	name = "pilot seat"
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"NF" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "1,0"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"NK" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "2,4"
+	},
+/area/shuttle/lifeboat)
+"NO" = (
+/obj/structure/extinguisher_cabinet/lifeboat{
+	pixel_x = 15;
+	pixel_y = 27
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"Od" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "3,6"
+	},
+/area/shuttle/lifeboat)
+"Ow" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "6,0"
+	},
+/area/shuttle/lifeboat)
+"OO" = (
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"PJ" = (
+/obj/structure/bed/chair/dropship/passenger/shuttle_chair{
+	dir = 1
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"Qa" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "12,0"
+	},
+/area/shuttle/lifeboat)
+"Rk" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "25,5"
+	},
+/area/shuttle/lifeboat)
+"RH" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "0,1"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"RR" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "23,6"
+	},
+/area/shuttle/lifeboat)
+"Td" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "3,5"
+	},
+/area/shuttle/lifeboat)
+"Tn" = (
+/obj/structure/bed/chair/dropship/passenger/shuttle_chair{
+	dir = 4
+	},
+/turf/open/shuttle/lifeboat,
+/area/shuttle/lifeboat)
+"TM" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "24,4"
+	},
+/area/shuttle/lifeboat)
+"TU" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "2,3"
+	},
+/area/shuttle/lifeboat)
+"Up" = (
+/obj/structure/prop/invuln/dropship_parts/lifeboat{
+	icon_state = "1,6"
+	},
+/turf/template_noop,
+/area/shuttle/lifeboat)
+"UG" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "23,5"
+	},
+/area/shuttle/lifeboat)
+"Vj" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "25,1"
+	},
+/area/shuttle/lifeboat)
+"VF" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "17,1"
+	},
+/area/shuttle/lifeboat)
+"VZ" = (
+/turf/open/shuttle/escapepod{
+	icon_state = "floor8"
+	},
+/area/shuttle/lifeboat)
+"Xj" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "24,1"
+	},
+/area/shuttle/lifeboat)
+"XV" = (
+/turf/open/shuttle/lifeboat{
+	icon_state = "plate"
+	},
+/area/shuttle/lifeboat)
+"Zl" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "24,0"
+	},
+/area/shuttle/lifeboat)
+"ZP" = (
+/turf/closed/shuttle/lifeboat/transparent{
+	icon_state = "26,2"
+	},
+/area/shuttle/lifeboat)
+"ZR" = (
+/turf/closed/shuttle/lifeboat{
+	icon_state = "11,0"
+	},
+/area/shuttle/lifeboat)
+
+(1,1,1) = {"
+qV
+su
+ej
+hQ
+ex
+RH
+vG
+"}
+(2,1,1) = {"
+Up
+zz
+Io
+mA
+ep
+Dj
+NF
+"}
+(3,1,1) = {"
+zv
+Cq
+NK
+TU
+Ax
+HW
+sO
+"}
+(4,1,1) = {"
+Od
+Td
+Tn
+Tn
+Tn
+GD
+Dn
+"}
+(5,1,1) = {"
+Bf
+kE
+OO
+VZ
+OO
+PJ
+iP
+"}
+(6,1,1) = {"
+Bf
+kE
+OO
+VZ
+OO
+PJ
+iP
+"}
+(7,1,1) = {"
+em
+kC
+ix
+XV
+OO
+zK
+Ow
+"}
+(8,1,1) = {"
+GA
+Td
+GQ
+XV
+OO
+GD
+ho
+"}
+(9,1,1) = {"
+Bf
+kE
+OO
+VZ
+OO
+AF
+Ep
+"}
+(10,1,1) = {"
+Bf
+kE
+OO
+VZ
+OO
+AF
+OO
+"}
+(11,1,1) = {"
+Bf
+kE
+OO
+VZ
+OO
+AF
+OO
+"}
+(12,1,1) = {"
+em
+kC
+OO
+XV
+OO
+zK
+ZR
+"}
+(13,1,1) = {"
+GA
+Td
+OO
+XV
+OO
+GD
+Qa
+"}
+(14,1,1) = {"
+Bf
+kE
+OO
+VZ
+OO
+AF
+lS
+"}
+(15,1,1) = {"
+Bf
+kE
+OO
+VZ
+OO
+AF
+OO
+"}
+(16,1,1) = {"
+Bf
+kE
+OO
+VZ
+OO
+AF
+OO
+"}
+(17,1,1) = {"
+em
+kC
+NO
+XV
+OO
+zK
+EP
+"}
+(18,1,1) = {"
+ci
+ce
+hD
+XV
+OO
+VF
+jA
+"}
+(19,1,1) = {"
+GA
+Td
+OO
+XV
+OO
+GD
+BP
+"}
+(20,1,1) = {"
+Bf
+kE
+OO
+VZ
+OO
+PJ
+iP
+"}
+(21,1,1) = {"
+Bf
+kE
+OO
+VZ
+OO
+PJ
+iP
+"}
+(22,1,1) = {"
+Bf
+kE
+OO
+VZ
+OO
+PJ
+iP
+"}
+(23,1,1) = {"
+em
+kC
+NE
+NE
+NE
+zK
+lK
+"}
+(24,1,1) = {"
+RR
+UG
+Lk
+hb
+EI
+tB
+BC
+"}
+(25,1,1) = {"
+rM
+Mu
+TM
+FI
+mt
+Xj
+Zl
+"}
+(26,1,1) = {"
+uJ
+Rk
+gp
+xI
+CS
+Vj
+FS
+"}
+(27,1,1) = {"
+wA
+gS
+pr
+KZ
+ZP
+uN
+wA
+"}
diff --git a/maps/shuttles/lifeboat-starboard.dmm b/maps/shuttles/lifeboat-starboard.dmm
index b1857064804c..05b128e0e2cb 100644
--- a/maps/shuttles/lifeboat-starboard.dmm
+++ b/maps/shuttles/lifeboat-starboard.dmm
@@ -102,7 +102,7 @@
 /area/shuttle/lifeboat)
 "lS" = (
 /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat{
-	id = "Boat2-D2";
+	id = "Boat2-D4";
 	throw_dir = 2
 	},
 /turf/open/shuttle/lifeboat,
@@ -159,6 +159,15 @@
 	},
 /turf/template_noop,
 /area/shuttle/lifeboat)
+"uX" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat{
+	id = "Boat2-D2";
+	throw_dir = 1
+	},
+/turf/open/shuttle/lifeboat{
+	icon_state = "test_floor4"
+	},
+/area/shuttle/lifeboat)
 "vG" = (
 /obj/docking_port/mobile/lifeboat/starboard,
 /obj/structure/prop/invuln/dropship_parts/lifeboat{
@@ -174,6 +183,15 @@
 	icon_state = "25,3"
 	},
 /area/shuttle/lifeboat)
+"ya" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat{
+	id = "Boat2-D1";
+	throw_dir = 1
+	},
+/turf/open/shuttle/lifeboat{
+	icon_state = "test_floor4"
+	},
+/area/shuttle/lifeboat)
 "zv" = (
 /turf/closed/shuttle/lifeboat{
 	icon_state = "2,6"
@@ -236,7 +254,7 @@
 /area/shuttle/lifeboat)
 "Ep" = (
 /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat{
-	id = "Boat2-D1";
+	id = "Boat2-D3";
 	throw_dir = 2
 	},
 /turf/open/shuttle/lifeboat,
@@ -357,6 +375,11 @@
 	icon_state = "12,0"
 	},
 /area/shuttle/lifeboat)
+"Qj" = (
+/turf/open/shuttle/lifeboat{
+	icon_state = "test_floor4"
+	},
+/area/shuttle/lifeboat)
 "Rk" = (
 /turf/closed/shuttle/lifeboat{
 	icon_state = "25,5"
@@ -373,6 +396,12 @@
 	icon_state = "23,6"
 	},
 /area/shuttle/lifeboat)
+"SA" = (
+/turf/open/shuttle/lifeboat{
+	dir = 1;
+	icon_state = "plating_striped"
+	},
+/area/shuttle/lifeboat)
 "Td" = (
 /turf/closed/shuttle/lifeboat{
 	icon_state = "3,5"
@@ -519,8 +548,8 @@ GD
 ho
 "}
 (9,1,1) = {"
-Bf
-kE
+ya
+SA
 OO
 VZ
 OO
@@ -528,8 +557,8 @@ AF
 Ep
 "}
 (10,1,1) = {"
-Bf
-kE
+Qj
+SA
 OO
 VZ
 OO
@@ -537,8 +566,8 @@ AF
 OO
 "}
 (11,1,1) = {"
-Bf
-kE
+Qj
+SA
 OO
 VZ
 OO
@@ -564,8 +593,8 @@ GD
 Qa
 "}
 (14,1,1) = {"
-Bf
-kE
+uX
+SA
 OO
 VZ
 OO
@@ -573,8 +602,8 @@ AF
 lS
 "}
 (15,1,1) = {"
-Bf
-kE
+Qj
+SA
 OO
 VZ
 OO
@@ -582,8 +611,8 @@ AF
 OO
 "}
 (16,1,1) = {"
-Bf
-kE
+Qj
+SA
 OO
 VZ
 OO