diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm
index 7e041d1c39..3fa61836e7 100644
--- a/maps/map_files/golden_arrow/golden_arrow.dmm
+++ b/maps/map_files/golden_arrow/golden_arrow.dmm
@@ -9,9 +9,18 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
+"af" = (
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/squad_one)
 "ag" = (
-/turf/closed/wall/almayer,
-/area/almayer/living/cafeteria_port)
+/obj/structure/window/framed/almayer,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/living/briefing)
 "al" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -20,15 +29,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"aq" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/bed/chair{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/alpha/squad_one)
 "ar" = (
 /obj/structure/machinery/landinglight/ds1/delayone{
 	dir = 8
@@ -44,23 +44,18 @@
 	},
 /area/almayer/hallways/hangar)
 "ay" = (
-/obj/structure/surface/table/almayer,
-/obj/item/trash/ceramic_plate{
-	pixel_x = -6;
-	pixel_y = 19
-	},
-/obj/item/trash/ceramic_plate{
-	pixel_x = -6;
-	pixel_y = 21
+/obj/structure/sign/safety/restrictedarea{
+	pixel_x = 12;
+	pixel_y = 29
 	},
-/obj/item/trash/ceramic_plate{
-	pixel_x = -5;
-	pixel_y = 23
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "plate"
 	},
-/area/almayer/living/cafeteria_port)
+/area/almayer/living/briefing)
 "aB" = (
 /obj/structure/machinery/landinglight/ds1/delaythree{
 	dir = 4
@@ -70,90 +65,82 @@
 	},
 /area/almayer/hallways/hangar)
 "aI" = (
-/obj/structure/sign/poster{
-	desc = "This poster features Audrey Rainwater standing in a jacuzzi. She was the July 2182 centerfold in House Bunny Gentleman's Magazine. Don't ask how you know that.";
-	icon_state = "poster16";
-	layer = 3.3;
-	name = "'Miss July' Pinup";
-	pixel_y = 29;
-	serial_number = 16
-	},
-/obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = -2;
-	pixel_y = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8;
-	layer = 3.3;
-	pixel_y = 4
-	},
-/obj/structure/bed{
-	can_buckle = 0
-	},
-/obj/structure/bed{
-	buckling_y = 13;
-	layer = 3.5;
-	pixel_y = 13
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
-/obj/item/bedsheet/brown{
-	layer = 3.4
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1;
+	pixel_y = 1
 	},
-/obj/item/bedsheet/brown{
-	pixel_y = 13
+/obj/structure/machinery/light{
+	dir = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/grunt_rnr)
+/area/almayer/living/briefing)
+"aJ" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 6
+	},
+/obj/item/prop/magazine/book/borntokill,
+/obj/item/prop/magazine/book/starshiptroopers{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/squads/alpha/squad_one)
 "aN" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/structure/machinery/computer/crew/alt,
 /turf/open/floor/almayer{
-	icon_state = "sterile_green"
+	icon_state = "cargo_arrow"
 	},
-/area/almayer/medical)
+/area/almayer/hallways/hangar)
 "aQ" = (
-/obj/structure/surface/rack,
-/obj/item/weapon/gun/shotgun/pump/special{
-	pixel_y = 10
-	},
-/obj/item/storage/box/nade_box{
-	pixel_y = -4;
-	pixel_x = 2
+/obj/structure/sign/safety/galley{
+	pixel_y = 29
 	},
-/obj/item/ammo_magazine/shotgun/buckshot/special,
-/obj/item/device/motiondetector,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/squad_one)
+/area/almayer/hallways/port_hallway)
 "aT" = (
 /obj/structure/machinery/computer/cameras/almayer/vehicle{
 	dir = 4;
 	pixel_x = -17
 	},
 /obj/structure/machinery/prop/almayer/CICmap{
-	pixel_y = 14;
-	pixel_x = -17;
-	icon_state = "shuttle";
 	dir = 4;
+	icon_state = "shuttle";
+	layer = 2.97;
 	name = "Tactical Map Display";
-	layer = 2.97
+	pixel_x = -17;
+	pixel_y = 14
 	},
 /turf/open/floor/almayer,
 /area/almayer/living/platoon_commander_rooms)
-"be" = (
-/turf/open/floor/almayer/uscm/directional/up_down{
-	dir = 9
+"bb" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
-/area/almayer/living/briefing)
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/cryo_cells)
 "bf" = (
 /obj/structure/machinery/light,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
+"bh" = (
+/obj/effect/landmark/start/marine/leader/alpha,
+/obj/effect/landmark/late_join/alpha,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/cryo_cells)
 "bo" = (
 /obj/structure/window/framed/almayer,
 /turf/open/floor/almayer{
@@ -178,8 +165,10 @@
 	},
 /area/almayer/hallways/hangar)
 "bw" = (
-/obj/structure/bed/chair,
-/turf/open/floor/almayer,
+/obj/structure/curtain/red,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
 /area/almayer/squads/alpha/platoon_sergeant)
 "by" = (
 /obj/effect/decal/warning_stripes{
@@ -190,33 +179,49 @@
 	},
 /area/almayer/hallways/hangar)
 "bG" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/computer/emails{
+/obj/structure/window/reinforced{
+	dir = 4;
+	pixel_x = -2;
 	pixel_y = 4
 	},
-/obj/structure/machinery/firealarm{
-	pixel_y = 28
+/obj/structure/window/reinforced{
+	dir = 8;
+	layer = 3.3;
+	pixel_y = 4
 	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
+/obj/structure/bed{
+	can_buckle = 0
 	},
-/area/almayer/squads/alpha/squad_one)
-"bI" = (
-/obj/effect/landmark/start/marine/smartgunner/alpha,
-/obj/effect/landmark/late_join/alpha,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/cryo_cells)
-"bJ" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
+/obj/structure/bed{
+	buckling_y = 13;
+	layer = 3.5;
+	pixel_y = 13
+	},
+/obj/item/bedsheet/brown{
+	layer = 3.4
+	},
+/obj/item/bedsheet/brown{
+	pixel_y = 13
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/item/toy/farwadoll{
+	desc = "A USCM approved plush doll. It's not soft and hardly comforting!";
+	force = 15;
+	icon_state = "therapyred";
+	layer = 4.1;
+	name = "Sergeant Huggs";
+	pixel_y = 15;
+	throwforce = 15
+	},
+/obj/item/clothing/head/cmcap{
+	layer = 4.1;
 	pixel_x = -1;
-	pixel_y = 2
+	pixel_y = 22
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "plate"
 	},
-/area/almayer/living/cafeteria_port)
+/area/almayer/living/grunt_rnr)
 "bQ" = (
 /obj/structure/machinery/landinglight/ds1{
 	dir = 1
@@ -226,24 +231,28 @@
 	},
 /area/almayer/hallways/hangar)
 "bR" = (
-/obj/structure/machinery/cm_vending/sorted/marine_food,
+/obj/structure/bed/chair/comfy,
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1;
+	pixel_y = 1
+	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
 /area/almayer/living/cafeteria_port)
 "bS" = (
-/obj/structure/surface/table/almayer,
-/obj/item/paper_bin{
-	pixel_x = -11;
-	pixel_y = -10
+/obj/structure/platform/stair_cut/alt,
+/obj/structure/stairs/perspective{
+	dir = 8;
+	icon_state = "p_stair_full"
 	},
+/obj/structure/platform,
+/obj/structure/machinery/light,
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "plate"
 	},
-/area/almayer/living/cafeteria_port)
-"bZ" = (
-/turf/open/floor/almayer,
-/area/almayer/squads/alpha/squad_one)
+/area/almayer/living/briefing)
 "ca" = (
 /turf/closed/wall/almayer/outer,
 /area/almayer/hallways/hangar)
@@ -272,6 +281,19 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
+"cr" = (
+/obj/effect/landmark/start/marine/alpha,
+/obj/effect/landmark/late_join/alpha,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/cryo_cells)
+"cs" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_one)
 "ct" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -284,135 +306,172 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"cB" = (
-/obj/structure/machinery/camera/autoname/almayer,
-/turf/open/floor/almayer,
-/area/almayer/hallways/starboard_hallway)
-"cH" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 10
-	},
-/obj/structure/bed/chair{
-	dir = 8
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/squads/alpha/platoon_sergeant)
-"cJ" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1;
-	pixel_y = 1
+"cy" = (
+/obj/structure/machinery/power/apc/almayer{
+	dir = 1
 	},
-/turf/open/floor/almayer,
-/area/almayer/hallways/port_hallway)
-"cL" = (
-/obj/structure/machinery/landinglight/ds1/delaytwo,
+/obj/structure/pipes/vents/scrubber,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/hallways/hangar)
-"cN" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
+/area/almayer/squads/alpha/squad_one)
+"cz" = (
+/obj/structure/machinery/disposal{
+	density = 0;
+	layer = 3.2;
+	pixel_y = 16
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/platoon_sergeant)
-"cO" = (
-/obj/structure/machinery/light{
-	dir = 1
+/area/almayer/squads/alpha/squad_one)
+"cA" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/prop/magazine/boots/n054{
+	pixel_x = 29
+	},
+/obj/structure/closet/secure_closet/smartgunner,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_two)
+"cB" = (
+/obj/structure/machinery/camera/autoname/almayer,
+/turf/open/floor/almayer,
+/area/almayer/hallways/starboard_hallway)
+"cD" = (
+/obj/structure/surface/table/almayer,
+/obj/item/reagent_container/food/drinks/coffeecup/wy{
+	desc = "A matte gray coffee mug bearing the Weyland-Yutani logo on its front. Looks like someone spat in it.";
+	name = "dip cup";
+	pixel_x = -4;
+	pixel_y = 8
+	},
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/squad_one)
+"cH" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/machinery/computer/med_data/laptop,
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
+	},
+/area/almayer/medical)
+"cJ" = (
+/obj/structure/bed/chair/office/light{
+	dir = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
-/area/almayer/living/cryo_cells)
+/area/almayer/medical)
+"cL" = (
+/obj/structure/machinery/landinglight/ds1/delaytwo,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hallways/hangar)
+"cR" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/squads/alpha/squad_one)
 "cS" = (
+/obj/structure/machinery/door/airlock/almayer/medical{
+	name = "\improper Platoon Medic Office";
+	req_one_access = list()
+	},
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
+	icon_state = "test_floor4"
 	},
-/area/almayer/hallways/starboard_hallway)
+/area/almayer/medical)
+"cT" = (
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/squad_one)
 "cU" = (
 /obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_x = -1;
-	pixel_y = 1
+	icon_state = "SW-out";
+	pixel_x = -1
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/machinery/light{
 	dir = 8
 	},
-/obj/structure/sign/safety/bulkhead_door{
-	pixel_x = -19
-	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/hallways/port_hallway)
 "cZ" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
+/obj/structure/machinery/cm_vending/sorted/medical/chemistry/no_access,
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
 	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
+/area/almayer/medical)
+"dd" = (
+/obj/structure/pipes/vents/pump{
+	dir = 8
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "sterile_green"
 	},
-/area/almayer/living/cryo_cells)
-"dd" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
+/area/almayer/medical)
+"di" = (
+/obj/structure/machinery/light,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/cafeteria_port)
+/area/almayer/living/cryo_cells)
 "dl" = (
-/turf/closed/wall/almayer,
-/area/almayer/squads/alpha/squad_two)
-"dm" = (
-/obj/structure/sign/safety/rewire{
-	pixel_x = 14;
-	pixel_y = 29
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/safety/coffee{
+	pixel_x = -19
 	},
-/obj/item/defenses/handheld/sentry,
+/obj/structure/machinery/vending/cigarette,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/squad_two)
-"dr" = (
-/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
-	pixel_y = 25
+/area/almayer/squads/alpha/platoon_sergeant)
+"dm" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/hallways/port_hallway)
-"dt" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/prop/invuln/overhead_pipe{
-	pixel_x = -7;
-	pixel_y = -4
+/area/almayer/medical)
+"dn" = (
+/obj/structure/bed/chair/comfy{
+	dir = 1
 	},
 /obj/effect/decal/warning_stripes{
-	icon_state = "S"
+	icon_state = "N";
+	pixel_y = 2
 	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
-/area/almayer/living/cryo_cells)
+/area/almayer/living/cafeteria_port)
+"dr" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/platoon_sergeant)
+"dt" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 10
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/medical)
 "dv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet,
-/obj/structure/machinery/alarm/almayer{
+/obj/structure/machinery/light{
 	dir = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/grunt_rnr)
+/area/almayer/living/briefing)
 "dA" = (
 /obj/structure/machinery/landinglight/ds1/delaytwo{
 	dir = 1
@@ -430,11 +489,23 @@
 	},
 /area/almayer/hallways/hangar)
 "dE" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 5
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/machinery/light{
+	dir = 4
 	},
-/turf/open/floor/almayer,
-/area/almayer/squads/alpha/platoon_sergeant)
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
+	},
+/area/almayer/medical)
+"dG" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/cryo_cells)
 "dH" = (
 /obj/item/bedsheet/brown,
 /obj/structure/bed,
@@ -446,13 +517,13 @@
 /turf/open/floor/plating,
 /area/almayer/hallways/hangar)
 "dO" = (
-/obj/structure/barricade/handrail{
-	dir = 1;
-	pixel_y = 12
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_x = -1;
+	pixel_y = 2
 	},
 /turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
+	icon_state = "dark_sterile"
 	},
 /area/almayer/living/cafeteria_port)
 "dP" = (
@@ -471,76 +542,33 @@
 	icon_state = "plating"
 	},
 /area/almayer/engineering)
-"ea" = (
-/obj/structure/surface/table/almayer,
-/obj/item/tool/kitchen/tray{
-	pixel_y = -10
-	},
-/obj/item/reagent_container/food/condiment/hotsauce/franks{
-	pixel_x = 7;
-	pixel_y = -3
-	},
-/obj/item/storage/box/cups{
-	pixel_x = -5;
-	pixel_y = -10
+"dX" = (
+/obj/structure/machinery/light{
+	dir = 4
 	},
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/squad_two)
+"ea" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/living/cafeteria_port)
-"ed" = (
-/obj/structure/window/framed/almayer,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/living/cafeteria_port)
-"em" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "sterile_green"
 	},
-/area/almayer/living/cryo_cells)
+/area/almayer/medical)
 "eo" = (
-/obj/structure/surface/table/almayer,
-/obj/item/reagent_container/food/drinks/coffeecup/wy{
-	desc = "A matte gray coffee mug bearing the Weyland-Yutani logo on its front. Looks like someone spat in it.";
-	name = "dip cup";
-	pixel_x = -4;
-	pixel_y = 8
+/turf/open/floor/almayer{
+	icon_state = "cargo_arrow"
 	},
-/turf/open/floor/almayer,
-/area/almayer/squads/alpha/squad_one)
+/area/almayer/hallways/port_hallway)
 "eu" = (
-/obj/structure/sign/safety/restrictedarea{
-	pixel_x = -18
-	},
-/turf/open/floor/almayer,
-/area/almayer/living/briefing)
-"eE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/recharger{
-	pixel_y = 5
-	},
-/obj/item/tool/hand_labeler{
-	pixel_x = -3;
-	pixel_y = 14
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_x = -1;
+	pixel_y = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/squad_one)
+/area/almayer/living/briefing)
 "eH" = (
 /obj/structure/window/framed/almayer/hull,
 /turf/open/floor/almayer{
@@ -548,42 +576,28 @@
 	},
 /area/almayer/hallways/hangar)
 "eJ" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_x = -1;
-	pixel_y = 2
+/obj/structure/machinery/power/apc/almayer,
+/obj/structure/surface/table/reinforced/prison,
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
+	},
+/area/almayer/medical)
+"eL" = (
+/obj/structure/machinery/cryopod/right,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
 	},
+/area/almayer/living/cryo_cells)
+"eR" = (
+/obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
+	icon_state = "N";
 	pixel_y = 2
 	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
 /area/almayer/living/cryo_cells)
-"eT" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 2
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/obj/structure/machinery/door/airlock/almayer/generic{
-	dir = 1;
-	id = "Delta_1";
-	name = "\improper Bathroom"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/living/cryo_cells)
 "eU" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
@@ -607,21 +621,33 @@
 	},
 /area/almayer/hallways/hangar)
 "ff" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/effect/decal/cleanable/dirt,
 /obj/structure/machinery/light{
-	dir = 1
+	dir = 4
 	},
-/turf/open/floor/almayer,
-/area/almayer/squads/alpha/platoon_sergeant)
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hallways/hangar)
 "fg" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/grunt_rnr)
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer/uscm/directional{
+	dir = 10
+	},
+/area/almayer/living/briefing)
 "fh" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 10
 	},
-/area/almayer/hallways/port_hallway)
+/obj/structure/bed/chair{
+	dir = 8
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/squads/alpha/platoon_sergeant)
 "fl" = (
 /obj/structure/machinery/landinglight/ds1/delaytwo{
 	dir = 4
@@ -630,11 +656,20 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"ft" = (
-/turf/open/floor/almayer/uscm{
-	dir = 1
+"fo" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
-/area/almayer/living/briefing)
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/cryo_cells)
 "fx" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -648,26 +683,56 @@
 	},
 /area/almayer/hallways/hangar)
 "fy" = (
-/obj/structure/bed/chair/comfy{
-	dir = 4
+/obj/structure/platform,
+/obj/structure/stairs/perspective{
+	dir = 8;
+	icon_state = "p_stair_full"
 	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/safety/rewire{
-	pixel_x = 14;
-	pixel_y = 29
+/obj/structure/platform/stair_cut/alt,
+/obj/structure/machinery/light{
+	dir = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/cafeteria_port)
+/area/almayer/living/briefing)
+"fJ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/prop/invuln/overhead_pipe{
+	pixel_x = -7;
+	pixel_y = -4
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/cryo_cells)
 "fL" = (
-/obj/structure/bed/chair/comfy{
-	dir = 4
+/obj/structure/surface/table/almayer,
+/obj/item/device/megaphone,
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
+/area/almayer/living/briefing)
+"fO" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
 /obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
+	icon_state = "SE-out";
+	pixel_x = 1
+	},
+/obj/structure/machinery/door/airlock/almayer/medical{
+	dir = 1;
+	name = "\improper Medical Subsection";
+	req_one_access = list()
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
 	},
+/area/almayer/medical)
+"fX" = (
+/obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/warning_stripes{
 	icon_state = "W";
 	pixel_x = -1
@@ -675,18 +740,19 @@
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
-/area/almayer/living/cafeteria_port)
-"fO" = (
-/obj/structure/pipes/standard/manifold/fourway/hidden/supply,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/port_hallway)
+/area/almayer/living/cryo_cells)
 "fY" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/roller,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/cm_vending/sorted/medical/no_access,
 /turf/open/floor/almayer{
 	icon_state = "sterile_green"
 	},
 /area/almayer/medical)
+"gd" = (
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_two)
 "gf" = (
 /obj/structure/closet/toolcloset,
 /obj/effect/decal/cleanable/dirt,
@@ -694,6 +760,19 @@
 	icon_state = "cargo"
 	},
 /area/almayer/engineering)
+"gg" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/cryo_cells)
 "gh" = (
 /obj/structure/machinery/landinglight/ds1{
 	dir = 1
@@ -713,25 +792,13 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/living/platoon_commander_rooms)
-"gs" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 5
+"gq" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out";
+	pixel_x = 1
 	},
 /turf/open/floor/almayer,
-/area/almayer/living/briefing)
-"gt" = (
-/obj/structure/surface/rack,
-/obj/item/weapon/gun/rifle/m41aMK1{
-	pixel_y = 7
-	},
-/obj/item/weapon/gun/rifle/m41aMK1,
-/obj/item/weapon/gun/rifle/m41aMK1{
-	pixel_y = -7
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/alpha/squad_one)
+/area/almayer/hallways/port_hallway)
 "gz" = (
 /obj/structure/ship_ammo/rocket/widowmaker,
 /turf/open/floor/almayer{
@@ -739,8 +806,12 @@
 	},
 /area/almayer/hallways/hangar)
 "gA" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/computer/emails{
+	dir = 1
+	},
 /turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
+	icon_state = "plate"
 	},
 /area/almayer/squads/alpha/platoon_sergeant)
 "gD" = (
@@ -751,119 +822,58 @@
 	icon_state = "cargo"
 	},
 /area/almayer/hallways/hangar)
-"gE" = (
-/obj/structure/machinery/cryopod/right,
+"gG" = (
 /obj/structure/machinery/light{
-	dir = 4
+	dir = 1
 	},
-/turf/open/floor/almayer{
-	icon_state = "cargo"
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/cm_vending/sorted/medical/blood{
+	req_access = list()
 	},
-/area/almayer/living/cryo_cells)
-"gG" = (
-/obj/structure/closet/emcloset,
 /turf/open/floor/almayer{
-	icon_state = "cargo"
+	icon_state = "sterile_green"
 	},
-/area/almayer/hallways/port_hallway)
+/area/almayer/medical)
 "gH" = (
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/living/cryo_cells)
-"gI" = (
-/obj/structure/machinery/alarm/almayer{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/living/cryo_cells)
-"gJ" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/safety/galley{
-	pixel_x = -19
+/obj/structure/machinery/power/apc/almayer{
+	dir = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/living/cryo_cells)
 "gL" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/light{
+	dir = 8
 	},
 /turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
+	icon_state = "plate"
 	},
-/area/almayer/hallways/port_hallway)
+/area/almayer/living/grunt_rnr)
 "gM" = (
-/obj/structure/machinery/computer/arcade{
-	density = 0;
-	pixel_y = 16
-	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/vents/scrubber,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/squad_two)
-"gO" = (
-/obj/effect/decal/cleanable/dirt,
+/area/almayer/squads/alpha/platoon_sergeant)
+"ha" = (
 /obj/structure/machinery/light{
 	dir = 8
 	},
-/obj/structure/sign/safety/rewire{
-	pixel_x = 14;
-	pixel_y = 29
-	},
+/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/cryo_cells)
-"gQ" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/obj/item/ammo_box/magazine/misc/mre{
-	pixel_x = -23;
-	pixel_y = -11
-	},
-/obj/item/facepaint/black,
-/turf/open/floor/almayer,
-/area/almayer/squads/alpha/platoon_sergeant)
-"gU" = (
-/obj/structure/machinery/cryopod,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/living/cryo_cells)
-"gV" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
-	dir = 1;
-	name = "\improper Briefing Room"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/living/briefing)
+/area/almayer/squads/alpha/squad_one)
 "he" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 6
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/hangar)
-"hj" = (
-/obj/structure/bed/chair/comfy{
-	dir = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/living/cafeteria_port)
 "hk" = (
 /obj/structure/machinery/camera/autoname/almayer{
 	dir = 4;
@@ -874,22 +884,14 @@
 	},
 /area/almayer/hallways/hangar)
 "ho" = (
-/obj/structure/machinery/door/airlock/almayer/medical{
-	name = "\improper Medical Subsection";
-	req_one_access = list()
+/obj/structure/machinery/autodoc_console{
+	dir = 1;
+	pixel_y = 6
 	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
 	},
 /area/almayer/medical)
-"hq" = (
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/living/cafeteria_port)
 "hA" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 10
@@ -898,123 +900,137 @@
 	icon_state = "cargo"
 	},
 /area/almayer/hallways/hangar)
+"hC" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/surface/table/almayer,
+/obj/item/smartgun_battery{
+	pixel_x = 4;
+	pixel_y = -5
+	},
+/obj/effect/spawner/random/powercell{
+	pixel_x = -8;
+	pixel_y = 7
+	},
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/squads/alpha/squad_two)
 "hF" = (
 /obj/effect/decal/cleanable/blood/oil,
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
 "hG" = (
-/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/alpha{
-	pixel_x = -20
-	},
-/obj/structure/closet/secure_closet/platoon_sergeant{
-	pixel_x = 6
+/obj/structure/machinery/medical_pod/autodoc{
+	dir = 1;
+	pixel_y = 6
 	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "test_floor4"
 	},
-/area/almayer/squads/alpha/platoon_sergeant)
+/area/almayer/medical)
 "hN" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/safety/conference_room{
-	pixel_y = 29
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/computer/secure_data{
+	pixel_y = 6
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/hallways/port_hallway)
-"hQ" = (
-/obj/effect/decal/cleanable/dirt,
+/area/almayer/squads/alpha/platoon_sergeant)
+"hR" = (
+/obj/structure/machinery/firealarm{
+	pixel_y = 28
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_y = 2
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 2
+	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/squads/alpha/squad_one)
+/area/almayer/living/cryo_cells)
 "hS" = (
 /turf/closed/wall/almayer,
 /area/almayer/living/platoon_commander_rooms)
 "hW" = (
-/obj/structure/machinery/autodoc_console,
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/machinery/recharger,
+/obj/item/reagent_container/spray/cleaner,
 /turf/open/floor/almayer{
 	icon_state = "sterile_green"
 	},
 /area/almayer/medical)
-"hZ" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
-	name = "\improper Briefing Room"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/living/briefing)
-"ij" = (
-/obj/structure/surface/table/almayer,
-/obj/item/trash/ceramic_plate,
-/turf/open/floor/almayer,
-/area/almayer/squads/alpha/platoon_sergeant)
 "ik" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/line_nexter{
-	dir = 1;
-	id = "MTline";
-	pixel_y = 13
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
 	},
-/area/almayer/living/cafeteria_port)
-"io" = (
-/obj/structure/machinery/washing_machine,
-/obj/structure/machinery/washing_machine{
-	layer = 3.5;
-	pixel_y = 15
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1;
+	pixel_y = 1
 	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/living/grunt_rnr)
+/area/almayer/living/cafeteria_port)
 "ip" = (
 /obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
+	icon_state = "NE-out";
+	pixel_y = 2
 	},
 /obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "SE-out"
 	},
