diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index b15ee29dd20a..7d9361919028 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -837,8 +837,8 @@
 /area/almayer/living/basketball)
 "acJ" = (
 /mob/living/silicon/decoy/ship_ai{
-	pixel_y = -16;
-	layer = 2.98
+	layer = 2.98;
+	pixel_y = -16
 	},
 /obj/structure/blocker/invisible_wall,
 /obj/effect/decal/warning_stripes{
@@ -2464,22 +2464,22 @@
 /obj/structure/machinery/door_control{
 	id = "ARES StairsLock";
 	name = "ARES Exterior Lockdown Override";
-	req_one_access_txt = "90;91;92";
+	pixel_x = 8;
 	pixel_y = -24;
-	pixel_x = 8
+	req_one_access_txt = "90;91;92"
 	},
 /obj/structure/machinery/door_control{
 	id = "ARES Emergency";
 	name = "ARES Emergency Lockdown Override";
-	req_one_access_txt = "91;92";
-	pixel_y = -24
+	pixel_y = -24;
+	req_one_access_txt = "91;92"
 	},
 /obj/structure/machinery/door_control{
 	id = "Brig Lockdown Shutters";
 	name = "Brig Lockdown Override";
-	req_access_txt = "1;3";
 	pixel_x = -8;
-	pixel_y = -24
+	pixel_y = -24;
+	req_access_txt = "1;3"
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/living/commandbunks)
@@ -5816,9 +5816,9 @@
 /obj/structure/machinery/door_control{
 	id = "ARES StairsUpper";
 	name = "ARES Core Access";
-	req_one_access_txt = "1;200;90;91;92";
+	pixel_x = -24;
 	pixel_y = 24;
-	pixel_x = -24
+	req_one_access_txt = "1;200;90;91;92"
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -5840,9 +5840,9 @@
 "asG" = (
 /obj/structure/surface/table/reinforced/almayer_B{
 	climbable = 0;
+	indestructible = 1;
 	unacidable = 1;
-	unslashable = 1;
-	indestructible = 1
+	unslashable = 1
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -7084,34 +7084,34 @@
 /obj/structure/machinery/door_control{
 	id = "ARES StairsUpper";
 	name = "ARES Core Access";
-	req_one_access_txt = "91;92";
+	pixel_x = -10;
 	pixel_y = -24;
-	pixel_x = -10
+	req_one_access_txt = "91;92"
 	},
 /obj/structure/machinery/door_control{
 	id = "ARES StairsLock";
 	name = "ARES Exterior Lockdown";
-	req_one_access_txt = "91;92";
-	pixel_y = -24
+	pixel_y = -24;
+	req_one_access_txt = "91;92"
 	},
 /obj/structure/surface/table/reinforced/almayer_B{
 	climbable = 0;
+	indestructible = 1;
 	unacidable = 1;
-	unslashable = 1;
-	indestructible = 1
+	unslashable = 1
 	},
 /obj/structure/transmitter/rotary{
-	phone_color = "blue";
-	phone_id = "AI Reception";
+	name = "AI Reception Telephone";
 	phone_category = "ARES";
-	name = "AI Reception Telephone"
+	phone_color = "blue";
+	phone_id = "AI Reception"
 	},
 /obj/structure/machinery/door_control{
 	id = "ARES Emergency";
 	name = "ARES Emergency Lockdown";
-	req_one_access_txt = "91;92";
+	pixel_x = 10;
 	pixel_y = -24;
-	pixel_x = 10
+	req_one_access_txt = "91;92"
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -7125,9 +7125,9 @@
 	},
 /obj/structure/surface/table/reinforced/almayer_B{
 	climbable = 0;
+	indestructible = 1;
 	unacidable = 1;
-	unslashable = 1;
-	indestructible = 1
+	unslashable = 1
 	},
 /obj/item/paper_bin/uscm{
 	pixel_y = 6
@@ -10992,31 +10992,31 @@
 	},
 /obj/structure/machinery/door_control{
 	id = "ARES Interior";
+	indestructible = 1;
 	name = "ARES Chamber Lockdown";
-	req_one_access_txt = "1;200;90;91;92";
 	pixel_x = 24;
 	pixel_y = -8;
-	indestructible = 1
+	req_one_access_txt = "1;200;90;91;92"
 	},
 /obj/structure/machinery/door_control{
 	id = "ARES Railing";
+	indestructible = 1;
 	name = "ARES Chamber Railings";
-	req_one_access_txt = "91;92";
-	pixel_x = 24;
 	needs_power = 0;
-	indestructible = 1
+	pixel_x = 24;
+	req_one_access_txt = "91;92"
 	},
 /obj/structure/machinery/door/poddoor/railing{
+	closed_layer = 4.1;
+	density = 0;
 	dir = 2;
 	id = "ARES Railing";
-	unslashable = 0;
-	unacidable = 0;
-	pixel_y = -1;
-	pixel_x = -1;
+	layer = 2.1;
 	open_layer = 2.1;
-	closed_layer = 4.1;
-	density = 0;
-	layer = 2.1
+	pixel_x = -1;
+	pixel_y = -1;
+	unacidable = 0;
+	unslashable = 0
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -11990,7 +11990,9 @@
 /obj/structure/pipes/vents/pump{
 	dir = 4
 	},
-/turf/open/floor/almayer,
+/turf/open/floor/almayer{
+	icon_state = "red"
+	},
 /area/almayer/squads/alpha)
 "aPk" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
@@ -12002,10 +12004,14 @@
 	},
 /area/almayer/command/lifeboat)
 "aPl" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
+/obj/structure/machinery/cm_vending/clothing/marine/alpha{
+	density = 0;
+	layer = 4.1;
+	pixel_y = -29
+	},
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/turf/open/floor/almayer,
 /area/almayer/squads/alpha)
 "aPm" = (
 /obj/structure/closet/firecloset,
@@ -12014,13 +12020,14 @@
 	},
 /area/almayer/hallways/aft_hallway)
 "aPn" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
+/obj/structure/machinery/cm_vending/clothing/marine/bravo{
+	density = 0;
+	pixel_y = 16
 	},
 /turf/open/floor/almayer{
-	icon_state = "redcorner"
+	icon_state = "plate"
 	},
-/area/almayer/squads/alpha)
+/area/almayer/squads/bravo)
 "aPo" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -12110,19 +12117,6 @@
 /obj/structure/sign/nosmoking_1,
 /turf/closed/wall/almayer,
 /area/almayer/squads/alpha)
-"aPM" = (
-/obj/structure/machinery/cm_vending/clothing/marine/alpha,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/alpha)
-"aPN" = (
-/obj/structure/machinery/light,
-/obj/structure/machinery/cm_vending/clothing/marine/alpha,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/alpha)
 "aPX" = (
 /obj/structure/largecrate/random/case/double,
 /turf/open/floor/plating/plating_catwalk,
@@ -12292,69 +12286,16 @@
 /obj/structure/sign/nosmoking_1,
 /turf/closed/wall/almayer,
 /area/almayer/squads/bravo)