-/area/almayer/living/cryo_cells)
-"ir" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1;
-	pixel_y = 1
+/obj/structure/machinery/door/airlock/almayer/generic{
+	id = "Delta_1";
+	name = "\improper Bathroom"
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "test_floor4"
 	},
 /area/almayer/living/cryo_cells)
-"it" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
+"iy" = (
+/obj/structure/pipes/vents/pump{
+	dir = 8
 	},
-/area/almayer/squads/alpha/squad_two)
-"iv" = (
 /obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_x = -1;
-	pixel_y = 1
+	icon_state = "S"
 	},
 /obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
+	icon_state = "N";
+	pixel_y = 2
 	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
-/area/almayer/living/cryo_cells)
-"iy" = (
+/area/almayer/medical)
+"iA" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/item/device/flashlight/lamp,
+/turf/open/floor/almayer,
+/area/almayer/living/platoon_commander_rooms)
+"iC" = (
+/obj/structure/sign/safety/security{
+	pixel_x = 15;
+	pixel_y = -25
+	},
+/obj/structure/sign/safety/west{
+	pixel_x = 3;
+	pixel_y = -25
+	},
+/obj/structure/largecrate/random/barrel/blue,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hallways/port_hallway)
+"iE" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/item/spacecash/c10{
@@ -1027,16 +1043,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha/squad_one)
-"iA" = (
-/obj/structure/surface/table/reinforced/almayer_B,
-/obj/item/device/flashlight/lamp,
-/turf/open/floor/almayer,
-/area/almayer/living/platoon_commander_rooms)
-"iF" = (
-/turf/open/floor/almayer/uscm/directional/up_down{
-	dir = 5
-	},
-/area/almayer/living/briefing)
 "iG" = (
 /obj/structure/machinery/door/poddoor/almayer/open,
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -1048,6 +1054,20 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/port_hallway)
+"iL" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 1
+	},
+/obj/structure/machinery/light{
+	dir = 4
+	},
+/obj/structure/pipes/vents/scrubber,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hallways/port_hallway)
 "iN" = (
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -1059,51 +1079,66 @@
 	},
 /area/almayer/living/platoon_commander_rooms)
 "jb" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/structure/machinery/recharger,
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/obj/structure/machinery/light{
+	dir = 4
+	},
 /turf/open/floor/almayer{
 	icon_state = "sterile_green"
 	},
 /area/almayer/medical)
 "jc" = (
-/turf/closed/wall/almayer/outer,
-/area/almayer/squads/alpha/squad_two)
+/obj/structure/closet/firecloset,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/hallways/port_hallway)
 "je" = (
 /obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
+	icon_state = "E";
+	pixel_x = 1
 	},
-/turf/open/floor/almayer,
-/area/almayer/hallways/port_hallway)
+/obj/structure/machinery/camera/autoname/almayer{
+	dir = 8;
+	name = "ship-grade camera"
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hallways/hangar)
 "jf" = (
-/obj/structure/machinery/body_scanconsole,
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
 /turf/open/floor/almayer{
 	icon_state = "sterile_green"
 	},
 /area/almayer/medical)
 "jg" = (
-/obj/structure/surface/rack,
-/obj/item/ammo_magazine/flamer_tank,
-/obj/item/ammo_magazine/flamer_tank,
-/obj/item/weapon/gun/flamer{
-	current_mag = null;
-	pixel_y = 4
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/obj/item/device/motiondetector,
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/squads/alpha/squad_two)
+/area/almayer/medical)
 "jj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/prop/magazine/boots/n054{
-	pixel_x = 29
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out";
+	pixel_x = 1
 	},
-/obj/structure/closet/secure_closet/smartgunner,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/light,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/squad_two)
+/area/almayer/hallways/port_hallway)
 "jl" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SE-out";
@@ -1114,31 +1149,40 @@
 	},
 /area/almayer/hallways/hangar)
 "jo" = (
-/turf/open/floor/almayer/uscm/directional/up_down{
-	dir = 8
-	},
+/turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/briefing)
-"jG" = (
-/obj/structure/surface/rack,
-/obj/item/weapon/gun/shotgun/pump/special{
-	pixel_y = 8
+"js" = (
+/obj/structure/machinery/firealarm{
+	pixel_y = 28
 	},
-/obj/item/storage/box/nade_box{
-	pixel_x = 4;
-	pixel_y = -2
+/obj/structure/largecrate/supply/ammo/m41amk1,
+/obj/structure/largecrate/supply/ammo/m41amk1{
+	pixel_x = 3;
+	pixel_y = 10
 	},
-/obj/item/ammo_magazine/shotgun/buckshot/special,
-/obj/item/device/motiondetector,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/squads/alpha/squad_two)
-"jM" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/squads/alpha/squad_one)
+"jG" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out";
+	pixel_x = -1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 2
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/medical)
 "jO" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -1151,48 +1195,69 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"jS" = (
-/obj/structure/bed/chair/comfy,
+"jU" = (
 /obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1;
-	pixel_y = 1
+	icon_state = "S"
 	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
 	},
-/area/almayer/living/cafeteria_port)
-"jU" = (
-/obj/structure/machinery/chem_dispenser,
-/obj/item/reagent_container/glass/beaker/bluespace,
 /turf/open/floor/almayer{
-	icon_state = "sterile_green"
+	icon_state = "dark_sterile"
 	},
 /area/almayer/medical)
 "jV" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 2
+	},
+/obj/structure/machinery/door/airlock/almayer/medical{
+	dir = 1;
+	name = "\improper Medical Subsection";
+	req_one_access = list()
+	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
 	},
-/area/almayer/living/briefing)
+/area/almayer/medical)
 "kg" = (
-/turf/closed/wall/almayer,
-/area/almayer/living/grunt_rnr)
-"kl" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/alarm/almayer{
-	dir = 1
-	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "test_floor4"
 	},
-/area/almayer/living/cafeteria_port)
+/area/almayer/living/briefing)
 "km" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
 	},
 /area/almayer/hallways/hangar)
+"kq" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/cryo_cells)
+"kr" = (
+/obj/structure/machinery/cryopod/right,
+/obj/structure/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/living/cryo_cells)
 "kB" = (
 /obj/structure/machinery/door/airlock/almayer/engineering{
 	name = "\improper Engineering Hallway";
@@ -1216,11 +1281,14 @@
 	},
 /area/almayer/engineering)
 "kI" = (
-/obj/structure/largecrate/random/barrel/blue,
-/turf/open/floor/almayer{
-	icon_state = "plate"
+/obj/structure/machinery/light{
+	dir = 8
 	},
-/area/almayer/hallways/port_hallway)
+/obj/structure/bed/chair{
+	dir = 4
+	},
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/platoon_sergeant)
 "kU" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -1239,42 +1307,68 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"kW" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/almayer/living/grunt_rnr)
+"kX" = (
+/obj/structure/machinery/power/apc/almayer{
+	dir = 1
+	},
+/obj/structure/prop/invuln/lattice_prop{
+	icon_state = "lattice2";
+	pixel_x = 16;
+	pixel_y = 16
+	},
+/obj/structure/prop/invuln/lattice_prop{
+	dir = 1;
+	icon_state = "lattice-simple";
+	pixel_x = 16;
+	pixel_y = -15
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hallways/port_hallway)
+"lc" = (
+/obj/structure/closet/cryo,
+/obj/structure/closet/cryo,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/cryo_cells)
 "ld" = (
+/obj/structure/closet,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/item/tool/screwdriver,
+/obj/structure/machinery/light{
+	unacidable = 1;
+	unslashable = 1
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/squad_one)
+/area/almayer/living/grunt_rnr)
 "lg" = (
-/obj/structure/machinery/medical_pod/bodyscanner,
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
-	icon_state = "sterile_green"
+	icon_state = "cargo_arrow"
 	},
-/area/almayer/medical)
+/area/almayer/hallways/starboard_hallway)
 "lh" = (
 /obj/structure/machinery/floodlight/landing,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
 "lm" = (
-/obj/structure/machinery/disposal,
+/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	dir = 1;
+	icon_state = "cargo_arrow"
 	},
-/area/almayer/squads/alpha/platoon_sergeant)
+/area/almayer/hallways/hangar)
 "lo" = (
-/obj/structure/machinery/door/poddoor/almayer/locked{
-	name = "\improper Hangar Lockdown Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1;
+	pixel_y = 1
 	},
+/turf/open/floor/almayer,
 /area/almayer/hallways/port_hallway)
 "ly" = (
 /obj/effect/decal/cleanable/dirt,
@@ -1301,82 +1395,83 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/starboard_hallway)
 "lG" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
+/obj/structure/bed/chair/comfy{
+	dir = 1
 	},
-/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
-/area/almayer/living/cryo_cells)
-"lI" = (
-/turf/open/floor/almayer/uscm/directional/up_down,
-/area/almayer/living/briefing)
+/area/almayer/living/cafeteria_port)
 "lQ" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep,
+/obj/structure/machinery/firealarm{
+	pixel_y = 28
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/squads/alpha/squad_two)
 "lS" = (
-/obj/structure/machinery/cm_vending/sorted/medical/no_access,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "sterile_green"
-	},
-/area/almayer/medical)
-"lU" = (
-/obj/structure/bed/chair{
-	dir = 1
+/obj/structure/surface/rack,
+/obj/item/device/flashlight/lamp/on{
+	pixel_y = 13
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/squads/alpha/platoon_sergeant)
-"mc" = (
+"lW" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/camera/autoname/almayer{
-	dir = 8;
-	name = "ship-grade camera"
+/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_two)
+"mc" = (
+/obj/structure/bed{
+	can_buckle = 0
+	},
+/obj/item/bedsheet/brown{
+	layer = 3.4
 	},
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
+	icon_state = "plate"
 	},
-/area/almayer/living/cryo_cells)
+/area/almayer/squads/alpha/platoon_sergeant)
 "me" = (
-/obj/structure/machinery/medical_pod/sleeper,
-/turf/open/floor/almayer{
-	icon_state = "sterile_green"
+/obj/structure/machinery/door/airlock/almayer/command/reinforced{
+	dir = 1;
+	name = "\improper Briefing Room"
 	},
-/area/almayer/medical)
-"mg" = (
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
 	},
-/turf/open/floor/almayer,
 /area/almayer/living/briefing)
-"mk" = (
-/obj/structure/largecrate/random/case/small,
-/obj/item/toy/deck{
+"mf" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/surface/table/almayer,
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/item/storage/fancy/cigarettes/lucky_strikes{
 	pixel_x = -6;
-	pixel_y = 6
+	pixel_y = 12
 	},
-/obj/structure/sign/poster{
-	desc = "One of those hot, tanned babes back the beaches of good ol' Earth.";
-	icon_state = "poster12";
-	name = "Beach Babe Pinup";
-	pixel_x = -30;
-	pixel_y = 6;
-	serial_number = 12
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/squads/alpha/squad_two)
+"mg" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
 	},
-/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/grunt_rnr)
+/area/almayer/living/briefing)
+"mk" = (
+/turf/open/floor/almayer{
+	dir = 8;
+	icon_state = "cargo_arrow"
+	},
+/area/almayer/living/briefing)
 "ml" = (
 /obj/structure/ship_ammo/minirocket,
 /turf/open/floor/almayer{
@@ -1390,23 +1485,13 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
-"mr" = (
+"ms" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
+	dir = 4;
 	icon_state = "cargo_arrow"
 	},
-/area/almayer/living/grunt_rnr)
-"ms" = (
-/obj/structure/bed{
-	can_buckle = 0
-	},
-/obj/item/bedsheet/brown{
-	layer = 3.4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/alpha/platoon_sergeant)
+/area/almayer/hallways/port_hallway)
 "mB" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -1419,20 +1504,19 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"mG" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
+"mD" = (
+/obj/structure/machinery/door/airlock/almayer/generic,
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
-/area/almayer/squads/alpha/platoon_sergeant)
-"mJ" = (
-/obj/structure/surface/table/almayer,
-/obj/item/spacecash/c10{
-	pixel_x = 5;
-	pixel_y = 7
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
 	},
-/turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha/squad_one)
+"mR" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/squad_two)
 "mW" = (
 /obj/structure/machinery/landinglight/ds1,
 /turf/open/floor/almayer{
@@ -1440,7 +1524,7 @@
 	},
 /area/almayer/hallways/hangar)
 "mY" = (
-/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/supply,
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
 	pixel_x = 1
@@ -1453,6 +1537,14 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/living/cryo_cells)
+"nb" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
+	name = "\improper Squad Two Armoury"
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/squads/alpha/squad_two)
 "nd" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -1467,35 +1559,51 @@
 	},
 /area/almayer/hallways/hangar)
 "ni" = (
-/obj/structure/machinery/cm_vending/clothing/medic/alpha,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/bed/chair/comfy/alpha{
+	dir = 4
+	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green"
+	icon_state = "plate"
 	},
-/area/almayer/medical)
+/area/almayer/living/briefing)
 "nj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/item/tool/wrench{
-	pixel_y = 7
+/obj/structure/window/reinforced{
+	dir = 4;
+	pixel_x = -2;
+	pixel_y = 4
 	},
-/obj/structure/machinery/camera/autoname/almayer{
+/obj/structure/window/reinforced{
 	dir = 8;
-	name = "ship-grade camera"
+	layer = 3.3;
+	pixel_y = 4
 	},
-/obj/structure/sign/poster{
-	desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE.";
-	icon_state = "poster11";
-	name = "YOU ALWAYS KNOW A WORKING JOE.";
-	pixel_x = -4;
-	pixel_y = 32;
-	serial_number = 11
+/obj/structure/bed{
+	can_buckle = 0
+	},
+/obj/structure/bed{
+	buckling_y = 13;
+	layer = 3.5;
+	pixel_y = 13
+	},
+/obj/item/bedsheet/brown{
+	layer = 3.4
+	},
+/obj/item/bedsheet/brown{
+	pixel_y = 13
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/prop/invuln/lattice_prop{
+	icon_state = "lattice1";
+	pixel_x = 16;
+	pixel_y = -15
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/squad_one)
+/area/almayer/living/grunt_rnr)
 "ns" = (
-/obj/structure/closet/cryo,
+/obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/cryo,
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -1506,47 +1614,30 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/starboard_hallway)
-"nC" = (
-/obj/structure/machinery/firealarm{
-	pixel_y = 28
-	},
-/obj/structure/filingcabinet/chestdrawer{
-	density = 0;
-	pixel_x = -8;
-	pixel_y = 16
-	},
-/obj/structure/filingcabinet{
-	density = 0;
-	pixel_x = 8;
-	pixel_y = 16
-	},
+"nG" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
-/area/almayer/squads/alpha/platoon_sergeant)
+/area/almayer/squads/alpha/squad_one)
 "nH" = (
 /obj/structure/machinery/light,
 /turf/open/floor/almayer,
 /area/almayer/hallways/starboard_hallway)
 "nK" = (
-/obj/structure/bed/chair/comfy{
-	dir = 1
-	},
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_x = -1;
-	pixel_y = 2
+/obj/structure/machinery/power/apc/almayer{
+	dir = 1
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "plate"
 	},
 /area/almayer/living/cafeteria_port)
 "nM" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/structure/machinery/computer/med_data/laptop,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/surface/table/reinforced/almayer_B,
 /turf/open/floor/almayer{
-	icon_state = "sterile_green"
+	icon_state = "plate"
 	},
-/area/almayer/medical)
+/area/almayer/living/briefing)
 "nN" = (
 /obj/structure/largecrate/random/secure,
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -1554,6 +1645,15 @@
 	icon_state = "cargo"
 	},
 /area/almayer/hallways/hangar)
+"nR" = (
+/obj/structure/machinery/cryopod{
+	layer = 3.1;
+	pixel_y = 13
+	},
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/living/cryo_cells)
 "nT" = (
 /obj/structure/machinery/landinglight/ds1/delaytwo{
 	dir = 4
@@ -1571,28 +1671,30 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"nY" = (
-/obj/structure/machinery/shower{
+"nV" = (
+/obj/structure/machinery/light{
 	dir = 1
 	},
-/obj/structure/window/reinforced{
-	dir = 4;
-	health = 80
-	},
-/obj/structure/window/reinforced{
-	dir = 8;
-	health = 80
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
 	},
-/turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/cryo_cells)
+"nY" = (
+/obj/structure/bed/chair/comfy/alpha{
+	dir = 1
+	},
+/turf/open/floor/almayer,
+/area/almayer/living/briefing)
 "oa" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
-	name = "\improper Sergeants Room"
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/bed/chair/comfy/alpha{
+	dir = 8
 	},
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/platoon_sergeant)
+/area/almayer/living/briefing)
 "oe" = (
 /obj/structure/sign/safety/bulkhead_door{
 	pixel_y = -29
@@ -1601,35 +1703,39 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"of" = (
-/obj/structure/bed/chair{
-	dir = 4
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/grunt_rnr)
 "og" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/almayer/squads/alpha/squad_two)
-"ok" = (
-/obj/structure/machinery/alarm/almayer{
+/obj/structure/machinery/light{
 	dir = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/platoon_sergeant)
+/area/almayer/hallways/port_hallway)
+"oh" = (
+/obj/structure/largecrate/random/barrel/blue,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hallways/port_hallway)
 "ol" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
+/turf/open/floor/almayer/uscm/directional{
+	dir = 8;
+	icon_state = "logo_c"
 	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/grunt_rnr)
+/area/almayer/living/briefing)
+"ot" = (
+/obj/structure/surface/rack,
+/obj/item/weapon/gun/rifle/m41aMK1{
+	pixel_y = 7
+	},
+/obj/item/weapon/gun/rifle/m41aMK1,
+/obj/item/weapon/gun/rifle/m41aMK1{
+	pixel_y = -7
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_two)
 "ou" = (
 /turf/open/floor/almayer_hull{
 	dir = 1;
@@ -1637,12 +1743,15 @@
 	},
 /area/almayer/hallways/hangar)
 "ov" = (
-/obj/structure/surface/table/almayer,
-/obj/item/device/megaphone,
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/storage/box/pillbottles,
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "sterile_green"
 	},
-/area/almayer/living/briefing)
+/area/almayer/medical)
 "oA" = (
 /obj/structure/machinery/shower{
 	dir = 8
@@ -1652,15 +1761,21 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/platoon_commander_rooms)
 "oH" = (
-/obj/structure/machinery/light,
+/obj/structure/machinery/light{
+	dir = 4
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/living/cafeteria_port)
 "oJ" = (
-/obj/structure/machinery/disposal,
-/turf/open/floor/almayer,
-/area/almayer/living/briefing)
+/obj/structure/machinery/medical_pod/bodyscanner{
+	pixel_y = 6
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical)
 "oK" = (
 /obj/structure/machinery/door/poddoor/almayer/open,
 /turf/open/floor/almayer{
@@ -1668,66 +1783,86 @@
 	},
 /area/almayer/hallways/hangar)
 "oL" = (
-/obj/structure/surface/table/almayer,
-/obj/item/tool/kitchen/tray{
-	pixel_y = -10
-	},
-/obj/item/reagent_container/food/condiment/hotsauce/tabasco{
-	pixel_x = 7;
-	pixel_y = -2
-	},
-/obj/item/storage/box/cups{
-	pixel_x = -5;
-	pixel_y = -10
+/obj/structure/platform_decoration{
+	dir = 8
 	},
+/obj/structure/platform_decoration,
 /obj/effect/decal/warning_stripes{
-	icon_state = "W";
+	icon_state = "NW-out";
 	pixel_x = -1;
-	pixel_y = 1
+	pixel_y = 2
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "plate"
 	},
-/area/almayer/living/cafeteria_port)
+/area/almayer/living/briefing)
 "oM" = (
 /obj/structure/bed/chair/comfy{
-	dir = 1
+	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/safety/rewire{
+	pixel_x = 14;
+	pixel_y = 29
+	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "plate"
 	},
 /area/almayer/living/cafeteria_port)
-"oR" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
+"oQ" = (
+/obj/item/prop/helmetgarb/gunoil{
+	pixel_x = 7;
+	pixel_y = 6
+	},
+/obj/item/prop/helmetgarb/gunoil,
+/obj/structure/surface/table/almayer,
+/obj/structure/sign/poster{
+	desc = "Koorlander Golds, lovingly machine rolled for YOUR pleasure.";
+	icon_state = "poster10";
+	name = "Koorlander Gold Poster";
+	pixel_x = 29;
+	pixel_y = 6;
+	serial_number = 10
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/cryo_cells)
-"pl" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
+/area/almayer/squads/alpha/squad_one)
+"pf" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/surface/table/almayer,
+/obj/item/ammo_box/magazine/heap/empty,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/squads/alpha/squad_two)
+"pl" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/hangar)
 "pt" = (
+/obj/structure/machinery/door/poddoor/almayer/locked{
+	dir = 4;
+	name = "\improper Hangar Lockdown Blast Door"
+	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "test_floor4"
 	},
-/area/almayer/squads/alpha/squad_two)
+/area/almayer/hallways/port_hallway)
 "pw" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
+/obj/effect/decal/cleanable/dirt,
 /obj/structure/prop/invuln/lattice_prop{
 	dir = 1;
 	icon_state = "lattice-simple";
 	pixel_x = 16;
 	pixel_y = -15
 	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/port_hallway)
+/turf/open/floor/almayer,
+/area/almayer/living/grunt_rnr)
+"pB" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_two)
 "pD" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -1738,11 +1873,9 @@
 	},
 /area/almayer/hallways/hangar)
 "pF" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
+/obj/structure/bed/chair,
 /turf/open/floor/almayer,
-/area/almayer/hallways/port_hallway)
+/area/almayer/squads/alpha/platoon_sergeant)
 "pG" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -1756,46 +1889,56 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"pI" = (
-/turf/open/floor/almayer/uscm/directional/up_down{
-	dir = 10
-	},
-/area/almayer/living/briefing)
+"pJ" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/closed/wall/almayer/outer,
+/area/almayer/squads/alpha/squad_one)
 "pO" = (
+/obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 2
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/almayer/hallways/hangar)
-"pP" = (
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/platoon_sergeant)
-"pZ" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/obj/structure/machinery/light{
-	dir = 4
+/area/almayer/hallways/hangar)
+"pW" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 5
 	},
+/obj/structure/largecrate/random/barrel/blue,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hallways/port_hallway)
+"pZ" = (
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	dir = 4;
+	icon_state = "cargo_arrow"
 	},
 /area/almayer/hallways/port_hallway)
 "qa" = (
-/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad,
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	dir = 1;
+	icon_state = "cargo_arrow"
 	},
 /area/almayer/squads/alpha/squad_one)
+"qf" = (
+/obj/structure/machinery/cryopod/right{
+	pixel_y = 6
+	},
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/living/cryo_cells)
 "qh" = (
-/obj/structure/foamed_metal,
-/turf/open/floor/plating,
-/area/almayer/hallways/hangar)
+/obj/structure/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "qi" = (
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
@@ -1810,48 +1953,36 @@
 	icon_state = "plating"
 	},
 /area/almayer/engineering)
-"qp" = (
-/obj/structure/machinery/firealarm{
-	pixel_y = 28
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 2
+"qm" = (
+/obj/structure/machinery/cryopod/right{
+	layer = 3.1;
+	pixel_y = 13
 	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 2
+/turf/open/floor/almayer{
+	icon_state = "cargo"
 	},
+/area/almayer/living/cryo_cells)
+"qp" = (
+/obj/structure/window/framed/almayer,
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "test_floor4"
 	},
 /area/almayer/living/cryo_cells)
 "qu" = (
-/obj/structure/surface/table/reinforced/prison,
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
+	dir = 1;
+	name = "\improper Briefing Room"
+	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green"
+	icon_state = "test_floor4"
 	},
-/area/almayer/medical)
+/area/almayer/living/briefing)
 "qv" = (
-/obj/item/frame/camera{
-	desc = "The Staff Officer insisted he needed to monitor everyone at all times.";
-	layer = 2.9;
-	name = "broken camera";
-	pixel_x = -7;
-	pixel_y = -6
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+/obj/structure/bed/chair/comfy/alpha{
+	dir = 8
 	},
-/area/almayer/living/cryo_cells)
+/turf/open/floor/almayer,
+/area/almayer/living/briefing)
 "qw" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
@@ -1861,13 +1992,24 @@
 "qA" = (
 /turf/closed/wall/almayer,
 /area/almayer/squads/alpha/platoon_sergeant)
-"qH" = (
+"qD" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/vents/scrubber,
+/obj/structure/sign/poster{
+	desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE.";
+	icon_state = "poster11";
+	name = "YOU ALWAYS KNOW A WORKING JOE.";
+	pixel_x = 27;
+	serial_number = 11
+	},
+/obj/structure/machinery/disposal{
+	density = 0;
+	layer = 3.2;
+	pixel_y = 16
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/platoon_sergeant)
+/area/almayer/squads/alpha/squad_two)
 "qI" = (
 /obj/structure/machinery/landinglight/ds1/delayone{
 	dir = 8
@@ -1877,96 +2019,28 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"qK" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/alpha/squad_one)
 "qQ" = (
 /turf/open/floor/almayer{
-	dir = 1;
 	icon_state = "cargo_arrow"
 	},
-/area/almayer/squads/alpha/squad_two)
+/area/almayer/squads/alpha/platoon_sergeant)
 "qR" = (
-/obj/structure/prop/invuln/overhead_pipe{
-	pixel_x = -7;
-	pixel_y = 12
-	},
-/obj/structure/prop/invuln/overhead_pipe{
-	pixel_x = -7;
-	pixel_y = -4
-	},
-/obj/structure/sign/safety/water{
-	pixel_x = 14;
-	pixel_y = 24
-	},
-/obj/item/storage/backpack/marine/satchel{
-	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
-	icon = 'icons/obj/janitor.dmi';
-	icon_state = "trashbag3";
-	name = "trash bag";
-	pixel_x = -7;
-	pixel_y = 14
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/living/cryo_cells)
-"qS" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1
-	},
+/obj/structure/machinery/cm_vending/sorted/marine_food,
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
-/area/almayer/living/cryo_cells)
+/area/almayer/living/cafeteria_port)
 "qT" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/machinery/camera/autoname/almayer{
-	dir = 8;
-	name = "ship-grade camera"
+/turf/open/floor/almayer/uscm/directional{
+	dir = 9
 	},
-/turf/open/floor/almayer,
-/area/almayer/hallways/hangar)
+/area/almayer/living/briefing)
 "qU" = (
 /obj/structure/flora/pottedplant{
 	icon_state = "pottedplant_21"
 	},
 /turf/open/floor/almayer,
 /area/almayer/living/platoon_commander_rooms)
-"qV" = (
-/obj/structure/surface/table/almayer,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/camera/autoname/almayer{
-	dir = 8;
-	name = "ship-grade camera"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/living/cafeteria_port)
-"qX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/alarm/almayer{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hallways/port_hallway)
 "qZ" = (
 /obj/structure/machinery/power/fusion_engine{
 	name = "\improper S-52 fusion reactor 3"
@@ -1976,6 +2050,14 @@
 	icon_state = "plating"
 	},
 /area/almayer/engineering)
+"rb" = (
+/obj/structure/machinery/cryopod{
+	pixel_y = 6
+	},
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/living/cryo_cells)
 "rd" = (
 /obj/structure/closet/cryo,
 /turf/open/floor/almayer{
@@ -1992,13 +2074,9 @@
 	},
 /area/almayer/hallways/hangar)
 "rh" = (
-/obj/effect/landmark/late_join/alpha,
-/obj/effect/landmark/start/marine/alpha,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/cryo_cells)
-"ri" = (
-/obj/structure/machinery/light{
-	dir = 4
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out";
+	pixel_x = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
@@ -2011,151 +2089,121 @@
 	},
 /area/almayer/hallways/hangar)
 "rl" = (
-/obj/structure/machinery/light{
+/turf/open/floor/almayer/uscm/directional{
 	dir = 1
 	},
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/storage/box/pillbottles,
-/turf/open/floor/almayer{
-	icon_state = "sterile_green"
-	},
-/area/almayer/medical)
+/area/almayer/living/briefing)
 "rr" = (
-/obj/structure/machinery/door/poddoor/almayer/locked{
-	dir = 4;
-	name = "\improper Hangar Lockdown Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/hallways/port_hallway)
-"ry" = (
-/obj/structure/surface/rack,
-/obj/item/weapon/gun/rifle/m41aMK1{
-	pixel_y = 7
+/turf/open/floor/almayer/uscm/directional{
+	dir = 5
 	},
-/obj/item/weapon/gun/rifle/m41aMK1,
-/obj/item/weapon/gun/rifle/m41aMK1{
-	pixel_y = -7
+/area/almayer/living/briefing)
+"rx" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/squads/alpha/squad_two)
-"rA" = (
-/obj/structure/machinery/light{
+/area/almayer/living/cafeteria_port)
+"ry" = (
+/obj/structure/bed/chair/comfy/alpha{
 	dir = 4
 	},
 /turf/open/floor/almayer,
-/area/almayer/squads/alpha/squad_two)
-"rE" = (
-/obj/structure/machinery/light{
-	dir = 4
+/area/almayer/living/briefing)
+"rA" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/janitorialcart,
+/obj/item/tool/mop{
+	pixel_x = -1;
+	pixel_y = -10
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/platoon_sergeant)
+/area/almayer/hallways/port_hallway)
 "rH" = (
-/turf/closed/wall/almayer/white/hull,
-/area/almayer/medical)
-"rJ" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/bed/chair{
-	dir = 8
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/turf/open/floor/almayer,
 /area/almayer/squads/alpha/platoon_sergeant)
-"rM" = (
-/obj/structure/cargo_container/wy/mid,
-/turf/open/floor/almayer,
-/area/almayer/hallways/hangar)
-"rO" = (
-/obj/effect/landmark/start/marine/tl/alpha,
-/obj/effect/landmark/late_join/alpha,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/cryo_cells)
-"rR" = (
-/obj/structure/sign/safety/ammunition{
-	pixel_x = 14;
-	pixel_y = -28
+"rI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/surface/table/almayer,
+/obj/item/toy/beach_ball/holoball,
+/obj/structure/sign/poster{
+	desc = "One of those hot, tanned babes back the beaches of good ol' Earth.";
+	icon_state = "poster12";
+	name = "Beach Babe Pinup";
+	pixel_x = 28;
+	pixel_y = 5;
+	serial_number = 12
 	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
+/obj/structure/sign/poster{
+	desc = "This poster features Audrey Rainwater standing in a jacuzzi. She was the July 2182 centerfold in House Bunny Gentleman's Magazine. Don't ask how you know that.";
+	icon_state = "poster16";
+	name = "'Miss July' Pinup";
+	pixel_x = 32;
+	serial_number = 16
 	},
-/area/almayer/hallways/port_hallway)
-"rV" = (
-/obj/structure/sign/safety/bulkhead_door{
-	pixel_x = -19
+/obj/item/storage/fancy/cigarettes/lucky_strikes{
+	pixel_x = 6;
+	pixel_y = 16
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/hallways/port_hallway)
+/area/almayer/squads/alpha/squad_one)
+"rJ" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer,
+/area/almayer/living/briefing)
+"rM" = (
+/obj/structure/cargo_container/wy/mid,
+/turf/open/floor/almayer,
+/area/almayer/hallways/hangar)
+"rV" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer/uscm/directional,
+/area/almayer/living/briefing)
 "rX" = (
-/obj/structure/sign/safety/rewire{
-	pixel_x = 14;
-	pixel_y = 29
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet,
+/obj/structure/machinery/alarm/almayer{
+	dir = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/hallways/port_hallway)
+/area/almayer/living/grunt_rnr)
 "rY" = (
 /turf/open/floor/almayer{
 	icon_state = "bluefull"
 	},
 /area/almayer/living/platoon_commander_rooms)
-"sa" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hallways/starboard_hallway)
-"sb" = (
-/obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = -2;
-	pixel_y = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8;
-	layer = 3.3;
-	pixel_y = 4
-	},
-/obj/structure/bed{
-	can_buckle = 0
-	},
-/obj/structure/bed{
-	buckling_y = 13;
-	layer = 3.5;
-	pixel_y = 13
+"rZ" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/obj/item/bedsheet/brown{
-	layer = 3.4
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
 	},
-/obj/item/bedsheet/brown{
-	pixel_y = 13
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
 	},
+/area/almayer/living/cryo_cells)
+"sa" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/item/toy/farwadoll{
-	desc = "A USCM approved plush doll. It's not soft and hardly comforting!";
-	force = 15;
-	icon_state = "therapyred";
-	layer = 4.1;
-	name = "Sergeant Huggs";
-	pixel_y = 15;
-	throwforce = 15
-	},
-/obj/item/clothing/head/cmcap{
-	layer = 4.1;
-	pixel_x = -1;
-	pixel_y = 22
-	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/grunt_rnr)
+/area/almayer/hallways/starboard_hallway)
 "sc" = (
 /obj/structure/pipes/vents/scrubber,
 /obj/effect/decal/cleanable/dirt,
@@ -2163,51 +2211,51 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"sg" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
+"sf" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
 /turf/open/floor/almayer,
 /area/almayer/squads/alpha/squad_one)
-"si" = (
-/obj/structure/bed/chair/comfy{
-	dir = 8
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
+"sg" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
+	name = "\improper Dorms"
 	},
+/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "test_floor4"
 	},
-/area/almayer/living/cafeteria_port)
+/area/almayer/living/grunt_rnr)
 "sk" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
+/obj/structure/machinery/power/apc/almayer{
+	dir = 8
 	},
-/obj/structure/machinery/light,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/hallways/port_hallway)
+/area/almayer/living/grunt_rnr)
 "sm" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/storage/box/bodybags,
+/turf/open/floor/almayer/uscm/directional{
+	dir = 6
+	},
+/area/almayer/living/briefing)
+"so" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "sterile_green"
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 5
 	},
-/area/almayer/medical)
+/turf/open/floor/almayer,
+/area/almayer/hallways/port_hallway)
 "sv" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/cryo,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/cryo_cells)
+/area/almayer/living/briefing)
 "sy" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -2227,12 +2275,6 @@
 "sI" = (
 /turf/closed/wall/almayer/outer,
 /area/almayer/living/cryo_cells)
-"sJ" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
-	},
-/area/almayer/living/grunt_rnr)
 "sK" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
@@ -2242,33 +2284,51 @@
 /area/almayer/hallways/starboard_hallway)
 "sN" = (
 /obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
+	icon_state = "SE-out";
+	pixel_x = 1
 	},
 /obj/structure/machinery/light{
 	dir = 4
 	},
-/obj/structure/pipes/vents/scrubber,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/hallways/port_hallway)
-"sR" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
-	name = "\improper Squad One Armoury"
+"sO" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
 	},
+/area/almayer/living/cafeteria_port)
+"sR" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/grunt_rnr)
+"sS" = (
+/obj/structure/surface/table/almayer,
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
+"sU" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_x = -1;
+	pixel_y = 2
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 2
 	},
-/area/almayer/squads/alpha/squad_one)
-"sS" = (
-/obj/structure/bed/chair/comfy,
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
-/area/almayer/living/cafeteria_port)
+/area/almayer/living/cryo_cells)
+"sV" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/squads/alpha/squad_two)
 "sY" = (
 /obj/structure/closet/secure_closet/personal/cabinet{
 	req_access = null
@@ -2277,58 +2337,50 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/platoon_commander_rooms)
-"to" = (
-/obj/structure/prop/invuln/lifeboat_hatch_placeholder,
-/turf/open/floor/almayer,
-/area/almayer/hallways/hangar)
-"tr" = (
+"ti" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/cryo_cells)
+"to" = (
+/obj/structure/prop/invuln/lifeboat_hatch_placeholder,
+/turf/open/floor/almayer,
+/area/almayer/hallways/hangar)
+"tr" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
+	dir = 5
 	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/port_hallway)
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/platoon_sergeant)
 "tv" = (
 /obj/structure/flora/pottedplant{
 	icon_state = "pottedplant_18"
 	},
 /turf/open/floor/almayer,
 /area/almayer/living/platoon_commander_rooms)
-"tA" = (
-/obj/structure/filingcabinet/chestdrawer{
-	density = 0;
-	pixel_x = -8;
-	pixel_y = 16
-	},
-/obj/structure/filingcabinet{
-	density = 0;
-	pixel_x = 8;
-	pixel_y = 16
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
+"ty" = (
+/obj/structure/surface/table/almayer,
+/obj/item/storage/box/pdt_kit{
+	pixel_x = 7;
+	pixel_y = 9
 	},
-/area/almayer/squads/alpha/platoon_sergeant)
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/squads/alpha/squad_two)
 "tG" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
 "tT" = (
+/obj/structure/surface/table/almayer,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
-	},
-/area/almayer/living/cryo_cells)
-"tU" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/structure/bed/chair/comfy/alpha{
-	dir = 1
-	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -2340,17 +2392,13 @@
 	},
 /area/almayer/hallways/hangar)
 "tX" = (
-/obj/structure/bed/chair/comfy{
-	dir = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 2
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/vents/scrubber,
+/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
+	pixel_y = 25
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "plate"
 	},
 /area/almayer/living/cafeteria_port)
 "ua" = (
@@ -2361,6 +2409,12 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hallways/hangar)
+"ub" = (
+/obj/structure/machinery/light,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/cafeteria_port)
 "ug" = (
 /obj/structure/machinery/camera/autoname/almayer{
 	dir = 4;
@@ -2379,43 +2433,89 @@
 /obj/structure/machinery/faxmachine/uscm/command/capt,
 /turf/open/floor/almayer,
 /area/almayer/living/platoon_commander_rooms)
-"uw" = (
-/obj/effect/decal/cleanable/dirt,
+"up" = (
+/obj/structure/bed/chair/comfy{
+	dir = 1
+	},
 /obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 2
+	},
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/cafeteria_port)
+"uu" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
 	},
-/area/almayer/hallways/port_hallway)
-"uA" = (
-/obj/structure/closet,
 /obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer,
+/area/almayer/hallways/port_hallway)
+"uw" = (
 /obj/structure/machinery/light{
-	unacidable = 1;
-	unslashable = 1
+	dir = 8
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/grunt_rnr)
-"uF" = (
-/obj/structure/surface/table/almayer,
+/area/almayer/living/briefing)
+"uA" = (
+/obj/structure/machinery/light,
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/living/briefing)
+"uF" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/machinery/computer/crew/alt,
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
+	},
+/area/almayer/medical)
 "uG" = (
 /obj/item/tool/warning_cone,
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
 "uH" = (
-/turf/closed/wall/almayer,
-/area/almayer/squads/alpha/squad_one)
-"uO" = (
+/obj/structure/largecrate/random/case/small,
+/obj/item/toy/deck{
+	pixel_x = -6;
+	pixel_y = 6
+	},
+/obj/structure/sign/poster{
+	desc = "One of those hot, tanned babes back the beaches of good ol' Earth.";
+	icon_state = "poster12";
+	name = "Beach Babe Pinup";
+	pixel_x = -30;
+	pixel_y = 6;
+	serial_number = 12
+	},
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "plate"
 	},
 /area/almayer/living/grunt_rnr)
+"uO" = (
+/obj/structure/surface/table/almayer,
+/obj/item/device/flashlight/lamp{
+	pixel_x = 11;
+	pixel_y = 5
+	},
+/obj/item/paper_bin/uscm{
+	pixel_x = -4;
+	pixel_y = 7
+	},
+/obj/item/tool/pen{
+	pixel_x = -5;
+	pixel_y = 4
+	},
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/platoon_sergeant)
 "vb" = (
 /obj/structure/surface/table/reinforced/almayer_B{
 	layer = 2.0;
@@ -2424,65 +2524,25 @@
 /turf/closed/wall/almayer,
 /area/almayer/living/platoon_commander_rooms)
 "vk" = (
+/obj/structure/machinery/light,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/chem_master,
 /turf/open/floor/almayer{
-	icon_state = "sterile_green"
-	},
-/area/almayer/medical)
-"vo" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/computer/cameras/wooden_tv/prop{
 	dir = 8;
-	layer = 3.2;
-	pixel_x = -3;
-	pixel_y = 6
-	},
-/obj/structure/sign/poster{
-	desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE.";
-	icon_state = "poster11";
-	name = "YOU ALWAYS KNOW A WORKING JOE.";
-	pixel_x = 27;
-	serial_number = 11
-	},
-/obj/item/trash/pistachios{
-	layer = 2;
-	pixel_x = 6;
-	pixel_y = -6
-	},
-/obj/structure/machinery/recharger{
-	layer = 3.1;
-	pixel_y = 22
-	},
-/obj/item/ammo_magazine/rifle/incendiary{
-	current_rounds = 0;
-	desc = "A 10mm assault rifle magazine with ':D' drawn on the side";
-	pixel_x = 10;
-	pixel_y = 2
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "cargo_arrow"
 	},
-/area/almayer/living/grunt_rnr)
+/area/almayer/living/briefing)
 "vp" = (
-/obj/item/prop/helmetgarb/gunoil{
-	pixel_x = 7;
-	pixel_y = 6
-	},
-/obj/item/prop/helmetgarb/gunoil,
-/obj/structure/surface/table/almayer,
-/obj/structure/sign/poster{
-	desc = "Koorlander Golds, lovingly machine rolled for YOUR pleasure.";
-	icon_state = "poster10";
-	name = "Koorlander Gold Poster";
-	pixel_x = 29;
-	pixel_y = 6;
-	serial_number = 10
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
+/obj/structure/prop/invuln/lattice_prop{
+	dir = 1;
+	icon_state = "lattice-simple";
+	pixel_x = 16;
+	pixel_y = -15
 	},
-/area/almayer/squads/alpha/squad_one)
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hallways/port_hallway)
 "vt" = (
 /obj/structure/machinery/power/apc/almayer{
 	dir = 1
@@ -2492,60 +2552,46 @@
 	},
 /area/almayer/living/platoon_commander_rooms)
 "vB" = (
-/obj/structure/bed/chair/comfy,
-/obj/structure/pipes/standard/simple/hidden/supply,
 /obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/living/cafeteria_port)
-"vE" = (
-/obj/structure/sign/safety/cryo{
-	pixel_x = 6;
-	pixel_y = -29
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 2
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/prop/invuln/overhead_pipe{
-	pixel_x = -7;
-	pixel_y = -3
-	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/cryo_cells)
+/area/almayer/living/briefing)
 "vF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad,
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	dir = 1;
+	icon_state = "cargo_arrow"
 	},
 /area/almayer/squads/alpha/squad_two)
 "vL" = (
+/obj/structure/sign/safety/bulkhead_door{
+	pixel_x = -19
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hallways/port_hallway)
+"vN" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NW-out";
 	pixel_x = -1;
 	pixel_y = 2
 	},
-/turf/open/floor/almayer,
-/area/almayer/hallways/port_hallway)
-"vN" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/warning_stripes{
-	icon_state = "N";
+	icon_state = "NE-out";
+	pixel_x = 1;
 	pixel_y = 2
 	},
+/obj/structure/machinery/light,
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "plate"
 	},
-/area/almayer/living/cryo_cells)
-"vP" = (
-/obj/structure/machinery/light,
-/obj/structure/pipes/vents/scrubber,
-/turf/open/floor/almayer,
-/area/almayer/squads/alpha/squad_one)
+/area/almayer/living/briefing)
 "vS" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -2558,30 +2604,28 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"vT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/prop/invuln/lattice_prop{
-	dir = 1;
-	icon_state = "lattice-simple";
-	pixel_x = 16;
-	pixel_y = -15
-	},
-/turf/open/floor/almayer,
-/area/almayer/living/grunt_rnr)
 "vU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 6
 	},
-/area/almayer/hallways/port_hallway)
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/grunt_rnr)
 "vY" = (
-/obj/structure/surface/table/almayer,
 /obj/structure/sign/safety/rewire{
 	pixel_x = 14;
 	pixel_y = 29
 	},
-/turf/open/floor/almayer,
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
 /area/almayer/living/briefing)
 "wc" = (
 /obj/structure/machinery/door/airlock/almayer/command/reinforced{
@@ -2591,32 +2635,32 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/living/platoon_commander_rooms)
-"wl" = (
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
+"wd" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_x = -1;
+	pixel_y = 2
+	},
+/obj/structure/machinery/light{
+	dir = 1
 	},
-/area/almayer/squads/alpha/squad_one)
-"wp" = (
-/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/hallways/port_hallway)
-"wu" = (
+"wl" = (
+/turf/open/floor/almayer,
+/area/almayer/living/grunt_rnr)
+"wn" = (
+/obj/structure/pipes/standard/manifold/fourway/hidden/supply,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hallways/port_hallway)
+"wp" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/item/ammo_box/magazine/misc/flares/empty{
-	pixel_x = -1;
-	pixel_y = 16
-	},
-/obj/item/device/flashlight/flare{
-	pixel_x = 10
-	},
-/obj/structure/machinery/light,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/squad_two)
+/area/almayer/hallways/port_hallway)
 "wx" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NE-out";
@@ -2634,11 +2678,15 @@
 	},
 /area/almayer/hallways/hangar)
 "wJ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/safety/coffee{
-	pixel_x = -19
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/obj/item/prop/magazine/book/bladerunner,
+/obj/item/storage/fancy/cigarettes/lucky_strikes{
+	pixel_x = 2;
+	pixel_y = 18
 	},
-/obj/structure/machinery/vending/cigarette,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -2653,220 +2701,203 @@
 	},
 /area/almayer/hallways/hangar)
 "wS" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 2
+/obj/structure/machinery/light{
+	dir = 4
 	},
 /turf/open/floor/almayer,
-/area/almayer/hallways/port_hallway)
+/area/almayer/living/briefing)
 "wV" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer,
-/area/almayer/hallways/port_hallway)
-"wZ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/vents/scrubber,
-/turf/open/floor/almayer,
-/area/almayer/squads/alpha/squad_two)
-"xc" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
 /obj/structure/machinery/door/airlock/almayer/generic{
-	name = "\improper Canteen"
+	dir = 1;
+	name = "\improper Platoon Sergeants Bunk"
 	},
+/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
 	},