-"aQP" = (
-/obj/structure/machinery/cm_vending/clothing/marine/bravo,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/bravo)
-"aQQ" = (
-/obj/structure/machinery/firealarm{
-	pixel_y = 28
-	},
-/obj/structure/machinery/cm_vending/clothing/marine/bravo,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/bravo)
-"aQR" = (
-/obj/item/device/radio/intercom{
-	freerange = 1;
-	name = "General Listening Channel";
-	pixel_y = 28
-	},
-/obj/structure/machinery/cm_vending/clothing/marine/bravo,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/bravo)
-"aQS" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/structure/machinery/cm_vending/clothing/marine/bravo,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/bravo)
 "aQT" = (
-/obj/structure/machinery/cm_vending/clothing/marine/alpha,
-/obj/structure/machinery/camera/autoname/almayer{
-	dir = 1;
-	name = "ship-grade camera"
+/obj/structure/machinery/cm_vending/clothing/marine/alpha{
+	density = 0;
+	layer = 4.1;
+	pixel_y = -29
 	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "cargo_arrow"
 	},
 /area/almayer/squads/alpha)
-"aQU" = (
-/obj/structure/machinery/alarm/almayer{
-	dir = 1
-	},
-/obj/structure/machinery/cm_vending/clothing/marine/bravo,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/bravo)
-"aQV" = (
-/obj/structure/machinery/status_display{
-	pixel_y = 30
-	},
-/obj/structure/machinery/cm_vending/clothing/marine/bravo,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/bravo)
 "aQW" = (
 /obj/structure/machinery/vending/cola{
 	pixel_x = -6;
@@ -12596,7 +12537,10 @@
 /area/almayer/squads/bravo)
 "aRU" = (
 /obj/structure/pipes/vents/pump/on,
-/turf/open/floor/almayer,
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "orange"
+	},
 /area/almayer/squads/bravo)
 "aRV" = (
 /obj/structure/platform{
@@ -12610,7 +12554,10 @@
 /obj/structure/pipes/vents/scrubber{
 	dir = 4
 	},
-/turf/open/floor/almayer,
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "orange"
+	},
 /area/almayer/squads/bravo)
 "aRZ" = (
 /turf/open/floor/almayer{
@@ -12927,12 +12874,13 @@
 	},
 /area/almayer/living/offices)
 "aTv" = (
-/obj/structure/machinery/camera/autoname/almayer{
-	name = "ship-grade camera"
+/obj/structure/machinery/cm_vending/clothing/marine/bravo{
+	density = 0;
+	pixel_y = 16
 	},
-/obj/structure/machinery/cm_vending/clothing/marine/bravo,
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	dir = 1;
+	icon_state = "cargo_arrow"
 	},
 /area/almayer/squads/bravo)
 "aTw" = (
@@ -12942,12 +12890,7 @@
 	},
 /area/almayer/squads/bravo)
 "aTx" = (
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/obj/structure/machinery/power/apc/almayer{
-	dir = 4
-	},
+/obj/structure/machinery/power/apc/almayer,
 /obj/structure/surface/table/almayer,
 /obj/item/tool/hand_labeler,
 /turf/open/floor/almayer{
@@ -14290,9 +14233,9 @@
 /obj/structure/machinery/door_control{
 	id = "ARES Mainframe Right";
 	name = "ARES Mainframe Lockdown";
-	req_one_access_txt = "200;91;92";
 	pixel_x = -24;
-	pixel_y = -24
+	pixel_y = -24;
+	req_one_access_txt = "200;91;92"
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -15367,14 +15310,14 @@
 	},
 /area/almayer/squads/alpha)
 "bfw" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /obj/item/device/radio/intercom{
 	freerange = 1;
 	name = "General Listening Channel";
 	pixel_y = 28
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /turf/open/floor/almayer{
 	dir = 1;
 	icon_state = "red"
@@ -15431,12 +15374,12 @@
 	},
 /area/almayer/squads/alpha)
 "bfD" = (
-/obj/structure/machinery/status_display{
-	pixel_y = 30
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/machinery/light{
+	dir = 1
+	},
 /turf/open/floor/almayer{
 	dir = 1;
 	icon_state = "red"
@@ -15713,19 +15656,16 @@
 	icon_state = "red"
 	},
 /area/almayer/squads/alpha)
-"bgV" = (
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
-	},
-/area/almayer/squads/alpha)
 "bgW" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
+/obj/structure/machinery/cm_vending/clothing/marine/charlie{
+	density = 0;
+	layer = 4.1;
+	pixel_y = -29
 	},
 /turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
+	icon_state = "plate"
 	},
-/area/almayer/squads/alpha)
+/area/almayer/squads/charlie)
 "bgY" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -16418,7 +16358,7 @@
 "blB" = (
 /turf/open/floor/almayer{
 	dir = 1;
-	icon_state = "cargo_arrow"
+	icon_state = "orange"
 	},
 /area/almayer/squads/bravo)
 "blZ" = (
@@ -17216,6 +17156,9 @@
 /obj/structure/sign/poster{
 	pixel_y = 32
 	},
+/obj/structure/machinery/light{
+	dir = 8
+	},
 /turf/open/floor/almayer{
 	dir = 8;
 	icon_state = "red"
@@ -20411,19 +20354,6 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/lower_engineering)
-"bFh" = (
-/obj/structure/machinery/cm_vending/clothing/marine/charlie,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/charlie)
-"bFi" = (
-/obj/structure/machinery/light,
-/obj/structure/machinery/cm_vending/clothing/marine/charlie,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/charlie)
 "bFj" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -21071,12 +21001,12 @@
 	plane = -7
 	},
 /obj/structure/machinery/door/poddoor/almayer/blended/white/open{
-	open_layer = 1.9;
+	closed_layer = 3.2;
 	id = "ARES Emergency";
-	needs_power = 0;
-	name = "ARES Emergency Lockdown";
 	layer = 3.2;
-	closed_layer = 3.2;
+	name = "ARES Emergency Lockdown";
+	needs_power = 0;
+	open_layer = 1.9;
 	plane = -7
 	},
 /turf/open/floor/almayer/no_build{
@@ -21868,17 +21798,17 @@
 /obj/structure/machinery/door_control{
 	id = "ARES StairsLower";
 	name = "ARES Core Lockdown";
-	req_one_access_txt = "19;200;90;91;92";
 	pixel_x = 24;
-	pixel_y = -8
+	pixel_y = -8;
+	req_one_access_txt = "19;200;90;91;92"
 	},
 /obj/structure/machinery/camera/autoname/almayer/containment/ares{
 	dir = 8;
 	pixel_y = 2
 	},
 /turf/open/floor/almayer/no_build{
-	icon_state = "silver";
-	dir = 4
+	dir = 4;
+	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
 "bLw" = (
@@ -23072,20 +23002,8 @@
 /obj/structure/pipes/vents/pump{
 	dir = 4
 	},
-/turf/open/floor/almayer,
-/area/almayer/squads/charlie)
-"bQB" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/almayer/squads/charlie)
-"bQC" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
 /turf/open/floor/almayer{
-	icon_state = "emeraldcorner"
+	icon_state = "emerald"
 	},
 /area/almayer/squads/charlie)
 "bQD" = (
@@ -23265,22 +23183,22 @@
 	plane = -7
 	},
 /obj/effect/step_trigger/ares_alert/public{
+	alert_id = "AresStairs";
 	alert_message = "Caution: Movement detected in ARES Core.";
-	cooldown_duration = 1200;
-	alert_id = "AresStairs"
+	cooldown_duration = 1200
 	},
 /obj/effect/step_trigger/ares_alert/public{
+	alert_id = "AresStairs";
 	alert_message = "Caution: Movement detected in ARES Core.";
-	cooldown_duration = 1200;
-	alert_id = "AresStairs"
+	cooldown_duration = 1200
 	},
 /obj/structure/machinery/door/poddoor/almayer/blended/white/open{
-	open_layer = 1.9;
+	closed_layer = 3.2;
 	id = "ARES Emergency";
-	needs_power = 0;
-	name = "ARES Emergency Lockdown";
 	layer = 3.2;
-	closed_layer = 3.2;
+	name = "ARES Emergency Lockdown";
+	needs_power = 0;
+	open_layer = 1.9;
 	plane = -7
 	},
 /turf/open/floor/almayer/no_build{
@@ -23736,7 +23654,10 @@
 /obj/structure/pipes/vents/scrubber{
 	dir = 4
 	},
-/turf/open/floor/almayer,
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "blue"
+	},
 /area/almayer/squads/delta)
 "bTE" = (
 /turf/open/floor/almayer{
@@ -26151,13 +26072,13 @@
 /turf/open/floor/almayer,
 /area/almayer/living/grunt_rnr)
 "cdP" = (
-/obj/structure/machinery/cm_vending/clothing/marine/charlie,
-/obj/structure/machinery/camera/autoname/almayer{
-	dir = 1;
-	name = "ship-grade camera"
+/obj/structure/machinery/cm_vending/clothing/marine/charlie{
+	density = 0;
+	layer = 4.1;
+	pixel_y = -29
 	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "cargo_arrow"
 	},
 /area/almayer/squads/charlie)
 "cdT" = (
@@ -26664,6 +26585,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/machinery/camera/autoname/almayer,
 /turf/open/floor/almayer{
 	dir = 1;
 	icon_state = "emerald"
@@ -26896,17 +26818,12 @@
 	icon_state = "emerald"
 	},
 /area/almayer/squads/charlie)
-"cje" = (
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
-	},
-/area/almayer/squads/charlie)
 "cjf" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
 	},
 /turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