-/area/almayer/living/cafeteria_port)
-"xe" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/obj/item/ammo_magazine/pistol{
-	current_rounds = 0
-	},
-/obj/item/weapon/gun/pistol/m4a3{
-	current_mag = null
-	},
-/turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha/platoon_sergeant)
+"xf" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/squad_one)
 "xh" = (
 /obj/structure/cargo_container/arious/right,
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
-"xl" = (
-/obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = -2;
-	pixel_y = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8;
-	layer = 3.3;
-	pixel_y = 4
-	},
-/obj/structure/bed{
-	can_buckle = 0
-	},
-/obj/structure/bed{
-	buckling_y = 13;
-	layer = 3.5;
-	pixel_y = 13
-	},
-/obj/item/bedsheet/brown{
-	layer = 3.4
-	},
-/obj/item/bedsheet/brown{
-	pixel_y = 13
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/living/grunt_rnr)
-"xq" = (
-/obj/structure/machinery/cryopod/right,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/living/cryo_cells)
-"xs" = (
+"xm" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/secure_closet/squad_sergeant,
+/obj/structure/machinery/firealarm{
+	pixel_y = 28
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
+/area/almayer/hallways/port_hallway)
+"xx" = (
+/obj/structure/machinery/light,
+/obj/structure/pipes/vents/scrubber,
+/turf/open/floor/almayer,
 /area/almayer/squads/alpha/squad_one)
 "xz" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
 /turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/living/briefing)
-"xH" = (
+/area/almayer/medical)
+"xB" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/firealarm{
-	pixel_y = 28
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/recharger{
+	pixel_y = 6
+	},
+/obj/structure/machinery/camera/autoname/almayer{
+	dir = 4;
+	name = "ship-grade camera"
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/squads/alpha/squad_two)
 "xK" = (
-/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/light{
+	dir = 8
+	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
 	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
 /area/almayer/living/cryo_cells)
-"xQ" = (
-/obj/structure/machinery/light{
-	dir = 1
+"xM" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out";
+	pixel_x = -1
 	},
-/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
 /area/almayer/living/cryo_cells)
-"xX" = (
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
-	},
-/area/almayer/squads/alpha/squad_one)
-"ya" = (
+"xQ" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/almayer/squads/alpha/squad_one)
-"yj" = (
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
+/obj/structure/sign/safety/galley{
+	pixel_x = -19
 	},
-/obj/structure/pipes/vents/scrubber,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/squad_one)
-"yn" = (
+/area/almayer/living/cryo_cells)
+"xX" = (
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "cargo_arrow"
 	},
-/area/almayer/living/briefing)
-"ys" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
+/area/almayer/living/grunt_rnr)
+"xZ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep,
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/turf/open/floor/almayer,
-/area/almayer/squads/alpha/squad_one)
-"yt" = (
-/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
-	pixel_y = 25
+/area/almayer/squads/alpha/squad_two)
+"yj" = (
+/obj/structure/machinery/camera/autoname/almayer{
+	dir = 1;
+	name = "ship-grade camera"
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "plate"
 	},
-/area/almayer/living/cryo_cells)
-"yu" = (
-/obj/structure/machinery/light{
-	dir = 8
+/area/almayer/living/grunt_rnr)
+"ys" = (
+/obj/structure/sign/safety/rewire{
+	pixel_x = 14;
+	pixel_y = 29
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/cafeteria_port)
+/area/almayer/hallways/port_hallway)
+"yt" = (
+/obj/structure/window/framed/almayer,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/squads/alpha/platoon_sergeant)
 "yv" = (
-/obj/structure/bed/chair/comfy{
-	dir = 8
+/obj/structure/machinery/light{
+	dir = 4
+	},
+/obj/structure/machinery/power/apc/almayer{
+	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/cafeteria_port)
+/area/almayer/living/briefing)
 "yx" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/vents/scrubber,
-/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
-	pixel_y = 25
+/obj/structure/machinery/firealarm{
+	pixel_y = 28
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/cafeteria_port)
-"yD" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/machinery/door/airlock/almayer/generic,
+/area/almayer/living/grunt_rnr)
+"yA" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/secure_closet/squad_sergeant,
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/squad_two)
+/area/almayer/squads/alpha/squad_one)
 "yF" = (
-/obj/effect/landmark/start/marine/alpha,
-/obj/effect/landmark/late_join/alpha,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/cryo_cells)
-"yM" = (
 /obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
+	icon_state = "W";
+	pixel_x = -1;
+	pixel_y = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
 /area/almayer/living/cryo_cells)
+"yL" = (
+/obj/structure/closet/coffin/woodencrate,
+/obj/item/storage/box/m94,
+/obj/item/storage/box/m94,
+/obj/item/storage/box/m94,
+/obj/structure/sign/safety/rewire{
+	pixel_x = 14;
+	pixel_y = 29
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_one)
+"yM" = (
+/obj/structure/surface/table/almayer,
+/obj/item/reagent_container/food/condiment/hotsauce/cholula{
+	pixel_x = -9;
+	pixel_y = -3
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/cafeteria_port)
 "yO" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 5
@@ -2875,20 +2906,19 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/hangar)
 "yT" = (
-/obj/structure/surface/table/almayer,
-/obj/item/device/cassette_tape/nam{
-	layer = 2.9;
-	pixel_x = -6;
-	pixel_y = 7
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+	icon_state = "cargo_arrow"
 	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/squads/alpha/squad_one)
+/area/almayer/hallways/port_hallway)
 "yY" = (
-/obj/structure/machinery/medical_pod/autodoc,
-/turf/open/floor/almayer{
-	icon_state = "sterile_green"
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 10
 	},
-/area/almayer/medical)
+/obj/structure/bed/chair,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/squads/alpha/platoon_sergeant)
 "yZ" = (
 /obj/structure/machinery/light{
 	dir = 1
@@ -2897,16 +2927,8 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"ze" = (
-/obj/structure/surface/table/almayer,
-/obj/item/trash/ceramic_plate{
-	pixel_x = 18;
-	pixel_y = 3
-	},
-/obj/item/trash/ceramic_plate{
-	pixel_x = 18;
-	pixel_y = 5
-	},
+"za" = (
+/obj/structure/machinery/camera/autoname/almayer,
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
 	pixel_y = 2
@@ -2914,43 +2936,14 @@
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
-/area/almayer/living/cafeteria_port)
-"zm" = (
-/obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = -2;
-	pixel_y = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8;
-	layer = 3.3;
-	pixel_y = 4
-	},
-/obj/structure/bed{
-	can_buckle = 0
-	},
-/obj/structure/bed{
-	buckling_y = 13;
-	layer = 3.5;
-	pixel_y = 13
-	},
-/obj/item/bedsheet/brown{
-	layer = 3.4
-	},
-/obj/item/bedsheet/brown{
-	pixel_y = 13
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/prop/invuln/lattice_prop{
-	icon_state = "lattice1";
-	pixel_x = 16;
-	pixel_y = -15
+/area/almayer/living/cryo_cells)
+"zn" = (
+/obj/structure/machinery/light{
+	dir = 4
 	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 9
 	},
-/area/almayer/living/grunt_rnr)
-"zn" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
 	pixel_x = 1
@@ -2959,24 +2952,14 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/living/cryo_cells)
-"zs" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/firealarm{
-	pixel_y = 28
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/living/grunt_rnr)
-"zv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
+"zt" = (
+/obj/structure/machinery/light{
+	dir = 8
 	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/squads/alpha/platoon_sergeant)
+/area/almayer/living/cryo_cells)
 "zy" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
@@ -2996,41 +2979,6 @@
 	icon_state = "plating"
 	},
 /area/almayer/engineering)
-"zH" = (
-/obj/item/device/radio/intercom{
-	freerange = 1;
-	name = "General Listening Channel";
-	pixel_y = 28
-	},
-/obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = -2;
-	pixel_y = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8;
-	layer = 3.3;
-	pixel_y = 4
-	},
-/obj/structure/bed{
-	can_buckle = 0
-	},
-/obj/structure/bed{
-	buckling_y = 13;
-	layer = 3.5;
-	pixel_y = 13
-	},
-/obj/item/bedsheet/brown{
-	layer = 3.4
-	},
-/obj/item/bedsheet/brown{
-	pixel_y = 13
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/living/grunt_rnr)
 "zJ" = (
 /obj/structure/machinery/firealarm{
 	pixel_y = 28
@@ -3038,28 +2986,6 @@
 /turf/open/floor/almayer,
 /area/almayer/hallways/starboard_hallway)
 "zK" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 5
-	},
-/turf/open/floor/almayer,
-/area/almayer/squads/alpha/squad_two)
-"zM" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/item/smartgun_battery{
-	pixel_x = 4;
-	pixel_y = -5
-	},
-/obj/effect/spawner/random/powercell{
-	pixel_x = -8;
-	pixel_y = 7
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 4
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/squads/alpha/squad_two)
-"zV" = (
 /obj/structure/pipes/vents/scrubber,
 /obj/structure/sign/safety/bulkhead_door{
 	pixel_x = 7;
@@ -3069,58 +2995,77 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/port_hallway)
-"Af" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
+"zM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "cargo_arrow"
 	},
-/turf/open/floor/almayer,
 /area/almayer/hallways/port_hallway)
-"Ao" = (
-/obj/structure/machinery/shower{
-	pixel_y = 16
+"zV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/disposal,
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/obj/structure/window/reinforced{
-	dir = 4;
-	health = 80
+/area/almayer/squads/alpha/platoon_sergeant)
+"zZ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/surface/table/almayer,
+/obj/item/tool/screwdriver,
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/obj/structure/window/reinforced{
-	dir = 8;
-	health = 80
+/area/almayer/squads/alpha/squad_one)
+"Ad" = (
+/obj/structure/machinery/door/poddoor/almayer/locked{
+	name = "\improper Hangar Lockdown Blast Door"
 	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/cryo_cells)
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/hallways/port_hallway)
 "Ap" = (
 /obj/structure/surface/table/almayer,
-/obj/item/reagent_container/food/drinks/cans/waterbottle{
-	pixel_x = 9;
-	pixel_y = 3
-	},
-/obj/item/prop/helmetgarb/flair_io{
-	pixel_x = -10;
-	pixel_y = 6
-	},
+/obj/item/trash/ceramic_plate,
 /turf/open/floor/almayer,
 /area/almayer/squads/alpha/platoon_sergeant)
 "As" = (
-/turf/open/floor/almayer,
-/area/almayer/living/grunt_rnr)
-"Ax" = (
-/obj/structure/machinery/cryopod{
-	layer = 3.1;
-	pixel_y = 13
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
+"Aw" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out";
+	pixel_x = -1
+	},
+/obj/structure/machinery/door/airlock/almayer/generic{
+	name = "\improper Canteen"
 	},
 /turf/open/floor/almayer{
-	icon_state = "cargo"
+	icon_state = "test_floor4"
 	},
 /area/almayer/living/cryo_cells)
-"AF" = (
-/obj/structure/bed/chair/comfy{
-	dir = 8
+"Ax" = (
+/obj/structure/machinery/shower{
+	dir = 4
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/cryo_cells)
+"AA" = (
+/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
+	pixel_y = 25
 	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/squads/alpha/platoon_sergeant)
+/area/almayer/living/cryo_cells)
 "AG" = (
 /obj/structure/machinery/landinglight/ds1/delaythree{
 	dir = 1
@@ -3171,14 +3116,14 @@
 	},
 /area/almayer/engineering)
 "AY" = (
-/obj/structure/machinery/light{
-	dir = 4
+/obj/structure/machinery/camera/autoname/almayer{
+	dir = 4;
+	name = "ship-grade camera"
 	},
-/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/squad_two)
+/area/almayer/hallways/port_hallway)
 "Bf" = (
 /obj/effect/decal/cleanable/blood/oil,
 /turf/open/floor/almayer{
@@ -3186,37 +3131,59 @@
 	},
 /area/almayer/hallways/hangar)
 "Bg" = (
-/obj/structure/machinery/cm_vending/sorted/medical/blood{
-	req_access = list()
-	},
-/turf/open/floor/almayer{
-	icon_state = "sterile_green"
+/obj/structure/bed/chair{
+	dir = 4
 	},
-/area/almayer/medical)
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer,
+/area/almayer/living/grunt_rnr)
 "Bh" = (
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
-	},
-/obj/structure/pipes/vents/scrubber,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/vending/coffee/simple,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/squad_two)
-"Bj" = (
-/obj/structure/window/framed/almayer,
+/area/almayer/squads/alpha/platoon_sergeant)
+"Bi" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/living/briefing)
+/area/almayer/living/cryo_cells)
+"Bj" = (
+/obj/structure/window/framed/almayer/white,
+/turf/open/floor/almayer,
+/area/almayer/medical)
 "Bo" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/bedsheetbin{
-	pixel_y = 6
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer,
+/area/almayer/living/grunt_rnr)
+"Bq" = (
+/obj/structure/pipes/standard/manifold/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
 	},
+/area/almayer/living/cafeteria_port)
+"Br" = (
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/living/cryo_cells)
+"Bu" = (
+/obj/item/defenses/handheld/sentry,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_one)
 "Bw" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/safety/rewire{
@@ -3227,15 +3194,7 @@
 "Bz" = (
 /turf/open/floor/almayer,
 /area/almayer/living/platoon_commander_rooms)
-"BM" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/living/cryo_cells)
-"BO" = (
+"BA" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/surface/table/almayer,
 /obj/item/prop/helmetgarb/gunoil{
@@ -3255,6 +3214,24 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/alpha/squad_two)
+"BM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "cargo_arrow"
+	},
+/area/almayer/living/cryo_cells)
+"BO" = (
+/obj/structure/bed/chair{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/platoon_sergeant)
 "BP" = (
 /obj/effect/decal/cleanable/blood/oil,
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -3277,6 +3254,11 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
+"BY" = (
+/obj/effect/landmark/start/marine/alpha,
+/obj/effect/landmark/late_join/alpha,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/cryo_cells)
 "BZ" = (
 /obj/structure/machinery/light{
 	dir = 1
@@ -3284,34 +3266,51 @@
 /turf/open/floor/almayer,
 /area/almayer/living/platoon_commander_rooms)
 "Cb" = (
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+/obj/structure/surface/table/almayer,
+/obj/item/ashtray/bronze{
+	pixel_x = 7;
+	pixel_y = 9
 	},
-/area/almayer/medical)
-"Cf" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
+/obj/item/trash/semki{
+	layer = 2;
+	pixel_x = -13;
+	pixel_y = 14
 	},
-/obj/structure/machinery/light{
-	dir = 4
+/obj/item/prop/magazine/boots/n054{
+	pixel_x = 29
 	},
-/turf/open/floor/almayer,
-/area/almayer/hallways/hangar)
-"Cg" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
-	name = "\improper Squad Two Armoury"
+/obj/item/prop/magazine/dirty/torn{
+	pixel_x = -6;
+	pixel_y = 6
+	},
+/obj/item/clothing/glasses/disco_fever{
+	pixel_x = 5;
+	pixel_y = 4
 	},
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/squad_two)
+/area/almayer/living/grunt_rnr)
+"Cf" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/cafeteria_port)
+"Cg" = (
+/obj/structure/surface/table/almayer,
+/obj/item/folder/black_random,
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/platoon_sergeant)
 "Cl" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
 	pixel_x = 1
 	},
-/turf/open/floor/almayer,
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "cargo_arrow"
+	},
 /area/almayer/hallways/hangar)
 "Cq" = (
 /turf/closed/wall/almayer/outer,
@@ -3320,45 +3319,69 @@
 /turf/open/space/basic,
 /area/space)
 "Cs" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
+/obj/structure/bed/chair/comfy{
+	dir = 1
 	},
+/obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/warning_stripes{
-	icon_state = "W";
+	icon_state = "NW-out";
 	pixel_x = -1;
-	pixel_y = 1
+	pixel_y = 2
 	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
-/area/almayer/living/cryo_cells)
+/area/almayer/living/cafeteria_port)
 "Cu" = (
-/turf/open/floor/almayer,
-/area/almayer/squads/alpha/squad_two)
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
+	name = "\improper Sergeants Room"
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/squads/alpha/platoon_sergeant)
 "Cv" = (
-/obj/structure/platform_decoration{
-	dir = 8
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
 	},
-/obj/structure/machinery/camera/autoname/almayer{
-	dir = 4;
-	name = "ship-grade camera";
+/area/almayer/medical)
+"Cw" = (
+/obj/structure/machinery/body_scanconsole{
 	pixel_y = 6
 	},
-/turf/open/floor/almayer,
-/area/almayer/living/briefing)
-"Cw" = (
 /turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
+	icon_state = "test_floor4"
 	},
-/area/almayer/living/briefing)
+/area/almayer/medical)
+"CC" = (
+/obj/structure/surface/rack,
+/obj/item/ammo_magazine/flamer_tank,
+/obj/item/ammo_magazine/flamer_tank,
+/obj/item/weapon/gun/flamer{
+	current_mag = null;
+	pixel_y = 4
+	},
+/obj/item/device/motiondetector,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_two)
 "CF" = (
-/obj/structure/machinery/sleep_console,
-/obj/structure/machinery/light,
+/obj/structure/bed/chair/comfy{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/medical)
+/area/almayer/living/cafeteria_port)
 "CK" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -3377,56 +3400,48 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"CV" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/computer/med_data/laptop{
-	pixel_y = 6
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
+"CZ" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{
+	name = "Alamo Remote Control Console";
+	shuttleId = "dropship_alamo"
 	},
-/area/almayer/squads/alpha/platoon_sergeant)
-"CX" = (
+/turf/open/floor/almayer,
+/area/almayer/living/platoon_commander_rooms)
+"Db" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/firealarm{
-	pixel_y = 28
+/turf/closed/wall/almayer/outer,
+/area/almayer/squads/alpha/squad_two)
+"Dc" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
-/obj/structure/machinery/disposal{
-	density = 0;
-	layer = 3.2;
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hallways/hangar)
+"Df" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/surface/table/almayer,
+/obj/item/ammo_box/magazine/misc/flares/empty{
+	pixel_x = -1;
 	pixel_y = 16
 	},
+/obj/item/device/flashlight/flare{
+	pixel_x = 10
+	},
+/obj/structure/machinery/light,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/cafeteria_port)
-"CZ" = (
-/obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{
-	name = "Alamo Remote Control Console";
-	shuttleId = "dropship_alamo"
-	},
-/turf/open/floor/almayer,
-/area/almayer/living/platoon_commander_rooms)
-"Dc" = (
+/area/almayer/squads/alpha/squad_two)
+"Dg" = (
+/obj/effect/decal/cleanable/dirt,
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
 	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/hangar)
-"Dg" = (
-/obj/structure/sign/poster{
-	desc = "This poster features Audrey Rainwater standing in a jacuzzi. She was the July 2182 centerfold in House Bunny Gentleman's Magazine. Don't ask how you know that.";
-	icon_state = "poster16";
-	layer = 3.3;
-	name = "'Miss July' Pinup";
-	pixel_y = 29;
-	serial_number = 16
-	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/squad_two)
+/area/almayer/squads/alpha/platoon_sergeant)
 "Dj" = (
 /obj/structure/machinery/power/apc/almayer{
 	dir = 1
@@ -3435,40 +3450,54 @@
 /area/almayer/hallways/starboard_hallway)
 "Dl" = (
 /obj/structure/surface/table/almayer,
-/obj/structure/machinery/computer/emails{
-	dir = 1
+/obj/item/paper_bin{
+	pixel_x = 5;
+	pixel_y = 22
 	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
 	},
-/area/almayer/squads/alpha/platoon_sergeant)
-"Ds" = (
-/obj/structure/platform{
-	dir = 1
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
 	},
-/turf/open/floor/almayer,
-/area/almayer/living/briefing)
+/area/almayer/living/cafeteria_port)
 "Dw" = (
-/obj/structure/sign/safety/security{
-	pixel_x = 15;
-	pixel_y = -25
+/obj/structure/bed/chair/comfy{
+	dir = 8
 	},
-/obj/structure/sign/safety/west{
-	pixel_x = 3;
-	pixel_y = -25
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
 	},
-/obj/structure/largecrate/random/barrel/blue,
-/turf/open/floor/almayer{
-	icon_state = "plate"
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
-/area/almayer/hallways/port_hallway)
-"Dy" = (
-/obj/structure/machinery/light,
-/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
-/area/almayer/living/cryo_cells)
+/area/almayer/living/cafeteria_port)
+"Dx" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 9
+	},
+/obj/item/bananapeel{
+	desc = "Ew.";
+	gender = "plural";
+	icon = 'icons/obj/items/shards.dmi';
+	icon_state = "shrapnelsmall";
+	name = "\improper finger nails";
+	pixel_x = -6;
+	pixel_y = 5
+	},
+/obj/item/ashtray/glass{
+	pixel_x = 3;
+	pixel_y = -4
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/squads/alpha/squad_one)
 "DB" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -3481,21 +3510,35 @@
 "DC" = (
 /turf/open/floor/almayer,
 /area/almayer/hallways/starboard_hallway)
+"DE" = (
+/obj/structure/machinery/light{
+	dir = 4
+	},
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_two)
 "DF" = (
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = 11
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/alarm/almayer{
+	dir = 1
 	},
-/obj/structure/mirror{
-	pixel_x = 28
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/cryo_cells)
+/area/almayer/living/cafeteria_port)
 "DM" = (
 /obj/structure/machinery/power/apc/almayer,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
+"DR" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 5
+	},
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/squad_two)
 "DV" = (
 /obj/structure/machinery/door/airlock/almayer/command/reinforced{
 	dir = 1;
@@ -3506,51 +3549,52 @@
 	},
 /area/almayer/living/platoon_commander_rooms)
 "DX" = (
-/turf/closed/wall/almayer/white,
-/area/almayer/medical)
-"DY" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 5
+/obj/structure/toilet{
+	pixel_y = 16
 	},
-/obj/structure/largecrate/random/barrel/blue,
 /turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/port_hallway)
+/area/almayer/living/cryo_cells)
+"DY" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/platoon_sergeant)
 "Ea" = (
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/hangar)
 "Eb" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
+/obj/structure/surface/table/reinforced/almayer_B,
+/turf/open/floor/almayer,
+/area/almayer/living/briefing)
+"Ei" = (
+/obj/structure/machinery/space_heater,
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "plate"
 	},
-/area/almayer/living/cryo_cells)
+/area/almayer/squads/alpha/squad_one)
 "Eo" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
+/obj/structure/platform_decoration,
+/obj/structure/platform_decoration{
+	dir = 8
 	},
-/area/almayer/living/cafeteria_port)
-"Ex" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/bed/chair/comfy/alpha{
-	dir = 1
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1;
+	pixel_y = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/living/briefing)
+"Eu" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_x = -1;
+	pixel_y = 2
+	},
+/turf/open/floor/almayer,
+/area/almayer/hallways/port_hallway)
 "Ey" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -3559,76 +3603,91 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/starboard_hallway)
 "ED" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/obj/item/tool/warning_cone{
-	pixel_x = 2;
-	pixel_y = 10
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "cargo_arrow"
 	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/squads/alpha/squad_two)
+/area/almayer/hallways/port_hallway)
 "EF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/firealarm{
-	pixel_y = 28
+/obj/structure/machinery/washing_machine,
+/obj/structure/machinery/washing_machine{
+	layer = 3.5;
+	pixel_y = 15
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/hallways/port_hallway)
-"EO" = (
-/obj/structure/machinery/light,
+/area/almayer/living/grunt_rnr)
+"EI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/vents/scrubber,
+/obj/structure/sign/safety/bathunisex{
+	pixel_y = 29
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/living/cryo_cells)
-"EQ" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_x = -1;
-	pixel_y = 2
-	},
-/obj/structure/machinery/light{
-	dir = 1
+"EK" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/camera/autoname/almayer{
+	dir = 8;
+	name = "ship-grade camera"
 	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hallways/port_hallway)
-"ER" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_y = 2
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out"
+	dir = 1;
+	icon_state = "cargo_arrow"
 	},
-/obj/structure/machinery/door/airlock/almayer/generic{
-	id = "Delta_1";
-	name = "\improper Bathroom"
+/area/almayer/living/cryo_cells)
+"EO" = (
+/obj/structure/machinery/disposal{
+	density = 0;
+	layer = 3.2;
+	pixel_y = 16
 	},
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "plate"
 	},
 /area/almayer/living/cryo_cells)
-"EX" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
+"EQ" = (
+/obj/structure/window/reinforced{
+	dir = 4;
+	pixel_x = -2;
+	pixel_y = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8;
+	layer = 3.3;
+	pixel_y = 4
+	},
+/obj/structure/bed{
+	can_buckle = 0
+	},
+/obj/structure/bed{
+	buckling_y = 13;
+	layer = 3.5;
+	pixel_y = 13
+	},
+/obj/item/bedsheet/brown{
+	layer = 3.4
+	},
+/obj/item/bedsheet/brown{
+	pixel_y = 13
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/grunt_rnr)
+"EX" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
 	icon_state = "cargo"
 	},
 /area/almayer/hallways/hangar)
-"EY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/item/ammo_box/magazine/heap/empty,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/squads/alpha/squad_two)
 "EZ" = (
 /obj/structure/machinery/landinglight/ds1{
 	dir = 4
@@ -3637,25 +3696,60 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
+"Fa" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out";
+	pixel_x = 1
+	},
+/obj/structure/machinery/door/airlock/almayer/generic{
+	name = "\improper Canteen"
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/living/cafeteria_port)
 "Fe" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/closed/wall/almayer/outer,
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/computer/emails{
+	pixel_y = 4
+	},
+/obj/structure/machinery/firealarm{
+	pixel_y = 28
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
 /area/almayer/squads/alpha/squad_one)
+"Fg" = (
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/squad_two)
 "Fi" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/roller,
+/obj/item/storage/box/bodybags,
+/obj/structure/machinery/light{
+	dir = 8
+	},
 /turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
+	icon_state = "sterile_green"
 	},
-/area/almayer/living/briefing)
+/area/almayer/medical)
 "Fj" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
-	name = "\improper Dorms"
+/obj/structure/surface/table/almayer,
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
+/obj/item/ammo_box/magazine/misc/mre{
+	pixel_x = -23;
+	pixel_y = -11
 	},
-/area/almayer/living/grunt_rnr)
+/obj/item/facepaint/black,
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/platoon_sergeant)
 "Fl" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
@@ -3667,6 +3761,24 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/starboard_hallway)
+"Fw" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 2
+	},
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hallways/port_hallway)
+"Fy" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/squads/alpha/squad_two)
 "Fz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage,
@@ -3675,37 +3787,27 @@
 	},
 /area/almayer/engineering)
 "FE" = (
-/obj/structure/surface/table/almayer,
-/obj/item/device/flashlight/lamp{
-	pixel_x = 11;
-	pixel_y = 5
-	},
-/obj/item/paper_bin/uscm{
-	pixel_x = -4;
-	pixel_y = 7
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
-/obj/item/tool/pen{
-	pixel_x = -5;
-	pixel_y = 4
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/grunt_rnr)
+"FI" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
 /turf/open/floor/almayer,
-/area/almayer/squads/alpha/platoon_sergeant)
-"FI" = (
-/obj/structure/surface/table/almayer,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1;
-	pixel_y = 1
+/area/almayer/living/grunt_rnr)
+"FN" = (
+/obj/structure/machinery/medical_pod/sleeper{
+	dir = 8;
+	pixel_y = 6
 	},
+/obj/structure/machinery/light,
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "test_floor4"
 	},
-/area/almayer/living/cafeteria_port)
-"FN" = (
-/obj/structure/surface/table/almayer,
-/turf/open/floor/almayer,
-/area/almayer/living/briefing)
+/area/almayer/medical)
 "FP" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -3714,87 +3816,125 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/hangar)
 "FR" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/pipes/vents/pump{
+	dir = 8
+	},
+/turf/open/floor/almayer,
+/area/almayer/living/grunt_rnr)
+"FS" = (
+/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
+	pixel_y = 25
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hallways/port_hallway)
+"FT" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
 	pixel_x = 1
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/living/cafeteria_port)
-"FS" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 9
-	},
-/turf/open/floor/almayer,
-/area/almayer/squads/alpha/squad_one)
-"FT" = (
-/obj/structure/bed/chair{
-	dir = 4
+	icon_state = "plate"
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/almayer/living/grunt_rnr)
+/area/almayer/living/briefing)
 "FV" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
+/obj/structure/surface/table/almayer,
+/obj/item/trash/ceramic_plate{
+	pixel_x = 18;
+	pixel_y = 3
+	},
+/obj/item/trash/ceramic_plate{
+	pixel_x = 18;
+	pixel_y = 5
 	},
 /obj/effect/decal/warning_stripes{
-	icon_state = "S"
+	icon_state = "N";
+	pixel_y = 2
 	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
 /area/almayer/living/cafeteria_port)
 "FW" = (
-/obj/structure/machinery/disposal{
-	density = 0;
-	layer = 3.2;
-	pixel_y = 16
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/obj/structure/sign/safety/rewire{
+	pixel_x = 14;
+	pixel_y = 29
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/living/cryo_cells)
-"FX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/vents/scrubber,
-/obj/structure/sign/safety/bathunisex{
-	pixel_y = 29
+"Gf" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/computer/cameras/wooden_tv/prop{
+	dir = 8;
+	layer = 3.2;
+	pixel_x = -3;
+	pixel_y = 6
+	},
+/obj/structure/sign/poster{
+	desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE.";
+	icon_state = "poster11";
+	name = "YOU ALWAYS KNOW A WORKING JOE.";
+	pixel_x = 27;
+	serial_number = 11
+	},
+/obj/item/trash/pistachios{
+	layer = 2;
+	pixel_x = 6;
+	pixel_y = -6
+	},
+/obj/structure/machinery/recharger{
+	layer = 3.1;
+	pixel_y = 22
+	},
+/obj/item/ammo_magazine/rifle/incendiary{
+	current_rounds = 0;
+	desc = "A 10mm assault rifle magazine with ':D' drawn on the side";
+	pixel_x = 10;
+	pixel_y = 2
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/cryo_cells)
-"Gf" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
+/area/almayer/living/grunt_rnr)
+"Gg" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/squads/alpha/platoon_sergeant)
+/area/almayer/living/cryo_cells)
 "Gi" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/squads/alpha/squad_two)
-"Gk" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/safety/ammunition{
+	pixel_x = 14;
+	pixel_y = -28
+	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green"
+	icon_state = "plate"
 	},
-/area/almayer/medical)
-"Gq" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/item/storage/fancy/cigarettes/lucky_strikes{
-	pixel_x = -6;
-	pixel_y = 12
+/area/almayer/hallways/port_hallway)
+"Gk" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 2
 	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/squads/alpha/squad_two)
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/cafeteria_port)
 "Gs" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/effect/decal/cleanable/dirt,
@@ -3808,58 +3948,55 @@
 /area/almayer/hallways/starboard_hallway)
 "Gz" = (
 /obj/structure/bed/chair/comfy{
-	dir = 1
+	dir = 8
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "plate"
 	},
 /area/almayer/living/cafeteria_port)
-"GJ" = (
-/obj/structure/surface/table/almayer,
-/obj/item/ashtray/bronze{
-	pixel_x = 7;
-	pixel_y = 9
-	},
-/obj/item/trash/semki{
-	layer = 2;
-	pixel_x = -13;
-	pixel_y = 14
+"GG" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/obj/item/prop/magazine/boots/n054{
-	pixel_x = 29
+/turf/open/floor/almayer,
+/area/almayer/hallways/port_hallway)
+"GK" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_y = 2
 	},
-/obj/item/prop/magazine/dirty/torn{
-	pixel_x = -6;
-	pixel_y = 6
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out";
+	pixel_x = -1
 	},
-/obj/item/clothing/glasses/disco_fever{
-	pixel_x = 5;
-	pixel_y = 4
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out";
+	pixel_x = 1
 	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
+/obj/structure/machinery/door/airlock/almayer/generic{
+	dir = 1;
+	id = "Delta_1";
+	name = "\improper Bathroom"
 	},
-/area/almayer/living/grunt_rnr)
-"GK" = (
-/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
+	icon_state = "test_floor4"
 	},
 /area/almayer/living/cryo_cells)
 "GL" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
 /obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
+	icon_state = "E";
+	pixel_x = 1
 	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/light{
-	dir = 8
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
 	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/hallways/port_hallway)
+/area/almayer/living/cafeteria_port)
 "GN" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -3868,6 +4005,13 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hallways/hangar)
+"GP" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_one)
 "GQ" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -3876,97 +4020,68 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/hangar)
-"GX" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/living/cafeteria_port)
 "GY" = (
-/obj/structure/surface/table/almayer,
-/obj/item/reagent_container/food/condiment/hotsauce/cholula{
-	pixel_x = -9;
-	pixel_y = -3
-	},
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	dir = 1;
+	icon_state = "cargo_arrow"
 	},
-/area/almayer/living/cafeteria_port)
-"Hb" = (
+/area/almayer/living/briefing)
+"Hj" = (
 /obj/structure/surface/table/almayer,
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/item/prop/magazine/book/bladerunner,
-/obj/item/storage/fancy/cigarettes/lucky_strikes{
-	pixel_x = 2;
-	pixel_y = 18
+/obj/structure/machinery/prop/almayer/CICmap{
+	pixel_y = 29
 	},
+/obj/effect/landmark/map_item,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/squads/alpha/platoon_sergeant)
-"Hf" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/almayer/hallways/port_hallway)
-"Hj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/janitorialcart,
-/obj/item/tool/mop{
-	pixel_x = -1;
-	pixel_y = -10
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hallways/port_hallway)
 "Hm" = (
-/obj/structure/surface/table/almayer,
+/obj/structure/bed/chair{
+	dir = 4
+	},
 /turf/open/floor/almayer,
 /area/almayer/squads/alpha/platoon_sergeant)
 "Hv" = (
-/obj/structure/surface/table/almayer,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/ceramic_plate{
-	pixel_y = 19
+/obj/item/frame/camera{
+	desc = "The Staff Officer insisted he needed to monitor everyone at all times.";
+	layer = 2.9;
+	name = "broken camera";
+	pixel_x = -7;
+	pixel_y = -6
 	},
-/obj/item/trash/ceramic_plate{
-	pixel_y = 21
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/obj/item/trash/ceramic_plate{
-	pixel_y = 23
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
 	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/living/cafeteria_port)
-"HC" = (
-/obj/structure/surface/table/almayer,
-/obj/item/paper_bin/uscm,
-/obj/item/tool/pen,
-/turf/open/floor/almayer,
-/area/almayer/living/briefing)
-"HD" = (
-/obj/structure/machinery/disposal{
-	density = 0;
-	layer = 3.2;
-	pixel_y = 16
+/area/almayer/living/cryo_cells)
+"Hw" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
+/obj/structure/machinery/door/airlock/almayer/generic,
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "test_floor4"
 	},
-/area/almayer/squads/alpha/squad_one)
+/area/almayer/squads/alpha/squad_two)
+"HC" = (
+/obj/structure/machinery/camera/autoname/almayer{
+	dir = 8;
+	name = "ship-grade camera"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer,
+/area/almayer/living/briefing)
 "HF" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -3975,14 +4090,11 @@
 /area/almayer/hallways/starboard_hallway)
 "HG" = (
 /obj/effect/decal/warning_stripes{
-	icon_state = "N";
+	icon_state = "NW-out";
 	pixel_y = 2
 	},
 /obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/machinery/light{
-	dir = 4
+	icon_state = "SW-out"
 	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
@@ -3992,13 +4104,29 @@
 /obj/structure/machinery/status_display{
 	pixel_y = 30
 	},
-/turf/open/floor/almayer,
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 2
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
 /area/almayer/living/briefing)
 "HJ" = (
 /obj/structure/machinery/light{
 	dir = 4
 	},
-/turf/open/floor/almayer,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
 /area/almayer/living/briefing)
 "HK" = (
 /turf/closed/wall/almayer,
@@ -4029,68 +4157,55 @@
 /area/almayer/hallways/hangar)
 "HX" = (
 /obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/machinery/camera/autoname/almayer{
-	dir = 8;
-	name = "ship-grade camera"
+	icon_state = "N";
+	pixel_y = 2
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/almayer/hallways/hangar)
-"Io" = (
 /obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1
+	icon_state = "S"
 	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
+/obj/structure/machinery/light{
+	dir = 4
 	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
 /area/almayer/living/cryo_cells)
-"Iu" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster{
-	desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE.";
-	icon_state = "poster11";
-	name = "YOU ALWAYS KNOW A WORKING JOE.";
-	pixel_x = 27;
-	serial_number = 11
-	},
-/obj/structure/machinery/disposal{
-	density = 0;
-	layer = 3.2;
-	pixel_y = 16
-	},
+"Ii" = (
+/obj/structure/machinery/cryopod,
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "cargo"
 	},
-/area/almayer/squads/alpha/squad_two)
+/area/almayer/living/cryo_cells)
 "Iw" = (
-/obj/structure/machinery/firealarm{
-	pixel_y = 28
-	},
-/obj/structure/largecrate/supply/ammo/m41amk1,
-/obj/structure/largecrate/supply/ammo/m41amk1{
-	pixel_y = 10;
-	pixel_x = 3
+/obj/structure/surface/table/almayer,
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/platoon_sergeant)
+"IC" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/squads/alpha/squad_two)
-"IC" = (
-/obj/effect/landmark/start/marine/medic/alpha,
-/obj/effect/landmark/late_join/alpha,
-/turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/cryo_cells)
 "ID" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/squads/alpha/platoon_sergeant)
+"IE" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/surface/table/almayer,
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/item/tool/warning_cone{
+	pixel_x = 2;
+	pixel_y = 10
+	},
+/turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha/squad_two)
 "IN" = (
 /obj/effect/decal/cleanable/blood/oil,
@@ -4113,19 +4228,11 @@
 /area/almayer/hallways/hangar)
 "IU" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/item/device/flashlight/flare{
-	pixel_x = 8;
-	pixel_y = -1
-	},
-/obj/item/device/flashlight/flare{
-	pixel_x = 5;
-	pixel_y = 5
-	},
+/obj/structure/machinery/light,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/squad_two)
+/area/almayer/hallways/port_hallway)
 "IW" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -4133,25 +4240,30 @@
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
 "IX" = (
-/obj/structure/surface/table/almayer,
-/obj/item/paper_bin{
-	pixel_x = 11;
-	pixel_y = -10
+/obj/structure/machinery/light{
+	dir = 4
 	},
+/obj/structure/surface/table/almayer,
+/obj/item/paper_bin/uscm,
+/obj/item/tool/pen,
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "plate"
 	},
-/area/almayer/living/cafeteria_port)
+/area/almayer/living/briefing)
 "Jb" = (
-/obj/structure/stairs{
-	icon_state = "ramptop"
+/obj/structure/machinery/cm_vending/clothing/medic/alpha,
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
 	},
-/obj/structure/platform{
-	dir = 4;
-	layer = 2.7
+/area/almayer/medical)
+"Jc" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
 	},
 /turf/open/floor/almayer,
-/area/almayer/living/briefing)
+/area/almayer/hallways/port_hallway)
 "Jg" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/item/clipboard{
@@ -4161,28 +4273,28 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/platoon_commander_rooms)
-"Jj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/photocopier,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/alpha/platoon_sergeant)
 "Jk" = (
-/obj/structure/machinery/camera/autoname/almayer{
-	dir = 1;
-	name = "ship-grade camera"
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/grunt_rnr)
+/area/almayer/living/briefing)
 "Jn" = (
-/obj/structure/toilet{
-	pixel_y = 16
+/obj/structure/surface/table/almayer,
+/obj/item/reagent_container/food/drinks/cans/waterbottle{
+	pixel_x = 9;
+	pixel_y = 3
 	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/cryo_cells)
+/obj/item/prop/helmetgarb/flair_io{
+	pixel_x = -10;
+	pixel_y = 6
+	},
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/platoon_sergeant)
 "Jq" = (
 /obj/structure/machinery/landinglight/ds1/delaytwo{
 	dir = 8
@@ -4192,33 +4304,19 @@
 	},
 /area/almayer/hallways/hangar)
 "Jv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/light,
-/obj/structure/barricade/handrail{
-	dir = 4
+/obj/structure/machinery/light{
+	dir = 8
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/living/cafeteria_port)
-"JA" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/living/grunt_rnr)
 "JD" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 9
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
-"JH" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/squads/alpha/squad_one)
 "JI" = (
 /obj/structure/machinery/landinglight/ds1/delaythree{
 	dir = 4
@@ -4230,12 +4328,14 @@
 	},
 /area/almayer/hallways/hangar)
 "JJ" = (
-/obj/structure/machinery/camera/autoname/almayer{
-	dir = 1;
-	name = "ship-grade camera"
+/obj/structure/machinery/sleep_console{
+	dir = 8;
+	pixel_y = 6
 	},
-/turf/open/floor/almayer,
-/area/almayer/living/briefing)
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical)
 "JP" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -4263,11 +4363,17 @@
 	},
 /area/almayer/hallways/hangar)
 "Kd" = (
-/obj/structure/machinery/shower{
-	pixel_y = 16
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1;
+	pixel_y = 1
 	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/cryo_cells)
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/cafeteria_port)
 "Ke" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -4281,28 +4387,43 @@
 	},
 /area/almayer/hallways/hangar)
 "Ki" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
+/obj/structure/machinery/shower{
+	pixel_y = 16
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+/obj/structure/window/reinforced{
+	dir = 4;
+	health = 80
 	},
-/area/almayer/living/cryo_cells)
-"Kk" = (
-/turf/open/floor/almayer/uscm/directional/up_down{
-	dir = 6
+/obj/structure/window/reinforced{
+	dir = 8;
+	health = 80
 	},
-/area/almayer/living/briefing)
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/cryo_cells)
 "Kl" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 10
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/photocopier,
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/obj/structure/bed/chair,
-/turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha/platoon_sergeant)
+"Kp" = (
+/obj/structure/surface/rack,
+/obj/item/weapon/gun/rifle/m41aMK1{
+	pixel_y = 7
+	},
+/obj/item/weapon/gun/rifle/m41aMK1,
+/obj/item/weapon/gun/rifle/m41aMK1{
+	pixel_y = -7
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_one)
 "Ks" = (
-/turf/open/floor/almayer,
+/turf/open/floor/almayer{
+	icon_state = "bluefull"
+	},
 /area/almayer/living/briefing)
 "Kt" = (
 /obj/structure/machinery/power/smes/buildable,
@@ -4313,13 +4434,8 @@
 	},
 /area/almayer/engineering)
 "Kv" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hallways/port_hallway)
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/platoon_sergeant)
 "Kx" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -4331,63 +4447,88 @@
 	},
 /area/almayer/hallways/hangar)
 "KD" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/secure_closet/smartgunner,
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out";
+	pixel_x = -1
+	},
+/obj/structure/machinery/light,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/squad_one)
+/area/almayer/hallways/port_hallway)
 "KH" = (
 /obj/vehicle/powerloader,
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
 "KK" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 8
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/grunt_rnr)
+"KM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/light,
+/obj/structure/barricade/handrail{
+	dir = 4
 	},
 /turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
+	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/platoon_sergeant)
+/area/almayer/living/cafeteria_port)
 "KO" = (
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
 "KP" = (
-/obj/structure/machinery/cryopod{
-	pixel_y = 6
-	},
+/obj/structure/surface/table/almayer,
 /turf/open/floor/almayer{
-	icon_state = "cargo"
+	icon_state = "plate"
 	},
 /area/almayer/living/cryo_cells)
 "KQ" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
 /area/almayer/squads/alpha/platoon_sergeant)
 "KU" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/squads/alpha/squad_two)
+/turf/open/floor/almayer{
+	icon_state = "cargo_arrow"
+	},
+/area/almayer/hallways/port_hallway)
 "KY" = (
-/obj/structure/surface/table/almayer,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/fancy/cigarettes/lucky_strikes{
-	pixel_x = -7;
-	pixel_y = 9
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/cafeteria_port)
+/area/almayer/living/briefing)
 "Ld" = (
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
+/obj/structure/window/reinforced{
+	dir = 4;
+	pixel_x = -2;
+	pixel_y = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8;
+	layer = 3.3;
+	pixel_y = 4
+	},
+/obj/structure/bed{
+	can_buckle = 0
+	},
+/obj/structure/bed{
+	buckling_y = 13;
+	layer = 3.5;
+	pixel_y = 13
+	},
+/obj/item/bedsheet/brown{
+	layer = 3.4
 	},
-/obj/structure/prop/invuln/lattice_prop{
-	icon_state = "lattice2";
-	pixel_x = 16;
-	pixel_y = 16
+/obj/item/bedsheet/brown{
+	pixel_y = 13
 	},
 /obj/structure/prop/invuln/lattice_prop{
 	dir = 1;
@@ -4395,10 +4536,20 @@
 	pixel_x = 16;
 	pixel_y = -15
 	},
+/obj/structure/prop/invuln/lattice_prop{
+	icon_state = "lattice2";
+	pixel_x = 16;
+	pixel_y = 16
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/hallways/port_hallway)
+/area/almayer/living/grunt_rnr)
+"Lf" = (
+/obj/effect/landmark/start/marine/tl/alpha,
+/obj/effect/landmark/late_join/alpha,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/cryo_cells)
 "Lg" = (
 /obj/docking_port/stationary/marine_dropship/almayer_hangar_1,
 /obj/effect/landmark/observer_start,
@@ -4430,13 +4581,14 @@
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
 "Ls" = (
-/obj/structure/machinery/door/airlock/almayer/generic{
-	dir = 1;
-	name = "\improper Platoon Sergeants Bunk"
+/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/alpha{
+	density = 0
+	},
+/obj/structure/machinery/light/small{
+	dir = 1
 	},
-/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "plate"
 	},
 /area/almayer/squads/alpha/platoon_sergeant)
 "Lx" = (
@@ -4456,9 +4608,10 @@
 /area/almayer/living/platoon_commander_rooms)
 "LF" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep,
+/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	dir = 1;
+	icon_state = "cargo_arrow"
 	},
 /area/almayer/squads/alpha/squad_one)
 "LH" = (
@@ -4471,71 +4624,75 @@
 	},
 /area/almayer/hallways/hangar)
 "LJ" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 6
+/turf/open/floor/almayer/uscm/directional{
+	dir = 8
+	},
+/area/almayer/living/briefing)
+"LK" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/bed/chair{
+	dir = 1
 	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/grunt_rnr)
-"LQ" = (
-/obj/effect/landmark/start/marine/alpha,
-/obj/effect/landmark/late_join/alpha,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
+/area/almayer/squads/alpha/squad_one)
+"LL" = (
+/obj/effect/landmark/late_join/alpha,
+/obj/effect/landmark/start/marine/alpha,
+/turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/cryo_cells)
-"LZ" = (
-/obj/structure/machinery/light,
-/turf/open/floor/almayer,
-/area/almayer/living/platoon_commander_rooms)
-"Ma" = (
-/obj/effect/decal/cleanable/dirt,
+"LQ" = (
 /obj/effect/decal/warning_stripes{
-	icon_state = "S"
+	icon_state = "NW-out";
+	pixel_x = -1;
+	pixel_y = 1
 	},
 /obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
+	icon_state = "SW-out";
+	pixel_x = -1
 	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
 /area/almayer/living/cryo_cells)
-"Me" = (
+"LS" = (
+/obj/structure/bed/chair/comfy{
+	dir = 1
+	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/secure_closet/squad_sergeant,
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "dark_sterile"
 	},
+/area/almayer/living/cafeteria_port)
+"LZ" = (
+/obj/structure/machinery/light,
+/turf/open/floor/almayer,
+/area/almayer/living/platoon_commander_rooms)
+"Me" = (
+/turf/closed/wall/almayer,
 /area/almayer/squads/alpha/squad_two)
 "Mi" = (
-/obj/effect/landmark/late_join,
-/obj/effect/landmark/start/marine/alpha,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/cryo_cells)
-"Mj" = (
-/obj/structure/pipes/vents/scrubber,
-/turf/open/floor/almayer,
-/area/almayer/living/briefing)
-"Mn" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
+/obj/structure/machinery/light{
+	dir = 4
 	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
 /area/almayer/living/cryo_cells)
-"Mv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/largecrate/supply/ammo/m41amk1,
-/obj/structure/largecrate/supply/ammo/m41amk1{
-	pixel_y = 10;
-	pixel_x = 3
+"Mj" = (
+/obj/structure/surface/table/reinforced/prison,
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
 	},
+/area/almayer/medical)
+"Mn" = (
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	dir = 1;
+	icon_state = "cargo_arrow"
 	},
-/area/almayer/squads/alpha/squad_one)
+/area/almayer/living/cryo_cells)
 "MB" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SE-out"
@@ -4561,14 +4718,13 @@
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
 "MJ" = (
-/obj/structure/machinery/camera/autoname/almayer{
-	dir = 4;
-	name = "ship-grade camera"
+/obj/structure/machinery/light{
+	dir = 4
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/hallways/port_hallway)
+/area/almayer/living/grunt_rnr)
 "MK" = (
 /turf/closed/wall/almayer/outer,
 /area/almayer/living/platoon_commander_rooms)
@@ -4578,58 +4734,35 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/hangar)
-"MP" = (
-/obj/structure/closet/coffin/woodencrate,
-/obj/item/storage/box/m94,
-/obj/item/storage/box/m94,
-/obj/item/storage/box/m94,
-/obj/structure/sign/safety/rewire{
-	pixel_x = 14;
-	pixel_y = 29
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/alpha/squad_one)
 "MZ" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
-	dir = 1;
 	icon_state = "cargo_arrow"
 	},
-/area/almayer/squads/alpha/squad_one)
-"Ne" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 2
+/area/almayer/living/grunt_rnr)
+"Na" = (
+/obj/structure/machinery/light{
+	dir = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
-/area/almayer/living/cafeteria_port)
-"Nf" = (
-/turf/open/floor/almayer/uscm/directional/up_down{
-	dir = 4
+/area/almayer/living/cryo_cells)
+"Ne" = (
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "cargo_arrow"
 	},
 /area/almayer/living/briefing)
+"Nf" = (
+/turf/closed/wall/almayer/white,
+/area/almayer/medical)
 "Ng" = (
-/obj/structure/pipes/standard/manifold/fourway/hidden/supply,
-/turf/open/floor/almayer,
-/area/almayer/hallways/port_hallway)
-"Nh" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/prop/invuln/lattice_prop{
-	dir = 1;
-	icon_state = "lattice-simple";
-	pixel_x = 16;
-	pixel_y = -15
+/obj/structure/machinery/light{
+	dir = 1
 	},
 /turf/open/floor/almayer,
-/area/almayer/living/grunt_rnr)
+/area/almayer/squads/alpha/platoon_sergeant)
 "Nk" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 6