+	icon_state = "emerald"
 	},
 /area/almayer/squads/charlie)
 "cjg" = (
@@ -27017,15 +26934,6 @@
 	icon_state = "emerald"
 	},
 /area/almayer/squads/charlie)
-"cjF" = (
-/obj/structure/machinery/camera/autoname/almayer{
-	name = "ship-grade camera"
-	},
-/obj/structure/machinery/cm_vending/clothing/marine/delta,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/delta)
 "cjK" = (
 /obj/structure/machinery/door/airlock/almayer/maint,
 /obj/structure/disposalpipe/segment{
@@ -27137,50 +27045,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/delta)
-"cks" = (
-/obj/structure/machinery/cm_vending/clothing/marine/delta,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/delta)
-"cku" = (
-/obj/item/device/radio/intercom{
-	freerange = 1;
-	name = "General Listening Channel";
-	pixel_y = 28
-	},
-/obj/structure/machinery/cm_vending/clothing/marine/delta,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/delta)
-"ckv" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/structure/machinery/cm_vending/clothing/marine/delta,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/delta)
-"ckx" = (
-/obj/structure/machinery/alarm/almayer{
-	dir = 1
-	},
-/obj/structure/machinery/cm_vending/clothing/marine/delta,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/delta)
-"cky" = (
-/obj/structure/machinery/status_display{
-	pixel_y = 30
-	},
-/obj/structure/machinery/cm_vending/clothing/marine/delta,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/squads/delta)
 "ckB" = (
 /obj/structure/machinery/door/airlock/almayer/maint{
 	dir = 1;
@@ -27234,9 +27098,12 @@
 	},
 /area/almayer/squads/delta)
 "ckR" = (
+/obj/structure/machinery/cm_vending/clothing/marine/delta{
+	density = 0;
+	pixel_y = 16
+	},
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
+	icon_state = "plate"
 	},
 /area/almayer/squads/delta)
 "ckS" = (
@@ -27323,6 +27190,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/item/device/radio/intercom{
+	freerange = 1;
+	name = "General Listening Channel";
+	pixel_y = -29
+	},
 /turf/open/floor/almayer{
 	dir = 8;
 	icon_state = "bluecorner"
@@ -27355,6 +27227,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/machinery/alarm/almayer{
+	dir = 1;
+	pixel_y = -29
+	},
 /turf/open/floor/almayer{
 	icon_state = "blue"
 	},
@@ -27404,9 +27280,9 @@
 "clw" = (
 /obj/structure/machinery/light{
 	dir = 8;
+	invisibility = 101;
 	unacidable = 1;
-	unslashable = 1;
-	invisibility = 101
+	unslashable = 1
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -28012,9 +27888,7 @@
 	},
 /area/almayer/squads/charlie)
 "coj" = (
-/obj/structure/machinery/power/apc/almayer{
-	dir = 4
-	},
+/obj/structure/machinery/power/apc/almayer,
 /obj/structure/surface/table/almayer,
 /obj/item/tool/hand_labeler,
 /turf/open/floor/almayer{
@@ -28152,8 +28026,8 @@
 	pixel_y = 6
 	},
 /obj/item/folder/white{
-	pixel_y = 6;
-	pixel_x = 5
+	pixel_x = 5;
+	pixel_y = 6
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -28644,8 +28518,8 @@
 	icon_state = "ramptop"
 	},
 /turf/open/floor/almayer/no_build{
-	icon_state = "silver";
-	dir = 4
+	dir = 4;
+	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
 "cBs" = (
@@ -30460,12 +30334,13 @@
 	},
 /area/almayer/hull/lower_hull/l_f_s)
 "dpO" = (
-/obj/structure/machinery/cm_vending/clothing/marine/delta,
-/obj/structure/sign/banners/maximumeffort{
-	pixel_y = 30
+/obj/structure/machinery/cm_vending/clothing/marine/delta{
+	density = 0;
+	pixel_y = 16
 	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	dir = 1;
+	icon_state = "cargo_arrow"
 	},
 /area/almayer/squads/delta)
 "dpV" = (
@@ -31267,8 +31142,8 @@
 	dir = 1
 	},
 /turf/open/floor/almayer/no_build{
-	icon_state = "silver";
-	dir = 8
+	dir = 8;
+	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
 "dGr" = (
@@ -31619,8 +31494,8 @@
 	dir = 1
 	},
 /turf/open/floor/almayer/no_build{
-	icon_state = "silver";
-	dir = 4
+	dir = 4;
+	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
 "dQv" = (
@@ -33167,9 +33042,9 @@
 /obj/structure/machinery/door_control{
 	id = "ARES Mainframe Left";
 	name = "ARES Mainframe Lockdown";
-	req_one_access_txt = "200;91;92";
 	pixel_x = 24;
-	pixel_y = 24
+	pixel_y = 24;
+	req_one_access_txt = "200;91;92"
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "tcomms"
@@ -33866,9 +33741,9 @@
 	},
 /obj/structure/machinery/light{
 	dir = 4;
+	invisibility = 101;
 	unacidable = 1;
-	unslashable = 1;
-	invisibility = 101
+	unslashable = 1
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -34697,8 +34572,8 @@
 	dir = 1
 	},
 /turf/open/floor/almayer/no_build{
-	icon_state = "silver";
-	dir = 8
+	dir = 8;
+	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
 "fdj" = (
@@ -35097,6 +34972,18 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/command/lifeboat)
+"foL" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "emeraldcorner"
+	},
+/area/almayer/squads/charlie)
 "fpd" = (
 /obj/structure/sign/safety/hvac_old{
 	pixel_x = 8;
@@ -36195,13 +36082,13 @@
 /obj/structure/machinery/door_control{
 	id = "ARES Operations Right";
 	name = "ARES Operations Shutter";
-	req_one_access_txt = "1;200;91;92";
 	pixel_x = 24;
-	pixel_y = -8
+	pixel_y = -8;
+	req_one_access_txt = "1;200;91;92"
 	},
 /turf/open/floor/almayer/no_build{
-	icon_state = "silver";
-	dir = 4
+	dir = 4;
+	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
 "fMt" = (
@@ -36212,12 +36099,12 @@
 	},
 /obj/effect/step_trigger/ares_alert/core,
 /obj/structure/machinery/door/poddoor/almayer/blended/white/open{
-	open_layer = 1.9;
+	closed_layer = 3.2;
 	id = "ARES Emergency";
-	needs_power = 0;
-	name = "ARES Emergency Lockdown";
 	layer = 3.2;
-	closed_layer = 3.2;
+	name = "ARES Emergency Lockdown";
+	needs_power = 0;
+	open_layer = 1.9;
 	plane = -7
 	},
 /obj/structure/sign/safety/laser{
@@ -36225,8 +36112,8 @@
 	pixel_y = -8
 	},
 /obj/structure/sign/safety/rewire{
-	pixel_y = 6;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 6
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "test_floor4"
@@ -36749,12 +36636,12 @@
 	pixel_y = 8
 	},
 /obj/structure/transmitter/rotary{
-	pixel_x = 8;
-	pixel_y = -8;
+	name = "AI Core Telephone";
+	phone_category = "ARES";
 	phone_color = "blue";
 	phone_id = "AI Core";
-	phone_category = "ARES";
-	name = "AI Core Telephone"
+	pixel_x = 8;
+	pixel_y = -8
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -36762,8 +36649,8 @@
 /area/almayer/command/airoom)
 "gbg" = (
 /obj/structure/sign/safety/terminal{
-	pixel_y = 24;
-	pixel_x = 14
+	pixel_x = 14;
+	pixel_y = 24
 	},
 /obj/structure/sign/safety/laser{
 	pixel_y = 24
@@ -36778,9 +36665,9 @@
 /obj/structure/machinery/door_control{
 	id = "ARES Operations Right";
 	name = "ARES Operations Shutter";
-	req_one_access_txt = "1;200;91;92";
 	pixel_x = -24;
-	pixel_y = -8
+	pixel_y = -8;
+	req_one_access_txt = "1;200;91;92"
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -37167,13 +37054,13 @@
 /area/almayer/hull/lower_hull/l_f_s)
 "gjw" = (
 /obj/structure/machinery/faxmachine/uscm/command{
+	density = 0;
 	department = "AI Core";
-	pixel_y = 32;
-	density = 0
+	pixel_y = 32
 	},
 /obj/structure/surface/rack{
-	pixel_y = 16;
-	density = 0
+	density = 0;
+	pixel_y = 16
 	},
 /obj/structure/machinery/computer/working_joe{
 	dir = 8;
@@ -37830,9 +37717,9 @@
 /area/almayer/hallways/starboard_hallway)
 "gyN" = (
 /obj/structure/machinery/prop{
+	desc = "It's a server box...";
 	icon_state = "comm_server";
-	name = "server box";
-	desc = "It's a server box..."
+	name = "server box"
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "test_floor4"
@@ -38475,23 +38362,23 @@
 	},
 /obj/structure/machinery/door_control{
 	id = "ARES Interior";
+	indestructible = 1;
 	name = "ARES Chamber Lockdown";
-	req_one_access_txt = "1;200;90;91;92";
 	pixel_x = -24;
 	pixel_y = -8;
-	indestructible = 1
+	req_one_access_txt = "1;200;90;91;92"
 	},
 /obj/structure/machinery/door/poddoor/railing{
+	closed_layer = 4.1;
+	density = 0;
 	dir = 2;
 	id = "ARES Railing";
-	unslashable = 0;
-	unacidable = 0;
-	pixel_y = -1;
-	pixel_x = -1;
+	layer = 2.1;
 	open_layer = 2.1;
-	density = 0;
-	closed_layer = 4.1;
-	layer = 2.1
+	pixel_x = -1;
+	pixel_y = -1;
+	unacidable = 0;
+	unslashable = 0
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -38538,24 +38425,24 @@
 	},
 /obj/structure/machinery/door_control{
 	id = "ARES Interior";
+	indestructible = 1;
 	name = "ARES Chamber Lockdown";
-	req_one_access_txt = "1;200;90;91;92";
 	pixel_x = 24;
 	pixel_y = 8;
-	indestructible = 1
+	req_one_access_txt = "1;200;90;91;92"
 	},
 /obj/structure/machinery/door/poddoor/railing{
-	id = "ARES Railing";
-	unslashable = 0;
-	unacidable = 0;
-	open_layer = 2.1;
+	closed_layer = 4;
 	density = 0;
+	id = "ARES Railing";
 	layer = 2.1;
-	closed_layer = 4
+	open_layer = 2.1;
+	unacidable = 0;
+	unslashable = 0
 	},
 /turf/open/floor/almayer/no_build{
-	icon_state = "silver";
-	dir = 4
+	dir = 4;
+	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
 "gPc" = (
@@ -38858,9 +38745,9 @@
 "gXs" = (
 /obj/effect/step_trigger/ares_alert/terminals,
 /obj/structure/machinery/door/poddoor/shutters/almayer{
+	dir = 4;
 	id = "ARES Operations Right";
-	name = "\improper ARES Operations Shutters";
-	dir = 4
+	name = "\improper ARES Operations Shutters"
 	},
 /obj/structure/pipes/standard/simple/hidden/supply/no_boom{
 	dir = 4
@@ -40132,6 +40019,18 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_medbay)
+"hAZ" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/machinery/light,
+/turf/open/floor/almayer{
+	icon_state = "blue"
+	},
+/area/almayer/squads/delta)
 "hBc" = (
 /obj/structure/pipes/vents/scrubber{
 	dir = 4
@@ -40790,12 +40689,12 @@
 	pixel_y = 24
 	},
 /obj/structure/machinery/computer/crew/alt{
-	pixel_x = -17;
-	dir = 4
+	dir = 4;
+	pixel_x = -17
 	},
 /obj/structure/sign/safety/terminal{
-	pixel_y = 24;
-	pixel_x = 14
+	pixel_x = 14;
+	pixel_y = 24
 	},
 /obj/structure/sign/safety/fibre_optics{
 	pixel_x = 14;
@@ -40868,10 +40767,10 @@
 /area/almayer/hull/lower_hull/l_a_p)
 "hTl" = (
 /obj/structure/prop/server_equipment/yutani_server{
-	pixel_y = 16;
-	name = "server tower";
+	density = 0;
 	desc = "A powerful server tower housing various AI functions.";
-	density = 0
+	name = "server tower";
+	pixel_y = 16
 	},
 /obj/structure/pipes/standard/simple/hidden/supply/no_boom,
 /turf/open/floor/almayer/no_build{
@@ -41454,7 +41353,10 @@
 	},
 /area/almayer/medical/lower_medical_medbay)
 "ihM" = (
-/obj/structure/machinery/cm_vending/clothing/marine/delta,
+/obj/structure/machinery/cm_vending/clothing/marine/delta{
+	density = 0;
+	pixel_y = 16
+	},
 /obj/structure/sign/safety/cryo{
 	pixel_x = 32
 	},
@@ -41958,24 +41860,24 @@
 	},
 /obj/structure/machinery/door_control{
 	id = "ARES Interior";
+	indestructible = 1;
 	name = "ARES Chamber Lockdown";
-	req_one_access_txt = "1;200;90;91;92";
 	pixel_x = -24;
 	pixel_y = 8;
-	indestructible = 1
+	req_one_access_txt = "1;200;90;91;92"
 	},
 /obj/structure/machinery/door/poddoor/railing{
-	id = "ARES Railing";
-	unslashable = 0;
-	unacidable = 0;
-	open_layer = 2.1;
+	closed_layer = 4;
 	density = 0;
+	id = "ARES Railing";
 	layer = 2.1;
-	closed_layer = 4
+	open_layer = 2.1;
+	unacidable = 0;
+	unslashable = 0
 	},
 /turf/open/floor/almayer/no_build{
-	icon_state = "silver";
-	dir = 8
+	dir = 8;
+	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
 "itR" = (
@@ -42210,10 +42112,10 @@
 "iyH" = (
 /obj/structure/surface/table/reinforced/almayer_B{
 	climbable = 0;
-	unacidable = 1;
-	unslashable = 1;
+	desc = "A square metal surface resting on its fat metal bottom. You can't flip something that doesn't have legs. This one has a metal rail running above it, preventing something large passing over. Like you.";
 	indestructible = 1;
-	desc = "A square metal surface resting on its fat metal bottom. You can't flip something that doesn't have legs. This one has a metal rail running above it, preventing something large passing over. Like you."
+	unacidable = 1;
+	unslashable = 1
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -43288,8 +43190,8 @@
 	dir = 1
 	},
 /turf/open/floor/almayer/no_build{
-	icon_state = "silver";
-	dir = 4
+	dir = 4;
+	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
 "iZG" = (
@@ -44152,12 +44054,12 @@
 	},
 /obj/effect/step_trigger/ares_alert/core,
 /obj/structure/machinery/door/poddoor/almayer/blended/white/open{
-	open_layer = 1.9;
+	closed_layer = 3.2;
 	id = "ARES Emergency";
-	needs_power = 0;
-	name = "ARES Emergency Lockdown";
 	layer = 3.2;
-	closed_layer = 3.2;
+	name = "ARES Emergency Lockdown";
+	needs_power = 0;
+	open_layer = 1.9;
 	plane = -7
 	},
 /turf/open/floor/almayer/no_build{
@@ -44521,8 +44423,8 @@
 /obj/structure/machinery/door_control{
 	id = "ARES StairsUpper";
 	name = "ARES Core Access";
-	req_one_access_txt = "19;200;90;91;92";
-	pixel_x = 24
+	pixel_x = 24;
+	req_one_access_txt = "19;200;90;91;92"
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -45231,7 +45133,11 @@
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/cells)
 "jVr" = (
-/obj/structure/machinery/cm_vending/clothing/marine/alpha,
+/obj/structure/machinery/cm_vending/clothing/marine/alpha{
+	density = 0;
+	layer = 4.1;
+	pixel_y = -29
+	},
 /obj/structure/sign/safety/cryo{
 	pixel_x = 32
 	},
@@ -45815,6 +45721,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/machinery/light,
 /turf/open/floor/almayer{
 	icon_state = "orange"
 	},
@@ -46574,13 +46481,13 @@
 /obj/structure/machinery/door_control{
 	id = "ARES StairsLower";
 	name = "ARES Core Lockdown";
-	req_one_access_txt = "19;200;90;91;92";
 	pixel_x = -24;
-	pixel_y = -8
+	pixel_y = -8;
+	req_one_access_txt = "19;200;90;91;92"
 	},
 /turf/open/floor/almayer/no_build{
-	icon_state = "silver";
-	dir = 8
+	dir = 8;
+	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
 "kAh" = (
@@ -46983,8 +46890,8 @@
 	icon_state = "ramptop"
 	},
 /turf/open/floor/almayer/no_build{
-	icon_state = "silver";
-	dir = 8
+	dir = 8;
+	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
 "kKG" = (
@@ -47339,9 +47246,9 @@
 /obj/structure/machinery/door_control{
 	id = "ARES Mainframe Right";
 	name = "ARES Mainframe Lockdown";
-	req_one_access_txt = "200;91;92";
 	pixel_x = -24;
-	pixel_y = 24
+	pixel_y = 24;
+	req_one_access_txt = "200;91;92"
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "tcomms"
@@ -47537,7 +47444,10 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_f_p)
 "kXa" = (
-/obj/structure/machinery/cm_vending/clothing/marine/bravo,
+/obj/structure/machinery/cm_vending/clothing/marine/bravo{
+	density = 0;
+	pixel_y = 16
+	},
 /obj/structure/sign/safety/cryo{
 	pixel_x = 32
 	},
@@ -47557,8 +47467,8 @@
 /area/almayer/command/computerlab)
 "kXj" = (
 /turf/open/floor/almayer/no_build{
-	icon_state = "silver";
-	dir = 4
+	dir = 4;
+	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
 "kXu" = (
@@ -48229,22 +48139,26 @@
 	pixel_y = 24
 	},
 /obj/structure/sign/safety/terminal{
-	pixel_y = 24;
-	pixel_x = 14
+	pixel_x = 14;
+	pixel_y = 24
 	},
 /obj/structure/machinery/door_control{
 	id = "ARES Operations Left";
 	name = "ARES Operations Shutter";
-	req_one_access_txt = "1;200;91;92";
 	pixel_x = 24;
-	pixel_y = -8
+	pixel_y = -8;
+	req_one_access_txt = "1;200;91;92"
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
 	},
 /area/almayer/command/airoom)
 "lok" = (
-/obj/structure/machinery/cm_vending/clothing/marine/charlie,
+/obj/structure/machinery/cm_vending/clothing/marine/charlie{
+	density = 0;
+	layer = 4.1;
+	pixel_y = -29
+	},
 /obj/structure/sign/safety/cryo{
 	pixel_x = 32
 	},
@@ -48266,6 +48180,23 @@
 "loP" = (
 /turf/closed/wall/almayer,
 /area/almayer/engineering/laundry)
+"loS" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/item/device/radio/intercom{
+	freerange = 1;
+	name = "General Listening Channel";
+	pixel_y = -29
+	},
+/obj/structure/machinery/light,
+/turf/open/floor/almayer{
+	icon_state = "bluecorner"
+	},
+/area/almayer/squads/delta)
 "loV" = (
 /obj/structure/desertdam/decals/road_edge{
 	icon_state = "road_edge_decal3";
@@ -50606,6 +50537,20 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/lifeboat_pumps/north1)
+"mtr" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/machinery/status_display{
+	pixel_y = -29
+	},
+/turf/open/floor/almayer{
+	icon_state = "orange"
+	},
+/area/almayer/squads/bravo)
 "mtD" = (
 /obj/structure/machinery/status_display{
 	pixel_x = 16;
@@ -50678,6 +50623,10 @@
 	dir = 4
 	},
 /obj/structure/pipes/standard/manifold/hidden/supply,
+/obj/structure/machinery/camera/autoname/almayer{
+	dir = 1;
+	name = "ship-grade camera"
+	},
 /turf/open/floor/almayer{
 	icon_state = "bluecorner"
 	},
@@ -50807,9 +50756,6 @@
 	},
 /area/almayer/hull/lower_hull/l_f_s)
 "mzg" = (
-/obj/structure/sign/poster{
-	pixel_y = -32
-	},
 /turf/open/floor/almayer{
 	icon_state = "emerald"
 	},
@@ -51042,12 +50988,12 @@
 	plane = -7
 	},
 /obj/structure/machinery/door/poddoor/almayer/blended/white/open{
-	open_layer = 1.9;
+	closed_layer = 3.2;
 	id = "ARES Emergency";
-	needs_power = 0;
-	name = "ARES Emergency Lockdown";
 	layer = 3.2;
-	closed_layer = 3.2;
+	name = "ARES Emergency Lockdown";
+	needs_power = 0;
+	open_layer = 1.9;
 	plane = -7
 	},
 /turf/open/floor/almayer/no_build{
@@ -51131,8 +51077,8 @@
 /area/almayer/medical/medical_science)
 "mHE" = (
 /turf/open/floor/almayer/no_build{
-	icon_state = "silver";
-	dir = 8
+	dir = 8;
+	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
 "mHO" = (
@@ -51631,17 +51577,17 @@
 	},
 /obj/effect/step_trigger/ares_alert/core,
 /obj/structure/machinery/door/poddoor/almayer/blended/white/open{
-	open_layer = 1.9;
+	closed_layer = 3.2;
 	id = "ARES Emergency";
-	needs_power = 0;
-	name = "ARES Emergency Lockdown";
 	layer = 3.2;
-	closed_layer = 3.2;
+	name = "ARES Emergency Lockdown";
+	needs_power = 0;
+	open_layer = 1.9;
 	plane = -7
 	},
 /obj/structure/sign/safety/terminal{
-	pixel_y = -8;
-	pixel_x = -18
+	pixel_x = -18;
+	pixel_y = -8
 	},
 /obj/structure/sign/safety/fibre_optics{
 	pixel_x = -18;
@@ -51791,9 +51737,9 @@
 "mUC" = (
 /obj/structure/machinery/light{
 	dir = 4;
+	invisibility = 101;
 	unacidable = 1;
-	unslashable = 1;
-	invisibility = 101
+	unslashable = 1
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -51887,6 +51833,9 @@
 	name = "synthetic potted plant";
 	pixel_y = 8
 	},
+/obj/structure/sign/banners/maximumeffort{
+	pixel_y = 30
+	},
 /turf/open/floor/almayer{
 	dir = 9;
 	icon_state = "blue"
@@ -52424,7 +52373,7 @@
 "njd" = (
 /obj/structure/pipes/standard/manifold/hidden/supply,
 /turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
+	icon_state = "red"
 	},
 /area/almayer/squads/alpha)
 "njD" = (
@@ -53222,6 +53171,22 @@
 /obj/effect/landmark/late_join/charlie,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/charlie)
+"nCp" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/item/device/radio/intercom{
+	freerange = 1;
+	name = "General Listening Channel";
+	pixel_y = -29
+	},
+/turf/open/floor/almayer{
+	icon_state = "orange"
+	},
+/area/almayer/squads/bravo)
 "nDd" = (
 /obj/structure/closet/secure_closet/guncabinet/red,
 /obj/item/ammo_magazine/smg/m39,
@@ -54286,8 +54251,8 @@
 	layer = 3.3
 	},
 /obj/structure/sign/safety/terminal{
-	pixel_y = 24;
-	pixel_x = 14
+	pixel_x = 14;
+	pixel_y = 24
 	},
 /obj/structure/sign/safety/fibre_optics{
 	pixel_x = 14;
@@ -55013,8 +54978,8 @@
 	},
 /obj/structure/platform_decoration,
 /turf/open/floor/almayer/no_build{
-	icon_state = "silver";
-	dir = 4
+	dir = 4;
+	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
 "osz" = (
@@ -55709,8 +55674,8 @@
 /obj/structure/machinery/door_control{
 	id = "ARES StairsUpper";
 	name = "ARES Core Access";
-	req_one_access_txt = "19;200;90;91;92";
-	pixel_x = -24
+	pixel_x = -24;
+	req_one_access_txt = "19;200;90;91;92"
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -55767,9 +55732,9 @@
 /obj/structure/machinery/door_control{
 	id = "ARES StairsLower";
 	name = "ARES Core Lockdown";
-	req_one_access_txt = "19;200;90;91;92";
 	pixel_x = -24;
-	pixel_y = 8
+	pixel_y = 8;
+	req_one_access_txt = "19;200;90;91;92"
 	},
 /obj/structure/machinery/camera/autoname/almayer/containment/ares{
 	dir = 4;
@@ -55777,8 +55742,8 @@
 	},
 /obj/effect/step_trigger/clone_cleaner,
 /turf/open/floor/almayer/no_build{
-	icon_state = "silver";
-	dir = 8
+	dir = 8;
+	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
 "oLv" = (
@@ -56807,10 +56772,10 @@
 /area/almayer/living/briefing)
 "pmV" = (
 /obj/structure/prop/server_equipment/yutani_server/broken{
-	pixel_y = 16;
-	name = "server tower";
+	density = 0;
 	desc = "A powerful server tower housing various AI functions.";
-	density = 0
+	name = "server tower";
+	pixel_y = 16
 	},
 /obj/structure/pipes/standard/simple/hidden/supply/no_boom,
 /turf/open/floor/almayer/no_build{
@@ -58434,8 +58399,8 @@
 	dir = 8
 	},
 /turf/open/floor/almayer/no_build{
-	icon_state = "silver";
-	dir = 4
+	dir = 4;
+	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
 "pYo" = (
@@ -59432,13 +59397,13 @@
 /obj/structure/machinery/door_control{
 	id = "ARES Operations Left";
 	name = "ARES Operations Shutter";
-	req_one_access_txt = "1;200;91;92";
 	pixel_x = -24;
-	pixel_y = -8
+	pixel_y = -8;
+	req_one_access_txt = "1;200;91;92"
 	},
 /turf/open/floor/almayer/no_build{
-	icon_state = "silver";
-	dir = 8
+	dir = 8;
+	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
 "qxA" = (
@@ -60700,9 +60665,9 @@
 /obj/structure/machinery/door_control{
 	id = "ARES Mainframe Left";
 	name = "ARES Mainframe Lockdown";
-	req_one_access_txt = "200;91;92";
 	pixel_x = 24;
-	pixel_y = -24
+	pixel_y = -24;
+	req_one_access_txt = "200;91;92"
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -61227,8 +61192,8 @@
 	pixel_y = 1
 	},
 /obj/structure/machinery/computer/crew/alt{
-	pixel_x = 17;
-	dir = 8
+	dir = 8;
+	pixel_x = 17
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -61276,9 +61241,9 @@
 "roH" = (
 /obj/effect/step_trigger/ares_alert/terminals,
 /obj/structure/machinery/door/poddoor/shutters/almayer{
+	dir = 4;
 	id = "ARES Operations Left";
-	name = "\improper ARES Operations Shutters";
-	dir = 4
+	name = "\improper ARES Operations Shutters"
 	},
 /obj/structure/pipes/standard/simple/hidden/supply/no_boom{
 	dir = 4
@@ -61393,11 +61358,17 @@
 /turf/open/floor/plating,
 /area/almayer/living/offices/flight)
 "rrq" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/machinery/status_display{
+	pixel_y = 30
+	},
 /turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "blue"
+	dir = 1;
+	icon_state = "red"
 	},
-/area/almayer/squads/delta)
+/area/almayer/squads/alpha)
 "rrB" = (
 /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/reinforced{
 	name = "\improper Cryogenics Bay"
@@ -61594,7 +61565,7 @@
 "rvT" = (
 /obj/structure/pipes/standard/manifold/hidden/supply,
 /turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
+	icon_state = "emerald"
 	},
 /area/almayer/squads/charlie)
 "rwv" = (
@@ -62989,9 +62960,9 @@
 	},
 /obj/structure/machinery/light{
 	dir = 8;
+	invisibility = 101;
 	unacidable = 1;
-	unslashable = 1;
-	invisibility = 101
+	unslashable = 1
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -62999,8 +62970,8 @@
 /area/almayer/command/airoom)
 "sdl" = (
 /obj/structure/surface/rack{
-	pixel_y = 16;
-	density = 0
+	density = 0;
+	pixel_y = 16
 	},
 /obj/item/tool/wet_sign,
 /obj/item/tool/wet_sign,
@@ -64440,8 +64411,14 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/lifeboat_pumps/south1)
 "sNb" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/machinery/light,
 /turf/open/floor/almayer{
-	dir = 8;
 	icon_state = "orange"
 	},
 /area/almayer/squads/bravo)
@@ -65555,8 +65532,8 @@
 "tmK" = (
 /obj/structure/machinery/door/airlock/almayer/maint{
 	dir = 1;
-	req_one_access_txt = "91;92";
-	req_one_access = null
+	req_one_access = null;
+	req_one_access_txt = "91;92"
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "test_floor4"
@@ -69661,6 +69638,9 @@
 	name = "synthetic potted plant";
 	pixel_y = 8
 	},
+/obj/structure/machinery/alarm/almayer{
+	dir = 1
+	},
 /turf/open/floor/almayer{
 	dir = 9;
 	icon_state = "orange"
@@ -70002,10 +69982,10 @@
 /area/almayer/hull/lower_hull/l_m_p)
 "vhe" = (
 /obj/structure/prop/server_equipment/yutani_server{
-	pixel_y = 16;
-	name = "server tower";
+	density = 0;
 	desc = "A powerful server tower housing various AI functions.";
-	density = 0
+	name = "server tower";
+	pixel_y = 16
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -70902,8 +70882,8 @@
 	dir = 4
 	},
 /turf/open/floor/almayer/no_build{
-	icon_state = "silver";
-	dir = 8
+	dir = 8;
+	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
 "vBm" = (
@@ -71238,6 +71218,9 @@
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/machinery/firealarm{
+	pixel_y = -29
+	},
 /turf/open/floor/almayer{
 	icon_state = "orange"
 	},
@@ -72549,17 +72532,17 @@
 	plane = -7
 	},
 /obj/effect/step_trigger/ares_alert/public{
+	alert_id = "AresStairs";
 	alert_message = "Caution: Movement detected in ARES Core.";
-	cooldown_duration = 1200;
-	alert_id = "AresStairs"
+	cooldown_duration = 1200
 	},
 /obj/structure/machinery/door/poddoor/almayer/blended/white/open{
-	open_layer = 1.9;
+	closed_layer = 3.2;
 	id = "ARES Emergency";
-	needs_power = 0;
-	name = "ARES Emergency Lockdown";
 	layer = 3.2;
-	closed_layer = 3.2;
+	name = "ARES Emergency Lockdown";
+	needs_power = 0;
+	open_layer = 1.9;
 	plane = -7
 	},
 /turf/open/floor/almayer/no_build{
@@ -73204,9 +73187,9 @@
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/structure/machinery/door_control{
 	id = "ARES Emergency";
+	indestructible = 1;
 	name = "ARES Emergency Lockdown";
-	req_one_access_txt = "91;92";
-	indestructible = 1
+	req_one_access_txt = "91;92"
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "plating"
@@ -74530,8 +74513,8 @@
 /area/almayer/living/gym)
 "xbN" = (
 /obj/structure/surface/rack{
-	pixel_y = 16;
-	density = 0
+	density = 0;
+	pixel_y = 16
 	},
 /obj/structure/janitorialcart,
 /obj/item/tool/mop,
@@ -75016,6 +74999,21 @@
 /obj/structure/largecrate/random/barrel/yellow,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_m_s)
+"xoe" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/machinery/status_display{
+	pixel_y = -29
+	},
+/turf/open/floor/almayer{
+	dir = 8;
+	icon_state = "bluecorner"
+	},
+/area/almayer/squads/delta)
 "xoh" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2;
@@ -75340,14 +75338,14 @@
 /obj/structure/machinery/door_control{
 	id = "ARES StairsLower";
 	name = "ARES Core Lockdown";
-	req_one_access_txt = "19;200;90;91;92";
 	pixel_x = 24;
-	pixel_y = 8
+	pixel_y = 8;
+	req_one_access_txt = "19;200;90;91;92"
 	},
 /obj/effect/step_trigger/clone_cleaner,
 /turf/open/floor/almayer/no_build{
-	icon_state = "silver";
-	dir = 4
+	dir = 4;
+	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
 "xvX" = (
@@ -76583,9 +76581,9 @@
 /obj/structure/machinery/door_control{
 	id = "ARES StairsUpper";
 	name = "ARES Core Access";
-	req_one_access_txt = "1;200;90;91;92";
+	pixel_x = 24;
 	pixel_y = 24;
-	pixel_x = 24
+	req_one_access_txt = "1;200;90;91;92"
 	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
@@ -117827,10 +117825,10 @@ aMC
 aLT
 avv
 bfu
-bgV
-aPM
+rGj
+aQT
 aLT
-aQP
+aTv
 blB
 bnp
 aTx
@@ -117871,11 +117869,11 @@ bMy
 bJC
 cog
 chN
-cje
-bFh
+mzg
+cdP
 bJC
 dpO
-ckR
+ckX
 cli
 coj
 bSJ
@@ -118029,11 +118027,11 @@ aLT
 aLT
 aLT
 aLT
-bfw
-bgV
-aPM
+bfx
+rGj
+aQT
 aLT
-aQQ
+aTv
 blB
 kiU
 aQL
@@ -118074,11 +118072,11 @@ bJC
 bJC
 bJC
 chO
-cje
-bFh
+mzg
+cdP
 bJC
-cks
-ckR
+dpO
+ckX
 clj
 bSJ
 bSJ
@@ -118233,10 +118231,10 @@ aMB
 bdA
 aLT
 ial
-aMz
-aPM
+rGj
+aPl
 aLT
-aQP
+aPn
 aRU
 bnr
 aQL
@@ -118277,11 +118275,11 @@ bMx
 cgr
 bJC
 raK
-cje
-bFh
+mzg
+bgW
 bJC
-cks
 ckR
+ckX
 iyS
 bSJ
 clJ
@@ -118435,11 +118433,11 @@ bco
 bdr
 bdA
 aLT
-bfx
-bgV
-aPM
+bfw
+rGj
+aQT
 aLT
-aQP
+aTv
 blB
 vJV
 aQL
@@ -118480,11 +118478,11 @@ cfo
 cgr
 bJC
 chQ
-cje
-bFh
+mzg
+cdP
 bJC
-cks
-ckR
+dpO
+ckX
 clk
 bSJ
 clJ
@@ -118639,10 +118637,10 @@ bdr
 bdC
 beR
 bfy
-bgV
-aPM
+rGj
+aQT
 aLT
-aQR
+aTv
 blB
 bnt
 bpG
@@ -118683,11 +118681,11 @@ cfo
 cgs
 chk
 chR
-cje
-bFh
+mzg
+cdP
 bJC
-cku
-ckR
+dpO
+ckX
 cll
 clE
 clK
@@ -118841,13 +118839,13 @@ bco
 bdr
 bdA
 aLT
-bfx
+bfD
 aPj
-aPN
+aPl
 aLT
-aQS
-aRT
-bnu
+aPn
+blB
+sNb
 aQL
 brr
 aRT
@@ -118885,13 +118883,13 @@ cdV
 cfo
 cgr
 bJC
-chN
-bJD
-bFi
+foL
+mzg
+bgW
 bJC
-ckv
-bTA
-clm
+ckR
+ckX
+loS
 bSJ
 clJ
 clg
@@ -119045,12 +119043,12 @@ aMC
 bdA
 aLT
 bfx
-bgW
-aPM
+bgY
+aQT
 aLT
-aQP
+aTv
 blB
-bnu
+nCp
 aQL
 brr
 aUY
@@ -119089,11 +119087,11 @@ bMy
 cgr
 bJC
 chP
-cje
-bFh
+mzg
+cdP
 bJC
-cks
-ckR
+dpO
+ckX
 cln
 bSJ
 clJ
@@ -119248,10 +119246,10 @@ aLT
 aLT
 aLT
 hQW
-bgW
-aPM
+bgY
+aQT
 aLT
-aQP
+aTv
 blB
 qhU
 aQL
@@ -119292,11 +119290,11 @@ bJC
 bJC
 bJC
 uUo
-cje
+mzg
 cdP
 bJC
-cjF
-ckR
+dpO
+ckX
 sUO
 bSJ
 bSJ
@@ -119451,11 +119449,11 @@ aMB
 bdD
 aLT
 bfz
+bgY
 aPl
-aQT
 aLT
-aTv
-aRT
+aPn
+blB
 bnu
 aQL
 brt
@@ -119496,10 +119494,10 @@ cgt
 bJC
 chS
 bQA
-bFh
+bgW
 bJC
-cks
-bTA
+ckR
+ckX
 meu
 bSJ
 clL
@@ -119653,13 +119651,13 @@ bcE
 bdr
 bdD
 aLT
-bfx
-bgW
-aPM
+rrq
+bgY
+aQT
 aLT
-aQP
+aTv
 blB
-bnu
+mtr
 aQL
 brt
 bpC
@@ -119699,11 +119697,11 @@ cgt
 bJC
 chQ
 cjf
-bFh
+cdP
 bJC
-cks
-ckR
-clo
+dpO
+ckX
+xoe
 bSJ
 clL
 clg
@@ -119857,10 +119855,10 @@ bdr
 bdC
 beS
 bfy
-bgW
-aPM
+bgY
+aQT
 aLT
-aQP
+aTv
 blB
 bnt
 bpH
@@ -119902,10 +119900,10 @@ cgs
 chl
 chR
 cjf
-bFh
+cdP
 bJC
-cks
-ckR
+dpO
+ckX
 cll
 clF
 clK
@@ -120060,10 +120058,10 @@ aMC
 bdD
 aLT
 bfC
+bgY
 aPl
-aPM
 aLT
-aQU
+aPn
 aRX
 cSQ
 aQL
@@ -120104,10 +120102,10 @@ bMy
 cgt
 bJC
 chV
-bQB
-bFh
+cjf
+bgW
 bJC
-ckx
+ckR
 bTC
 mvl
 bSJ
@@ -120262,13 +120260,13 @@ aLT
 aLT
 aLT
 aLT
-bfD
-bgW
-aPM
+bfx
+bgY
+aQT
 aLT
-aQV
+aTv
 blB
-bnu
+sNb
 aQL
 aQL
 aQL
@@ -120308,11 +120306,11 @@ bJC
 bJC
 chW
 rvT
-bFh
+cdP
 bJC
-cky
-ckR
-cln
+dpO
+ckX
+hAZ
 bSJ
 bSJ
 bSJ
@@ -120467,12 +120465,12 @@ aLT
 bpL
 bfE
 njd
-aPN
+aQT
 aLT
-aQS
+aTv
 blB
 uvu
-sNb
+aUZ
 aQL
 bsS
 mqK
@@ -120508,15 +120506,15 @@ bJC
 cfp
 cgu
 bJC
-fcB
+bMx
 chQ
 cjf
-bFh
+cdP
 bJC
-cks
-ckR
+dpO
+ckX
 clo
-rrq
+bVn
 bSJ
 clM
 clS
@@ -120669,11 +120667,11 @@ bdr
 bkg
 aMz
 bfy
+bgY
 aPl
-aPM
 aLT
-aQP
-aRT
+aPn
+blB
 bnt
 aRT
 ihY
@@ -120713,11 +120711,11 @@ cfo
 chm
 bJD
 chR
-bQB
-bFi
+cjf
+bgW
 bJC
-ckv
-bTA
+ckR
+ckX
 cll
 bTA
 clG
@@ -120872,10 +120870,10 @@ aLT
 aLT
 brv
 nuA
-bgW
-aPM
+bgY
+aQT
 aLT
-aQP
+aTv
 blB
 oiQ
 lml
@@ -120917,10 +120915,10 @@ bJC
 cdf
 jxx
 cjf
-bFh
+cdP
 bJC
-cks
-ckR
+dpO
+ckX
 rXj
 gfo
 bSJ
@@ -121075,10 +121073,10 @@ bdr
 bpK
 aMz
 bfy
-bgW
-aPM
+bgY
+aQT
 aLT
-aQP
+aTv
 blB
 bnt
 aRT
@@ -121120,10 +121118,10 @@ chn
 bJD
 chR
 cjf
-bFh
+cdP
 bJC
-cks
-ckR
+dpO
+ckX
 cll
 bTA
 clH
@@ -121278,11 +121276,11 @@ bdv
 aLT
 bry
 bfu
-aPn
+bgY
 jVr
 aLT
 kXa
-aRZ
+blB
 chL
 lAl
 aQL
@@ -121322,11 +121320,11 @@ cgv
 bJC
 wqc
 chN
-bQC
+cjf
 lok
 bJC
 ihM
-bTE
+ckX
 clm
 hXY
 bSJ