@@ -4637,26 +4770,36 @@
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
 "Np" = (
+/turf/open/floor/almayer,
+/area/almayer/living/briefing)
+"Nr" = (
 /obj/structure/surface/table/almayer,
-/obj/item/paper_bin{
-	pixel_x = 5;
-	pixel_y = 22
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/squad_two)
+"NB" = (
+/obj/structure/sign/safety/cryo{
+	pixel_x = 6;
+	pixel_y = -29
 	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/prop/invuln/overhead_pipe{
+	pixel_x = -7;
+	pixel_y = -3
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "plate"
 	},
-/area/almayer/living/cafeteria_port)
-"Ns" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
+/area/almayer/living/cryo_cells)
+"ND" = (
+/obj/structure/sign/safety/rewire{
+	pixel_x = 14;
+	pixel_y = 29
 	},
-/turf/open/floor/almayer,
-/area/almayer/hallways/port_hallway)
+/obj/item/defenses/handheld/sentry,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_two)
 "NE" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -4675,42 +4818,47 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/living/platoon_commander_rooms)
-"NF" = (
-/turf/open/floor/almayer/uscm/directional/up_down{
-	dir = 1
-	},
-/area/almayer/living/briefing)
 "NO" = (
-/obj/structure/machinery/cm_vending/sorted/medical/chemistry/no_access,
+/obj/structure/bed/chair/comfy,
 /turf/open/floor/almayer{
-	icon_state = "sterile_green"
-	},
-/area/almayer/medical)
-"NQ" = (
-/obj/structure/pipes/vents/pump{
-	dir = 8
+	icon_state = "plate"
 	},
-/turf/open/floor/almayer,
-/area/almayer/living/grunt_rnr)
+/area/almayer/living/cafeteria_port)
 "NT" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
-/area/almayer/living/cryo_cells)
+/area/almayer/living/cafeteria_port)
 "NV" = (
-/obj/structure/machinery/cryopod/right{
-	pixel_y = 6
+/obj/structure/sign/safety/cryo{
+	pixel_x = 6;
+	pixel_y = -29
 	},
 /turf/open/floor/almayer{
-	icon_state = "cargo"
+	icon_state = "plate"
 	},
 /area/almayer/living/cryo_cells)
 "Ob" = (
-/obj/effect/decal/cleanable/dirt,
+/obj/structure/platform{
+	dir = 4;
+	layer = 2.7
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1;
+	pixel_y = 1
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/cafeteria_port)
+/area/almayer/living/briefing)
 "Oc" = (
 /obj/structure/machinery/power/terminal{
 	dir = 1
@@ -4723,36 +4871,28 @@
 /area/almayer/engineering)
 "Od" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/light{
-	dir = 8
-	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	dir = 8;
+	icon_state = "cargo_arrow"
 	},
-/area/almayer/living/grunt_rnr)
+/area/almayer/living/briefing)
 "Oj" = (
-/obj/structure/machinery/door/airlock/almayer/generic,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
+/obj/structure/machinery/camera/autoname/almayer,
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "plate"
 	},
-/area/almayer/squads/alpha/squad_one)
+/area/almayer/hallways/port_hallway)
 "Os" = (
-/obj/structure/window/framed/almayer,
+/obj/structure/bed/chair/comfy,
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/squads/alpha/platoon_sergeant)
+/area/almayer/living/cafeteria_port)
 "OA" = (
-/obj/structure/bed/chair/comfy/alpha{
-	dir = 1
-	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/living/briefing)
+/area/almayer/medical)
 "OC" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/structure/machinery/light,
@@ -4761,22 +4901,39 @@
 	},
 /area/almayer/living/platoon_commander_rooms)
 "OG" = (
-/obj/structure/machinery/light{
-	dir = 8
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/alarm/almayer{
+	dir = 1
 	},
-/turf/open/floor/almayer,
-/area/almayer/squads/alpha/squad_one)
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hallways/port_hallway)
 "OH" = (
+/obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/warning_stripes{
-	icon_state = "E";
+	icon_state = "SE-out";
 	pixel_x = 1
 	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hallways/hangar)
+"OI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/surface/table/almayer,
 /obj/structure/machinery/light{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/almayer/hallways/hangar)
+/obj/item/storage/toolbox/mechanical{
+	pixel_x = 1;
+	pixel_y = 7
+	},
+/obj/item/tool/wrench,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_one)
 "OJ" = (
 /obj/structure/machinery/landinglight/ds1/delaythree,
 /turf/open/floor/almayer{
@@ -4792,27 +4949,63 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
+"OU" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/squads/alpha/squad_two)
 "OX" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
+/turf/open/floor/almayer/uscm/directional{
 	dir = 4
 	},
-/turf/open/floor/almayer,
-/area/almayer/living/grunt_rnr)
+/area/almayer/living/briefing)
 "Pc" = (
+/obj/structure/surface/table/almayer,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/obj/item/tool/kitchen/tray{
+	pixel_x = 16;
+	pixel_y = -10
+	},
+/obj/item/storage/box/cups{
+	pixel_x = 11;
+	pixel_y = -9
+	},
+/obj/item/trash/ceramic_plate{
+	pixel_x = 18;
+	pixel_y = 3
+	},
+/obj/item/trash/ceramic_plate{
+	pixel_x = 18;
+	pixel_y = 5
+	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "plate"
 	},
 /area/almayer/living/cafeteria_port)
 "Pe" = (
-/obj/structure/machinery/door/airlock/almayer/medical{
-	name = "\improper Platoon Medic Office";
-	req_one_access = list()
+/obj/structure/bed/chair/comfy,
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/medical)
+/area/almayer/living/cafeteria_port)
+"Pf" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/bedsheetbin{
+	pixel_y = 6
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/cryo_cells)
 "Ph" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -4824,12 +5017,39 @@
 	},
 /area/almayer/hallways/hangar)
 "Pl" = (
-/obj/structure/machinery/light{
-	dir = 4
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
 	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 9
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/cryo_cells)
+"Pm" = (
+/obj/structure/surface/rack,
+/obj/item/weapon/gun/shotgun/pump/special{
+	pixel_y = 8
+	},
+/obj/item/storage/box/nade_box{
+	pixel_x = 4;
+	pixel_y = -2
 	},
+/obj/item/ammo_magazine/shotgun/buckshot/special,
+/obj/item/device/motiondetector,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_two)
+"Pp" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
+	name = "\improper Squad One Armoury"
+	},
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/squads/alpha/squad_one)
+"Pr" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
 	pixel_x = 1
@@ -4837,11 +5057,7 @@
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
-/area/almayer/living/cryo_cells)
-"Pr" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/almayer/living/briefing)
+/area/almayer/medical)
 "Pt" = (
 /obj/effect/decal/cleanable/blood/oil,
 /obj/effect/decal/cleanable/dirt,
@@ -4849,16 +5065,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"Pv" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/prop/almayer/CICmap{
-	pixel_y = 29
-	},
-/obj/effect/landmark/map_item,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/alpha/platoon_sergeant)
 "Py" = (
 /obj/structure/machinery/landinglight/ds1{
 	dir = 4
@@ -4868,39 +5074,75 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"PM" = (
-/obj/structure/bed/chair{
-	dir = 4
+"PA" = (
+/obj/structure/surface/rack,
+/obj/item/weapon/gun/shotgun/pump/special{
+	pixel_y = 10
 	},
-/turf/open/floor/almayer,
-/area/almayer/squads/alpha/platoon_sergeant)
+/obj/item/storage/box/nade_box{
+	pixel_x = 2;
+	pixel_y = -4
+	},
+/obj/item/ammo_magazine/shotgun/buckshot/special,
+/obj/item/device/motiondetector,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_one)
+"PF" = (
+/obj/structure/machinery/light,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hallways/port_hallway)
+"PG" = (
+/obj/structure/machinery/computer/arcade{
+	density = 0;
+	pixel_y = 16
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_two)
 "PQ" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 8
+	},
 /turf/open/floor/almayer{
-	dir = 1;
 	icon_state = "cargo_arrow"
 	},
-/area/almayer/squads/alpha/squad_two)
+/area/almayer/squads/alpha/platoon_sergeant)
 "PW" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/machinery/door/airlock/almayer/command/reinforced{
+	name = "\improper Private Briefing Room"
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/living/briefing)
+"PY" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 8
+	},
 /obj/effect/decal/warning_stripes{
-	icon_state = "E";
+	icon_state = "SE-out";
 	pixel_x = 1
 	},
 /obj/effect/decal/warning_stripes{
-	icon_state = "N";
+	icon_state = "NE-out";
+	pixel_x = 1;
 	pixel_y = 2
 	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
-/area/almayer/living/cafeteria_port)
-"PY" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 10
+/area/almayer/medical)
+"PZ" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 8
 	},
-/turf/open/floor/almayer,
-/area/almayer/living/briefing)
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/squads/alpha/squad_one)
 "Qc" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/structure/machinery/computer/overwatch/almayer{
@@ -4921,14 +5163,27 @@
 /turf/open/floor/almayer,
 /area/almayer/living/platoon_commander_rooms)
 "Qe" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/item/ammo_magazine/pistol{
+	current_rounds = 0
+	},
+/obj/item/weapon/gun/pistol/m4a3{
+	current_mag = null
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/squads/alpha/platoon_sergeant)
+"Qi" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/safety/conference_room{
+	pixel_y = 29
+	},
 /turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
+	icon_state = "plate"
 	},
 /area/almayer/hallways/port_hallway)
-"Qi" = (
-/obj/structure/surface/table/almayer,
-/turf/open/floor/almayer,
-/area/almayer/squads/alpha/squad_two)
 "Qk" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 1
@@ -4936,47 +5191,44 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/hangar)
 "Ql" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/obj/item/storage/toolbox/mechanical{
-	pixel_x = 1;
-	pixel_y = 7
-	},
-/obj/item/tool/wrench,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/alpha/squad_one)
-"Qq" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 2
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+/obj/structure/prop/invuln/lattice_prop{
+	icon_state = "lattice1";
+	pixel_x = 16;
+	pixel_y = -15
 	},
-/area/almayer/living/cryo_cells)
-"Qu" = (
-/obj/structure/machinery/camera/autoname/almayer,
+/obj/structure/largecrate/random/case/double,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/hallways/port_hallway)
+"Qu" = (
+/obj/structure/machinery/firealarm{
+	pixel_y = 28
+	},
+/obj/structure/filingcabinet/chestdrawer{
+	density = 0;
+	pixel_x = -8;
+	pixel_y = 16
+	},
+/obj/structure/filingcabinet{
+	density = 0;
+	pixel_x = 8;
+	pixel_y = 16
+	},
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/platoon_sergeant)
+"Qw" = (
+/turf/closed/wall/almayer/outer,
+/area/almayer/squads/alpha/squad_two)
 "Qx" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 11
 	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+/obj/structure/mirror{
+	pixel_x = 28
 	},
+/turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/cryo_cells)
 "QD" = (
 /obj/effect/decal/warning_stripes{
@@ -4988,28 +5240,39 @@
 	},
 /area/almayer/living/cryo_cells)
 "QE" = (
-/obj/structure/platform_decoration{
-	dir = 4
+/obj/structure/machinery/chem_dispenser,
+/obj/item/reagent_container/glass/beaker/bluespace,
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
 	},
-/turf/open/floor/almayer,
-/area/almayer/living/briefing)
+/area/almayer/medical)
 "QI" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/reagent_container/spray/cleaner,
+/obj/structure/surface/table/almayer,
 /obj/effect/decal/cleanable/dirt,
+/obj/item/storage/fancy/cigarettes/lucky_strikes{
+	pixel_x = -7;
+	pixel_y = 9
+	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green"
+	icon_state = "plate"
 	},
-/area/almayer/medical)
+/area/almayer/living/cafeteria_port)
+"QJ" = (
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/squads/alpha/squad_one)
 "QM" = (
-/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
-/area/almayer/living/cryo_cells)
+/area/almayer/living/cafeteria_port)
 "QN" = (
 /obj/structure/pipes/vents/scrubber,
 /turf/open/floor/almayer{
@@ -5027,10 +5290,25 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/platoon_commander_rooms)
 "QS" = (
-/obj/structure/surface/table/almayer,
-/obj/item/folder/black_random,
-/turf/open/floor/almayer,
+/obj/structure/bed/chair/comfy{
+	dir = 8
+	},
+/obj/structure/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
 /area/almayer/squads/alpha/platoon_sergeant)
+"QT" = (
+/obj/structure/machinery/cryopod,
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/almayer/living/cryo_cells)
 "QW" = (
 /obj/structure/cargo_container/wy/left,
 /obj/structure/sign/poster{
@@ -5050,23 +5328,22 @@
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
 "QX" = (
-/obj/structure/machinery/light{
-	dir = 8
+/obj/structure/machinery/power/apc/almayer{
+	dir = 1
 	},
-/obj/structure/bed/chair{
-	dir = 4
+/obj/structure/pipes/vents/scrubber,
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/turf/open/floor/almayer,
 /area/almayer/squads/alpha/platoon_sergeant)
-"Rc" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/computer/secure_data{
-	pixel_y = 6
+"Ra" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/squads/alpha/platoon_sergeant)
+/area/almayer/living/cryo_cells)
 "Rg" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -5076,151 +5353,225 @@
 	},
 /area/almayer/hallways/hangar)
 "Rh" = (
+/obj/structure/machinery/alarm/almayer{
+	dir = 1
+	},
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
+	icon_state = "plate"
 	},
-/area/almayer/hallways/port_hallway)
+/area/almayer/squads/alpha/platoon_sergeant)
+"Rj" = (
+/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_one)
 "Rl" = (
 /obj/structure/surface/table/almayer,
-/obj/item/trash/plate,
-/obj/item/trash/ceramic_plate{
-	pixel_x = 6;
-	pixel_y = 19
+/obj/item/tool/kitchen/tray{
+	pixel_y = -10
 	},
-/obj/item/trash/ceramic_plate{
-	pixel_x = 6;
-	pixel_y = 21
+/obj/item/reagent_container/food/condiment/hotsauce/tabasco{
+	pixel_x = 7;
+	pixel_y = -2
 	},
-/obj/item/trash/ceramic_plate{
-	pixel_x = 5;
-	pixel_y = 23
+/obj/item/storage/box/cups{
+	pixel_x = -5;
+	pixel_y = -10
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/cafeteria_port)
+"Rr" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer,
+/area/almayer/hallways/starboard_hallway)
+"Rv" = (
+/turf/closed/wall/almayer/outer,
+/area/almayer/living/cafeteria_port)
+"Rx" = (
+/obj/structure/surface/table/almayer,
+/obj/item/paper_bin{
+	pixel_x = -11;
+	pixel_y = -10
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/cafeteria_port)
+"Ry" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/surface/table/almayer,
+/obj/item/tool/wrench{
+	pixel_y = 7
+	},
+/obj/structure/machinery/camera/autoname/almayer{
+	dir = 8;
+	name = "ship-grade camera"
+	},
+/obj/structure/sign/poster{
+	desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE.";
+	icon_state = "poster11";
+	name = "YOU ALWAYS KNOW A WORKING JOE.";
+	pixel_x = -4;
+	pixel_y = 32;
+	serial_number = 11
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_one)
+"RD" = (
+/obj/effect/landmark/late_join,
+/obj/effect/landmark/start/marine/alpha,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/cryo_cells)
+"RO" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/secure_closet/squad_sergeant,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_two)
+"RT" = (
+/obj/structure/machinery/landinglight/ds1/delayone,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hallways/hangar)
+"Sc" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/cryo_cells)
+"Sd" = (
+/obj/structure/sign/poster{
+	desc = "This poster features Audrey Rainwater standing in a jacuzzi. She was the July 2182 centerfold in House Bunny Gentleman's Magazine. Don't ask how you know that.";
+	icon_state = "poster16";
+	layer = 3.3;
+	name = "'Miss July' Pinup";
+	pixel_y = 29;
+	serial_number = 16
+	},
+/obj/structure/window/reinforced{
+	dir = 4;
+	pixel_x = -2;
+	pixel_y = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8;
+	layer = 3.3;
+	pixel_y = 4
+	},
+/obj/structure/bed{
+	can_buckle = 0
+	},
+/obj/structure/bed{
+	buckling_y = 13;
+	layer = 3.5;
+	pixel_y = 13
+	},
+/obj/item/bedsheet/brown{
+	layer = 3.4
+	},
+/obj/item/bedsheet/brown{
+	pixel_y = 13
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/grunt_rnr)
+"Si" = (
+/obj/structure/machinery/light,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/cryo_cells)
+"Sl" = (
+/obj/structure/surface/table/almayer,
+/obj/item/paper_bin{
+	pixel_x = 11;
+	pixel_y = -10
 	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
 /area/almayer/living/cafeteria_port)
-"Rr" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/almayer/hallways/starboard_hallway)
-"Rv" = (
-/obj/structure/window/framed/almayer,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/living/cryo_cells)
-"Rx" = (
+"So" = (
 /obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
+	icon_state = "S"
 	},
-/turf/open/floor/almayer,
-/area/almayer/hallways/port_hallway)
-"RT" = (
-/obj/structure/machinery/landinglight/ds1/delayone,
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"Sc" = (
+"Sq" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
 	},
 /obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1
+	icon_state = "E";
+	pixel_x = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
 /area/almayer/living/cryo_cells)
-"Sd" = (
-/obj/structure/sign/safety/galley{
-	pixel_y = 29
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hallways/port_hallway)
-"Sh" = (
+"Su" = (
 /obj/structure/surface/table/almayer,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/light{
-	dir = 1
-	},
 /obj/item/tool/kitchen/tray{
-	pixel_x = 16;
 	pixel_y = -10
 	},
-/obj/item/storage/box/cups{
-	pixel_x = 11;
-	pixel_y = -9
-	},
-/obj/item/trash/ceramic_plate{
-	pixel_x = 18;
-	pixel_y = 3
-	},
-/obj/item/trash/ceramic_plate{
-	pixel_x = 18;
-	pixel_y = 5
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
+/obj/item/reagent_container/food/condiment/hotsauce/franks{
+	pixel_x = 7;
+	pixel_y = -3
 	},
-/area/almayer/living/cafeteria_port)
-"Sl" = (
-/obj/structure/surface/table/almayer,
-/turf/open/floor/almayer{
-	icon_state = "plate"
+/obj/item/storage/box/cups{
+	pixel_x = -5;
+	pixel_y = -10
 	},
-/area/almayer/living/cryo_cells)
-"So" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
 /obj/effect/decal/warning_stripes{
-	icon_state = "S"
+	icon_state = "E";
+	pixel_x = 1
 	},
-/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/hallways/hangar)
-"Su" = (
-/obj/structure/bed/chair/office/light{
+/area/almayer/living/cafeteria_port)
+"Sw" = (
+/obj/structure/machinery/shower{
 	dir = 1
 	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+/obj/structure/window/reinforced{
+	dir = 4;
+	health = 80
 	},
-/area/almayer/medical)
-"Sw" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
+/obj/structure/window/reinforced{
+	dir = 8;
+	health = 80
 	},
+/turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/cryo_cells)
 "Sy" = (
-/obj/structure/machinery/power/apc/almayer{
-	dir = 8
+/obj/structure/machinery/disposal,
+/obj/structure/machinery/camera/autoname/almayer{
+	dir = 4;
+	name = "ship-grade camera"
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/grunt_rnr)
-"SG" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
-	},
-/obj/structure/machinery/door/airlock/almayer/generic{
-	name = "\improper Canteen"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/living/cryo_cells)
+/area/almayer/living/briefing)
 "SL" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -5242,50 +5593,28 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"SV" = (
-/obj/structure/sink{
-	pixel_y = 24
-	},
-/obj/structure/mirror{
-	pixel_y = 32
-	},
-/obj/item/storage/pill_bottle/tramadol/skillless{
-	layer = 2.9;
-	pill_type_to_fill = null;
-	pixel_y = 14
-	},
-/obj/structure/pipes/vents/pump,
-/obj/structure/surface/rack{
-	density = 0;
-	pixel_x = 26
+"ST" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/surface/table/almayer,
+/obj/item/device/flashlight/flare{
+	pixel_x = 8;
+	pixel_y = -1
 	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
+/obj/item/device/flashlight/flare{
+	pixel_x = 5;
+	pixel_y = 5
 	},
-/obj/item/tool/soap,
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "plate"
 	},
-/area/almayer/living/cryo_cells)
+/area/almayer/squads/alpha/squad_two)
 "SY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 5
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "cargo_arrow"
 	},
-/turf/open/floor/almayer,
 /area/almayer/hallways/port_hallway)
-"Tb" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 6
-	},
-/obj/item/prop/magazine/book/borntokill,
-/obj/item/prop/magazine/book/starshiptroopers{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/squads/alpha/squad_one)
 "Td" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 9
@@ -5293,30 +5622,101 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/hangar)
 "Tg" = (
-/obj/structure/machinery/disposal{
-	density = 0;
-	layer = 3.2;
-	pixel_y = 16
+/obj/item/device/radio/intercom{
+	freerange = 1;
+	name = "General Listening Channel";
+	pixel_y = 28
+	},
+/obj/structure/window/reinforced{
+	dir = 4;
+	pixel_x = -2;
+	pixel_y = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8;
+	layer = 3.3;
+	pixel_y = 4
+	},
+/obj/structure/bed{
+	can_buckle = 0
+	},
+/obj/structure/bed{
+	buckling_y = 13;
+	layer = 3.5;
+	pixel_y = 13
+	},
+/obj/item/bedsheet/brown{
+	layer = 3.4
 	},
+/obj/item/bedsheet/brown{
+	pixel_y = 13
+	},
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/hallways/port_hallway)
+/area/almayer/living/grunt_rnr)
 "Tj" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 5
+/obj/structure/filingcabinet/chestdrawer{
+	density = 0;
+	pixel_x = -8;
+	pixel_y = 16
+	},
+/obj/structure/filingcabinet{
+	density = 0;
+	pixel_x = 8;
+	pixel_y = 16
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/obj/item/folder/black_random,
-/turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha/platoon_sergeant)
 "Tk" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/window/reinforced{
+	dir = 4;
+	pixel_x = -2;
+	pixel_y = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8;
+	layer = 3.3;
+	pixel_y = 4
+	},
+/obj/structure/bed{
+	can_buckle = 0
+	},
+/obj/structure/bed{
+	buckling_y = 13;
+	layer = 3.5;
+	pixel_y = 13
+	},
+/obj/item/bedsheet/brown{
+	layer = 3.4
+	},
+/obj/item/bedsheet/brown{
+	pixel_y = 13
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/grunt_rnr)
+"To" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "cargo_arrow"
+	},
+/area/almayer/living/cryo_cells)
+"Tr" = (
+/obj/structure/machinery/alarm/almayer{
+	dir = 1
+	},
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/hallways/port_hallway)
+/area/almayer/living/cryo_cells)
 "Tu" = (
 /obj/structure/sign/safety/hazard{
 	pixel_x = -19;
@@ -5346,20 +5746,22 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
+"Ty" = (
+/turf/closed/wall/almayer/outer,
+/area/almayer/squads/alpha/squad_one)
 "Tz" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
+/obj/structure/bed/chair{
+	dir = 8
 	},
-/area/almayer/squads/alpha/squad_two)
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/platoon_sergeant)
 "TC" = (
-/obj/structure/surface/table/almayer,
-/obj/item/storage/box/pdt_kit{
-	pixel_x = 7;
-	pixel_y = 9
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/squads/alpha/squad_two)
+/turf/open/floor/almayer,
+/area/almayer/hallways/port_hallway)
 "TD" = (
 /obj/item/tool/crowbar/red{
 	pixel_x = -13;
@@ -5382,29 +5784,27 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/hallways/hangar)
-"TN" = (
-/turf/closed/wall/almayer,
-/area/almayer/engineering)
-"TO" = (
+"TI" = (
+/obj/effect/decal/cleanable/dirt,
 /obj/structure/surface/table/almayer,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 9
-	},
-/obj/item/bananapeel{
-	desc = "Ew.";
-	gender = "plural";
-	icon = 'icons/obj/items/shards.dmi';
-	icon_state = "shrapnelsmall";
-	name = "\improper finger nails";
-	pixel_x = -6;
+/obj/structure/machinery/recharger{
 	pixel_y = 5
 	},
-/obj/item/ashtray/glass{
-	pixel_x = 3;
-	pixel_y = -4
+/obj/item/tool/hand_labeler{
+	pixel_x = -3;
+	pixel_y = 14
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha/squad_one)
+"TN" = (
+/turf/closed/wall/almayer,
+/area/almayer/engineering)
+"TO" = (
+/obj/structure/pipes/standard/manifold/fourway/hidden/supply,
+/turf/open/floor/almayer,
+/area/almayer/hallways/port_hallway)
 "TP" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -5418,109 +5818,110 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"TV" = (
-/obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = -2;
-	pixel_y = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8;
-	layer = 3.3;
-	pixel_y = 4
-	},
-/obj/structure/bed{
-	can_buckle = 0
-	},
-/obj/structure/bed{
-	buckling_y = 13;
-	layer = 3.5;
-	pixel_y = 13
-	},
-/obj/item/bedsheet/brown{
-	layer = 3.4
-	},
-/obj/item/bedsheet/brown{
-	pixel_y = 13
-	},
-/obj/structure/prop/invuln/lattice_prop{
-	dir = 1;
-	icon_state = "lattice-simple";
-	pixel_x = 16;
-	pixel_y = -15
-	},
-/obj/structure/prop/invuln/lattice_prop{
-	icon_state = "lattice2";
-	pixel_x = 16;
-	pixel_y = 16
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/living/grunt_rnr)
+"TT" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/vents/scrubber,
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/squad_two)
 "TY" = (
-/obj/structure/machinery/light{
-	dir = 8
+/obj/structure/barricade/handrail{
+	dir = 1;
+	pixel_y = 12
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	dir = 8;
+	icon_state = "cargo_arrow"
 	},
-/area/almayer/living/cryo_cells)
+/area/almayer/living/cafeteria_port)
 "Ub" = (
-/turf/open/floor/almayer{
-	icon_state = "sterile_green"
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/camera/autoname/almayer{
+	dir = 8;
+	name = "ship-grade camera"
 	},
-/area/almayer/medical)
-"Uh" = (
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "plate"
 	},
 /area/almayer/living/cafeteria_port)
-"Ui" = (
-/obj/structure/bed/chair/comfy{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
+"Uh" = (
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "test_floor5"
 	},
+/area/almayer/living/briefing)
+"Ui" = (
+/turf/closed/wall/almayer,
 /area/almayer/living/cafeteria_port)
 "Uj" = (
-/turf/open/floor/almayer,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
 /area/almayer/squads/alpha/platoon_sergeant)
-"Uv" = (
-/obj/structure/pipes/standard/manifold/hidden/supply,
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
+"Uk" = (
+/obj/structure/surface/table/almayer,
+/obj/item/spacecash/c10{
+	pixel_x = 5;
+	pixel_y = 7
 	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/squads/alpha/squad_one)
+"Uv" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "plate"
 	},
 /area/almayer/living/cafeteria_port)
 "UA" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
-	dir = 4;
 	icon_state = "cargo_arrow"
 	},
 /area/almayer/hallways/hangar)
+"UI" = (
+/obj/structure/surface/table/almayer,
+/obj/item/device/cassette_tape/nam{
+	layer = 2.9;
+	pixel_x = -6;
+	pixel_y = 7
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/squads/alpha/squad_one)
 "UK" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
+/obj/structure/machinery/light{
+	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/light,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/hallways/port_hallway)
+/area/almayer/squads/alpha/platoon_sergeant)
+"UN" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/line_nexter{
+	dir = 1;
+	id = "MTline";
+	pixel_y = 13
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "cargo_arrow"
+	},
+/area/almayer/living/cafeteria_port)
 "UO" = (
-/obj/structure/machinery/light,
+/obj/structure/bed/chair{
+	dir = 4
+	},
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/grunt_rnr)
+"UT" = (
+/obj/structure/machinery/disposal{
+	density = 0;
+	layer = 3.2;
+	pixel_y = 16
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -5543,63 +5944,57 @@
 	},
 /area/almayer/engineering)
 "Va" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/recharger{
-	pixel_y = 6
-	},
-/obj/structure/machinery/camera/autoname/almayer{
-	dir = 4;
-	name = "ship-grade camera"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
-/area/almayer/squads/alpha/squad_two)
+/turf/open/floor/almayer,
+/area/almayer/hallways/port_hallway)
 "Vc" = (
-/obj/structure/machinery/cryopod,
-/obj/structure/machinery/light{
-	dir = 8
-	},
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
-	icon_state = "cargo"
+	icon_state = "dark_sterile"
 	},
 /area/almayer/living/cryo_cells)
 "Ve" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+/obj/structure/sink{
+	pixel_y = 24
 	},
-/area/almayer/living/cryo_cells)
-"Vj" = (
-/turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "plating"
+/obj/structure/mirror{
+	pixel_y = 32
 	},
-/area/almayer/engineering)
-"Vp" = (
-/obj/structure/surface/rack,
-/obj/item/weapon/gun/flamer{
-	current_mag = null;
-	pixel_y = 4
+/obj/item/storage/pill_bottle/tramadol/skillless{
+	layer = 2.9;
+	pill_type_to_fill = null;
+	pixel_y = 14
 	},
-/obj/item/ammo_magazine/flamer_tank,
-/obj/item/ammo_magazine/flamer_tank,
-/obj/item/device/motiondetector,
-/turf/open/floor/almayer{
-	icon_state = "plate"
+/obj/structure/pipes/vents/pump,
+/obj/structure/surface/rack{
+	density = 0;
+	pixel_x = 26
 	},
-/area/almayer/squads/alpha/squad_one)
-"Vr" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
 	},
+/obj/item/tool/soap,
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
 /area/almayer/living/cryo_cells)
+"Vj" = (
+/turf/open/floor/almayer{
+	dir = 5;
+	icon_state = "plating"
+	},
+/area/almayer/engineering)
+"Vp" = (
+/turf/closed/wall/almayer,
+/area/almayer/living/grunt_rnr)
+"Vr" = (
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/briefing)
 "Vv" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -5613,39 +6008,51 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"VL" = (
+"VK" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/disposal,
+/obj/structure/closet/secure_closet/smartgunner,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/squads/alpha/squad_one)
+"VL" = (
+/obj/structure/closet/secure_closet/platoon_sergeant,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/squads/alpha/platoon_sergeant)
 "VQ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/vending/coffee/simple,
+/obj/structure/machinery/disposal,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/squads/alpha/platoon_sergeant)
 "VX" = (
-/obj/structure/machinery/light{
-	dir = 4
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1;
+	pixel_y = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/grunt_rnr)
+/area/almayer/living/briefing)
 "Wf" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
 /obj/structure/prop/invuln/lattice_prop{
-	icon_state = "lattice1";
+	dir = 1;
+	icon_state = "lattice-simple";
 	pixel_x = 16;
 	pixel_y = -15
 	},
-/obj/structure/largecrate/random/case/double,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/hallways/port_hallway)
+/turf/open/floor/almayer,
+/area/almayer/living/grunt_rnr)
 "Wg" = (
 /obj/structure/sign/safety/cryo{
 	pixel_x = 8;
@@ -5661,11 +6068,31 @@
 	},
 /area/almayer/living/platoon_commander_rooms)
 "Wj" = (
-/obj/structure/curtain/red,
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "test_floor4"
 	},
-/area/almayer/squads/alpha/platoon_sergeant)
+/area/almayer/living/grunt_rnr)
+"Wl" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out";
+	pixel_x = -1
+	},
+/turf/open/floor/almayer,
+/area/almayer/hallways/port_hallway)
+"Wm" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 2
+	},
+/turf/open/floor/almayer,
+/area/almayer/hallways/port_hallway)
+"Wp" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 9
+	},
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/squad_one)
 "Wr" = (
 /obj/structure/machinery/floodlight/landing,
 /turf/open/floor/almayer,
@@ -5700,12 +6127,27 @@
 /obj/item/prop/magazine/book/theartofwar,
 /turf/open/floor/almayer,
 /area/almayer/living/platoon_commander_rooms)
-"WP" = (
-/obj/structure/bed/chair/comfy,
+"WK" = (
+/obj/structure/surface/rack,
+/obj/item/weapon/gun/flamer{
+	current_mag = null;
+	pixel_y = 4
+	},
+/obj/item/ammo_magazine/flamer_tank,
+/obj/item/ammo_magazine/flamer_tank,
+/obj/item/device/motiondetector,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/living/cafeteria_port)
+/area/almayer/squads/alpha/squad_one)
+"WP" = (
+/obj/structure/bed/chair/comfy/alpha{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor5"
+	},
+/area/almayer/living/briefing)
 "WV" = (
 /obj/structure/machinery/door/poddoor/almayer/locked{
 	dir = 4;
@@ -5715,23 +6157,36 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/hallways/starboard_hallway)
+"WY" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/obj/structure/sign/safety/bulkhead_door{
+	pixel_x = -19
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hallways/port_hallway)
 "Xa" = (
-/obj/structure/machinery/cryopod/right{
-	layer = 3.1;
-	pixel_y = 13
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
 /turf/open/floor/almayer{
-	icon_state = "cargo"
+	icon_state = "dark_sterile"
 	},
 /area/almayer/living/cryo_cells)
 "Xc" = (
-/obj/structure/sign/safety/cryo{
-	pixel_x = 6;
-	pixel_y = -29
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
+/obj/structure/machinery/shower{
+	pixel_y = 16
 	},
+/turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/cryo_cells)
 "Xd" = (
 /turf/open/floor/almayer{
@@ -5754,11 +6209,18 @@
 	},
 /area/almayer/living/platoon_commander_rooms)
 "Xw" = (
-/obj/structure/machinery/shower{
-	dir = 4
+/obj/structure/bed/chair/comfy{
+	dir = 1
 	},
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/cryo_cells)
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/cafeteria_port)
 "Xy" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -5777,46 +6239,100 @@
 	},
 /area/almayer/hallways/hangar)
 "Xz" = (
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
-	},
-/obj/structure/pipes/vents/scrubber,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/alpha/platoon_sergeant)
+/obj/structure/foamed_metal,
+/turf/open/floor/plating,
+/area/almayer/hallways/hangar)
 "XI" = (
-/obj/item/defenses/handheld/sentry,
-/turf/open/floor/almayer{
-	icon_state = "plate"
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
-/area/almayer/squads/alpha/squad_one)
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hallways/port_hallway)
 "XJ" = (
 /turf/closed/wall/almayer,
 /area/almayer/living/briefing)
+"XL" = (
+/obj/structure/prop/invuln/overhead_pipe{
+	pixel_x = -7;
+	pixel_y = 12
+	},
+/obj/structure/prop/invuln/overhead_pipe{
+	pixel_x = -7;
+	pixel_y = -4
+	},
+/obj/structure/sign/safety/water{
+	pixel_x = 14;
+	pixel_y = 24
+	},
+/obj/item/storage/backpack/marine/satchel{
+	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+	icon = 'icons/obj/janitor.dmi';
+	icon_state = "trashbag3";
+	name = "trash bag";
+	pixel_x = -7;
+	pixel_y = 14
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/living/cryo_cells)
 "XQ" = (
-/obj/structure/machinery/space_heater,
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	dir = 8;
+	icon_state = "cargo_arrow"
 	},
-/area/almayer/squads/alpha/squad_one)
+/area/almayer/hallways/port_hallway)
 "XR" = (
-/obj/structure/window/framed/almayer/white,
-/turf/open/floor/almayer,
-/area/almayer/medical)
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/ceramic_plate{
+	pixel_y = 19
+	},
+/obj/item/trash/ceramic_plate{
+	pixel_y = 21
+	},
+/obj/item/trash/ceramic_plate{
+	pixel_y = 23
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/living/cafeteria_port)
+"Ya" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "cargo_arrow"
+	},
+/area/almayer/squads/alpha/squad_two)
 "Yb" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/starboard_hallway)
-"Yd" = (
+"Yc" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/light,
+/obj/structure/largecrate/supply/ammo/m41amk1,
+/obj/structure/largecrate/supply/ammo/m41amk1{
+	pixel_x = 3;
+	pixel_y = 10
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/hallways/port_hallway)
+/area/almayer/squads/alpha/squad_one)
+"Yd" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 5
+	},
+/obj/item/folder/black_random,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/squads/alpha/platoon_sergeant)
 "Yh" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -5833,12 +6349,31 @@
 	icon_state = "cargo"
 	},
 /area/almayer/hallways/hangar)
+"Yp" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer,
+/area/almayer/squads/alpha/squad_two)
 "Ys" = (
-/obj/structure/machinery/power/apc/almayer,
+/obj/structure/surface/table/almayer,
+/obj/item/trash/plate,
+/obj/item/trash/ceramic_plate{
+	pixel_x = 6;
+	pixel_y = 19
+	},
+/obj/item/trash/ceramic_plate{
+	pixel_x = 6;
+	pixel_y = 21
+	},
+/obj/item/trash/ceramic_plate{
+	pixel_x = 5;
+	pixel_y = 23
+	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/medical)
+/area/almayer/living/cafeteria_port)
 "Yw" = (
 /obj/structure/machinery/door/poddoor/almayer/locked{
 	dir = 4;
@@ -5849,152 +6384,152 @@
 	},
 /area/almayer/hallways/hangar)
 "Yx" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/almayer/hallways/port_hallway)
-"YA" = (
-/obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = -2;
-	pixel_y = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8;
-	layer = 3.3;
-	pixel_y = 4
+/obj/structure/surface/table/almayer,
+/obj/item/trash/ceramic_plate{
+	pixel_x = -6;
+	pixel_y = 19
 	},
-/obj/structure/bed{
-	can_buckle = 0
+/obj/item/trash/ceramic_plate{
+	pixel_x = -6;
+	pixel_y = 21
 	},
-/obj/structure/bed{
-	buckling_y = 13;
-	layer = 3.5;
-	pixel_y = 13
+/obj/item/trash/ceramic_plate{
+	pixel_x = -5;
+	pixel_y = 23
 	},
-/obj/item/bedsheet/brown{
-	layer = 3.4
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
 	},
-/obj/item/bedsheet/brown{
-	pixel_y = 13
+/area/almayer/living/cafeteria_port)
+"YA" = (
+/obj/structure/machinery/light{
+	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	dir = 8;
+	icon_state = "cargo_arrow"
 	},
-/area/almayer/living/grunt_rnr)
+/area/almayer/living/briefing)
 "YB" = (
 /turf/closed/wall/almayer/outer,
 /area/almayer/engineering)
 "YG" = (
 /obj/effect/decal/warning_stripes{
-	icon_state = "S"
+	icon_state = "N";
+	pixel_y = 2
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1;
+	pixel_y = 1
 	},
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
+	icon_state = "dark_sterile"
 	},
 /area/almayer/living/cryo_cells)
 "YK" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
+/obj/structure/machinery/firealarm{
+	pixel_y = 28
 	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
+/obj/structure/machinery/disposal{
+	density = 0;
+	layer = 3.2;
+	pixel_y = 16
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "plate"
 	},
 /area/almayer/living/cafeteria_port)
 "YP" = (
 /turf/closed/wall/almayer/outer,
-/area/almayer/living/cafeteria_port)
+/area/almayer/living/briefing)
+"YX" = (
+/obj/effect/landmark/start/marine/medic/alpha,
+/obj/effect/landmark/late_join/alpha,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/cryo_cells)
 "Zb" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/closed/wall/almayer/outer,
+/obj/structure/sign/poster{
+	desc = "This poster features Audrey Rainwater standing in a jacuzzi. She was the July 2182 centerfold in House Bunny Gentleman's Magazine. Don't ask how you know that.";
+	icon_state = "poster16";
+	layer = 3.3;
+	name = "'Miss July' Pinup";
+	pixel_y = 29;
+	serial_number = 16
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
 /area/almayer/squads/alpha/squad_two)
 "Zf" = (
-/obj/structure/machinery/camera/autoname/almayer,
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
-/area/almayer/living/cryo_cells)
+/area/almayer/living/cafeteria_port)
 "Zk" = (
-/turf/closed/wall/almayer/outer,
-/area/almayer/squads/alpha/squad_one)
-"Zv" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/almayer/living/briefing)
-"ZB" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 2
+/obj/structure/closet/emcloset,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
 	},
-/obj/structure/machinery/light{
+/area/almayer/hallways/port_hallway)
+"Zl" = (
+/obj/structure/machinery/power/apc/almayer{
 	dir = 1
 	},
+/obj/structure/pipes/vents/scrubber,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/hallways/port_hallway)
-"ZC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/item/toy/beach_ball/holoball,
-/obj/structure/sign/poster{
-	desc = "One of those hot, tanned babes back the beaches of good ol' Earth.";
-	icon_state = "poster12";
-	name = "Beach Babe Pinup";
-	pixel_x = 28;
-	pixel_y = 5;
-	serial_number = 12
+/area/almayer/squads/alpha/squad_two)
+"Zv" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/obj/structure/sign/poster{
-	desc = "This poster features Audrey Rainwater standing in a jacuzzi. She was the July 2182 centerfold in House Bunny Gentleman's Magazine. Don't ask how you know that.";
-	icon_state = "poster16";
-	name = "'Miss July' Pinup";
-	pixel_x = 32;
-	serial_number = 16
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/obj/item/storage/fancy/cigarettes/lucky_strikes{
-	pixel_x = 6;
-	pixel_y = 16
+/area/almayer/living/briefing)
+"ZB" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/computer/med_data/laptop{
+	pixel_y = 6
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
+/area/almayer/squads/alpha/platoon_sergeant)
+"ZC" = (
+/turf/closed/wall/almayer,
 /area/almayer/squads/alpha/squad_one)
+"ZI" = (
+/obj/effect/landmark/start/marine/smartgunner/alpha,
+/obj/effect/landmark/late_join/alpha,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/cryo_cells)
 "ZL" = (
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"ZR" = (
-/obj/structure/stairs{
-	icon_state = "ramptop"
+"ZM" = (
+/obj/structure/window/framed/almayer,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
 	},
-/obj/structure/platform{
-	dir = 8;
-	layer = 2.7
+/area/almayer/living/cafeteria_port)
+"ZR" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/chem_master,
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
 	},
-/turf/open/floor/almayer,
-/area/almayer/living/briefing)
+/area/almayer/medical)
 "ZV" = (
-/obj/effect/landmark/start/marine/leader/alpha,
-/obj/effect/landmark/late_join/alpha,
-/turf/open/floor/plating/plating_catwalk,
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
 /area/almayer/living/cryo_cells)
 
 (1,1,1) = {"
@@ -12628,18 +13163,18 @@ Cr
 Cr
 Cr
 Cr
-jc
-jc
-jc
-jc
-jc
-jc
 Cr
 Cr
 Cr
 Cr
 Cr
 Cr
+Qw
+Qw
+Qw
+Qw
+Qw
+Qw
 Cr
 Cr
 Cr
@@ -12780,18 +13315,18 @@ Cr
 Cr
 Cr
 Cr
-jc
-ry
-jg
-jG
-ry
-jc
 Cr
 Cr
 Cr
 Cr
 Cr
 Cr
+Qw
+ot
+CC
+Pm
+ot
+Qw
 Cr
 Cr
 Cr
@@ -12912,6 +13447,12 @@ ca
 ca
 ca
 ca
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
 ca
 ca
 ca
@@ -12929,21 +13470,15 @@ sC
 sC
 sC
 sC
-rr
-rr
-rr
-jc
-dm
-Cu
-Cu
 pt
-jc
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+pt
+pt
+Qw
+ND
+Fg
+Fg
+gd
+Qw
 Cr
 Cr
 Cr
@@ -13064,38 +13599,38 @@ wK
 Ll
 wz
 ml
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
 ca
-qh
-qh
-qh
-qh
-qh
+Xz
+Xz
+ca
+ca
+VL
 sC
 sC
-Hb
-lm
-qA
-VL
-mG
-qA
 wJ
 VQ
 qA
 zV
 DY
-Dw
+qA
 dl
 Bh
-AY
+qA
 zK
-pt
-jc
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+pW
+iC
+Me
+Zl
+DE
+DR
+gd
+Qw
 Cr
 Cr
 Cr
@@ -13216,40 +13751,40 @@ wz
 Ll
 wz
 ml
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
 ca
-qh
-qh
-qh
-qh
-qh
-sC
 Xz
-cN
-KQ
+Xz
+ca
 Ls
 KQ
-dE
+sC
 QX
-PM
-mG
-qA
+rH
+dr
+wV
 dr
 tr
 kI
-dl
-dl
-dl
-yD
-dl
-jc
-jc
-jc
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+Hm
+DY
+qA
+FS
+XI
+oh
+Me
+Me
+Me
+Hw
+Me
+Qw
+Qw
+Qw
 Cr
 Cr
 Cr
@@ -13368,41 +13903,41 @@ SR
 SR
 wx
 Pt
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+ca
+Xz
+Xz
 ca
-qh
-qh
-qh
-sC
-sC
 sC
-tA
-PM
 Uj
-Os
-Uj
-Kl
+sC
 Tj
 Hm
-lU
-qA
 Kv
-tr
+yt
+Kv
+yY
 Yd
-dl
+Iw
 BO
-Va
+qA
 og
-pt
+XI
 IU
-wu
-jc
-jc
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+Me
+BA
+xB
+Yp
+gd
+ST
+Df
+Qw
+Qw
 Cr
 Cr
 Cr
@@ -13520,41 +14055,41 @@ KO
 KO
 Kx
 ml
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
 ca
-qh
-qh
+Xz
+Xz
 ca
-hG
-pP
-Wj
-pP
-ij
-FE
-qA
-nC
+lS
+KQ
 bw
-gQ
+KQ
 Ap
-lU
+uO
 qA
 Qu
 pF
+Fj
+Jn
+BO
+qA
+Oj
+TC
 wp
-dl
-xH
-Cu
-og
-Cu
-Cu
-pt
+Me
 lQ
-jc
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+Fg
+Yp
+Fg
+Fg
+gd
+xZ
+Qw
 Cr
 Cr
 Cr
@@ -13672,41 +14207,41 @@ Ea
 KO
 kV
 ml
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
 ca
-qh
-qh
-qh
-sC
-ms
-Wj
-rE
-AF
-Dl
-qA
-ok
-Uj
-xe
+Xz
+Xz
+ca
+mc
+KQ
+bw
+KQ
 QS
 gA
-oa
+qA
 Rh
-pF
+Kv
 Qe
 Cg
 qQ
 Cu
 ED
 TC
-Cu
-Cu
+eo
+nb
 vF
-jc
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+Fg
+IE
+ty
+Fg
+Fg
+lW
+Qw
 Cr
 Cr
 Cr
@@ -13835,30 +14370,30 @@ ca
 ca
 ca
 ca
+ca
+ca
+ca
+ca
+ca
+ca
 qA
-ff
-cH
-rJ
-KK
-Gf
-uw
 Ng
 fh
 Tz
 PQ
 ID
 zM
-Gq
+TO
 KU
-zK
-lQ
-jc
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+OU
+Ya
+mR
+hC
+mf
+Fy
+DR
+xZ
+Qw
 Cr
 Cr
 Cr
@@ -13987,30 +14522,30 @@ ZL
 CN
 rk
 ca
-Rc
-Uj
-Uj
-Uj
-zv
-qA
+Xz
+Xz
+Xz
+Xz
+Xz
+ca
 hN
-pF
-rR
-dl
+Kv
+Kv
+Kv
 Dg
-Cu
+qA
 Qi
-EY
+TC
 Gi
-og
+Me
 Zb
-jc
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+Fg
+Nr
+pf
+sV
+Yp
+Db
+Qw
 Cr
 Cr
 Cr
@@ -14139,29 +14674,29 @@ ZL
 mm
 ax
 ca
-Pv
-Uj
-Uj
-mG
-qH
-qA
+Xz
+Xz
+Xz
+Xz
+Xz
+ca
 Hj
-tr
-wp
-dl
+Kv
+Kv
+DY
 gM
-pt
+qA
 rA
-it
-Cu
-wZ
-jc
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+XI
+wp
+Me
+PG
+gd
+dX
+pB
+Fg
+TT
+Qw
 Cr
 Cr
 Cr
@@ -14291,29 +14826,29 @@ ZL
 AQ
 xh
 ca
-CV
-pP
-rE
-Jj
-qA
-qA
+Xz
+Xz
+Xz
+Xz
+Xz
+ca
 ZB
-tr
+KQ
 UK
-dl
-dl
-Iw
-jc
-Iu
+Kl
+qA
+qA
+Fw
+XI
 jj
 Me
-jc
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+Me
+js
+Qw
+qD
+cA
+RO
+Qw
 Cr
 Cr
 Cr
@@ -14443,29 +14978,29 @@ pl
 yO
 wz
 ca
+ca
+ca
+ca
+ca
+ca
+ca
 qA
 qA
 qA
 qA
 qA
-Hf
-Ns
-gL
-Af
-gG
-dl
-jc
-jc
 jc
-jc
-jc
-jc
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+Jc
+XQ
+GG
+Zk
+Me
+Qw
+Qw
+Qw
+Qw
+Qw
+Qw
 Cr
 Cr
 Cr
@@ -14593,26 +15128,26 @@ KO
 uG
 KO
 Dc
-tG
+wz
 oK
-rV
-MJ
 wp
 wp
-GL
-cJ
+wp
+iN
+iN
+iN
 vL
-tr
-je
-Yx
+AY
+wp
+wp
 cU
 lo
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+Eu
+XI
+Wl
+uu
+WY
+Ad
 Cr
 Cr
 Cr
@@ -14745,26 +15280,26 @@ Ph
 IT
 KO
 Qk
-zy
+lm
 iG
-uw
+SO
+SY
+SO
 iK
 iK
 SO
-Tk
-SO
+zM
 iK
-fO
 iK
 SO
 SY
-lo
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+SO
+iK
+wn
+iK
+SO
+so
+Ad
 Cr
 Cr
 Cr
@@ -14897,26 +15432,26 @@ wz
 Ws
 zD
 Dc
-KO
+ZL
 oK
+ms
+ms
+iN
+pZ
+pZ
+iN
 wp
 wp
 iN
 iN
-pZ
-wV
-wS
-tr
-Rx
-wV
 sN
-lo
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+Va
+Wm
+XI
+gq
+Va
+iL
+Ad
 Cr
 Cr
 Cr
@@ -15050,30 +15585,30 @@ nd
 KO
 Dc
 oe
-Yj
-kg
-kg
-kg
+XJ
 kg
+qu
+XJ
 kg
-gG
-Ns
-pF
-Af
-Hf
-uH
-Zk
-Zk
-Zk
-Zk
-Zk
+qu
+XJ
+Vp
+Vp
+Vp
+Vp
+Vp
 Zk
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+Jc
+TC
+GG
+jc
+ZC
+Ty
+Ty
+Ty
+Ty
+Ty
+Ty
 Cr
 Cr
 Cr
@@ -15202,30 +15737,30 @@ bQ
 KO
 Dc
 ad
-Yj
+XJ
 YA
 Od
 Sy
 mk
-kg
-kg
+vk
+XJ
 EQ
 gL
 sk
 uH
-uH
-Mv
-Zk
-HD
+Vp
+Vp
+wd
+XQ
 KD
-xs
-Zk
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+ZC
+ZC
+Yc
+Ty
+cz
+VK
+yA
+Ty
 Cr
 Cr
 Cr
@@ -15351,33 +15886,33 @@ dJ
 dJ
 dJ
 dB
-KO
+aN
 Dc
 eY
-Yj
-YA
+XJ
 As
 As
-JA
-YA
-kg
-qX
-tr
-iN
-uH
-eE
-hQ
+Vr
+Vr
+As
+XJ
+EQ
+wl
+wl
+KK
+EQ
+Vp
 OG
-bZ
-bZ
-ya
-Zk
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+XI
+iN
+ZC
+TI
+cs
+af
+cT
+cT
+xf
+Ty
 Cr
 Cr
 Cr
@@ -15503,34 +16038,34 @@ dJ
 dJ
 dJ
 dA
-tG
+UA
 Dc
 eY
-Yj
-io
-As
+ag
 As
+Np
+Np
+rJ
 As
-sb
-kg
+XJ
 EF
-tr
-wp
-uH
+wl
+wl
+wl
 bG
-bZ
-bZ
-Tb
-iy
-vP
+Vp
+xm
+XI
+wp
+ZC
 Fe
-Zk
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+cT
+cT
+aJ
+iE
+xx
+pJ
+Ty
 Cr
 Cr
 Cr
@@ -15655,34 +16190,34 @@ dJ
 dJ
 dJ
 AG
-tG
+UA
 Dc
 eY
-Yj
-xl
+ag
 As
+qT
 LJ
 fg
-sJ
-Fj
+Vr
+XJ
 Tk
-Ng
+wl
 vU
 sR
 MZ
 sg
-JH
+SY
 TO
 yT
-bZ
+Pp
 LF
-Zk
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+nG
+PZ
+Dx
+UI
+cT
+GP
+Ty
 Cr
 Cr
 Cr
@@ -15807,34 +16342,34 @@ dJ
 dJ
 dJ
 gh
-zD
+aN
 Dc
 eY
-Yj
-xl
-As
+XJ
+Vr
+rl
 ol
-As
-mr
-uO
-Rh
-pF
-Qe
+rV
+Vr
+XJ
+Tk
+wl
+FE
 wl
 xX
-bZ
-jM
-mJ
+Wj
+ED
+TC
 eo
-bZ
+QJ
 qa
-Zk
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+cT
+cR
+Uk
+cD
+cT
+Rj
+Ty
 Cr
 Cr
 Cr
@@ -15959,34 +16494,34 @@ dJ
 dJ
 dJ
 dB
-KO
+zD
 Qk
 MC
-Yj
+XJ
 dv
-As
+rr
 OX
-kW
+sm
 uA
-kg
+XJ
 rX
-tr
-rR
-uH
+wl
+FI
+Bo
 ld
-bZ
+Vp
 ys
-bZ
-bZ
-hQ
-LF
-Zk
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+XI
+Gi
+ZC
+zZ
+cT
+sf
+cT
+cT
+cs
+GP
+Ty
 Cr
 Cr
 Cr
@@ -16111,34 +16646,34 @@ dJ
 dJ
 dJ
 LH
-KO
+aN
 Dc
 eY
-Yj
-TV
-vT
-Nh
-vT
-zm
-kg
+XJ
+Vr
+Np
+Np
+rJ
+As
+XJ
 Ld
 pw
 Wf
-uH
+pw
 nj
-aq
-ys
+Vp
+kX
 vp
 Ql
 ZC
-Zk
-Zk
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+Ry
+LK
+sf
+oQ
+OI
+rI
+Ty
+Ty
 Cr
 Cr
 Cr
@@ -16263,33 +16798,33 @@ dJ
 dJ
 dJ
 AG
-tG
+UA
 Dc
 eY
-Yj
-YA
+ag
 FT
-ol
-As
-YA
-kg
-Qu
-tr
-iN
-uH
-uH
-uH
+FT
+FT
+sv
+vB
+XJ
+EQ
+Bg
+FE
+wl
+EQ
+Vp
 Oj
-uH
-Zk
-Zk
-Zk
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+XI
+iN
+ZC
+ZC
+ZC
+mD
+ZC
+Ty
+Ty
+Ty
 Cr
 Cr
 Cr
@@ -16415,31 +16950,31 @@ dJ
 dJ
 dJ
 gh
-tG
+UA
 Dc
 eY
-Yj
-zs
-kW
-of
-As
+ag
+WP
+WP
+WP
+WP
 Jk
-kg
-dr
-gL
+XJ
+yx
+Bo
 UO
-uH
+wl
 yj
-qK
+Vp
 FS
 XQ
-Zk
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+PF
+ZC
+cy
+ha
+Wp
+Ei
+Ty
 Cr
 Cr
 Cr
@@ -16570,28 +17105,28 @@ dB
 UA
 Dc
 eY
-Yj
-zH
-As
-NQ
-As
-xl
-kg
+XJ
+WP
+WP
+WP
+WP
+KY
+XJ
 Tg
-tr
-wp
-uH
-MP
-bZ
-bZ
+wl
+FR
+wl
+Tk
+Vp
+UT
 XI
-Zk
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+wp
+ZC
+yL
+cT
+cT
+Bu
+Ty
 Cr
 Cr
 Cr
@@ -16719,31 +17254,31 @@ dJ
 dJ
 dJ
 dA
-KO
+zD
 Dc
 bf
-Yj
+XJ
 aI
-GJ
-vo
 VX
-xl
-kg
+VX
+VX
+vN
+XJ
 Sd
-tr
-wp
-uH
-gt
+Cb
+Gf
+MJ
+Tk
 Vp
 aQ
-gt
-Zk
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
+XI
+wp
+ZC
+Kp
+WK
+PA
+Kp
+Ty
 Cr
 Cr
 Cr
@@ -16871,20 +17406,26 @@ ar
 vS
 Tx
 mB
-KO
+aN
 Dc
 eY
-Yj
-kg
-kg
-kg
-kg
-kg
-kg
-ed
-xc
-ed
-ag
+XJ
+WP
+WP
+WP
+WP
+KY
+XJ
+Vp
+Vp
+Vp
+Vp
+Vp
+Vp
+ZM
+Fa
+ZM
+Ui
 HK
 HK
 HK
@@ -16934,12 +17475,6 @@ Cr
 Cr
 Cr
 Cr
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
 "}
 (73,1,1) = {"
 Cr
@@ -17009,48 +17544,54 @@ Ea
 Ea
 KO
 KO
-KO
+aN
 KO
 KO
 KO
 Ea
 Ea
 KO
-KO
+aN
 KO
 KO
 KO
 pD
 ZL
 So
-zD
+aN
 Dc
 eY
 ag
-ag
-CX
-yu
+WP
+WP
+WP
 WP
 KY
-Hv
+XJ
 Ui
 YK
 Jv
-ag
-HK
-HK
-Xw
-Xw
+NO
+QI
+XR
 Xw
+NT
+KM
+Ui
 HK
-Bo
-Sl
 HK
-gU
 Ax
-Vc
 Ax
+Ax
+HK
+Pf
 KP
+HK
+Ii
+nR
+QT
+nR
+rb
 sI
 Cr
 Cr
@@ -17086,12 +17627,6 @@ Cr
 Cr
 Cr
 Cr
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
 "}
 (74,1,1) = {"
 Cr
@@ -17155,54 +17690,60 @@ KO
 Xy
 fx
 bq
+JZ
+JZ
+SR
+SR
 pO
-pO
-Cl
-Cl
-pO
-HX
+wz
 OH
+SR
+SR
+SR
 Cl
-Cl
-Cl
-Cl
-pO
-pO
-pO
-Cf
-qT
-Cl
+JZ
+JZ
+ff
+SR
+SR
+je
 Vv
 SR
 pG
-tG
+UA
 Dc
 eY
 ag
 Eo
 Ob
-GX
-jS
+Ob
+Ob
 oL
-FI
+XJ
 nK
-YK
+Cf
 ik
 bR
-HK
+Rl
 Kd
 Cs
-ir
-ir
-iv
-Qx
-qS
+NT
+UN
+qR
+HK
+Xc
 YG
 yF
 yF
 LQ
-yF
-yF
+fX
+ti
+To
+BY
+BY
+cr
+BY
+BY
 sI
 Cr
 Cr
@@ -17238,12 +17779,6 @@ Cr
 Cr
 Cr
 Cr
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
 "}
 (75,1,1) = {"
 Cr
@@ -17311,50 +17846,56 @@ bo
 bo
 hS
 hS
-XJ
-XJ
-XJ
-XJ
-XJ
-XJ
-XJ
+ay
+jo
+Zv
+Nf
+Nf
 Bj
+cS
 Bj
 Bj
-XJ
-XJ
-yn
-gV
-XJ
-XJ
-Rr
+Nf
+Bj
+Bj
+Nf
+Bj
+Bj
+Nf
+lg
 Yb
 co
-ag
+XJ
 fy
 fL
-bJ
+sS
 sS
 bS
-Rl
+XJ
 oM
-YK
+CF
 dO
-bR
+Os
+Rx
+Ys
+LS
+NT
+TY
+qR
 HK
-Kd
+Xc
 QD
-NT
-ri
-NT
-yM
-Ma
-YG
 ZV
 Mi
-LQ
-rh
+ZV
 rh
+gg
+To
+bh
+RD
+cr
+LL
+LL
 sI
 Cr
 Cr
@@ -17390,12 +17931,6 @@ Cr
 Cr
 Cr
 Cr
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
 "}
 (76,1,1) = {"
 Cr
@@ -17464,49 +17999,55 @@ Bz
 Bz
 bo
 eu
-Ks
+jo
 Zv
-Ks
+Nf
 Jb
 Cv
-tU
-OA
-Ks
-OA
-tU
-Ks
-Fi
+Cv
+dd
+Mj
+Nf
+fY
+hW
 Fi
+jf
 oJ
-XJ
+Nf
 zJ
 Yb
 Gx
-ag
-Sh
-ze
-Uh
-Uh
-Uh
+XJ
+Vr
+Np
 Uh
+Np
+As
+XJ
 Pc
 FV
-dO
-bR
-HK
-Kd
-QD
-NT
+Zf
+Zf
+Zf
+Zf
+sO
+QM
+TY
+qR
 HK
-gI
-BM
 Xc
+QD
+ZV
 HK
-gE
-Xa
-xq
+Tr
 Xa
 NV
+HK
+kr
+qm
+eL
+qm
+qf
 sI
 Cr
 Cr
@@ -17542,12 +18083,6 @@ Cr
 Cr
 Cr
 Cr
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
 "}
 (77,1,1) = {"
 Cr
@@ -17616,43 +18151,49 @@ Bz
 rY
 DV
 Ks
-pI
-lI
-Kk
+Np
+Zv
+Nf
 uF
-Ds
 OA
 OA
+dm
 Mj
-Ex
-Ex
-gs
-Ks
-Ks
+Nf
+gG
+OA
+OA
+jg
 Cw
-hZ
-cS
+Nf
+DC
 Ey
-nx
-ag
+lg
+me
 GY
 Np
-Uh
-Uh
-Uh
-Uh
-Uh
-FV
-dO
-bR
+Np
+rJ
+As
+XJ
+yM
+Dl
+Zf
+Zf
+Zf
+Zf
+Zf
+QM
+TY
+qR
 HK
 HK
-Zf
-Dy
+za
+Si
 HK
-cO
-xK
-EO
+Na
+dG
+di
 HK
 HK
 HK
@@ -17694,12 +18235,6 @@ Cr
 Cr
 Cr
 Cr
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
 "}
 (78,1,1) = {"
 Cr
@@ -17769,48 +18304,54 @@ LZ
 hS
 HH
 jo
-ft
+Zv
 Nf
-uF
-Ds
-OA
-OA
-Ks
-OA
+cH
+cJ
 OA
-PY
+dt
+ea
+fO
 Pr
+PY
 Pr
+jG
 xz
 jV
 sK
 ly
-sa
-ag
+nx
+XJ
 yv
-si
+As
 Ne
-sS
+tT
 IX
-ay
+XJ
 Gz
-FV
-dO
-bR
-HK
-Kd
+Dw
+Gk
+Os
+Sl
+Yx
 lG
 QM
-HK
+TY
 qR
-dt
-vE
 HK
+Xc
+kq
 Vc
-Ax
-gU
-Ax
-KP
+HK
+XL
+fJ
+NB
+HK
+QT
+nR
+Ii
+nR
+rb
 sI
 Cr
 Cr
@@ -17846,12 +18387,6 @@ Cr
 Cr
 Cr
 Cr
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
 "}
 (79,1,1) = {"
 Cr
@@ -17920,49 +18455,55 @@ LE
 tv
 hS
 mg
-be
-NF
-iF
+jo
+Zv
+Nf
 ov
-Ds
 OA
 OA
-Ks
-OA
 OA
-Ks
-Ks
-Ks
+eJ
+Nf
+ho
+iy
+ho
+jU
 JJ
-XJ
+Nf
 cB
 lE
 sa
-ag
-yx
-dd
+XJ
+XJ
+XJ
 PW
-vB
-ea
-FR
-tX
-Uv
-dO
-bR
-HK
-Kd
-lG
-NT
+XJ
+XJ
+XJ
+tX
+Uv
+GL
+Pe
+Su
+rx
+up
+Bq
 TY
-NT
-Mn
-qS
-YG
-yF
-yF
-LQ
-yF
-yF
+qR
+HK
+Xc
+kq
+ZV
+zt
+ZV
+xM
+ti
+To
+BY
+BY
+cr
+BY
+BY
 sI
 Cr
 Cr
@@ -17998,12 +18539,6 @@ Cr
 Cr
 Cr
 Cr
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
 "}
 (80,1,1) = {"
 Cr
@@ -18074,47 +18609,53 @@ hS
 vY
 HC
 HJ
-Ks
+Nf
 ZR
 QE
-HJ
-Ks
-Ks
-Ks
-HJ
-Ks
-Ks
-Ks
+cZ
+dE
+Mj
+Nf
+hG
+jb
+hG
+jb
 FN
-XJ
+Nf
 DC
 Yb
 sa
-ag
-ag
-kl
-hq
-WP
-qV
-Hv
-hj
-FV
+XJ
+XJ
+As
+mk
+uw
+As
+XJ
+Ui
+DF
 oH
-ag
+NO
+Ub
+XR
+dn
+QM
+ub
+Ui
 HK
-Kd
+Xc
 QD
-NT
-ri
-NT
-yM
-em
-YG
-bI
-bI
-LQ
-yF
-yF
+ZV
+Mi
+ZV
+rh
+Sq
+To
+ZI
+ZI
+cr
+BY
+BY
 sI
 Cr
 Cr
@@ -18150,12 +18691,6 @@ Cr
 Cr
 Cr
 Cr
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
 "}
 (81,1,1) = {"
 Cr
@@ -18226,47 +18761,53 @@ hS
 XJ
 XJ
 XJ
-XJ
-XJ
-XJ
-XJ
-XJ
-XJ
-XJ
-XJ
-XJ
-XJ
-XJ
-XJ
-XJ
+Nf
+Nf
+Nf
+Nf
+Nf
+Nf
+Nf
+Nf
+Nf
+Nf
+Nf
+Nf
+Nf
 DC
 Yb
 Gx
 YP
-YP
-ag
-ag
-ag
-ag
-ag
-Rv
-SG
+ni
+ry
+ry
+Np
+rJ
+As
 Rv
+Ui
+Ui
+Ui
+Ui
+Ui
+qp
+Aw
+qp
 HK
 HK
 HK
-qp
-QM
-HK
-yt
-BM
-Xc
+hR
+Vc
 HK
-xq
-Xa
-gE
+AA
 Xa
 NV
+HK
+eL
+qm
+kr
+qm
+qf
 sI
 Cr
 Cr
@@ -18302,12 +18843,6 @@ Cr
 Cr
 Cr
 Cr
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
 "}
 (82,1,1) = {"
 Cr
@@ -18394,25 +18929,31 @@ DC
 DC
 Yb
 nx
-Cq
-sI
-Ao
+YP
+nM
+Eb
 Eb
 nY
-HK
-gO
-vN
+Np
+As
+sI
 Ki
 xK
-gJ
+Sw
 HK
 FW
-QD
-Dy
-HK
+eR
+bb
+dG
 xQ
-BM
+HK
 EO
+QD
+Si
+HK
+nV
+Xa
+di
 HK
 HK
 HK
@@ -18454,12 +18995,6 @@ Cr
 Cr
 Cr
 Cr
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
 "}
 (83,1,1) = {"
 Cr
@@ -18546,31 +19081,37 @@ Fl
 Fl
 Fn
 nx
-Cq
-sI
-Ao
+YP
+oa
 qv
-nY
-HK
-oR
-QD
+qv
+Np
+wS
+YP
+sI
 Ki
-xK
+Hv
 Sw
-tT
+HK
 gH
 QD
-NT
-HK
-QM
+bb
+dG
+Sc
 BM
-Xc
+Br
+QD
+ZV
 HK
 Vc
-Ax
-gU
-Ax
-KP
+Xa
+NV
+HK
+QT
+nR
+Ii
+nR
+rb
 sI
 Cr
 Cr
@@ -18606,12 +19147,6 @@ Cr
 Cr
 Cr
 Cr
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
 "}
 (84,1,1) = {"
 Cr
@@ -18698,31 +19233,37 @@ DC
 DC
 Rr
 sa
-Cq
-sI
-SV
-Qq
+YP
+qh
 Vr
-eT
-Io
-eJ
+Vr
+Vr
+YP
+YP
+sI
 Ve
-xK
-Sw
+HG
+Pl
 GK
-Sw
-QD
-NT
-TY
-NT
+Gg
+sU
+Ra
+dG
+Sc
 Mn
 Sc
-YG
-rO
-rO
-LQ
-yF
-yF
+QD
+ZV
+zt
+ZV
+xM
+rZ
+To
+Lf
+Lf
+cr
+BY
+BY
 sI
 Cr
 Cr
@@ -18758,12 +19299,6 @@ Cr
 Cr
 Cr
 Cr
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
 "}
 (85,1,1) = {"
 Cr
@@ -18845,36 +19380,42 @@ Cq
 Cq
 Cq
 Cq
-DX
-DX
-ho
-XR
-DX
-rH
+Cq
+Cq
+Cq
+Cq
+Cq
+Cq
+YP
+YP
+YP
+YP
+YP
+YP
 sI
 HK
-ER
+ip
 HK
 HK
-FX
-cZ
-Pl
-ip
-Sw
-mc
-Sw
+EI
 mY
 zn
-zn
-zn
-zn
-ip
-YG
-yF
+Bi
+Sc
+EK
+Sc
+fo
 IC
-LQ
-yF
-yF
+IC
+IC
+IC
+Bi
+To
+BY
+YX
+cr
+BY
+BY
 sI
 Cr
 Cr
@@ -18910,12 +19451,6 @@ Cr
 Cr
 Cr
 Cr
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
 "}
 (86,1,1) = {"
 Cr
@@ -18996,25 +19531,31 @@ Cr
 Cr
 Cr
 Cr
-Cq
-DX
-sm
-Cb
-Cb
-fY
-rH
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
 sI
-Jn
-HG
-DF
+DX
+HX
+Qx
 HK
-sv
-sv
+ns
+ns
 HK
 rd
 rd
 HK
-ns
+lc
 rd
 rd
 HK
@@ -19022,11 +19563,11 @@ rd
 rd
 rd
 HK
-xq
-Xa
-gE
-Xa
-NV
+eL
+qm
+kr
+qm
+qf
 sI
 Cr
 Cr
@@ -19062,12 +19603,6 @@ Cr
 Cr
 Cr
 Cr
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
 "}
 (87,1,1) = {"
 Cr
@@ -19148,13 +19683,19 @@ Cr
 Cr
 Cr
 Cr
-Cq
-DX
-QI
-Cb
-Cb
-jb
-rH
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
 sI
 sI
 sI
@@ -19214,12 +19755,6 @@ Cr
 Cr
 Cr
 Cr
-Cr
-Cr
-Cr
-Cr
-Cr
-Cr
 "}
 (88,1,1) = {"
 Cr
@@ -19300,13 +19835,13 @@ Cr
 Cr
 Cr
 Cr
-Cq
-DX
-yY
-Cb
-Cb
-lg
-rH
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
 Cr
 Cr
 Cr
@@ -19452,13 +19987,13 @@ Cr
 Cr
 Cr
 Cr
-Cq
-DX
-hW
-Cb
-Cb
-jf
-rH
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
 Cr
 Cr
 Cr
@@ -19604,13 +20139,13 @@ Cr
 Cr
 Cr
 Cr
-Cq
-DX
-yY
-Cb
-Cb
-me
-rH
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
 Cr
 Cr
 Cr
@@ -19756,13 +20291,13 @@ Cr
 Cr
 Cr
 Cr
-Cq
-DX
-hW
-Cb
-Cb
-CF
-rH
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
 Cr
 Cr
 Cr
@@ -19898,23 +20433,23 @@ Cr
 Cr
 Cr
 Cr
-Cq
-Cq
-Cq
-Cq
-Cq
+YB
+YB
+YB
+YB
+YB
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
 Cr
 Cr
 Cr
 Cr
 Cr
-Cq
-DX
-Bg
-Ub
-Cb
-lS
-rH
 Cr
 Cr
 Cr
@@ -20060,13 +20595,13 @@ Cr
 Cr
 Cr
 Cr
-Cq
-rH
-DX
-XR
-Pe
-DX
-rH
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
 Cr
 Cr
 Cr
@@ -20212,13 +20747,13 @@ Cr
 Cr
 Cr
 Cr
-Cq
-rH
-aN
-Ub
-Cb
-Gk
-rH
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
 Cr
 Cr
 Cr
@@ -20364,13 +20899,13 @@ Cr
 Cr
 Cr
 Cr
-Cq
-rH
-nM
-Su
-Cb
-qu
-rH
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
 Cr
 Cr
 Cr
@@ -20516,13 +21051,13 @@ Cr
 Cr
 Cr
 Cr
-Cq
-rH
-rl
-Cb
-Cb
-Ys
-rH
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
 Cr
 Cr
 Cr
@@ -20668,13 +21203,13 @@ Cr
 Cr
 Cr
 Cr
-Cq
-rH
-vk
-jU
-NO
-ni
-rH
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
 Cr
 Cr
 Cr
@@ -20820,13 +21355,13 @@ Cr
 Cr
 Cr
 Cr
-Cq
-rH
-rH
-rH
-rH
-rH
-rH
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
+Cr
 Cr
 Cr
 Cr