diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index 29a979754a..04935e89f0 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -126,18 +126,21 @@
 /datum/map_template/shuttle/trijent_elevator/ice_elevator/requisitions
 	elevator_network = "Requisitions"
 
-/datum/map_template/shuttle/golden_arrow
+/datum/map_template/shuttle/trijent_elevator/golden_arrow
 	shuttle_id = "unused"
 
-/datum/map_template/shuttle/golden_arrow/vehicleone
+/datum/map_template/shuttle/trijent_elevator/golden_arrow/vehicleone
 	name = "Vehicle Elevator One"
 	shuttle_id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_ONE
+	elevator_network = "ArrowVehicleOne"
 
-/datum/map_template/shuttle/golden_arrow/vehicletwo
+/datum/map_template/shuttle/trijent_elevator/golden_arrow/vehicletwo
 	name = "Vehicle Elevator Two"
 	shuttle_id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_TWO
+	elevator_network = "ArrowVehicleTwo"
 
-/datum/map_template/shuttle/golden_arrow/cargo
+/datum/map_template/shuttle/trijent_elevator/golden_arrow/cargo
 	name = "Cargo Elevator"
 	elevator_network = "garrow_cargo"
 	shuttle_id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_CARGO
+	elevator_network = "ArrowCargo"
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index b064d35239..38035638f6 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -382,8 +382,6 @@
 
 	var/shuttle_flags = NONE
 
-	var/elevator_network
-
 #define WORLDMAXX_CUTOFF (world.maxx + 1)
 #define WORLDMAXY_CUTOFF (world.maxx + 1)
 /**
diff --git a/code/modules/shuttle/shuttles/shipmap_elevator.dm b/code/modules/shuttle/shuttles/shipmap_elevator.dm
index 65b81d50d9..d74a8dcbe5 100644
--- a/code/modules/shuttle/shuttles/shipmap_elevator.dm
+++ b/code/modules/shuttle/shuttles/shipmap_elevator.dm
@@ -1,4 +1,4 @@
-/obj/docking_port/mobile/shipmap_elevator
+/obj/docking_port/mobile/trijent_elevator/shipmap_elevator
 	name = "Vehicle Elevator One"
 	height = 5
 	width = 7
@@ -16,11 +16,12 @@
 	ambience_flight = null
 	var/list/railings = list()
 	var/list/gears = list()
+	area_type = /area/shuttle/vehicle_elevator
 
-/obj/docking_port/mobile/shipmap_elevator/get_transit_path_type()
+/obj/docking_port/mobile/trijent_elevator/shipmap_elevator/get_transit_path_type()
 	return /turf/closed/wall/almayer/outer
 
-/obj/docking_port/mobile/shipmap_elevator/register()
+/obj/docking_port/mobile/trijent_elevator/shipmap_elevator/register()
 	. = ..()
 	for(var/obj/structure/machinery/gear/G in machines)
 		if(G.id == id)
@@ -29,12 +30,12 @@
 		if(R.id == id)
 			railings += R
 
-/obj/docking_port/mobile/shipmap_elevator/on_ignition()
+/obj/docking_port/mobile/trijent_elevator/shipmap_elevator/on_ignition()
 	for(var/i in gears)
 		var/obj/structure/machinery/gear/G = i
 		G.start_moving()
 
-/obj/docking_port/mobile/shipmap_elevator/set_idle()
+/obj/docking_port/mobile/trijent_elevator/shipmap_elevator/set_idle()
 	..()
 	for(var/i in gears)
 		var/obj/structure/machinery/gear/G = i
@@ -46,28 +47,29 @@
 		else
 			INVOKE_ASYNC(R, TYPE_PROC_REF(/obj/structure/machinery/door, close))
 
-/obj/docking_port/mobile/shipmap_elevator/two
+/obj/docking_port/mobile/trijent_elevator/shipmap_elevator/two
 	name = "Vehicle Elevator Two"
 	id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_TWO
 
-/obj/docking_port/mobile/shipmap_elevator/cargo
+/obj/docking_port/mobile/trijent_elevator/shipmap_elevator/cargo
 	name = "Cargo Elevator"
 	height = 6
 	width = 8
 	id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_CARGO
+	area_type = /area/shuttle/elevator1
 
 /obj/docking_port/stationary/shipmap_elevator
 	dir = NORTH
 	height = 5
 	width = 7
 
-/obj/docking_port/stationary/shipmap_elevator/one
+/obj/docking_port/stationary/trijent_elevator/shipmap_elevator/one
 	name = "Vehicle Elevator One"
 
-/obj/docking_port/stationary/shipmap_elevator/two
+/obj/docking_port/stationary/trijent_elevator/shipmap_elevator/two
 	name = "Vehicle Elevator Two"
 
-/obj/docking_port/stationary/shipmap_elevator/cargo
+/obj/docking_port/stationary/trijent_elevator/shipmap_elevator/cargo
 	name = "Cargo Elevator"
 	height = 6
 	width = 8
diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm
index 82097482f4..891a422e4b 100644
--- a/maps/map_files/golden_arrow/golden_arrow.dmm
+++ b/maps/map_files/golden_arrow/golden_arrow.dmm
@@ -10,17 +10,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aab" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/secure_closet/squad_sergeant{
-	name = "squad one sergeant locker";
-	req_access_txt = "32;39";
-	req_one_access = list()
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/platoonprep)
 "aac" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -43,16 +32,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aaf" = (
-/obj/effect/decal/strata_decals/grime/grime2{
-	dir = 8
-	},
-/obj/structure/largecrate/random/secure,
-/obj/structure/machinery/light,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "aag" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning";
@@ -61,84 +40,15 @@
 /turf/open/floor/almayer,
 /area/golden_arrow/motor_pool)
 "aah" = (
-/obj/docking_port/stationary/shipmap_elevator/cargo{
-	id = "garrow_cargo_elevator"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/docking_port/stationary/trijent_elevator{
-	name = "Cargo Elevator Upper";
+/obj/docking_port/stationary/trijent_elevator/shipmap_elevator/cargo{
 	id = "garrow_cargo_elevator_upper";
-	width = 8;
-	elevator_network = "ArrowCargo"
+	name = "Cargo Elevator Upper";
+	elevator_network = "ArrowCargo";
+	airlock_exit = "north";
+	airlock_area = /area/golden_arrow/cargo_shuttle/upper
 	},
 /turf/open/floor/almayer/empty,
-/area/golden_arrow/supply)
-"aai" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/door/airlock/almayer/secure{
-	dir = 8;
-	name = "\improper Shared Office";
-	req_access = list();
-	req_one_access_txt = "12;32"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/shared_office)
-"aaj" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aak" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/engineering)
-"aal" = (
-/obj/structure/machinery/door/airlock/almayer/secure{
-	dir = 1;
-	name = "\improper Platoon Commander's Office";
-	req_access = list();
-	req_one_access_txt = "19;12"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 2
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/platoon_commander_rooms)
-"aam" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out"
-	},
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
+/area/golden_arrow/cargo_shuttle/upper)
 "aan" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -198,13 +108,9 @@
 /obj/item/tool/kitchen/knife{
 	pixel_x = 9
 	},
-/turf/closed/wall/almayer,
-/area/golden_arrow/cryo_cells)
-"aar" = (
-/obj/structure/machinery/light{
-	dir = 1
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
 	},
-/turf/open/floor/almayer,
 /area/golden_arrow/cryo_cells)
 "aas" = (
 /obj/effect/decal/warning_stripes{
@@ -230,27 +136,6 @@
 	dir = 1
 	},
 /area/golden_arrow/briefing)
-"aau" = (
-/obj/structure/barricade/handrail{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonarmory)
-"aav" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/structure/surface/table/almayer,
-/obj/item/storage/briefcase/inflatable{
-	pixel_y = 10
-	},
-/obj/item/storage/briefcase/inflatable{
-	pixel_x = 3;
-	pixel_y = 5
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "aaw" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -298,80 +183,9 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/cryo_cells)
-"aaB" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cargo_container/wy/left{
-	opacity = 0
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aaC" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/roller{
-	pixel_y = 17
-	},
-/obj/item/roller{
-	pixel_y = 23
-	},
-/obj/item/storage/firstaid/regular{
-	pixel_x = -2;
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/medical)
-"aaD" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/almayer/locked{
-	dir = 4;
-	name = "\improper Second Platoon Ready Bay Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
-"aaE" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
-"aaF" = (
-/obj/structure/shuttle/part/dropship1/transparent/nose_center{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
-"aaG" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/shuttle/elevator,
-/area/golden_arrow/supply)
-"aaH" = (
-/obj/structure/largecrate/random/case/double,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aaI" = (
 /turf/closed/wall/almayer/outer,
 /area/golden_arrow/medical)
-"aaJ" = (
-/obj/structure/bed/chair{
-	dir = 8;
-	pixel_y = 3
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/dorms)
 "aaK" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -401,11 +215,6 @@
 	dir = 4
 	},
 /area/golden_arrow/motor_pool)
-"aaN" = (
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "aaO" = (
 /obj/structure/machinery/light/small/blue{
 	dir = 8;
@@ -414,26 +223,7 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/motor_pool)
-"aaP" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2-4"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoonarmory)
 "aaQ" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "door_warning";
-	dir = 8
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning";
 	dir = 8
@@ -455,13 +245,6 @@
 	},
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/hangar)
-"aaS" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
 "aaT" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -497,23 +280,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/almayer,
 /area/golden_arrow/platoonprep)
-"aaX" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aaY" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 6
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/synthcloset)
 "aaZ" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 6
@@ -522,49 +288,10 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aba" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "abb" = (
 /obj/effect/decal/cleanable/blood/oil,
 /turf/open/floor/almayer,
 /area/golden_arrow/engineering)
-"abc" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 6
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "2-4"
-	},
-/obj/structure/cable{
-	layer = 2.36
-	},
-/obj/structure/disposalpipe/junction{
-	dir = 2;
-	icon_state = "pipe-j2"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoonprep)
-"abd" = (
-/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage{
-	req_one_access = list()
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
-"abe" = (
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/prep_hallway)
 "abf" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SE-out";
@@ -574,17 +301,6 @@
 	dir = 4
 	},
 /area/golden_arrow/hangar)
-"abg" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "abh" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -603,16 +319,6 @@
 "abi" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
 /obj/structure/cable/heavyduty{
 	icon_state = "1-2"
 	},
@@ -621,58 +327,9 @@
 	},
 /turf/open/floor/almayer/edge,
 /area/golden_arrow/cryo_cells)
-"abj" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 1
-	},
-/obj/structure/machinery/gear{
-	id = "supply_elevator_gear"
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "abk" = (
 /turf/closed/wall/almayer,
 /area/golden_arrow/platoonarmory)
-"abl" = (
-/obj/effect/decal/cleanable/dirt,
-/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/golden_arrow/cryo_cells)
-"abm" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"abn" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	layer = 2.5;
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "abo" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -692,25 +349,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/dorms)
-"abq" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"abr" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/cryo_cells)
 "abs" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SE-out";
@@ -724,17 +362,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"abt" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
 "abu" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -747,25 +374,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/motor_pool)
-"abv" = (
-/obj/structure/sign/safety/bulkhead_door{
-	pixel_y = 27
-	},
-/obj/structure/sign/safety/hazard{
-	pixel_x = 14;
-	pixel_y = 27
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/reagent_dispensers/water_cooler/stacks{
-	density = 0;
-	layer = 3.6;
-	pixel_y = 18
-	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
 "abw" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -816,19 +424,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"abB" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/almayer{
-	dir = 4;
-	id = "apc1blastdoor";
-	name = "\improper Vehicle Bay One Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
 "abC" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -845,33 +440,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/motor_pool)
-"abE" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/oil,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"abF" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S";
-	layer = 3.3
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
-"abG" = (
-/turf/closed/shuttle/midway{
-	icon_state = "30";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "abH" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S";
@@ -885,16 +453,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"abI" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoonprep)
 "abJ" = (
 /turf/open/floor/almayer/edge/smooth/corner{
 	dir = 4
@@ -931,17 +489,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/hangar)
-"abN" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
 "abO" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -954,13 +501,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/motor_pool)
-"abP" = (
-/obj/structure/surface/table/almayer,
-/obj/item/toy/deck,
-/obj/structure/machinery/light,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "abQ" = (
 /obj/effect/decal/cleanable/blood/oil,
 /turf/open/floor/almayer{
@@ -1043,23 +583,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"abZ" = (
-/obj/structure/largecrate/supply/ammo{
-	fill_from_loc = 1;
-	name = "sentry crate"
-	},
-/obj/item/ammo_magazine/sentry{
-	layer = 3.01
-	},
-/obj/item/defenses/handheld/sentry,
-/obj/structure/largecrate/supply/explosives/grenades/less{
-	icon_state = "case";
-	layer = 3.1;
-	pixel_x = 20;
-	pixel_y = 10
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonarmory)
 "aca" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -1083,62 +606,8 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/cryo_cells)
-"acc" = (
-/obj/structure/bed/chair,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
-"acd" = (
-/obj/structure/surface/table/almayer,
-/obj/item/tool/soap{
-	pixel_x = -5;
-	pixel_y = -5
-	},
-/obj/item/tool/soap{
-	pixel_x = 7;
-	pixel_y = 12
-	},
-/obj/item/tool/soap/nanotrasen{
-	pixel_x = -7;
-	pixel_y = 6
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "ace" = (
 /obj/structure/surface/table/almayer,
-/obj/item/clothing/head/headband{
-	pixel_y = 9;
-	pixel_x = -15
-	},
-/obj/item/clothing/mask/cigarette/cigar{
-	pixel_x = 9
-	},
-/obj/item/prop/helmetgarb/lucky_feather{
-	pixel_y = 7
-	},
-/obj/item/trash/candle{
-	pixel_y = 14;
-	pixel_x = 15
-	},
-/obj/item/prop/helmetgarb/rosary{
-	pixel_x = -11;
-	desc = "An old rosary, a few beads missing from it's string, yet it still holds together.";
-	name = "damaged rosary"
-	},
-/obj/item/prop{
-	name = "\improper battered M10 pattern ballistic helmet";
-	icon = 'icons/obj/items/clothing/cm_hats.dmi';
-	icon_state = "helmet";
-	desc = "A helmet once belonging to a marine aboard the Golden Arrow. It's new home is sitting right in front of the memorial, a reminder of who has been lost.";
-	pixel_y = 12
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/surface/table/almayer,
 /obj/item/clothing/mask/cigarette/cigar{
 	pixel_x = 9
 	},
@@ -1172,21 +641,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/platoonprep)
-"acf" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"acg" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/light,
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "ach" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -1202,13 +656,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"acj" = (
-/obj/structure/machinery/camera/autoname/golden_arrow{
-	dir = 8;
-	name = "ship-grade camera"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
 "ack" = (
 /obj/structure/bed{
 	can_buckle = 0
@@ -1228,86 +675,34 @@
 	dir = 10
 	},
 /area/golden_arrow/dorms)
-"acl" = (
-/obj/effect/decal/cleanable/dirt,
+"aco" = (
+/obj/effect/decal/cleanable/blood/oil,
 /turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
+	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"acm" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
+"acq" = (
+/obj/structure/surface/table/almayer,
+/obj/item/toy/deck,
+/turf/open/floor/almayer{
+	icon_state = "mono"
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"acn" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/light,
-/obj/item/tool/soap/deluxe,
-/obj/item/tool/soap{
-	pixel_x = 3;
-	pixel_y = 15
+"acr" = (
+/obj/structure/pipes/vents/scrubber{
+	dir = 8
+	},
+/obj/structure/machinery/light/double/blue{
+	dir = 4;
+	light_color = "#dae2ff"
 	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/cryo_cells)
-"aco" = (
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"acp" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/obj/structure/largecrate/random/case{
-	pixel_y = 5
-	},
-/obj/structure/largecrate/random/case/double{
-	pixel_y = 15
-	},
-/obj/structure/largecrate/random/case{
-	pixel_y = -5
-	},
-/obj/structure/largecrate/random/mini/small_case{
-	layer = 3.1;
-	pixel_x = 8;
-	pixel_y = 14
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"acq" = (
-/obj/structure/surface/table/almayer,
-/obj/item/toy/deck,
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/golden_arrow/hangar)
-"acr" = (
-/obj/structure/pipes/vents/scrubber{
-	dir = 8
-	},
-/obj/structure/machinery/light/double/blue{
-	dir = 4;
-	light_color = "#dae2ff"
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/cryo_cells)
-"acs" = (
-/turf/open/floor/almayer/edge{
-	dir = 4
+"acs" = (
+/turf/open/floor/almayer/edge{
+	dir = 4
 	},
 /area/golden_arrow/prep_hallway)
 "act" = (
@@ -1317,18 +712,6 @@
 	},
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/platoonprep)
-"acu" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 10
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "acv" = (
 /obj/effect/landmark/nightmare{
 	insert_tag = "dorms"
@@ -1350,25 +733,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/platoonprep)
-"acy" = (
-/obj/item/trash/cigbutt{
-	layer = 3.2;
-	pixel_x = 4;
-	pixel_y = 10;
-	randpixel = 0
-	},
-/obj/item/ashtray/plastic{
-	icon_state = "ashtray_full_bl";
-	layer = 3.2;
-	pixel_x = -2;
-	pixel_y = 1
-	},
-/obj/structure/largecrate/supply/weapons/pistols{
-	layer = 3.1;
-	pixel_y = -7
-	},
-/turf/closed/wall/almayer/outer,
-/area/golden_arrow/hangar)
 "acz" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -1393,12 +757,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"acC" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "acD" = (
 /obj/structure/cable/heavyduty{
 	icon_state = "1-2"
@@ -1406,34 +764,6 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"acE" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"acF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/door_control/brbutton{
-	id = "squadblastdoor";
-	name = "hangar blast door control";
-	pixel_y = 28;
-	req_one_access_txt = "19;12"
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/platoonarmory)
-"acG" = (
-/obj/structure/ship_ammo/minirocket,
-/obj/structure/ship_ammo/minirocket{
-	layer = 3.1;
-	pixel_y = 9
-	},
-/turf/open/floor/almayer{
-	dir = 10;
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "acH" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S";
@@ -1441,52 +771,6 @@
 	},
 /turf/open/floor/almayer/edge/smooth/endcap_left,
 /area/golden_arrow/prep_hallway)
-"acI" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"acJ" = (
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/cryo_cells)
-"acK" = (
-/obj/structure/surface/table/almayer,
-/obj/item/trash/cigbutt/cigarbutt{
-	pixel_x = -3;
-	pixel_y = 25;
-	randpixel = 0
-	},
-/obj/item/ashtray/plastic{
-	icon_state = "ashtray_full_bl";
-	pixel_x = 9;
-	pixel_y = 6
-	},
-/obj/item/trash/cigbutt{
-	pixel_x = 4;
-	pixel_y = 5;
-	randpixel = 0
-	},
-/obj/item/prop/helmetgarb/gunoil{
-	layer = 3.3;
-	pixel_x = 9;
-	pixel_y = 23
-	},
-/obj/item/storage/fancy/cigar/matchbook{
-	pixel_x = -2;
-	pixel_y = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/platoonprep)
 "acL" = (
 /obj/structure/surface/table/almayer,
 /obj/item/prop/colony/game{
@@ -1495,44 +779,6 @@
 	},
 /turf/open/floor/almayer/edge,
 /area/golden_arrow/dorms)
-"acM" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/cryo_cells)
-"acN" = (
-/obj/structure/prop{
-	color = "#b30000";
-	icon = 'icons/obj/pipes/power_cond_white.dmi';
-	icon_state = "8-9";
-	layer = 2.9;
-	name = "cable";
-	pixel_x = 4;
-	pixel_y = -15
-	},
-/obj/structure/prop{
-	color = "#b30000";
-	icon = 'icons/obj/pipes/power_cond_white.dmi';
-	icon_state = "1-4";
-	name = "cable";
-	pixel_x = -9
-	},
-/obj/structure/prop{
-	color = "#b30000";
-	icon = 'icons/obj/pipes/power_cond_white.dmi';
-	icon_state = "8-10";
-	name = "cable";
-	pixel_x = 21
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin14"
-	},
-/area/golden_arrow/hangar)
 "acO" = (
 /obj/structure/machinery/shower{
 	dir = 4
@@ -1584,16 +830,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"acU" = (
-/obj/item/stack/cable_coil{
-	pixel_x = 7;
-	pixel_y = 13
-	},
-/obj/effect/decal/siding{
-	icon_state = "siding8"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "acV" = (
 /obj/effect/landmark/start/bridge,
 /obj/effect/landmark/late_join/alpha,
@@ -1602,11 +838,6 @@
 	dir = 4
 	},
 /area/golden_arrow/cryo_cells)
-"acW" = (
-/obj/structure/cargo_container/arious/right,
-/obj/structure/blocker/invisible_wall,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "acX" = (
 /obj/structure/sign/safety/galley{
 	pixel_y = 28
@@ -1620,11 +851,6 @@
 	dir = 9
 	},
 /area/golden_arrow/prep_hallway)
-"acY" = (
-/obj/structure/largecrate/random/case/double,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "acZ" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NE-out";
@@ -1640,37 +866,10 @@
 	dir = 8;
 	pixel_x = -24
 	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonarmory)
-"adb" = (
-/obj/structure/bed/chair/comfy{
-	buckling_y = 2;
-	dir = 8;
-	pixel_y = 2
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"adc" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/structure/barricade/handrail{
-	dir = 4
-	},
-/obj/item/facepaint/green{
-	pixel_x = 2;
-	pixel_y = 12
-	},
-/obj/item/facepaint/black{
-	pixel_x = -7;
-	pixel_y = 7
-	},
-/obj/item/facepaint/brown{
-	pixel_x = -2;
-	pixel_y = 1
+/turf/open/floor/almayer/edge{
+	dir = 9
 	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
+/area/golden_arrow/platoonarmory)
 "add" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -1683,12 +882,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"ade" = (
-/turf/closed/shuttle/midway{
-	icon_state = "103";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "adf" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/cable{
@@ -1710,36 +903,6 @@
 	dir = 1
 	},
 /area/golden_arrow/supply)
-"adh" = (
-/obj/structure/surface/table/almayer,
-/obj/item/prop/almayer/comp_open{
-	pixel_x = -12;
-	pixel_y = 9
-	},
-/obj/item/reagent_container/food/drinks/cans/souto/diet{
-	pixel_x = 8;
-	pixel_y = 11
-	},
-/obj/item/trash/chips{
-	layer = 2.7;
-	pixel_y = -9
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"adi" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "plating"
-	},
-/area/golden_arrow/engineering)
 "adj" = (
 /obj/structure/pipes/vents/scrubber{
 	dir = 1
@@ -1758,12 +921,6 @@
 "adl" = (
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/platoonarmory)
-"adm" = (
-/obj/structure/largecrate/supply/floodlights,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "adn" = (
 /obj/effect/decal/strata_decals/grime/grime2{
 	dir = 8
@@ -1814,24 +971,6 @@
 	dir = 4
 	},
 /area/golden_arrow/hangar)
-"ads" = (
-/obj/structure/sign/safety/bulkhead_door{
-	pixel_y = 27
-	},
-/obj/structure/sign/safety/hazard{
-	pixel_x = 14;
-	pixel_y = 27
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/largecrate/random/case/small,
-/obj/structure/largecrate/random/mini/small_case{
-	pixel_y = 11
-	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
 "adt" = (
 /obj/structure/closet/wardrobe{
 	name = "PT uniform"
@@ -1849,19 +988,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/cryo_cells)
-"adu" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/structure/machinery/computer/crew/alt{
-	dir = 4;
-	pixel_x = -10
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "adv" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -1872,13 +998,6 @@
 	dir = 1
 	},
 /area/golden_arrow/motor_pool)
-"adw" = (
-/obj/structure/bed/chair/comfy{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "adx" = (
 /obj/structure/platform{
 	dir = 8;
@@ -1967,21 +1086,6 @@
 	dir = 4
 	},
 /area/golden_arrow/cryo_cells)
-"adF" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/vents/pump{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "adG" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/effect/decal/cleanable/dirt{
@@ -2033,30 +1137,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/motor_pool)
-"adM" = (
-/turf/closed/shuttle/midway{
-	icon_state = "72";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
-"adN" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/platoonprep)
-"adO" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/almayer/open{
-	dir = 4;
-	name = "\improper Storage Bay One Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
 "adP" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NE-out";
@@ -2083,28 +1163,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/motor_pool)
-"adR" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/structure/target{
-	layer = 3.1;
-	name = "punching bag";
-	pixel_y = 16
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"adS" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 10
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "adT" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -2148,34 +1206,6 @@
 	dir = 8
 	},
 /area/golden_arrow/cryo_cells)
-"adX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/reinforced/almayer_B{
-	layer = 2.01;
-	pixel_x = 14
-	},
-/obj/item/ashtray/plastic{
-	pixel_x = 10;
-	pixel_y = -3
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
-"adY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/landinglight/ds1/delaythree{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"adZ" = (
-/obj/structure/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "aea" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W";
@@ -2227,17 +1257,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/medical)
-"aee" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	layer = 2.5;
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aef" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -2258,19 +1277,6 @@
 	dir = 1
 	},
 /area/golden_arrow/hangar)
-"aeh" = (
-/turf/closed/shuttle/midway{
-	icon_state = "75";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
-"aei" = (
-/obj/structure/machinery/cm_vending/sorted/tech/tool_storage{
-	req_one_access = list()
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "aej" = (
 /obj/item/trash/cigbutt{
 	pixel_y = 10;
@@ -2312,15 +1318,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/cryo_cells)
-"aem" = (
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 2
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/engineering)
 "aen" = (
 /obj/structure/cable/heavyduty{
 	icon_state = "1-2"
@@ -2332,67 +1329,12 @@
 "aeo" = (
 /turf/open/floor/almayer,
 /area/golden_arrow/dorms)
-"aep" = (
-/obj/structure/largecrate/random/case/double,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
-"aeq" = (
-/obj/structure/prop/almayer/computers/sensor_computer1,
-/turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "plating"
-	},
-/area/golden_arrow/engineering)
 "aer" = (
 /turf/open/floor/almayer{
 	dir = 1;
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/prep_hallway)
-"aes" = (
-/turf/open/floor/almayer/uscm{
-	dir = 5;
-	icon_state = "logo_directional1"
-	},
-/area/golden_arrow/hangar)
-"aet" = (
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/structure/machinery/door_control/brbutton{
-	id = "weapons_conny";
-	name = "weapons locker shutter control";
-	pixel_x = -5;
-	pixel_y = 23;
-	req_one_access_txt = "19;12"
-	},
-/obj/structure/machinery/door_control/brbutton{
-	id = "equipment_conny";
-	name = "equipment locker shutter control";
-	pixel_x = 7;
-	pixel_y = 23;
-	req_one_access_txt = "19;12"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoonarmory)
-"aeu" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/landinglight/ds1/delaytwo{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aev" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -2401,15 +1343,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/motor_pool)
-"aew" = (
-/obj/item/tool/weldingtool,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
-"aex" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "aey" = (
 /turf/open/floor/almayer{
 	dir = 8;
@@ -2426,27 +1359,6 @@
 "aeA" = (
 /turf/open/floor/almayer/edge,
 /area/golden_arrow/prep_hallway)
-"aeB" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/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 = 5;
-	pixel_y = 7
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "aeC" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -2460,14 +1372,6 @@
 	dir = 6
 	},
 /area/golden_arrow/platoon_commander_rooms)
-"aeD" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/largecrate/random/secure,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "aeE" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SE-out"
@@ -2492,24 +1396,6 @@
 	},
 /area/golden_arrow/cryo_cells)
 "aeG" = (
-/obj/structure/machinery/microwave{
-	density = 0;
-	pixel_y = 9
-	},
-/obj/item/reagent_container/food/drinks/coffee/marine{
-	pixel_y = -3;
-	pixel_x = 9
-	},
-/obj/item/storage/box/donkpockets{
-	pixel_y = 22;
-	pixel_x = 4
-	},
-/obj/structure/surface/table/almayer,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/surface/rack{
 	pixel_y = 14;
 	pixel_x = 4
@@ -2547,34 +1433,8 @@
 	dir = 10
 	},
 /area/golden_arrow/platoon_commander_rooms)
-"aeI" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
-"aeJ" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 9
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aeK" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/cable/heavyduty{
 	icon_state = "1-2"
 	},
@@ -2614,36 +1474,12 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/dorms)
-"aeN" = (
-/obj/structure/machinery/gear{
-	id = "supply_elevator_gear"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 6
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "blackcorner"
-	},
-/area/golden_arrow/hangar)
 "aeO" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
 	},
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/supply)
-"aeP" = (
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
-	},
-/area/golden_arrow/hangar)
 "aeQ" = (
 /obj/structure/bed/bedroll{
 	pixel_y = 7;
@@ -2670,11 +1506,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"aeS" = (
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
-	},
-/area/golden_arrow/hangar)
 "aeT" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -2715,37 +1546,11 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aeY" = (
-/obj/structure/machinery/door/poddoor/almayer/locked{
-	dir = 4;
-	name = "\improper Second Platoon Ready Bay Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
 "aeZ" = (
 /turf/open/floor/almayer/edge/smooth{
 	dir = 1
 	},
 /area/golden_arrow/motor_pool)
-"afa" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/golden_arrow/cryo_cells)
-"afb" = (
-/obj/structure/sign/safety/synth_storage{
-	pixel_y = 32
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "afc" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 4
@@ -2764,13 +1569,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/motor_pool)
-"afe" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
 "aff" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -2779,14 +1577,6 @@
 	dir = 8
 	},
 /area/golden_arrow/supply)
-"afg" = (
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "afh" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W";
@@ -2802,21 +1592,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/cryo_cells)
-"afi" = (
-/obj/structure/largecrate/supply/floodlights,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
-"afj" = (
-/obj/item/tool/weldingtool{
-	pixel_y = 6
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
-	},
-/area/golden_arrow/hangar)
 "afk" = (
 /obj/structure/gun_rack/m41/unloaded,
 /turf/open/floor/almayer,
@@ -2875,39 +1650,11 @@
 	layer = 2.52
 	},
 /obj/structure/pipes/standard/simple/hidden/supply,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/cable/heavyduty{
 	icon_state = "1-2"
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/motor_pool)
-"afp" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	layer = 1.9
-	},
-/obj/structure/machinery/door/airlock/almayer/secure{
-	name = "\improper Platoon Commander's Quarters";
-	req_access = list();
-	req_one_access_txt = "19;12"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/platoon_commander_rooms)
 "afq" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -2954,10 +1701,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aft" = (
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "afu" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W";
@@ -3062,32 +1805,6 @@
 	dir = 8
 	},
 /area/golden_arrow/motor_pool)
-"afE" = (
-/obj/structure/largecrate/supply/medicine/medkits{
-	pixel_x = -4;
-	pixel_y = 9
-	},
-/obj/structure/largecrate/supply/medicine/medkits{
-	layer = 3.1;
-	pixel_x = 15;
-	pixel_y = 24
-	},
-/obj/structure/largecrate/random/mini/med{
-	pixel_x = -6;
-	pixel_y = 21
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"afF" = (
-/obj/item/device/flashlight/lamp/tripod/grey,
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "afG" = (
 /obj/structure/bed/chair{
 	dir = 8
@@ -3097,13 +1814,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/platoon_commander_rooms)
-"afH" = (
-/obj/structure/shuttle/part/dropship2/transparent/engine_right_cap{
-	name = "\improper Tripoli"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "afI" = (
 /obj/structure/barricade/metal{
 	dir = 8
@@ -3135,15 +1845,6 @@
 	dir = 8
 	},
 /area/golden_arrow/hangar)
-"afK" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 10
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoon_commander_rooms)
 "afL" = (
 /obj/structure/bed{
 	can_buckle = 0
@@ -3163,13 +1864,6 @@
 	dir = 9
 	},
 /area/golden_arrow/dorms)
-"afM" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
 "afN" = (
 /turf/open/floor/almayer{
 	dir = 4;
@@ -3206,30 +1900,7 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/prep_hallway)
-"afS" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/camera/autoname/golden_arrow{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/medical)
 "afT" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
 	},
@@ -3257,13 +1928,6 @@
 	},
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/hangar)
-"afV" = (
-/obj/structure/bed/chair{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "afW" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -3282,21 +1946,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/medical)
-"afY" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 2
-	},
-/obj/item/tool/warning_cone{
-	pixel_x = -15;
-	pixel_y = 16
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "afZ" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NE-out";
@@ -3368,22 +2017,6 @@
 	dir = 6
 	},
 /area/golden_arrow/dorms)
-"agg" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/barricade/handrail{
-	dir = 8
-	},
-/obj/structure/machinery/computer/cameras/wooden_tv/prop{
-	dir = 4;
-	layer = 3.2;
-	pixel_x = -3;
-	pixel_y = 6
-	},
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "agh" = (
 /obj/structure/pipes/standard/manifold/hidden/supply,
 /obj/structure/disposalpipe/segment,
@@ -3392,18 +2025,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/cryo_cells)
-"agi" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3;
-	pixel_x = -1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "agj" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -3414,56 +2035,11 @@
 /obj/structure/barricade/handrail,
 /turf/open/floor/almayer,
 /area/golden_arrow/motor_pool)
-"agk" = (
-/obj/structure/surface/table/almayer,
-/obj/item/clothing/suit/storage/jacket/marine/service{
-	pixel_x = 11
-	},
-/obj/item/prop/magazine/dirty/torn{
-	pixel_x = -6;
-	pixel_y = 6
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
-"agl" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 4
-	},
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 4;
-	id = "apcbayrailing1"
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
-"agm" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"agn" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/closed/wall/almayer,
-/area/golden_arrow/platoonarmory)
 "ago" = (
 /turf/open/floor/almayer/edge/smooth/corner{
 	dir = 1
 	},
 /area/golden_arrow/supply)
-"agp" = (
-/obj/structure/bed/chair/comfy{
-	dir = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "agq" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SE-out"
@@ -3475,40 +2051,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"agr" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/synthcloset)
-"ags" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"agt" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/closed/wall/almayer,
-/area/golden_arrow/engineering)
-"agu" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/siding{
-	icon_state = "siding2"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "agv" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 1
@@ -3518,36 +2060,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"agw" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/effect/decal/strata_decals/grime/grime3,
-/obj/structure/largecrate/supply/ammo{
-	fill_from_loc = 1;
-	name = "materials crate"
-	},
-/obj/item/stack/sheet/metal/large_stack,
-/obj/item/stack/sheet/plasteel{
-	amount = 40;
-	pixel_x = 7;
-	pixel_y = 6
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"agx" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/obj/effect/decal/strata_decals/grime/grime2,
-/obj/structure/machinery/firealarm{
-	pixel_y = 28
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "agy" = (
 /obj/structure/cable/heavyduty{
 	icon_state = "1-2"
@@ -3556,29 +2068,6 @@
 	dir = 1
 	},
 /area/golden_arrow/hangar)
-"agz" = (
-/obj/structure/machinery/sleep_console{
-	dir = 4;
-	pixel_y = 6
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/medical)
-"agA" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "agB" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SE-out"
@@ -3609,17 +2098,6 @@
 	dir = 8
 	},
 /area/golden_arrow/platoonprep)
-"agF" = (
-/obj/structure/pipes/vents/pump{
-	dir = 4
-	},
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/cryo_cells)
 "agG" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -3668,39 +2146,6 @@
 	dir = 1
 	},
 /area/golden_arrow/dorms)
-"agJ" = (
-/obj/structure/pipes/vents/scrubber{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/railing{
-	id = "apcbayrailing1"
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
-"agK" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/safety/two{
-	pixel_x = 14;
-	pixel_y = -26
-	},
-/obj/structure/sign/safety/ammunition{
-	pixel_y = -26
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonarmory)
-"agL" = (
-/obj/structure/shuttle/part/dropship1/nose_front_left{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "agM" = (
 /obj/structure/machinery/light/double/blue{
 	light_color = "#dae2ff"
@@ -3738,17 +2183,6 @@
 	},
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/hangar)
-"agQ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	id = "weapons_conny";
-	name = "\improper Squad One Weapons Locker";
-	pixel_y = -4
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/platoonarmory)
 "agR" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 9
@@ -3779,35 +2213,7 @@
 	dir = 8
 	},
 /area/golden_arrow/hangar)
-"agU" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/item/trash/plate{
-	pixel_x = -4;
-	pixel_y = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "agV" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
 	},
@@ -3825,24 +2231,6 @@
 	dir = 4
 	},
 /area/golden_arrow/dorms)
-"agW" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/item/storage/fancy/cigarettes/lucky_strikes{
-	pixel_x = -7;
-	pixel_y = 9
-	},
-/obj/item/prop/magazine/dirty{
-	desc = "A copy of Playboy magazine. On the cover is photo of guitarist Sadie Summers, with the headline 'Sadie Summers tells ALL'. The article itself focuses on Sadie's many carnal exploits while on tour as well as her very public brawl at an LA nightclub that occured two years prior to the date of this issue. Flipping through the magazine you see article titles such as 'Jungle Mercenary: Life as an Ex-UPP commando', 'The whys and hows of choosing synthetic girls'.";
-	icon_state = "poster3";
-	name = "Playboy Magazine: Issue March 2182";
-	pixel_x = 3;
-	pixel_y = 7
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "agX" = (
 /obj/structure/machinery/door_control/brbutton{
 	pixel_y = 28;
@@ -3865,12 +2253,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"agZ" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 1
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
 "aha" = (
 /obj/structure/surface/table/almayer,
 /obj/item/trash/cigbutt/cigarbutt{
@@ -3918,27 +2300,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"ahd" = (
-/obj/structure/shuttle/part/dropship1/lower_right_wall{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
-"ahe" = (
-/obj/structure/largecrate/random/secure,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
-"ahf" = (
-/turf/closed/shuttle/midway/transparent{
-	icon_state = "34";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "ahg" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -4031,20 +2392,10 @@
 /obj/item/reagent_container/food/snacks/flour,
 /obj/item/reagent_container/food/snacks/flour,
 /obj/item/reagent_container/food/snacks/flour,
-/turf/closed/wall/almayer,
-/area/golden_arrow/cryo_cells)
-"ahn" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/disposal{
-	density = 0;
-	layer = 3.2;
-	pixel_y = 16
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
 	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
+/area/golden_arrow/cryo_cells)
 "aho" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -4060,77 +2411,13 @@
 	},
 /turf/open/floor/plating,
 /area/golden_arrow/hangar)
-"ahq" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/pipes/vents/pump{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"ahr" = (
-/obj/structure/bed/chair/comfy{
-	dir = 1
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/bed/chair/comfy{
-	buckling_y = 2;
-	dir = 8;
-	pixel_y = 2
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"ahs" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aht" = (
-/obj/structure/bed/chair/comfy{
-	dir = 4
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/bed/chair/comfy,
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/cryo_cells)
-"ahu" = (
-/obj/structure/shuttle/part/dropship1/right_outer_wing_connector{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
-"ahv" = (
-/obj/item/paper{
-	icon_state = "paper_words";
-	info = "OUT OF ORDER - When I find the dumbass that thought it was a good idea to drive over the elevator with the APC they're gonna get their ass beat.";
-	layer = 3.01;
-	name = "OUT OF ORDER";
-	pixel_x = 5;
-	pixel_y = -3
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
 "ahw" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -4146,14 +2433,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/almayer,
 /area/golden_arrow/dorms)
-"ahy" = (
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "ahz" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning";
@@ -4198,26 +2477,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/hangar)
-"ahC" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"ahD" = (
-/turf/closed/shuttle/midway/transparent{
-	icon_state = "39";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
-"ahE" = (
-/obj/structure/shuttle/part/dropship1/transparent/upper_right_wing{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "ahF" = (
 /obj/structure/machinery/door/poddoor/railing{
 	id = "garrow_vehicle_elevator_one"
@@ -4227,15 +2486,6 @@
 	dir = 1
 	},
 /area/golden_arrow/hangar)
-"ahG" = (
-/obj/structure/sign/banners/united_americas_flag{
-	pixel_y = 30
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
 "ahH" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -4267,12 +2517,6 @@
 /area/golden_arrow/medical)
 "ahK" = (
 /obj/structure/surface/table/almayer,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/surface/table/almayer,
 /obj/item/trash/plate{
 	pixel_y = 13;
 	pixel_x = 4
@@ -4280,57 +2524,8 @@
 /obj/item/trash/plate{
 	pixel_x = -3
 	},
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/golden_arrow/cryo_cells)
-"ahL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /turf/open/floor/almayer,
 /area/golden_arrow/cryo_cells)
-"ahM" = (
-/obj/effect/landmark/start/bridge,
-/obj/effect/landmark/late_join/alpha,
-/obj/effect/landmark/late_join,
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/cryo_cells)
-"ahN" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/shuttle/elevator/grating,
-/area/golden_arrow/supply)
-"ahO" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/almayer{
-	dir = 4;
-	id = "bay1door";
-	name = "\improper Weapons Bay One Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
-"ahP" = (
-/obj/structure/machinery/body_scanconsole{
-	pixel_y = 6
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/medical)
-"ahQ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "ahR" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -4367,19 +2562,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"ahU" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "ahV" = (
 /obj/structure/barricade/handrail,
 /obj/structure/disposalpipe/segment,
@@ -4387,23 +2569,6 @@
 	dir = 4
 	},
 /area/golden_arrow/supply)
-"ahW" = (
-/obj/effect/decal/strata_decals/grime/grime1{
-	dir = 8
-	},
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"ahX" = (
-/obj/structure/shuttle/part/dropship1/transparent/left_outer_bottom_wing{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "ahY" = (
 /obj/structure/prop/invuln/lattice_prop{
 	icon_state = "lattice1";
@@ -4486,52 +2651,7 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/hangar)
-"aie" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	layer = 2.5;
-	pixel_y = 1
-	},
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/sign/safety/bathunisex{
-	pixel_y = 28
-	},
-/obj/structure/sign/safety/water{
-	pixel_x = 15;
-	pixel_y = 28
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"aif" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/disposal{
-	density = 0;
-	layer = 3.2;
-	pixel_y = 16
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
 "aig" = (
-/obj/structure/machinery/door_control{
-	id = "cargobay3";
-	name = "cargobay3";
-	pixel_y = 23;
-	pixel_x = -7;
-	needs_power = 0
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/machinery/door_control{
 	id = "cargobay3";
 	name = "cargobay3";
@@ -4583,21 +2703,6 @@
 	dir = 5
 	},
 /area/golden_arrow/dorms)
-"aik" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "ail" = (
 /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
 	name = "\improper Prep Lockers"
@@ -4609,55 +2714,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/platoonprep)
-"aim" = (
-/obj/item/reagent_container/food/drinks/cans/beer{
-	layer = 4.2;
-	pixel_x = -11;
-	pixel_y = 8
-	},
-/turf/closed/wall/almayer/outer,
-/area/golden_arrow/hangar)
-"ain" = (
-/obj/structure/surface/table/almayer,
-/obj/item/tool/screwdriver{
-	pixel_x = -8;
-	pixel_y = 17
-	},
-/obj/item/reagent_container/food/drinks/coffee/marine{
-	pixel_y = 12
-	},
-/obj/item/reagent_container/food/drinks/coffee/marine{
-	pixel_x = -6;
-	pixel_y = 4
-	},
-/obj/item/reagent_container/food/drinks/coffee/marine{
-	pixel_x = 5
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
-"aio" = (
-/turf/open/floor/almayer/uscm{
-	dir = 8;
-	icon_state = "logo_directional1"
-	},
-/area/golden_arrow/hangar)
-"aip" = (
-/obj/structure/surface/table/almayer,
-/obj/item/prop/tableflag{
-	pixel_x = -9;
-	pixel_y = 2
-	},
-/obj/item/folder/black{
-	icon_state = "folder_black_white";
-	pixel_x = 2;
-	pixel_y = 14
-	},
-/obj/item/reagent_container/food/drinks/cans/souto/lime{
-	pixel_x = 5;
-	pixel_y = 3
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/shared_office)
 "aiq" = (
 /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
 	name = "\improper Prep Lockers"
@@ -4716,13 +2772,6 @@
 	dir = 4
 	},
 /area/golden_arrow/supply)
-"aiw" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aix" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -4757,32 +2806,12 @@
 	icon_state = "cargo"
 	},
 /area/golden_arrow/hangar)
-"aiA" = (
-/obj/structure/extinguisher_cabinet/lifeboat{
-	pixel_x = 12
-	},
-/turf/closed/shuttle/midway/transparent{
-	icon_state = "78";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "aiB" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/shared_office)
-"aiC" = (
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/structure/holohoop{
-	dir = 8;
-	id = "basketball";
-	side = "right"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
 "aiD" = (
 /obj/structure/machinery/door/poddoor/shutters/almayer{
 	dir = 4;
@@ -4793,30 +2822,6 @@
 	dir = 8
 	},
 /area/golden_arrow/platoonprep)
-"aiE" = (
-/obj/structure/prop/invuln{
-	desc = "big pile energy.";
-	icon = 'icons/obj/structures/props/ice_colony/barrel_yard.dmi';
-	icon_state = "pile_0";
-	name = "barrel pile";
-	pixel_y = -16
-	},
-/obj/structure/blocker/invisible_wall,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aiF" = (
-/obj/structure/largecrate/supply/motiondetectors,
-/obj/structure/largecrate/supply/explosives/grenades/less{
-	icon_state = "case";
-	pixel_y = 10
-	},
-/obj/item/ammo_box/magazine/mk1{
-	layer = 3.1;
-	pixel_x = -2;
-	pixel_y = 14
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonarmory)
 "aiG" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -4835,28 +2840,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/prep_hallway)
-"aiI" = (
-/obj/structure/surface/table/almayer,
-/obj/item/trash/plate{
-	pixel_x = 7;
-	pixel_y = 8
-	},
-/obj/item/reagent_container/food/condiment/saltshaker{
-	pixel_x = -4;
-	pixel_y = 13
-	},
-/obj/item/reagent_container/food/snacks/protein_pack{
-	pixel_x = 3;
-	pixel_y = 9
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"aiJ" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/platoonprep)
 "aiK" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NW-out";
@@ -4876,20 +2859,6 @@
 	layer = 2.52
 	},
 /obj/structure/pipes/standard/simple/hidden/supply,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 2;
-	pixel_x = -1
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning"
 	},
@@ -4953,32 +2922,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/medical)
-"aiR" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/engineering)
-"aiS" = (
-/obj/structure/machinery/gear{
-	id = "supply_elevator_gear"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 5
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "blackcorner"
-	},
-/area/golden_arrow/hangar)
 "aiT" = (
 /obj/structure/cable/heavyduty{
 	icon_state = "1-2"
@@ -4989,23 +2932,14 @@
 /area/golden_arrow/motor_pool)
 "aiU" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/cable/heavyduty{
 	icon_state = "1-2"
 	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning"
 	},
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
+/turf/open/floor/almayer/edge{
+	dir = 6
 	},
 /area/golden_arrow/prep_hallway)
 "aiV" = (
@@ -5023,7 +2957,7 @@
 /turf/open/floor/almayer/edge{
 	dir = 1
 	},
-/area/golden_arrow/supply)
+/area/golden_arrow/cargo_shuttle/upper)
 "aiW" = (
 /obj/structure/window/framed/almayer,
 /obj/structure/curtain/red,
@@ -5050,23 +2984,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aiZ" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
-"aja" = (
-/obj/structure/largecrate/supply/motiondetectors,
-/obj/item/ammo_box/magazine/mk1{
-	layer = 3.1;
-	pixel_x = -12;
-	pixel_y = 14
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonarmory)
 "ajb" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 8
@@ -5108,52 +3025,6 @@
 	dir = 8
 	},
 /area/golden_arrow/hangar)
-"ajf" = (
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/structure/largecrate/random/case/small{
-	anchored = 1;
-	density = 0;
-	pixel_y = 14
-	},
-/obj/structure/prop{
-	desc = "A wooden rack fitted to the wall.";
-	icon = 'icons/obj/items/items.dmi';
-	icon_state = "sheet-wood";
-	layer = 2.1;
-	name = "wooden rack";
-	pixel_y = 35
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
-"ajg" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
-"ajh" = (
-/obj/effect/decal/cleanable/blood/oil,
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	id = "weapons_conny";
-	name = "\improper Squad Two Weapons Locker";
-	pixel_y = -4
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/platoonarmory)
 "aji" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -5163,18 +3034,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/prep_hallway)
-"ajj" = (
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/holohoop{
-	dir = 4;
-	id = "basketball";
-	side = "left"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
 "ajk" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/largecrate/random/mini/small_case/c{
@@ -5185,12 +3044,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"ajl" = (
-/turf/closed/shuttle/midway{
-	icon_state = "54";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "ajm" = (
 /obj/structure/machinery/firealarm{
 	dir = 4;
@@ -5200,38 +3053,6 @@
 	dir = 4
 	},
 /area/golden_arrow/cryo_cells)
-"ajn" = (
-/obj/structure/closet/secure_closet/engineering_electrical{
-	req_one_access = null
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "plating"
-	},
-/area/golden_arrow/engineering)
-"ajo" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/safety/cryo{
-	name = "hypersleep semiotic";
-	pixel_x = 15;
-	pixel_y = -26
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
-"ajp" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "ajq" = (
 /obj/structure/closet/secure_closet{
 	icon_broken = "fridgebroken";
@@ -5316,20 +3137,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/briefing)
-"ajw" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 9
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
-"ajx" = (
-/turf/closed/shuttle/midway/transparent{
-	icon_state = "22";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "ajy" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -5348,36 +3155,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/dorms)
-"ajz" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/largecrate/supply/ammo{
-	fill_from_loc = 1;
-	name = "smoke grenades case";
-	pixel_y = 11
-	},
-/obj/item/explosive/grenade/smokebomb,
-/obj/item/explosive/grenade/smokebomb,
-/obj/item/explosive/grenade/smokebomb,
-/obj/item/explosive/grenade/smokebomb,
-/obj/item/explosive/grenade/smokebomb,
-/obj/item/explosive/grenade/smokebomb,
-/obj/item/explosive/grenade/smokebomb,
-/obj/item/explosive/grenade/smokebomb,
-/obj/item/explosive/grenade/smokebomb,
-/obj/item/explosive/grenade/smokebomb,
-/obj/item/explosive/grenade/smokebomb,
-/obj/item/explosive/grenade/smokebomb,
-/obj/item/explosive/grenade/smokebomb,
-/obj/item/explosive/grenade/smokebomb,
-/obj/item/explosive/grenade/smokebomb,
-/obj/item/explosive/grenade/smokebomb,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "ajA" = (
 /obj/structure/machinery/light/double/blue{
 	dir = 1;
@@ -5394,14 +3171,6 @@
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
 "ajB" = (
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
 	},
@@ -5412,48 +3181,14 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"ajC" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"ajD" = (
-/obj/structure/machinery/alarm/almayer{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
-"ajE" = (
-/obj/structure/largecrate/supply/supplies/flares,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "ajF" = (
-/obj/docking_port/stationary/shipmap_elevator/one{
-	id = "garrow_vehicle_elevator_one_storage";
-	name = "Vehicle Elevator One Storage";
-	roundstart_template = /datum/map_template/shuttle/golden_arrow_vehicle_two
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/docking_port/stationary/shipmap_elevator/one{
+/obj/docking_port/stationary/trijent_elevator/shipmap_elevator/one{
 	id = "garrow_vehicle_elevator_one_storage";
 	name = "Vehicle Elevator One Storage";
-	roundstart_template = /datum/map_template/shuttle/golden_arrow/vehicleone;
+	roundstart_template = /datum/map_template/shuttle/trijent_elevator/golden_arrow/vehicleone;
 	elevator_network = "ArrowVehicleOne"
 	},
-/turf/open/floor/almayer/empty,
+/turf/open/floor/corsat,
 /area/golden_arrow/motor_pool)
 "ajG" = (
 /obj/structure/machinery/light/double/blue{
@@ -5490,32 +3225,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"ajJ" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/prep_hallway)
-"ajK" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/structure/bed/chair,
-/turf/open/floor/almayer,
-/area/golden_arrow/briefing)
-"ajL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/landinglight/ds1/delaytwo{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "ajM" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -5525,14 +3234,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"ajN" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "ajO" = (
 /obj/structure/bed/chair{
 	dir = 1
@@ -5544,27 +3245,6 @@
 	icon_state = "cargo"
 	},
 /area/golden_arrow/briefing)
-"ajP" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/firealarm{
-	dir = 4;
-	pixel_x = 21
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
-"ajQ" = (
-/obj/structure/ship_ammo/minirocket,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/ship_ammo/minirocket{
-	layer = 3.1;
-	pixel_y = 9
-	},
-/turf/open/floor/almayer{
-	dir = 10;
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "ajR" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -5576,22 +3256,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/cryo_cells)
-"ajS" = (
-/obj/structure/shuttle/part/dropship1/transparent/right_inner_bottom_wing{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
-"ajT" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "ajU" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W";
@@ -5613,16 +3277,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/engineering)
-"ajW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "ajX" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -5632,10 +3286,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"ajY" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
 "ajZ" = (
 /turf/open/floor/almayer/edge/smooth{
 	dir = 1
@@ -5670,19 +3320,6 @@
 	dir = 4
 	},
 /area/golden_arrow/hangar)
-"ake" = (
-/obj/structure/machinery/power/smes/buildable,
-/obj/effect/decal/cleanable/cobweb2,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/engineering)
-"akf" = (
-/obj/structure/shuttle/part/dropship1/transparent/right_outer_bottom_wing{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "akg" = (
 /obj/item/ashtray/plastic{
 	icon_state = "ashtray_full_bl";
@@ -5692,39 +3329,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"akh" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/vents/pump{
-	dir = 8
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/briefing)
-"aki" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
-"akj" = (
-/obj/structure/prop{
-	color = "#b30000";
-	icon = 'icons/obj/pipes/power_cond_white.dmi';
-	icon_state = "4-5";
-	name = "cable";
-	pixel_x = 5
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin14"
-	},
-/area/golden_arrow/hangar)
 "akk" = (
 /obj/item/paper{
 	icon_state = "paper_words";
@@ -5736,12 +3340,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"akl" = (
-/obj/structure/shuttle/part/dropship1/nose_front_right{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "akm" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 4
@@ -5750,14 +3348,6 @@
 	dir = 1
 	},
 /area/golden_arrow/hangar)
-"akn" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/turf/closed/wall/almayer/outer,
-/area/golden_arrow/platoonarmory)
 "ako" = (
 /obj/item/tool/crowbar/red{
 	pixel_x = -13;
@@ -5772,23 +3362,6 @@
 /obj/item/toy/deck/uno,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"akq" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/firealarm{
-	dir = 4;
-	pixel_x = 21
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
-"akr" = (
-/obj/item/tool/crowbar/red{
-	pixel_x = -13;
-	pixel_y = -13
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aks" = (
 /obj/structure/cable/heavyduty{
 	icon_state = "4-8"
@@ -5842,16 +3415,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/platoonprep)
-"akw" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/machinery/computer/crew/alt{
-	dir = 4;
-	pixel_x = -10
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "akx" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -5872,44 +3435,9 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"akz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/prop{
-	density = 1;
-	desc = "A pump used for refueling the dropship.";
-	icon_state = "pipe_d";
-	layer = 2.7;
-	name = "refueling pump";
-	pixel_x = -4;
-	pixel_y = -5
-	},
-/obj/effect/decal/siding{
-	icon_state = "siding2"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "akA" = (
 /turf/open/floor/almayer/edge,
 /area/golden_arrow/cryo_cells)
-"akB" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_x = -1;
-	pixel_y = 2
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/camera/autoname/golden_arrow{
-	dir = 8
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "akC" = (
 /obj/vehicle/powerloader,
 /turf/open/floor/almayer{
@@ -5957,27 +3485,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"akH" = (
-/obj/structure/bed/chair/comfy,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"akI" = (
-/obj/structure/bed/chair{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/briefing)
 "akJ" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -5996,18 +3503,6 @@
 	layer = 2.52
 	},
 /obj/structure/surface/table/almayer,
-/obj/structure/machinery/prop/almayer/computer/PC{
-	dir = 4
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/structure/surface/table/almayer,
 /obj/structure/machinery/prop/almayer/computer/PC{
 	dir = 4;
 	pixel_y = 3
@@ -6024,21 +3519,6 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/cryo_cells)
 "akM" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4;
 	icon_state = "pipe-c"
@@ -6072,24 +3552,6 @@
 	dir = 8
 	},
 /area/golden_arrow/cryo_cells)
-"akP" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/strata_decals/grime/grime2{
-	dir = 8
-	},
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"akQ" = (
-/obj/structure/pipes/vents/scrubber{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
 "akR" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -6102,18 +3564,6 @@
 	dir = 4
 	},
 /area/golden_arrow/prep_hallway)
-"akS" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
-	dir = 1;
-	name = "\improper Prep Lockers"
-	},
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	layer = 1.9
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/platoonprep)
 "akT" = (
 /obj/structure/bed/chair/office/light{
 	dir = 4
@@ -6122,12 +3572,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/medical)
-"akU" = (
-/turf/closed/shuttle/midway{
-	icon_state = "81";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "akV" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -6139,31 +3583,6 @@
 	dir = 8
 	},
 /area/golden_arrow/hangar)
-"akW" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/medical)
-"akX" = (
-/obj/structure/machinery/door/poddoor/almayer{
-	dir = 4;
-	id = "bay1door";
-	name = "\improper Weapons Bay One Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
 "akY" = (
 /obj/structure/cable/heavyduty{
 	icon_state = "4-8"
@@ -6231,21 +3650,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/cryo_cells)
-"ald" = (
-/turf/closed/shuttle/midway{
-	icon_state = "83";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
-"ale" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "alf" = (
 /obj/structure/machinery/alarm/almayer{
 	dir = 1
@@ -6254,34 +3658,6 @@
 	dir = 1
 	},
 /area/golden_arrow/prep_hallway)
-"alg" = (
-/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,
-/area/golden_arrow/dorms)
-"alh" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 1
-	},
-/obj/structure/machinery/floodlight/landing/floor,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "ali" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -6293,20 +3669,6 @@
 	dir = 4
 	},
 /area/golden_arrow/hangar)
-"alj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"alk" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/vehicle_spawner/apc_movie/fixed{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "all" = (
 /turf/open/floor/almayer/edge/smooth/corner,
 /area/golden_arrow/motor_pool)
@@ -6336,12 +3698,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"alo" = (
-/turf/closed/shuttle/midway{
-	icon_state = "47";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "alp" = (
 /obj/structure/ship_ammo/rocket/widowmaker,
 /obj/effect/decal/cleanable/cobweb,
@@ -6349,20 +3705,6 @@
 	icon_state = "cargo"
 	},
 /area/golden_arrow/hangar)
-"alq" = (
-/obj/structure/bed/chair{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 6
-	},
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/briefing)
 "alr" = (
 /obj/structure/pipes/vents/pump{
 	dir = 4
@@ -6401,18 +3743,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"alv" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 2;
-	id = "apcbayrailing1"
-	},
-/turf/open/floor/almayer{
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
 "alw" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1
@@ -6425,15 +3755,6 @@
 	dir = 5
 	},
 /area/golden_arrow/hangar)
-"aly" = (
-/obj/effect/decal/cleanable/blood/oil,
-/obj/structure/largecrate/random/case{
-	pixel_y = 11
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin3"
-	},
-/area/golden_arrow/hangar)
 "alz" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -6452,13 +3773,6 @@
 	dir = 1
 	},
 /area/golden_arrow/supply)
-"alB" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/dorms)
 "alC" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -6484,18 +3798,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"alF" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/railing{
-	id = "apcbayrailing1"
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
 "alG" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 1
@@ -6505,18 +3807,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/shared_office)
-"alH" = (
-/obj/structure/pipes/vents/pump{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 2;
-	id = "apcbayrailing1"
-	},
-/turf/open/floor/almayer{
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
 "alI" = (
 /obj/structure/surface/table/almayer,
 /obj/item/weapon/straight_razor{
@@ -6529,17 +3819,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/platoon_commander_rooms)
-"alJ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/secure_closet/squad_sergeant{
-	name = "squad two sergeant locker";
-	req_access_txt = "32;40";
-	req_one_access = list()
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/platoonprep)
 "alK" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -6561,13 +3840,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"alM" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/landinglight/ds1/delayone,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "alN" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -6576,12 +3848,6 @@
 	dir = 4
 	},
 /area/golden_arrow/platoonprep)
-"alO" = (
-/obj/structure/shuttle/part/dropship1/transparent/outer_right_weapons{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "alP" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -6594,17 +3860,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/cryo_cells)
-"alQ" = (
-/obj/structure/barricade/handrail{
-	dir = 4
-	},
-/obj/structure/barricade/handrail{
-	dir = 8
-	},
-/obj/structure/closet/secure_closet,
-/obj/structure/machinery/light,
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "alR" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NW-out";
@@ -6633,26 +3888,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"alU" = (
-/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{
-	req_one_access = null
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/sign/safety/rewire{
-	pixel_x = 12;
-	pixel_y = 32
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/engineering)
-"alV" = (
-/obj/structure/machinery/power/smes/buildable,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/engineering)
 "alW" = (
 /obj/structure/machinery/camera/autoname/golden_arrow{
 	dir = 4;
@@ -6697,15 +3932,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/platoon_commander_rooms)
-"alZ" = (
-/obj/structure/machinery/floodlight/landing/floor,
-/obj/structure/machinery/landinglight/ds1/delayone{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "ama" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning"
@@ -6727,15 +3953,6 @@
 	dir = 4
 	},
 /area/golden_arrow/hangar)
-"amc" = (
-/obj/structure/machinery/power/terminal{
-	dir = 1
-	},
-/obj/structure/machinery/camera/autoname/golden_arrow{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/engineering)
 "amd" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -6763,12 +3980,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"amg" = (
-/turf/closed/shuttle/midway{
-	icon_state = "48";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "amh" = (
 /obj/structure/machinery/light/double/blue{
 	dir = 8;
@@ -6790,40 +4001,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"amj" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
-"amk" = (
-/obj/structure/barricade/handrail{
-	dir = 8
-	},
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/recharger{
-	pixel_y = -14
-	},
-/obj/item/ashtray/plastic{
-	icon_state = "ashtray_full_bl";
-	pixel_x = 9;
-	pixel_y = 6
-	},
-/obj/item/trash/cigbutt{
-	pixel_x = 4;
-	pixel_y = 5
-	},
-/obj/item/trash/cigbutt{
-	pixel_x = -4;
-	pixel_y = 15
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
-"aml" = (
-/obj/structure/shuttle/part/dropship1/transparent/upper_left_wing{
-	name = "\improper Tripoli"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "amm" = (
 /obj/structure/machinery/firealarm{
 	dir = 8;
@@ -6853,18 +4030,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/dorms)
-"amp" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "amq" = (
 /obj/structure/ladder{
 	id = "enginorth"
@@ -6875,26 +4040,7 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"amr" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/obj/structure/machinery/light,
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
 "ams" = (
-/obj/structure/machinery/door_control{
-	id = "weaponsbay2";
-	name = "weaponsbay2";
-	pixel_y = 23;
-	pixel_x = -7;
-	needs_power = 0
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/machinery/door_control{
 	id = "weaponsbay2";
 	name = "weaponsbay2";
@@ -6909,19 +4055,6 @@
 	},
 /turf/open/floor/plating,
 /area/golden_arrow/hangar)
-"amt" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/almayer{
-	dir = 4;
-	id = "bay2door";
-	name = "\improper Weapons Bay Two Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
 "amu" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -6932,12 +4065,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"amv" = (
-/obj/structure/shuttle/part/dropship1/transparent/left_inner_bottom_wing{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "amw" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/barricade/handrail{
@@ -6957,12 +4084,6 @@
 	dir = 8
 	},
 /area/golden_arrow/dorms)
-"amx" = (
-/turf/closed/shuttle/midway{
-	icon_state = "24";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "amy" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NW-out";
@@ -6976,15 +4097,6 @@
 	dir = 1
 	},
 /area/golden_arrow/hangar)
-"amz" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
 "amA" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S";
@@ -6997,20 +4109,6 @@
 	},
 /area/golden_arrow/hangar)
 "amB" = (
-/obj/structure/bed/chair{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 8
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/bed/chair{
 	dir = 1
 	},
@@ -7037,54 +4135,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/cryo_cells)
-"amD" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/oil,
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/item/tool/wet_sign{
-	pixel_x = -14;
-	pixel_y = 14
-	},
-/obj/item/tool/wet_sign{
-	pixel_x = -17;
-	pixel_y = 10
-	},
-/obj/item/tool/wet_sign{
-	pixel_x = -13;
-	pixel_y = 6
-	},
-/obj/item/tool/wet_sign{
-	pixel_x = -15;
-	pixel_y = 2
-	},
-/obj/item/tool/wet_sign{
-	pixel_x = -13;
-	pixel_y = -2
-	},
-/obj/item/tool/wet_sign{
-	pixel_x = 1;
-	pixel_y = 16
-	},
-/turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "plating"
-	},
-/area/golden_arrow/engineering)
-"amE" = (
-/obj/structure/platform{
-	dir = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin3"
-	},
-/area/golden_arrow/hangar)
 "amF" = (
 /obj/item/tool/mop{
 	pixel_x = -1;
@@ -7106,20 +4156,6 @@
 	dir = 1
 	},
 /area/golden_arrow/hangar)
-"amH" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 1
-	},
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "0-4";
-	layer = 2.36
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
 "amI" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 9
@@ -7127,7 +4163,7 @@
 /obj/structure/cable/heavyduty{
 	icon_state = "1-8"
 	},
-/turf/open/floor/almayer,
+/turf/open/floor/almayer/edge,
 /area/golden_arrow/platoonarmory)
 "amJ" = (
 /obj/structure/cable/heavyduty{
@@ -7177,20 +4213,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/platoon_commander_rooms)
-"amN" = (
-/obj/structure/sign/safety/medical{
-	pixel_x = 32;
-	pixel_y = 6
-	},
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/prep_hallway)
-"amO" = (
-/obj/structure/bed/chair/comfy,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "amP" = (
 /obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass,
 /obj/structure/machinery/door/firedoor/border_only/almayer{
@@ -7212,19 +4234,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"amR" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "amS" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -7250,18 +4259,6 @@
 	},
 /turf/open/floor/plating,
 /area/golden_arrow/hangar)
-"amV" = (
-/obj/structure/platform_decoration{
-	dir = 8
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin3"
-	},
-/area/golden_arrow/hangar)
 "amW" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SW-out";
@@ -7278,32 +4275,6 @@
 	},
 /turf/open/floor/almayer/edge/smooth/corner,
 /area/golden_arrow/hangar)
-"amX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"amY" = (
-/obj/structure/machinery/door/airlock/multi_tile/elevator/research{
-	name = "\improper Supply Elevator Hatch"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/supply)
-"amZ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
 "ana" = (
 /obj/structure/cargo_container/seegson/right,
 /turf/open/floor/almayer,
@@ -7340,14 +4311,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/engineering)
-"ane" = (
-/obj/structure/machinery/camera/autoname/golden_arrow{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "anf" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -7359,45 +4322,10 @@
 	dir = 1
 	},
 /area/golden_arrow/hangar)
-"ang" = (
-/obj/structure/machinery/floodlight/landing/floor{
-	pixel_x = -2
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"anh" = (
-/obj/structure/surface/table/almayer,
-/obj/item/prop/almayer/comp_closed{
-	pixel_x = -14;
-	pixel_y = 13
-	},
-/obj/item/reagent_container/food/drinks/coffee/marine,
-/obj/item/reagent_container/food/drinks/coffee/marine{
-	pixel_x = -13;
-	pixel_y = 16
-	},
-/obj/item/reagent_container/food/drinks/coffee/marine{
-	pixel_x = 9;
-	pixel_y = 9
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "ani" = (
 /obj/structure/blocker/invisible_wall,
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"anj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/computer/overwatch/almayer{
-	pixel_y = 24
-	},
-/obj/structure/bed/chair/office/dark{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
 "ank" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -7408,40 +4336,12 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/platoonprep)
-"anl" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "anm" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/engineering)
-"ann" = (
-/obj/structure/closet/coffin/woodencrate,
-/obj/item/ammo_magazine/rifle/m4ra/pve,
-/obj/item/ammo_magazine/rifle/m4ra/pve,
-/obj/item/ammo_magazine/rifle/m4ra/pve,
-/obj/item/ammo_magazine/rifle/m4ra/pve,
-/obj/item/ammo_magazine/rifle/m4ra/pve,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/platoonprep)
 "ano" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -7471,23 +4371,8 @@
 	},
 /turf/closed/wall/almayer,
 /area/golden_arrow/cryo_cells)
-"anq" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/largecrate/random/case/double,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "anr" = (
-/obj/docking_port/stationary/shipmap_elevator/one{
-	id = "garrow_vehicle_elevator_one"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/docking_port/stationary/shipmap_elevator/one{
+/obj/docking_port/stationary/trijent_elevator/shipmap_elevator/one{
 	id = "garrow_vehicle_elevator_one";
 	elevator_network = "ArrowVehicleOne";
 	name = "Vehicle Elevator One Upper"
@@ -7590,14 +4475,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"any" = (
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "anz" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -7635,16 +4512,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/cryo_cells)
-"anD" = (
-/obj/structure/reagent_dispensers/water_cooler/stacks{
-	density = 0;
-	pixel_x = -10;
-	pixel_y = 6
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/cryo_cells)
 "anE" = (
 /obj/structure/ship_ammo/rocket/widowmaker,
 /turf/open/floor/almayer{
@@ -7664,15 +4531,6 @@
 /turf/open/floor/almayer,
 /area/golden_arrow/platoon_commander_rooms)
 "anG" = (
-/obj/structure/bed/chair/comfy,
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
 	},
@@ -7683,55 +4541,14 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/cryo_cells)
-"anH" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"anI" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/engineering)
 "anJ" = (
 /obj/structure/surface/table/almayer,
-/obj/item/tool/kitchen/tray{
-	pixel_y = 3;
-	pixel_x = 6
-	},
-/obj/item/storage/box/cups{
-	pixel_x = 2;
-	pixel_y = 4
-	},
-/obj/item/reagent_container/food/condiment/hotsauce/tabasco{
-	pixel_x = 14;
-	pixel_y = 7
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/surface/table/almayer,
 /obj/item/trash/plate{
 	pixel_y = 4;
 	pixel_x = -4
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/cryo_cells)
-"anK" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer/uscm{
-	dir = 1;
-	icon_state = "logo_directional1"
-	},
-/area/golden_arrow/hangar)
 "anL" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -7771,23 +4588,6 @@
 	},
 /turf/open/floor/plating,
 /area/golden_arrow/hangar)
-"anO" = (
-/obj/vehicle/powerloader{
-	dir = 4
-	},
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"anP" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/shared_office)
 "anQ" = (
 /obj/structure/cable/heavyduty{
 	icon_state = "4-8"
@@ -7797,46 +4597,7 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"anR" = (
-/obj/structure/shuttle/part/dropship1/right_inner_wing_connector{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
-"anS" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/computer/emails{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/shared_office)
-"anT" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	layer = 1.9
-	},
-/obj/structure/machinery/door/poddoor/almayer/open{
-	closed_layer = 3.3;
-	dir = 4;
-	layer = 3.3;
-	name = "Maintenance Bay Blast Door";
-	open_layer = 3.3
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "anU" = (
-/obj/structure/machinery/door_control{
-	id = "cargobay2";
-	name = "carbobay2";
-	pixel_y = -23;
-	pixel_x = -7;
-	needs_power = 0
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/machinery/door_control{
 	id = "cargobay2";
 	name = "carbobay2";
@@ -7870,38 +4631,13 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/cryo_cells)
-"anX" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/prep_hallway)
 "anY" = (
 /obj/structure/pipes/standard/manifold/hidden/supply,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"anZ" = (
-/obj/item/prop/almayer/box{
-	pixel_y = 17
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin14"
-	},
-/area/golden_arrow/hangar)
 "aoa" = (
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/structure/sign/safety/ammunition{
-	pixel_x = 32
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
 	},
@@ -7914,21 +4650,6 @@
 	},
 /area/golden_arrow/platoonprep)
 "aob" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 5
-	},
-/obj/structure/sign/safety/terminal{
-	pixel_y = -26;
-	pixel_x = 1
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "1-4"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 5
 	},
@@ -7964,29 +4685,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/platoonarmory)
-"aod" = (
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
-"aoe" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
-	dir = 1;
-	name = "\improper Dorms"
-	},
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	layer = 1.9
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/dorms)
 "aof" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "cargo_arrow";
@@ -8007,32 +4705,10 @@
 /turf/open/floor/almayer/edge{
 	dir = 1
 	},
-/area/golden_arrow/supply)
+/area/golden_arrow/cargo_shuttle/lower)
 "aog" = (
 /turf/closed/wall/almayer,
 /area/golden_arrow/cryo_cells)
-"aoh" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S";
-	pixel_x = -8
-	},
-/obj/structure/machinery/light,
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/medical)
-"aoi" = (
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/obj/structure/machinery/computer/cryopod{
-	pixel_x = 6;
-	pixel_y = -2
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "aoj" = (
 /obj/effect/spawner/prop_gun/anti_tank{
 	anchored = 1
@@ -8048,19 +4724,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"aol" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S";
-	layer = 3.3
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aom" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -8078,13 +4741,6 @@
 	dir = 8
 	},
 /area/golden_arrow/supply)
-"aoo" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/atm{
-	pixel_y = 26
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "aop" = (
 /obj/structure/flora/pottedplant{
 	icon_state = "pottedplant_21"
@@ -8185,13 +4841,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aoy" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
 "aoz" = (
 /obj/structure/machinery/camera/autoname/golden_arrow{
 	dir = 8;
@@ -8215,10 +4864,6 @@
 	icon_state = "cargo"
 	},
 /area/golden_arrow/hangar)
-"aoB" = (
-/obj/structure/machinery/door/poddoor/almayer,
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
 "aoC" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -8231,16 +4876,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/motor_pool)
-"aoD" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/poddoor/almayer/locked{
-	dir = 2;
-	name = "\improper Hangar Lockdown Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
 "aoE" = (
 /obj/structure/machinery/light/double/blue{
 	dir = 4;
@@ -8256,16 +4891,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/platoonprep)
-"aoF" = (
-/obj/structure/stairs/perspective,
-/obj/structure/platform{
-	dir = 8;
-	layer = 2.7
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin3"
-	},
-/area/golden_arrow/hangar)
 "aoG" = (
 /obj/structure/largecrate/supply/ammo{
 	name = "sentry crate";
@@ -8283,18 +4908,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/platoonarmory)
-"aoH" = (
-/obj/structure/surface/table/almayer,
-/obj/item/device/megaphone{
-	pixel_x = 11;
-	pixel_y = 7
-	},
-/obj/item/prop/tableflag/uscm{
-	pixel_x = -12;
-	pixel_y = -1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/briefing)
 "aoI" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -8304,26 +4917,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/platoonarmory)
-"aoJ" = (
-/obj/structure/largecrate/random/case/double,
-/obj/structure/largecrate/random/case/small{
-	layer = 3.1;
-	pixel_x = 18;
-	pixel_y = 18
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
-"aoK" = (
-/obj/item/storage/box/guncase/pumpshotgun/special{
-	pixel_y = 4
-	},
-/obj/item/storage/box/guncase/flamer/special{
-	layer = 3.1;
-	pixel_y = 10
-	},
-/obj/structure/surface/rack,
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonarmory)
 "aoL" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -8335,22 +4928,6 @@
 	dir = 8
 	},
 /area/golden_arrow/briefing)
-"aoM" = (
-/obj/structure/filingcabinet{
-	density = 0;
-	pixel_x = -8;
-	pixel_y = 18
-	},
-/obj/structure/filingcabinet{
-	density = 0;
-	pixel_x = 8;
-	pixel_y = 16
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 5
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/engineering)
 "aoN" = (
 /obj/structure/cargo_container/seegson/left,
 /obj/effect/decal/warning_stripes{
@@ -8363,11 +4940,6 @@
 	dir = 4
 	},
 /area/golden_arrow/cryo_cells)
-"aoP" = (
-/obj/effect/decal/strata_decals/grime/grime4,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "aoQ" = (
 /obj/structure/bed/bedroll{
 	pixel_x = -2;
@@ -8388,16 +4960,6 @@
 /obj/structure/pipes/vents/pump,
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aoS" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aoT" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -8426,18 +4988,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"aoW" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/largecrate/random/case{
-	pixel_y = 11
-	},
-/obj/item/reagent_container/food/drinks/coffee/marine{
-	layer = 3.11;
-	pixel_x = 4;
-	pixel_y = 15
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aoX" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -8451,17 +5001,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aoY" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/door_control{
-	id = "synthbay";
-	name = "storage bay door-control";
-	pixel_y = -19
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/synthcloset)
 "aoZ" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -8470,45 +5009,6 @@
 	dir = 4
 	},
 /area/golden_arrow/supply)
-"apa" = (
-/obj/structure/ship_ammo/rocket/widowmaker,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
-"apb" = (
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/medical)
-"apc" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_x = -1;
-	pixel_y = 2
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 9
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
-"apd" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	id = "weapons_conny";
-	name = "\improper Squad Two Weapons Locker";
-	pixel_y = -4
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/platoonarmory)
 "ape" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -8516,34 +5016,6 @@
 /obj/structure/pipes/vents/pump,
 /turf/open/floor/almayer,
 /area/golden_arrow/engineering)
-"apf" = (
-/obj/structure/machinery/door_control{
-	id = "cargolock";
-	name = "GM cargo lock control";
-	pixel_x = -7;
-	pixel_y = 11
-	},
-/obj/structure/machinery/door_control{
-	id = "bay1door";
-	name = "GM north weapon bay control";
-	pixel_x = 8;
-	pixel_y = 11
-	},
-/obj/structure/machinery/door_control{
-	id = "bay2door";
-	name = "GM south weapon bay control";
-	pixel_x = 8;
-	pixel_y = 1
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/supply)
-"apg" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "aph" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -8581,12 +5053,6 @@
 	dir = 1
 	},
 /area/golden_arrow/hangar)
-"apl" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/shared_office)
 "apm" = (
 /obj/structure/surface/table/almayer,
 /obj/effect/decal/cleanable/dirt{
@@ -8617,11 +5083,6 @@
 	dir = 8
 	},
 /area/golden_arrow/motor_pool)
-"apo" = (
-/obj/structure/machinery/recharge_station,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "app" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -8637,14 +5098,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"apq" = (
-/obj/structure/machinery/door/airlock/maintenance/colony{
-	dir = 1;
-	name = "\improper Supply Launch Bay";
-	req_one_access = null
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "apr" = (
 /turf/open/floor/almayer,
 /area/golden_arrow/engineering)
@@ -8657,30 +5110,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/supply)
-"apt" = (
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 8;
-	id = "apcbayrailing1"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
-"apu" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/light,
-/obj/structure/prop{
-	density = 1;
-	desc = "An electronic device linked to the dropship's camera system that lets you observe your landing zone. This thing probably never even worked.";
-	icon = 'icons/obj/structures/props/almayer_props.dmi';
-	icon_state = "lz_detector";
-	layer = 3.1;
-	name = "\improper Damaged AN/AVD-60 LZ detector"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "apv" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/effect/decal/warning_stripes{
@@ -8722,32 +5151,11 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/cryo_cells)
-"apz" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "apA" = (
 /turf/open/floor/almayer/edge/smooth/corner{
 	dir = 4
 	},
 /area/golden_arrow/cryo_cells)
-"apB" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 10
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "apC" = (
 /obj/structure/machinery/cm_vending/sorted/medical/no_access{
 	pixel_y = 24;
@@ -8772,30 +5180,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"apE" = (
-/obj/structure/closet/secure_closet/marine_personal{
-	job = "Smartgunner";
-	pixel_x = 8
-	},
-/obj/structure/closet/secure_closet/marine_personal{
-	job = "Squad Sergeant";
-	pixel_x = -7
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
-"apF" = (
-/obj/structure/sign/safety/galley{
-	pixel_y = 28
-	},
-/obj/structure/sign/safety/cryo{
-	name = "hypersleep semiotic";
-	pixel_x = 15;
-	pixel_y = 28
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
 "apG" = (
 /obj/structure/bed/chair{
 	dir = 8
@@ -8827,7 +5211,9 @@
 /obj/structure/cable/heavyduty{
 	icon_state = "2-4"
 	},
-/turf/open/floor/almayer,
+/turf/open/floor/almayer/edge{
+	dir = 1
+	},
 /area/golden_arrow/platoonarmory)
 "apJ" = (
 /obj/effect/decal/warning_stripes{
@@ -8837,49 +5223,12 @@
 	dir = 1
 	},
 /area/golden_arrow/hangar)
-"apK" = (
-/obj/item/prop/colony/canister{
-	pixel_x = 3;
-	pixel_y = 19
-	},
-/obj/effect/decal/strata_decals/grime/grime2,
-/obj/item/tool/mop{
-	pixel_x = -10;
-	pixel_y = 20
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
-"apL" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 5
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/structure/sign/safety/terminal{
-	pixel_x = 1;
-	pixel_y = -26
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/prep_hallway)
 "apM" = (
 /obj/structure/cable/heavyduty{
 	icon_state = "4-8"
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/shared_office)
-"apN" = (
-/obj/structure/prop/dam/crane{
-	bound_height = 32;
-	climbable = 1;
-	layer = 3.5;
-	pixel_y = -23
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "apO" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -8890,22 +5239,14 @@
 	},
 /area/golden_arrow/prep_hallway)
 "apP" = (
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
 	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning"
 	},
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
+/turf/open/floor/almayer/edge{
+	dir = 10
 	},
 /area/golden_arrow/prep_hallway)
 "apQ" = (
@@ -8920,37 +5261,12 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/motor_pool)
-"apR" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
 "apS" = (
 /obj/structure/sign/safety/hazard{
 	pixel_y = -25
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/engineering)
-"apT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 8;
-	id = "apcbayrailing1"
-	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
-"apU" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoon_commander_rooms)
 "apV" = (
 /obj/structure/machinery/computer/crew/alt{
 	dir = 4;
@@ -8961,16 +5277,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/cryo_cells)
-"apW" = (
-/obj/structure/pipes/vents/pump,
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
-"apX" = (
-/turf/closed/shuttle/midway/transparent{
-	icon_state = "27";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "apY" = (
 /obj/structure/machinery/door/poddoor/railing{
 	id = "garrow_vehicle_elevator_two"
@@ -9015,16 +5321,6 @@
 	dir = 4
 	},
 /area/golden_arrow/platoonarmory)
-"aqc" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/door/poddoor/railing{
-	id = "apcbayrailing2"
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
 "aqd" = (
 /turf/open/floor/almayer/edge/smooth/endcap_left{
 	dir = 4
@@ -9058,21 +5354,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/motor_pool)
-"aqh" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/structure/largecrate/random/case/double{
-	layer = 3.1;
-	pixel_y = 9
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aqi" = (
 /obj/structure/machinery/cm_vending/gear/synth,
 /turf/open/floor/almayer,
@@ -9095,7 +5376,9 @@
 /obj/structure/cable/heavyduty{
 	icon_state = "4-8"
 	},
-/turf/open/floor/almayer,
+/turf/open/floor/almayer/edge{
+	dir = 6
+	},
 /area/golden_arrow/platoonarmory)
 "aql" = (
 /obj/structure/machinery/door/poddoor/almayer/locked{
@@ -9107,22 +5390,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/hangar)
-"aqm" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/almayer/locked{
-	dir = 4;
-	name = "\improper Hangar Lockdown Blast Door"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
-"aqn" = (
-/obj/structure/pipes/vents/scrubber{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aqo" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 9
@@ -9145,26 +5412,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"aqq" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aqr" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/photocopier{
-	pixel_y = 16
-	},
-/obj/item/reagent_container/food/drinks/coffeecup/uscm{
-	pixel_x = 7;
-	pixel_y = -7
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "aqs" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S";
@@ -9177,15 +5424,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aqt" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aqu" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -9195,32 +5433,6 @@
 	icon_state = "cargo"
 	},
 /area/golden_arrow/hangar)
-"aqv" = (
-/obj/structure/surface/table/almayer,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aqw" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aqx" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_y = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/sign/safety/conference_room{
-	pixel_y = 29
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
 "aqy" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -9285,15 +5497,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/platoonprep)
-"aqE" = (
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	id = "equipment_conny";
-	name = "\improper Squad One Equipment Locker"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/platoonarmory)
 "aqF" = (
 /obj/structure/surface/table/almayer,
 /turf/open/floor/almayer/edge/smooth{
@@ -9319,32 +5522,8 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/platoon_commander_rooms)
-"aqH" = (
-/obj/structure/shuttle/part/dropship1/lower_left_wall{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "aqI" = (
 /obj/structure/surface/table/almayer,
-/obj/item/reagent_container/food/condiment/hotsauce/tabasco{
-	pixel_x = 7;
-	pixel_y = 14
-	},
-/obj/item/paper_bin{
-	pixel_x = -7;
-	pixel_y = 5
-	},
-/obj/item/reagent_container/food/condiment/hotsauce/tabasco{
-	pixel_x = 6;
-	pixel_y = 6
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/surface/table/almayer,
 /obj/item/tool/kitchen/tray{
 	pixel_x = -3;
 	pixel_y = 3
@@ -9373,42 +5552,12 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/cryo_cells)
-"aqJ" = (
-/turf/closed/shuttle/elevator{
-	dir = 6
-	},
-/area/golden_arrow/supply)
-"aqK" = (
-/turf/closed/shuttle/elevator/button/research,
-/area/golden_arrow/supply)
 "aqL" = (
 /obj/effect/decal/cleanable/blood/oil,
 /obj/effect/decal/strata_decals/grime/grime3,
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aqM" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/landinglight/ds1/delaythree{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aqN" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/pipes/standard/manifold/hidden/supply,
 /obj/structure/cable/heavyduty{
 	icon_state = "4-8"
@@ -9435,13 +5584,6 @@
 "aqP" = (
 /turf/open/floor/almayer,
 /area/golden_arrow/motor_pool)
-"aqQ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
 "aqR" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -9505,13 +5647,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/platoon_commander_rooms)
-"aqW" = (
-/obj/structure/closet/secure_closet/platoon_sergeant,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/platoonprep)
 "aqX" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -9537,49 +5672,6 @@
 	icon_state = "black"
 	},
 /area/golden_arrow/hangar)
-"aqZ" = (
-/obj/structure/bed/chair/comfy{
-	buckling_y = 2;
-	dir = 8;
-	pixel_y = 2
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/bed/chair/comfy{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"ara" = (
-/obj/item/tool/mop{
-	pixel_x = -1;
-	pixel_y = 20
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
-"arb" = (
-/obj/structure/surface/table/almayer,
-/obj/item/trash/USCMtray{
-	pixel_y = 9
-	},
-/obj/item/reagent_container/food/snacks/cracker{
-	pixel_x = -2;
-	pixel_y = 7
-	},
-/obj/item/reagent_container/food/snacks/cracker{
-	pixel_y = 9
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "arc" = (
 /obj/structure/machinery/door/poddoor/railing{
 	dir = 2;
@@ -9597,7 +5689,7 @@
 /turf/open/floor/almayer/edge{
 	dir = 1
 	},
-/area/golden_arrow/supply)
+/area/golden_arrow/cargo_shuttle/upper)
 "ard" = (
 /obj/structure/machinery/door/poddoor/shutters/almayer{
 	dir = 4;
@@ -9619,15 +5711,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/closed/wall/almayer/outer,
 /area/golden_arrow/supply)
-"arg" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/prop/invuln/lattice_prop{
-	icon_state = "lattice3";
-	pixel_x = 16;
-	pixel_y = -15
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "arh" = (
 /turf/open/floor/almayer/edge/smooth{
 	dir = 1
@@ -9647,17 +5730,6 @@
 	},
 /area/golden_arrow/cryo_cells)
 "arj" = (
-/obj/structure/bed/chair/comfy{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
 	},
@@ -9676,20 +5748,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/cryo_cells)
-"ark" = (
-/obj/effect/decal/strata_decals/grime/grime1{
-	dir = 1
-	},
-/obj/effect/decal/strata_decals/grime/grime1{
-	dir = 1
-	},
-/obj/structure/prop/invuln/lattice_prop{
-	icon_state = "lattice1";
-	pixel_x = 16;
-	pixel_y = -15
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
 "arl" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -9703,11 +5761,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/platoonarmory)
-"arm" = (
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/supply)
 "arn" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/machinery/door/poddoor/railing{
@@ -9719,13 +5772,6 @@
 	dir = 4
 	},
 /area/golden_arrow/hangar)
-"aro" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/synthcloset)
 "arp" = (
 /obj/structure/platform_decoration{
 	dir = 1
@@ -9777,17 +5823,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/engineering)
-"arv" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "arw" = (
 /obj/structure/machinery/door/poddoor/almayer/locked{
 	dir = 2;
@@ -9813,18 +5848,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/platoon_commander_rooms)
-"ary" = (
-/obj/structure/pipes/vents/pump{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/railing{
-	id = "apcbayrailing2"
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
 "arz" = (
 /obj/structure/surface/rack,
 /obj/effect/decal/cleanable/dirt{
@@ -9835,21 +5858,6 @@
 	dir = 1
 	},
 /area/golden_arrow/dorms)
-"arA" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/dorms)
 "arB" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning";
@@ -9870,7 +5878,7 @@
 	pixel_y = -38;
 	dir = 4;
 	name = "Damaged M540 Armored Recon Carrier";
-	desc = "An M540 Armored Recon carrier, a supposedly more nimble alternative to the M577A3 APC. Evidently not nimble enough to escape from a dropship crashing into it."
+	desc = "An M540 Armored Recon carrier, a supposedly more nimble alternative to the M577A3 APC. Evidently not nimble enough to escape from a dropship crashing into it. At least it didn't get shot up."
 	},
 /obj/structure/machinery/prop{
 	icon = 'icons/obj/vehicles/arc.dmi';
@@ -9907,79 +5915,16 @@
 	dir = 4;
 	layer = 3.01;
 	name = "Damaged M540 Armored Recon Carrier";
-	desc = "An M540 Armored Recon carrier, a supposedly more nimble alternative to the M577A3 APC. Evidently not nimble enough to escape from a dropship crashing into it."
+	desc = "An M540 Armored Recon carrier, a supposedly more nimble alternative to the M577A3 APC. Evidently not nimble enough to escape from a dropship crashing into it. At least it didn't get shot up."
 	},
 /obj/structure/blocker/invisible_wall,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+/turf/open/floor/almayer/edge/smooth/corner{
+	dir = 4
 	},
-/obj/structure/machinery/prop{
-	icon = 'icons/obj/vehicles/arc.dmi';
-	icon_state = "arc_base";
-	pixel_x = -31;
-	pixel_y = -38;
-	dir = 4;
-	name = "Damaged M540 Armored Recon Carrier";
-	desc = "An M540 Armored Recon carrier, a supposedly more nimble alternative to the M577A3 APC. Evidently not nimble enough to escape from a dropship crashing into it. At least it didn't get shot up."
-	},
-/obj/structure/machinery/prop{
-	icon = 'icons/obj/vehicles/arc.dmi';
-	icon_state = "flare_launcher_1";
-	pixel_x = -31;
-	pixel_y = -38;
-	dir = 4;
-	layer = 3.01;
-	mouse_opacity = 0
-	},
-/obj/structure/machinery/prop{
-	icon = 'icons/obj/vehicles/arc.dmi';
-	icon_state = "frontalcannon_1";
-	pixel_x = -31;
-	pixel_y = -38;
-	dir = 4;
-	layer = 3.01;
-	mouse_opacity = 0
-	},
-/obj/structure/machinery/prop{
-	icon = 'icons/obj/vehicles/arc.dmi';
-	icon_state = "damaged_frame";
-	pixel_x = -31;
-	pixel_y = -38;
-	dir = 4;
-	layer = 3.01;
-	mouse_opacity = 0
-	},
-/obj/structure/machinery/prop{
-	icon = 'icons/obj/vehicles/arc.dmi';
-	icon_state = "wheels_1";
-	pixel_x = -31;
-	pixel_y = -38;
-	dir = 4;
-	layer = 3.01;
-	name = "Damaged M540 Armored Recon Carrier";
-	desc = "An M540 Armored Recon carrier, a supposedly more nimble alternative to the M577A3 APC. Evidently not nimble enough to escape from a dropship crashing into it. At least it didn't get shot up."
-	},
-/obj/structure/blocker/invisible_wall,
-/turf/open/floor/almayer/edge/smooth/corner{
-	dir = 4
-	},
-/area/golden_arrow/hangar)
-"arD" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
+/area/golden_arrow/hangar)
+"arD" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -10000,19 +5945,6 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"arF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "plating"
-	},
-/area/golden_arrow/engineering)
 "arG" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -10022,18 +5954,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"arH" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/oil,
-/obj/structure/largecrate/random/case/small,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
-"arI" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
 "arJ" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -10089,11 +6009,6 @@
 	},
 /area/golden_arrow/hangar)
 "arO" = (
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/item/stack/medical/ointment{
 	pixel_x = 2;
@@ -10129,58 +6044,7 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"arS" = (
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/engineering)
-"arT" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/prep_hallway)
-"arU" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/almayer/locked{
-	dir = 4;
-	name = "\improper Hangar Lockdown Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
-"arV" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/pipes/vents/scrubber{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
 "arW" = (
-/obj/structure/machinery/door_control{
-	id = "hangarlockdownnorth";
-	name = "hangarlockdownnorth";
-	pixel_x = -23;
-	needs_power = 0
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/machinery/door_control{
 	id = "hangarlockdownnorth";
 	name = "hangarlockdownnorth";
@@ -10214,52 +6078,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/almayer,
 /area/golden_arrow/prep_hallway)
-"arZ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/secure_closet/engineering_welding,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"asa" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/obj/structure/largecrate/supply/supplies/sandbags{
-	layer = 4.2;
-	pixel_y = 7
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"asb" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 5
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "1-4"
-	},
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoonprep)
-"asc" = (
-/obj/structure/pipes/vents/scrubber{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 2;
-	id = "apcbayrailing2"
-	},
-/turf/open/floor/almayer{
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
 "asd" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -10295,53 +6113,8 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/hangar)
-"asg" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/item/tool/warning_cone{
-	pixel_x = -6;
-	pixel_y = 16
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"ash" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/landinglight/ds1/delaythree{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "asi" = (
 /obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/phone_base{
-	pixel_y = 30;
-	pixel_x = 9;
-	phone_id = "Overwatch";
-	name = "overwatch receiver";
-	phone_category = "Command"
-	},
-/obj/structure/machinery/computer/ares_console{
-	dir = 4;
-	pixel_y = 6;
-	pixel_x = 2
-	},
-/obj/item/tool/pen{
-	pixel_x = -8;
-	pixel_y = -11
-	},
-/obj/structure/machinery/door_control{
-	pixel_y = -11;
-	pixel_x = 6;
-	id = "squadarmory";
-	name = "gear lockers door-control"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/surface/table/reinforced/almayer_B,
 /obj/structure/phone_base{
 	pixel_y = 30;
 	pixel_x = 9;
@@ -10384,29 +6157,6 @@
 	dir = 1
 	},
 /area/golden_arrow/hangar)
-"ask" = (
-/obj/effect/landmark/start/marine/leader/alpha,
-/obj/effect/landmark/late_join/alpha,
-/obj/effect/landmark/late_join,
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/cryo_cells)
-"asl" = (
-/obj/structure/machinery/gear{
-	id = "supply_elevator_gear"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "blackcorner"
-	},
-/area/golden_arrow/hangar)
 "asm" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -10419,25 +6169,8 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"asn" = (
-/obj/structure/machinery/floodlight/landing/floor{
-	pixel_x = -2
-	},
-/obj/structure/machinery/landinglight/ds1{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aso" = (
 /obj/structure/surface/table/almayer,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/surface/table/almayer,
 /obj/item/notepad/black{
 	pixel_y = 4
 	},
@@ -10447,34 +6180,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/briefing)
-"asp" = (
-/obj/effect/decal/cleanable/blood/oil,
-/obj/structure/largecrate/random/case/double,
-/obj/item/toy/beach_ball/holoball{
-	pixel_x = -2;
-	pixel_y = 15
-	},
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
-"asq" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/obj/item/tool/wirecutters{
-	pixel_x = -8;
-	pixel_y = 18
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"asr" = (
-/obj/structure/machinery/light,
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
 "ass" = (
 /obj/structure/largecrate/random/case/small,
 /turf/open/floor/almayer{
@@ -10491,26 +6196,6 @@
 	icon_state = "plating"
 	},
 /area/golden_arrow/motor_pool)
-"asu" = (
-/obj/structure/bed/chair/comfy{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"asv" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_x = -1;
-	pixel_y = 2
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "asw" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{
@@ -10522,15 +6207,6 @@
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
 "asx" = (
-/obj/structure/bed/chair,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 5
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 5
 	},
@@ -10549,28 +6225,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"asz" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
-"asA" = (
-/obj/structure/closet/secure_closet/smartgunner{
-	name = "squad one smartgunner locker";
-	req_access_txt = "14;39";
-	req_one_access = list()
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/platoonprep)
 "asB" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -10624,38 +6278,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/dorms)
-"asF" = (
-/obj/structure/largecrate/random/case/double,
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
-"asG" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/door/poddoor/railing{
-	id = "apcbayrailing1"
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
-"asH" = (
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin3"
-	},
-/area/golden_arrow/hangar)
-"asI" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/platoonarmory)
 "asJ" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 6
@@ -10684,32 +6306,6 @@
 	dir = 1
 	},
 /area/golden_arrow/cryo_cells)
-"asM" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/effect/decal/strata_decals/grime/grime2,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"asN" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"asO" = (
-/obj/structure/prop{
-	can_buckle = 1;
-	desc = "A regular case you'd sit on. The label says it's full of steel sheets. Probably empty now.";
-	icon = 'icons/obj/structures/crates.dmi';
-	icon_state = "case";
-	layer = 3.6;
-	name = "\improper uncomfy case"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "asP" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W";
@@ -10726,29 +6322,6 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"asQ" = (
-/obj/structure/fence,
-/obj/structure/machinery/door/poddoor/almayer/open{
-	closed_layer = 3.3;
-	dir = 4;
-	id = "squadblastdoor";
-	layer = 3.3;
-	name = "First Platoon Ready Bay Blast Door";
-	open_layer = 3.3
-	},
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	layer = 1.9
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/platoonarmory)
-"asR" = (
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/engineering)
 "asS" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -10760,26 +6333,6 @@
 	dir = 1
 	},
 /area/golden_arrow/cryo_cells)
-"asT" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 1
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/briefing)
 "asU" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 10
@@ -10792,26 +6345,6 @@
 	},
 /area/golden_arrow/prep_hallway)
 "asV" = (
-/obj/structure/prop/almayer/computers/sensor_computer1{
-	pixel_y = 15;
-	density = 0;
-	pixel_x = 5
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/structure/bed/chair/office/dark{
-	dir = 1;
-	layer = 3.1
-	},
-/obj/structure/barricade/handrail{
-	dir = 8
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/prop/almayer/computers/sensor_computer1{
 	pixel_y = 15;
 	density = 0;
@@ -10843,31 +6376,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/motor_pool)
-"asW" = (
-/obj/structure/closet/wardrobe{
-	name = "PT uniform"
-	},
-/obj/item/clothing/under/shorts/blue,
-/obj/item/clothing/under/shorts/red,
-/obj/item/clothing/under/shorts/blue,
-/obj/item/clothing/head/headband/red,
-/obj/item/clothing/under/shorts/red,
-/obj/structure/barricade/handrail{
-	layer = 3.1;
-	pixel_y = -1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
-"asX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/cryo_cells)
 "asY" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -10875,51 +6383,12 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"asZ" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"ata" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
 "atb" = (
 /turf/open/floor/almayer{
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
 "atc" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/item/storage/fancy/cigarettes/lucky_strikes{
-	pixel_x = -7;
-	pixel_y = 9
-	},
-/obj/item/prop/magazine/dirty{
-	icon_state = "poster3";
-	pixel_y = 7;
-	pixel_x = 3;
-	name = "Playboy Magazine: Issue March 2182";
-	desc = "A copy of Playboy magazine. On the cover is photo of guitarist Sadie Summers, with the headline 'Sadie Summers tells ALL'. The article itself focuses on Sadie's many carnal exploits while on tour as well as her very public brawl at an LA nightclub that occured two years prior to the date of this issue. Flipping through the magazine you see article titles such as 'Jungle Mercenary: Life as an Ex-UPP commando', 'The whys and hows of choosing synthetic girls'."
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
 	},
@@ -10930,17 +6399,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/cryo_cells)
-"atd" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "ate" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/simple/hidden/supply{
@@ -10958,27 +6416,6 @@
 	dir = 1
 	},
 /area/golden_arrow/hangar)
-"atg" = (
-/obj/structure/surface/table/almayer,
-/obj/item/prop/almayer/comp_open{
-	pixel_x = -6;
-	pixel_y = 9
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"ath" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "ati" = (
 /turf/open/floor/almayer/edge/smooth/corner,
 /area/golden_arrow/supply)
@@ -11006,21 +6443,11 @@
 	dir = 1
 	},
 /area/golden_arrow/hangar)
-"atl" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
 "atm" = (
 /turf/open/floor/almayer/edge{
 	dir = 9
 	},
 /area/golden_arrow/cryo_cells)
-"atn" = (
-/obj/structure/shuttle/part/dropship1/transparent/middle_left_wing{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "ato" = (
 /obj/structure/surface/table/almayer,
 /obj/item/tool/soap/deluxe{
@@ -11029,25 +6456,6 @@
 	},
 /turf/open/floor/almayer/edge,
 /area/golden_arrow/cryo_cells)
-"atp" = (
-/obj/structure/machinery/door/airlock/almayer/secure{
-	dir = 1;
-	name = "\improper Assembly Room";
-	req_access = list();
-	req_one_access_txt = "19;12"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 2
-	},
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/briefing)
 "atq" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -11064,66 +6472,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/briefing)
-"atr" = (
-/obj/structure/machinery/camera/autoname/golden_arrow{
-	dir = 4;
-	name = "ship-grade camera"
-	},
-/obj/structure/sign/safety/storage{
-	pixel_x = -18;
-	pixel_y = -7
-	},
-/obj/structure/sign/safety/two{
-	pixel_x = -18;
-	pixel_y = 7
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
-"ats" = (
-/obj/structure/machinery/light,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"att" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"atu" = (
-/obj/structure/machinery/autodoc_console{
-	dir = 1;
-	pixel_y = 6
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	layer = 2.5;
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/obj/structure/sign/safety/autodoc{
-	pixel_x = -17
-	},
-/obj/item/device/radio/intercom{
-	freerange = 1;
-	name = "General Listening Channel";
-	pixel_y = -29
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/medical)
 "atv" = (
 /obj/effect/decal/cleanable/blood/oil,
 /obj/structure/closet/coffin/woodencrate{
@@ -11146,10 +6494,6 @@
 	dir = 8
 	},
 /area/golden_arrow/hangar)
-"atx" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
 "aty" = (
 /obj/structure/machinery/power/terminal{
 	dir = 4
@@ -11186,27 +6530,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"atB" = (
-/obj/structure/bed/chair/comfy,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"atC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/largecrate/supply/supplies/flares{
-	pixel_x = -3;
-	pixel_y = 9
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
 "atD" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NE-out";
@@ -11269,51 +6592,6 @@
 	dir = 8
 	},
 /area/golden_arrow/dorms)
-"atJ" = (
-/obj/structure/machinery/medical_pod/bodyscanner{
-	pixel_y = 6
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/medical)
-"atK" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"atL" = (
-/obj/structure/machinery/alarm/almayer{
-	dir = 1
-	},
-/obj/structure/prop/invuln/lattice_prop{
-	icon_state = "lattice3";
-	pixel_x = 16;
-	pixel_y = -15
-	},
-/obj/structure/prop/invuln/lattice_prop{
-	icon_state = "lattice2";
-	pixel_x = 16;
-	pixel_y = 16
-	},
-/obj/structure/pipes/vents/scrubber{
-	dir = 8
-	},
-/obj/structure/machinery/disposal{
-	density = 0;
-	layer = 3.2;
-	pixel_y = 16
-	},
-/obj/structure/disposalpipe/trunk{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "atM" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -11326,104 +6604,25 @@
 	},
 /area/golden_arrow/cryo_cells)
 "atN" = (
-/obj/structure/machinery/computer/crew/alt{
-	dir = 4;
-	pixel_x = -10
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "1-4"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"atO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{
-	density = 0;
-	pixel_y = 19
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
-"atP" = (
-/obj/structure/surface/table/almayer,
-/obj/item/storage/box/co2_knife{
-	pixel_x = 3;
-	pixel_y = 13
-	},
-/obj/item/ammo_box/magazine/misc/flares/empty{
-	pixel_x = -14;
-	pixel_y = 16
-	},
-/obj/item/storage/box/pdt_kit/advanced,
-/obj/structure/machinery/alarm/almayer{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
-"atQ" = (
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/pipes/vents/pump,
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
-"atR" = (
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/structure/bed/chair,
-/turf/open/floor/almayer,
-/area/golden_arrow/briefing)
-"atS" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"atT" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/largecrate/random/secure,
-/obj/item/reagent_container/food/drinks/cans/waterbottle{
-	pixel_x = 7;
-	pixel_y = 13
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"atU" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/almayer{
-	dir = 4;
-	name = "\improper Storage Bay Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
-"atV" = (
-/obj/structure/machinery/door/poddoor/almayer{
+/obj/structure/machinery/computer/crew/alt{
 	dir = 4;
-	name = "\improper Storage Bay Blast Door"
+	pixel_x = -10
 	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
+/obj/structure/cable/heavyduty{
+	icon_state = "1-4"
 	},
-/area/golden_arrow/hangar)
+/turf/open/floor/almayer,
+/area/golden_arrow/cryo_cells)
+"atR" = (
+/obj/effect/decal/cleanable/dirt{
+	layer = 2.52
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/bed/chair,
+/turf/open/floor/almayer,
+/area/golden_arrow/briefing)
 "atW" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -11438,13 +6637,6 @@
 	},
 /turf/open/floor/plating,
 /area/golden_arrow/hangar)
-"atX" = (
-/obj/structure/machinery/power/smes/buildable,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/engineering)
 "atY" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -11479,35 +6671,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aua" = (
-/obj/structure/sign/safety/ladder{
-	pixel_y = 29
-	},
-/obj/effect/decal/cleanable/cobweb,
-/obj/structure/ladder{
-	height = -1;
-	id = "enginorth"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
-"aub" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3;
-	pixel_x = -1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/bed/bedroll{
-	buckle_lying = null;
-	can_buckle = 0;
-	color = "#333333";
-	desc = "A black gym mat, useful if you don't want to use the cold hard floor for exercise.";
-	foldabletype = null;
-	name = "gym mat";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "auc" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -11516,13 +6679,6 @@
 	dir = 10
 	},
 /area/golden_arrow/supply)
-"aud" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/light,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "aue" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8
@@ -11535,16 +6691,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/motor_pool)
-"auf" = (
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 8;
-	id = "apcbayrailing2"
-	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
 "aug" = (
 /obj/structure/machinery/autodoc_console{
 	pixel_y = 6
@@ -11567,38 +6713,9 @@
 "auh" = (
 /turf/closed/wall/almayer/outer,
 /area/golden_arrow/prep_hallway)
-"aui" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/obj/structure/machinery/gear{
-	id = "supply_elevator_gear"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/engineering)
-"auj" = (
-/obj/structure/surface/table/almayer,
-/obj/item/prop/colony/game{
-	pixel_x = 15;
-	pixel_y = 10
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "auk" = (
 /turf/open/floor/almayer,
 /area/golden_arrow/platoon_commander_rooms)
-"aul" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aum" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -11621,13 +6738,6 @@
 	dir = 8
 	},
 /area/golden_arrow/platoonprep)
-"auo" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
 "aup" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -11641,16 +6751,6 @@
 	dir = 4
 	},
 /area/golden_arrow/briefing)
-"auq" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/vents/pump,
-/obj/structure/machinery/disposal{
-	density = 0;
-	layer = 3.2;
-	pixel_y = 16
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "aur" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -11671,27 +6771,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aut" = (
-/obj/structure/barricade/handrail{
-	dir = 4
-	},
-/obj/structure/barricade/handrail{
-	dir = 8
-	},
-/obj/structure/closet/secure_closet,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/prop/invuln/lattice_prop{
-	icon_state = "lattice3";
-	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,
-/area/golden_arrow/dorms)
 "auu" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 5
@@ -11710,15 +6789,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/hangar)
-"auw" = (
-/obj/structure/machinery/door/poddoor/railing{
-	id = "apcbayrailing2"
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
 "aux" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -11732,37 +6802,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"auy" = (
-/obj/structure/surface/table/almayer,
-/obj/item/reagent_container/food/drinks/coffee/marine{
-	pixel_x = 5;
-	pixel_y = 2
-	},
-/obj/structure/machinery/reagentgrinder/industrial{
-	pixel_y = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
-"auz" = (
-/turf/closed/shuttle/midway{
-	icon_state = "69";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
-"auA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/disposal,
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/structure/disposalpipe/trunk{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/briefing)
 "auB" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -11777,15 +6816,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"auC" = (
-/obj/item/storage/toolbox/mechanical{
-	pixel_x = 3;
-	pixel_y = -7
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin14"
-	},
-/area/golden_arrow/hangar)
 "auD" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W";
@@ -11806,17 +6836,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/prep_hallway)
-"auF" = (
-/obj/structure/sink{
-	layer = 3.1;
-	pixel_y = 24
-	},
-/obj/structure/mirror{
-	pixel_x = -1;
-	pixel_y = 35
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
 "auG" = (
 /obj/structure/platform{
 	dir = 8;
@@ -11840,14 +6859,6 @@
 	},
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/briefing)
-"auI" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "auJ" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S";
@@ -11860,19 +6871,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/medical)
-"auK" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "auL" = (
 /obj/structure/machinery/camera/autoname/golden_arrow{
 	dir = 4
@@ -11881,18 +6879,6 @@
 	dir = 8
 	},
 /area/golden_arrow/prep_hallway)
-"auM" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "auN" = (
 /obj/structure/largecrate/supply/medicine/medkits{
 	pixel_y = 9;
@@ -11945,32 +6931,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/hangar)
-"auR" = (
-/obj/structure/sign/safety/hazard{
-	pixel_x = -20;
-	pixel_y = -7
-	},
-/obj/structure/sign/safety/bulkhead_door{
-	pixel_x = -20;
-	pixel_y = 7
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/prep_hallway)
-"auS" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out"
-	},
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "auT" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -11983,12 +6943,6 @@
 /area/golden_arrow/hangar)
 "auU" = (
 /obj/structure/disposalpipe/segment,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/disposalpipe/segment,
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning"
 	},
@@ -12006,96 +6960,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/cryo_cells)
-"auW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
-"auX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/item/storage/belt/utility/full{
-	pixel_y = 12
-	},
-/obj/item/storage/belt/utility/full{
-	pixel_x = 2;
-	pixel_y = 2
-	},
-/turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "plating"
-	},
-/area/golden_arrow/engineering)
-"auY" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
-	name = "\improper Cryo Bay"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 2
-	},
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/cryo_cells)
-"auZ" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/machinery/prop/almayer/CICmap{
-	density = 0;
-	icon_state = "shuttle";
-	layer = 2.97;
-	name = "Tactical Map Display";
-	pixel_y = 21
-	},
-/obj/structure/noticeboard{
-	pixel_x = -21;
-	pixel_y = 30
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/briefing)
-"ava" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cargo_container/wy/mid{
-	opacity = 0
-	},
-/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 = -22;
-	pixel_y = 3;
-	serial_number = 11
-	},
-/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";
-	serial_number = 16
-	},
-/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 = 6;
-	pixel_y = 8;
-	serial_number = 12
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "avb" = (
 /turf/closed/wall/almayer/outer,
 /area/golden_arrow/dorms)
@@ -12122,24 +6986,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/cryo_cells)
-"avf" = (
-/obj/structure/barricade/handrail{
-	dir = 4
-	},
-/obj/structure/barricade/handrail{
-	dir = 8
-	},
-/obj/structure/closet/secure_closet,
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
-"avg" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "avh" = (
 /obj/structure/cable/heavyduty{
 	icon_state = "2-8"
@@ -12166,16 +7012,6 @@
 	dir = 8
 	},
 /area/golden_arrow/cryo_cells)
-"avk" = (
-/obj/structure/machinery/door/poddoor/almayer{
-	dir = 4;
-	id = "bay2door";
-	name = "\improper Weapons Bay Two Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
 "avl" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NE-out"
@@ -12187,40 +7023,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"avm" = (
-/obj/structure/shuttle/part/dropship1/left_inner_wing_connector{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
-"avn" = (
-/obj/structure/cable/heavyduty{
-	icon_state = "2-4"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"avo" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"avp" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 2;
-	id = "apcbayrailing2"
-	},
-/turf/open/floor/almayer{
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
 "avq" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 4
@@ -12253,67 +7055,16 @@
 	},
 /area/golden_arrow/cryo_cells)
 "avs" = (
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/platoonarmory)
-"avt" = (
-/obj/structure/machinery/light{
+/turf/open/floor/almayer/edge{
 	dir = 4
 	},
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/golden_arrow/supply)
-"avu" = (
-/obj/structure/bed/chair{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
-"avv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
-	freerange = 1;
-	name = "General Listening Channel";
-	pixel_y = 28
-	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
+/area/golden_arrow/platoonarmory)
 "avw" = (
 /obj/structure/machinery/cm_vending/clothing/synth/snowflake,
 /turf/open/floor/almayer{
 	icon_state = "test_floor5"
 	},
 /area/golden_arrow/synthcloset)
-"avx" = (
-/obj/vehicle/powerloader{
-	dir = 4
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
-"avy" = (
-/obj/structure/machinery/firealarm{
-	dir = 8;
-	pixel_x = -24
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"avz" = (
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
 "avA" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W";
@@ -12343,16 +7094,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/platoon_commander_rooms)
-"avD" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/largecrate/random/case/small,
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "avE" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/cable/heavyduty{
@@ -12360,22 +7101,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/cryo_cells)
-"avF" = (
-/obj/structure/machinery/door/poddoor/almayer,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/prep_hallway)
-"avG" = (
-/obj/structure/largecrate/random/secure,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
 "avH" = (
 /obj/structure/surface/rack{
 	pixel_y = 19
@@ -12424,12 +7149,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/medical)
-"avK" = (
-/obj/structure/machinery/door/poddoor/almayer/open{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "avL" = (
 /obj/structure/machinery/landinglight/ds1{
 	dir = 4
@@ -12451,17 +7170,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"avN" = (
-/obj/structure/pipes/vents/scrubber{
-	dir = 8
-	},
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/cryo_cells)
 "avO" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/cable/heavyduty{
@@ -12476,75 +7184,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/prep_hallway)
-"avP" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/computer/cameras/almayer/vehicle{
-	dir = 8;
-	network = list("Golden Arrow","Vehicle","Midway");
-	pixel_x = 17
-	},
-/obj/structure/machinery/prop/almayer/CICmap{
-	density = 0;
-	dir = 8;
-	icon_state = "shuttle";
-	layer = 2.97;
-	name = "Tactical Map Display";
-	pixel_x = 17;
-	pixel_y = 14
-	},
-/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{
-	dir = 8;
-	icon_state = "cameras_old";
-	name = "Midway Remote Control Console";
-	pixel_x = 17;
-	pixel_y = -14;
-	shuttleId = "dropship_midway"
-	},
-/obj/structure/surface/table/reinforced/almayer_B{
-	layer = 2.01;
-	pixel_x = 14
-	},
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/item/clothing/glasses/hud/health{
-	pixel_x = 7;
-	pixel_y = 5
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
-"avQ" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/prep_hallway)
-"avR" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/bed/bedroll{
-	buckle_lying = null;
-	can_buckle = 0;
-	color = "#333333";
-	desc = "A black gym mat, useful if you don't want to use the cold hard floor for exercise.";
-	foldabletype = null;
-	name = "gym mat";
-	pixel_x = -2
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
-"avS" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "avT" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -12573,18 +7212,6 @@
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/hangar)
 "avW" = (
-/obj/structure/bed/chair/comfy{
-	dir = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/cable/heavyduty{
 	icon_state = "1-2"
@@ -12619,13 +7246,6 @@
 	dir = 4
 	},
 /area/golden_arrow/hangar)
-"avZ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "awa" = (
 /turf/open/floor/almayer/edge{
 	dir = 4
@@ -12644,21 +7264,6 @@
 /obj/structure/surface/table/almayer,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"awd" = (
-/obj/structure/machinery/power/terminal,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/engineering)
-"awe" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "awf" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -12667,57 +7272,7 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/medical)
-"awg" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"awh" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/crushed_cup{
-	pixel_x = 6;
-	pixel_y = -10
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
-"awi" = (
-/obj/structure/ship_ammo/minirocket,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/ship_ammo/minirocket{
-	layer = 3.1;
-	pixel_y = 9
-	},
-/turf/open/floor/almayer{
-	dir = 10;
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
-"awj" = (
-/obj/structure/pipes/standard/manifold/hidden/supply,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/engineering)
 "awk" = (
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
 	},
@@ -12737,19 +7292,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/motor_pool)
-"awm" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/cargo_container/wy/mid{
-	opacity = 0;
-	pixel_y = -17
-	},
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "awn" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NW-out";
@@ -12784,17 +7326,6 @@
 	dir = 8
 	},
 /area/golden_arrow/hangar)
-"awr" = (
-/obj/structure/machinery/floodlight/landing/floor{
-	pixel_x = 3
-	},
-/obj/structure/machinery/landinglight/ds1{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aws" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -12813,17 +7344,6 @@
 	dir = 6
 	},
 /area/golden_arrow/platoonprep)
-"awu" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "awv" = (
 /obj/structure/barricade/handrail,
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -12850,22 +7370,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"awy" = (
-/obj/structure/machinery/door_control/brbutton{
-	id = "apc1blastdoor";
-	name = "vehicle bay blast door control";
-	pixel_y = 28
-	},
-/obj/structure/machinery/door_control/brbutton{
-	id = "apcbayrailing1";
-	name = "vehicle bay railing control";
-	pixel_x = 13;
-	pixel_y = 28
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "awz" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -12892,29 +7396,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"awB" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/poddoor/almayer/locked{
-	dir = 2;
-	name = "\improper Hangar Lockdown Blast Door"
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
-"awC" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/obj/structure/machinery/floodlight/landing/floor,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "awD" = (
 /obj/structure/machinery/door/airlock/almayer/generic{
 	dir = 1;
@@ -12928,38 +7409,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/cryo_cells)
-"awE" = (
-/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep{
-	req_access = list();
-	req_one_access_txt = "8;12;39;40"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
-"awF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/platform/stair_cut,
-/obj/structure/stairs/perspective{
-	dir = 8;
-	icon_state = "p_stair_full"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
-"awG" = (
-/obj/structure/cargo_container/wy/mid{
-	pixel_y = 5
-	},
-/obj/structure/blocker/invisible_wall,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"awH" = (
-/obj/vehicle/powerloader{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "awI" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -12976,15 +7425,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/cryo_cells)
-"awJ" = (
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/shared_office)
 "awK" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 10
@@ -13027,29 +7467,10 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/supply)
-"awO" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer/edge/smooth/endcap_right{
+"awQ" = (
+/turf/open/floor/almayer/edge{
 	dir = 8
 	},
-/area/golden_arrow/cryo_cells)
-"awP" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 4;
-	id = "apcbayrailing1"
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
-"awQ" = (
-/turf/open/floor/almayer,
 /area/golden_arrow/platoonarmory)
 "awR" = (
 /obj/structure/machinery/light/double/blue{
@@ -13077,48 +7498,12 @@
 	dir = 6
 	},
 /area/golden_arrow/hangar)
-"awU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/item/tool/screwdriver{
-	icon_state = "screwdriver4";
-	pixel_x = 1
-	},
-/obj/item/prop/helmetgarb/gunoil{
-	pixel_x = -14;
-	pixel_y = 15
-	},
-/obj/structure/machinery/camera/autoname/golden_arrow{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
-"awV" = (
-/obj/structure/machinery/door/poddoor/almayer/locked{
-	dir = 4;
-	name = "\improper Hangar Lockdown Blast Door"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "awW" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
 	},
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/cryo_cells)
-"awX" = (
-/obj/structure/machinery/door/poddoor/almayer/open{
-	dir = 4;
-	name = "\improper Storage Bay One Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
-"awY" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/closed/wall/almayer/outer,
-/area/golden_arrow/hangar)
 "awZ" = (
 /obj/structure/cable/heavyduty{
 	icon_state = "1-2"
@@ -13147,13 +7532,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"axc" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
 "axd" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "cargo_arrow";
@@ -13223,18 +7601,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/medical)
-"axi" = (
-/obj/structure/bed{
-	can_buckle = 0
-	},
-/obj/item/bedsheet/rd,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/prop/magazine/book/theartofwar{
-	layer = 4.1;
-	pixel_x = -1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
 "axj" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "closed";
@@ -13304,20 +7670,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"axp" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 6
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "axq" = (
 /obj/structure/closet/secure_closet/smartgunner{
 	req_access_txt = "14;39";
@@ -13400,35 +7752,6 @@
 	dir = 4
 	},
 /area/golden_arrow/hangar)
-"axy" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
-"axz" = (
-/obj/structure/machinery/floodlight/landing/floor,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"axA" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/toolbox/mechanical/green{
-	pixel_y = 10
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "axB" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 1
@@ -13515,23 +7838,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"axI" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"axJ" = (
-/obj/structure/pipes/standard/manifold/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "axK" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -13584,11 +7890,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/platoonprep)
-"axP" = (
-/obj/structure/machinery/door/poddoor/railing,
-/obj/item/tool/warning_cone,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "axQ" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -13598,16 +7899,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"axR" = (
-/obj/structure/machinery/door/poddoor/almayer{
-	dir = 4;
-	id = "apc2blastdoor";
-	name = "\improper Vehicle Bay Two Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
 "axS" = (
 /turf/closed/wall/almayer/outer,
 /area/golden_arrow/motor_pool)
@@ -13679,11 +7970,6 @@
 /obj/structure/pipes/vents/scrubber,
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"axZ" = (
-/obj/structure/machinery/cm_vending/clothing/synth,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/synthcloset)
 "aya" = (
 /obj/structure/surface/table/almayer,
 /obj/item/device/camera{
@@ -13695,51 +7981,7 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/dorms)
-"ayb" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"ayc" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
-	pixel_y = 25
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/cryo_cells)
 "ayd" = (
-/obj/structure/disposalpipe/segment{
-	layer = 5.1;
-	name = "water pipe"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
@@ -13751,13 +7993,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/motor_pool)
-"aye" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/vents/scrubber{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "ayf" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -13766,30 +8001,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/medical)
-"ayg" = (
-/obj/structure/platform_decoration{
-	dir = 4
-	},
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/briefing)
-"ayh" = (
-/obj/structure/largecrate/supply/supplies/flares{
-	layer = 2.9;
-	pixel_x = -7
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "ayi" = (
 /obj/structure/closet/secure_closet/smartgunner{
 	req_access_txt = "14;40";
@@ -13802,12 +8013,6 @@
 /area/golden_arrow/platoonprep)
 "ayj" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/cable/heavyduty{
 	icon_state = "1-2"
 	},
@@ -13839,17 +8044,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aym" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/oil,
-/obj/structure/machinery/door/poddoor/railing{
-	id = "apcbayrailing1"
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
 "ayn" = (
 /obj/structure/bed/chair{
 	dir = 8;
@@ -13912,36 +8106,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/medical)
-"ays" = (
-/obj/item/storage/toolbox/mechanical/green{
-	pixel_x = 2;
-	pixel_y = -14
-	},
-/obj/structure/prop{
-	density = 1;
-	desc = "A fuel enhancement system for dropships. It improves the thrust produced by the fuel combustion for faster travels. Full of bullet holes and probably needs to be replaced. The label says it was manufactured in 2171";
-	icon = 'icons/obj/structures/props/almayer_props64.dmi';
-	icon_state = "fuel_enhancer";
-	name = "Damaged FS/FES-3 fuel enhancer";
-	pixel_y = 1
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
-"ayt" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S";
-	layer = 3.3
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "ayu" = (
 /obj/structure/machinery/camera/autoname/golden_arrow{
 	dir = 1
@@ -13964,15 +8128,6 @@
 	layer = 2.52
 	},
 /obj/structure/disposalpipe/segment,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/structure/disposalpipe/segment,
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning";
 	dir = 1
@@ -14024,16 +8179,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"ayB" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "ayC" = (
 /obj/vehicle/powerloader{
 	dir = 4
@@ -14085,19 +8230,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/platoonprep)
-"ayF" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "ayG" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -14105,9 +8237,6 @@
 /turf/open/floor/almayer/edge/smooth/corner,
 /area/golden_arrow/motor_pool)
 "ayH" = (
-/obj/structure/machinery/alarm/almayer{
-	dir = 1
-	},
 /turf/open/floor/almayer/edge/smooth{
 	dir = 5
 	},
@@ -14128,12 +8257,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/prep_hallway)
-"ayK" = (
-/obj/structure/machinery/floodlight/landing,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "ayL" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 8
@@ -14191,34 +8314,9 @@
 	},
 /turf/open/floor/almayer/edge,
 /area/golden_arrow/supply)
-"ayQ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"ayR" = (
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoonprep)
 "ayS" = (
 /turf/open/floor/plating,
 /area/golden_arrow/engineering)
-"ayT" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "ayU" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -14240,12 +8338,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/hangar)
-"ayW" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "ayX" = (
 /turf/open/floor/plating,
 /area/golden_arrow/hangar)
@@ -14329,21 +8421,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/supply)
-"azf" = (
-/obj/structure/bed/chair{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/briefing)
-"azg" = (
-/turf/open/floor/almayer/uscm{
-	dir = 4;
-	icon_state = "logo_directional1"
-	},
-/area/golden_arrow/hangar)
 "azh" = (
 /obj/effect/landmark/start/marine/alpha,
 /obj/effect/landmark/late_join/alpha,
@@ -14361,38 +8438,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/platoon_commander_rooms)
-"azj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "2-4"
-	},
-/obj/structure/cable{
-	icon_state = "0-8";
-	layer = 2.36
-	},
-/obj/item/device/radio/intercom{
-	freerange = 1;
-	name = "General Listening Channel";
-	pixel_y = 28
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/prep_hallway)
-"azk" = (
-/obj/structure/gun_rack/m41,
-/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 = -5;
-	pixel_y = 18
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonarmory)
 "azl" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -14404,22 +8449,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"azm" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/surface/table/almayer,
-/obj/item/tool/screwdriver{
-	layer = 3.03;
-	pixel_x = -4;
-	pixel_y = 7
-	},
-/obj/item/tool/wirecutters{
-	pixel_y = -7
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "azn" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SW-out"
@@ -14444,7 +8473,7 @@
 /turf/open/floor/almayer/edge{
 	dir = 1
 	},
-/area/golden_arrow/supply)
+/area/golden_arrow/cargo_shuttle/lower)
 "azp" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -14470,19 +8499,6 @@
 "azs" = (
 /turf/closed/wall/almayer/outer,
 /area/golden_arrow/briefing)
-"azt" = (
-/obj/structure/cargo_container/kelland/left{
-	layer = 3;
-	opacity = 0
-	},
-/obj/structure/cargo_container/kelland/left{
-	opacity = 0;
-	pixel_y = 22
-	},
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "azu" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -14493,9 +8509,8 @@
 /obj/structure/cable/heavyduty{
 	icon_state = "4-8"
 	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
+/turf/open/floor/almayer/edge{
+	dir = 4
 	},
 /area/golden_arrow/platoonarmory)
 "azv" = (
@@ -14521,12 +8536,6 @@
 /obj/structure/window/framed/almayer,
 /turf/open/floor/plating,
 /area/golden_arrow/cryo_cells)
-"azy" = (
-/obj/structure/cable/heavyduty{
-	icon_state = "2-8"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "azz" = (
 /obj/structure/surface/table/almayer,
 /obj/item/prop/almayer/flight_recorder{
@@ -14567,15 +8576,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/cryo_cells)
-"azC" = (
-/obj/structure/machinery/door/poddoor/almayer/locked{
-	dir = 4;
-	name = "\improper Hangar Lockdown Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
 "azD" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
@@ -14614,43 +8614,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/cryo_cells)
-"azH" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/prep_hallway)
-"azI" = (
-/obj/structure/surface/table/almayer,
-/obj/item/reagent_container/food/condiment/peppermill{
-	pixel_x = 1;
-	pixel_y = 12
-	},
-/obj/item/prop{
-	icon = 'icons/obj/items/paper.dmi';
-	icon_state = "newspaper";
-	name = "The Marine Corps Gazette";
-	desc = "An issue of The Marine Corps Gazette, the official newspaper of the United States Colonial Marines.";
-	pixel_y = -2;
-	pixel_x = -1
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/bed/chair/comfy,
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "azJ" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -14723,15 +8686,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"azP" = (
-/obj/structure/machinery/medical_pod/autodoc{
-	pixel_y = 6
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/medical)
 "azQ" = (
 /obj/structure/bed/chair{
 	dir = 1
@@ -14816,22 +8770,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"azX" = (
-/obj/structure/bed/chair,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 5
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
-"azY" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	dir = 10;
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "azZ" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -14842,33 +8780,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aAa" = (
-/obj/effect/landmark/start/marine/tl/alpha,
-/obj/effect/landmark/late_join/alpha,
-/obj/effect/landmark/late_join,
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/cryo_cells)
-"aAb" = (
-/obj/structure/cable{
-	layer = 2.45;
-	pixel_x = 7;
-	pixel_y = 1
-	},
-/obj/structure/prop{
-	color = "#b30000";
-	icon = 'icons/obj/pipes/power_cond_white.dmi';
-	icon_state = "0-8";
-	name = "cable";
-	pixel_x = 2;
-	pixel_y = 2
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin14"
-	},
-/area/golden_arrow/hangar)
 "aAc" = (
 /obj/structure/sign/safety/bulkhead_door{
 	pixel_y = 27
@@ -14907,15 +8818,6 @@
 	},
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/supply)
-"aAf" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/obj/structure/machinery/light,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aAg" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -15030,31 +8932,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aAq" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/recharger{
-	pixel_x = 5;
-	pixel_y = -10
-	},
-/obj/item/smartgun_battery{
-	pixel_x = 4;
-	pixel_y = -5
-	},
-/obj/item/prop/magazine{
-	desc = "A copy of Soldier of Fortune magazine. On the cover is a stylized imagine of a motion tracker in use, with the headline 'Combat Awareness in the 22nd Century'. The article covers the advancement in sensor technology that has made combat between peer nations like the UA and UPP increasingly lethal to those on the ground. Flipping through the magazine you see article titles such as 'Arsenal: The M2C Heavy Machinegun', and 'The Future War: advancements in Cyberdyne Systems combat AI'. At the back of the magazine is an extensive list of advertisements for private contractors and wares.";
-	icon_state = "poster8";
-	name = "Soldier Of Fortune: Issue March 2182";
-	pixel_x = 7;
-	pixel_y = 15
-	},
-/obj/item/clipboard{
-	pixel_x = -7;
-	pixel_y = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/platoonprep)
 "aAr" = (
 /obj/structure/machinery/door/poddoor/shutters/almayer{
 	dir = 4;
@@ -15106,46 +8983,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/cryo_cells)
-"aAw" = (
-/obj/structure/bed{
-	can_buckle = 0;
-	desc = "A lightweight support lattice.";
-	icon = 'icons/obj/structures/structures.dmi';
-	icon_state = "latticefull";
-	layer = 2.1;
-	name = "lattice"
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2";
-	pixel_x = -8
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2";
-	pixel_x = 2
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "node";
-	pixel_x = -3
-	},
-/obj/structure/girder/displaced,
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
-"aAx" = (
-/obj/structure/surface/table/almayer,
-/obj/item/tool/kitchen/tray{
-	pixel_x = 6;
-	pixel_y = 3
-	},
-/obj/item/storage/box/cups{
-	pixel_x = 2;
-	pixel_y = 4
-	},
-/obj/item/reagent_container/food/condiment/hotsauce/tabasco{
-	pixel_x = 14;
-	pixel_y = 7
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "aAy" = (
 /obj/structure/foamed_metal,
 /turf/open/floor/plating,
@@ -15186,16 +9023,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aAD" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/largecrate/random/case/double,
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aAE" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "cargo_arrow";
@@ -15209,16 +9036,6 @@
 /turf/open/floor/almayer/edge/smooth/corner,
 /area/golden_arrow/platoonarmory)
 "aAG" = (
-/obj/structure/disposalpipe/segment{
-	layer = 5.1;
-	name = "water pipe"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/cable/heavyduty{
 	icon_state = "1-2"
@@ -15282,47 +9099,6 @@
 /obj/structure/machinery/cryopod,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/cryo_cells)
-"aAL" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/obj/structure/machinery/gear{
-	id = "supply_elevator_gear"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aAM" = (
-/obj/structure/machinery/door/airlock/maintenance/colony{
-	dir = 1;
-	name = "\improper Power Substation";
-	req_one_access = null
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 2
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/engineering)
-"aAN" = (
-/obj/structure/sign/safety/storage{
-	pixel_x = -18
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
 "aAO" = (
 /obj/structure/surface/table/almayer,
 /obj/item/prop/tableflag{
@@ -15404,28 +9180,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/cryo_cells)
-"aAV" = (
-/obj/structure/surface/table/almayer,
-/obj/item/tool/kitchen/tray{
-	pixel_x = -5;
-	pixel_y = 6
-	},
-/obj/item/trash/plate{
-	pixel_x = -5;
-	pixel_y = 5
-	},
-/obj/item/trash/plate{
-	pixel_x = -3;
-	pixel_y = 7
-	},
-/obj/item/trash/plate{
-	pixel_x = -4;
-	pixel_y = 9
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/cryo_cells)
 "aAW" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W";
@@ -15441,27 +9195,6 @@
 	dir = 8
 	},
 /area/golden_arrow/hangar)
-"aAX" = (
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/obj/structure/disposalpipe/segment,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/obj/structure/disposalpipe/segment,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
-"aAY" = (
-/obj/structure/foamed_metal,
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "aAZ" = (
 /obj/structure/surface/table/almayer,
 /obj/item/paper_bin/uscm{
@@ -15481,23 +9214,8 @@
 /obj/structure/cable/heavyduty{
 	icon_state = "1-4"
 	},
-/turf/open/floor/almayer,
+/turf/open/floor/almayer/edge,
 /area/golden_arrow/platoonarmory)
-"aBb" = (
-/obj/structure/bed/chair/comfy,
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "aBc" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -15527,37 +9245,12 @@
 	dir = 4
 	},
 /area/golden_arrow/motor_pool)
-"aBf" = (
-/obj/structure/prop/invuln/lattice_prop{
-	icon_state = "lattice3";
-	pixel_x = 16;
-	pixel_y = -15
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
 "aBg" = (
 /turf/open/floor/almayer{
 	dir = 1;
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"aBh" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 10
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/shared_office)
 "aBi" = (
 /obj/structure/machinery/landinglight/ds1,
 /obj/structure/machinery/floodlight/landing/floor{
@@ -15579,15 +9272,6 @@
 "aBk" = (
 /turf/open/floor/almayer,
 /area/golden_arrow/cryo_cells)
-"aBl" = (
-/obj/structure/machinery/power/apc/almayer{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "plating"
-	},
-/area/golden_arrow/engineering)
 "aBm" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -15655,15 +9339,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/synthcloset)
-"aBs" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/secure_closet/surgical{
-	pixel_x = 30
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor5"
-	},
-/area/golden_arrow/synthcloset)
 "aBt" = (
 /turf/open/floor/almayer/edge/smooth/corner{
 	dir = 4
@@ -15717,11 +9392,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/cryo_cells)
-"aBy" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/largecrate/random/case/small,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
 "aBz" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NW-out";
@@ -15732,17 +9402,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aBA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 8;
-	id = "apcbayrailing2"
-	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
 "aBB" = (
 /obj/structure/surface/table/almayer,
 /turf/open/floor/almayer{
@@ -15750,12 +9409,6 @@
 	icon_state = "plating"
 	},
 /area/golden_arrow/motor_pool)
-"aBC" = (
-/obj/structure/flora/pottedplant{
-	icon_state = "pottedplant_21"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
 "aBD" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/pipes/standard/simple/hidden/supply{
@@ -15783,13 +9436,6 @@
 	dir = 8
 	},
 /area/golden_arrow/motor_pool)
-"aBF" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/medical)
 "aBG" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning"
@@ -15801,15 +9447,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/motor_pool)
-"aBH" = (
-/obj/effect/landmark/start/marine/medic/alpha,
-/obj/effect/landmark/late_join/alpha,
-/obj/effect/landmark/late_join,
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/cryo_cells)
 "aBI" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -15819,19 +9456,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/supply)
-"aBJ" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/golden_arrow/cryo_cells)
 "aBK" = (
 /turf/open/floor/almayer/edge{
 	dir = 8
@@ -15907,24 +9531,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/shared_office)
-"aBS" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_x = -1;
-	pixel_y = 2
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
-"aBT" = (
-/turf/closed/shuttle/midway/transparent{
-	icon_state = "86";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "aBU" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -15938,15 +9544,6 @@
 	},
 /area/golden_arrow/dorms)
 "aBV" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "cargo_arrow2";
-	dir = 1
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "cargo_arrow2";
 	dir = 1
@@ -15968,67 +9565,12 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/cryo_cells)
-"aBX" = (
-/obj/structure/surface/table/almayer,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/bed/chair/comfy,
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "aBY" = (
 /obj/structure/cargo_container/kelland/left{
 	pixel_y = 9
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aBZ" = (
-/obj/item/tool/screwdriver{
-	icon_state = "screwdriver3";
-	layer = 3.03;
-	pixel_x = -4;
-	pixel_y = 7
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
-	},
-/area/golden_arrow/hangar)
-"aCa" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S";
-	layer = 3.3
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
-"aCb" = (
-/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{
-	req_one_access = list();
-	req_one_access_txt = "8;12;39;40"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
-"aCc" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/machinery/firealarm{
-	dir = 4;
-	pixel_x = 21
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
-"aCd" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/platoonprep)
 "aCe" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -16047,15 +9589,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/motor_pool)
-"aCg" = (
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 2;
-	id = "apcbayrailing2"
-	},
-/turf/open/floor/almayer{
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
 "aCh" = (
 /obj/effect/decal/siding{
 	icon_state = "siding4"
@@ -16092,16 +9625,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/medical)
-"aCk" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2-8"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoonarmory)
 "aCl" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SW-out";
@@ -16118,30 +9641,12 @@
 "aCm" = (
 /turf/open/floor/almayer,
 /area/golden_arrow/prep_hallway)
-"aCn" = (
-/obj/structure/pipes/vents/scrubber{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/railing,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aCo" = (
-/obj/structure/machinery/power/terminal{
-	dir = 1
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/engineering)
 "aCp" = (
 /obj/structure/cable/heavyduty{
 	icon_state = "4-8"
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"aCq" = (
-/turf/closed/shuttle/elevator{
-	dir = 9
-	},
-/area/golden_arrow/supply)
 "aCr" = (
 /obj/item/stack/catwalk{
 	pixel_x = 4
@@ -16189,10 +9694,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/dorms)
-"aCv" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonarmory)
 "aCw" = (
 /obj/structure/bed/chair{
 	dir = 1
@@ -16224,17 +9725,6 @@
 	},
 /area/golden_arrow/hangar)
 "aCA" = (
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
 	},
@@ -16245,23 +9735,13 @@
 	pixel_y = 36;
 	pixel_x = 5;
 	shuttleId = "garrow_cargo_elevator";
-	dockId = "garrow_cargo_elevator_lower"
+	dockId = "garrow_cargo_elevator_storage"
 	},
 /turf/open/floor/almayer/edge/smooth{
 	dir = 1
 	},
 /area/golden_arrow/supply)
 "aCB" = (
-/obj/structure/bed/chair/comfy{
-	buckling_y = 2;
-	dir = 8;
-	pixel_y = 2
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/surface/table/almayer,
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -16289,47 +9769,13 @@
 	name = "hangar blast door control";
 	req_one_access_txt = "19;12"
 	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
+/turf/open/floor/almayer/edge{
+	dir = 5
 	},
 /area/golden_arrow/platoonarmory)
-"aCD" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S";
-	layer = 3.3
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	layer = 2.5;
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aCE" = (
 /turf/closed/wall/almayer,
 /area/golden_arrow/medical)
-"aCF" = (
-/obj/structure/machinery/gear{
-	id = "supply_elevator_gear"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "blackcorner"
-	},
-/area/golden_arrow/hangar)
-"aCG" = (
-/obj/effect/decal/cleanable/blood/oil/streak,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "aCH" = (
 /obj/effect/decal/strata_decals/grime/grime2,
 /obj/structure/machinery/power/apc/almayer{
@@ -16351,37 +9797,6 @@
 	dir = 1
 	},
 /area/golden_arrow/prep_hallway)
-"aCI" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer/uscm{
-	dir = 1
-	},
-/area/golden_arrow/hangar)
-"aCJ" = (
-/obj/structure/barricade/handrail{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/vents/pump,
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aCK" = (
-/turf/closed/shuttle/midway/transparent{
-	icon_state = "35";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
-"aCL" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "aCM" = (
 /obj/structure/closet/firecloset,
 /obj/structure/prop/invuln/lattice_prop{
@@ -16398,24 +9813,6 @@
 	icon_state = "cargo"
 	},
 /area/golden_arrow/cryo_cells)
-"aCN" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/largecrate/random/case/small{
-	layer = 3.1;
-	pixel_x = 3;
-	pixel_y = 35
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aCO" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -16446,20 +9843,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aCP" = (
-/obj/structure/machinery/floodlight/landing/floor{
-	pixel_x = 3
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aCQ" = (
-/turf/closed/shuttle/midway{
-	icon_state = "94";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "aCR" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -16472,11 +9855,6 @@
 	},
 /area/golden_arrow/hangar)
 "aCS" = (
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/landmark/nightmare{
 	insert_tag = "briefing"
 	},
@@ -16507,15 +9885,6 @@
 	layer = 2.52
 	},
 /obj/structure/pipes/standard/simple/hidden/supply,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/cable/heavyduty{
 	icon_state = "1-2"
 	},
@@ -16527,10 +9896,6 @@
 /obj/structure/surface/table/almayer,
 /turf/open/floor/almayer,
 /area/golden_arrow/supply)
-"aCX" = (
-/obj/structure/gun_rack/m41,
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonarmory)
 "aCY" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -16557,41 +9922,6 @@
 	dir = 8
 	},
 /area/golden_arrow/motor_pool)
-"aDa" = (
-/obj/structure/bed/chair/comfy{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"aDb" = (
-/obj/structure/cargo_container/kelland/right{
-	opacity = 0
-	},
-/obj/structure/cargo_container/kelland/right{
-	opacity = 0;
-	pixel_y = 22
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aDc" = (
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	id = "equipment_conny";
-	name = "\improper Squad Two Equipment Locker"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/platoonarmory)
 "aDd" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -16637,25 +9967,6 @@
 	icon_state = "plating"
 	},
 /area/golden_arrow/engineering)
-"aDf" = (
-/obj/structure/largecrate/random/case/double{
-	pixel_x = 4;
-	pixel_y = 5
-	},
-/obj/structure/largecrate/random/case/double{
-	layer = 3.1;
-	pixel_x = 6;
-	pixel_y = -7
-	},
-/obj/structure/largecrate/random/mini/small_case{
-	layer = 3.1;
-	pixel_x = 14;
-	pixel_y = 24
-	},
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "aDg" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -16694,12 +10005,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aDl" = (
-/obj/structure/shuttle/part/dropship1/transparent/engine_left_exhaust{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "aDm" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -16709,43 +10014,6 @@
 	dir = 4
 	},
 /area/golden_arrow/hangar)
-"aDn" = (
-/obj/structure/surface/rack{
-	pixel_y = 19
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/medical/ointment{
-	pixel_x = 2;
-	pixel_y = 34
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/cryo_cells)
-"aDo" = (
-/obj/structure/surface/table/almayer,
-/obj/item/device/camera{
-	pixel_x = -7;
-	pixel_y = 9
-	},
-/obj/item/device/camera_film{
-	pixel_y = 4
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/dorms)
-"aDp" = (
-/turf/closed/shuttle/dropship1{
-	icon_state = "97";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
-"aDq" = (
-/obj/structure/sign/banners/maximumeffort{
-	desc = "A large banner strung up on the wall intended to give the marines a boost in confidence.";
-	pixel_y = -5
-	},
-/turf/closed/wall/almayer,
-/area/golden_arrow/cryo_cells)
 "aDr" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning";
@@ -16792,17 +10060,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/motor_pool)
-"aDv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoonprep)
 "aDw" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -16847,44 +10104,6 @@
 	icon_state = "cargo"
 	},
 /area/golden_arrow/hangar)
-"aDA" = (
-/turf/closed/wall/almayer,
-/area/golden_arrow/engineering)
-"aDB" = (
-/obj/structure/bed/chair{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/briefing)
-"aDC" = (
-/obj/structure/sign/banners/united_americas_flag{
-	pixel_x = -30;
-	pixel_y = 31
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/vending/dinnerware,
-/obj/item/ashtray/glass{
-	pixel_x = -3;
-	pixel_y = 13
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
-"aDD" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
 "aDE" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -16895,14 +10114,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aDF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoonprep)
 "aDG" = (
 /obj/structure/surface/table/almayer,
 /obj/item/storage/toolbox/mechanical/green{
@@ -16932,37 +10143,20 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aDI" = (
-/obj/structure/surface/table/almayer,
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "aDJ" = (
 /obj/structure/machinery/power/apc/almayer{
 	dir = 1
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/synthcloset)
-"aDK" = (
-/obj/structure/surface/table/almayer,
-/obj/item/prop{
-	desc = "An issue of The Marine Corps Gazette, the official newspaper of the United States Colonial Marines.";
-	icon = 'icons/obj/items/paper.dmi';
-	icon_state = "newspaper";
-	name = "The Marine Corps Gazette";
-	pixel_x = 6;
-	pixel_y = 18
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
 "aDL" = (
 /obj/item/device/radio/intercom{
 	freerange = 1;
 	name = "General Listening Channel";
 	pixel_y = -29
 	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
+/turf/open/floor/almayer/edge{
+	dir = 6
 	},
 /area/golden_arrow/platoonarmory)
 "aDM" = (
@@ -16971,37 +10165,14 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aDN" = (
-/obj/structure/shuttle/part/dropship1/transparent/nose_top_left{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "aDO" = (
 /obj/structure/surface/table/almayer,
 /turf/open/floor/almayer,
 /area/golden_arrow/briefing)
-"aDP" = (
-/obj/structure/machinery/power/terminal,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/engineering)
 "aDQ" = (
 /turf/closed/wall/almayer/outer,
 /area/golden_arrow/platoonprep)
 "aDR" = (
-/obj/structure/machinery/door_control{
-	id = "cargobay1";
-	name = "cargobay1";
-	pixel_y = 23;
-	pixel_x = -7;
-	needs_power = 0
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/machinery/door_control{
 	id = "cargobay1";
 	name = "cargobay1";
@@ -17022,30 +10193,7 @@
 	},
 /turf/open/floor/almayer/edge,
 /area/golden_arrow/cryo_cells)
-"aDT" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 4;
-	id = "apcbayrailing1"
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
 "aDU" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 9
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 8;
 	icon_state = "pipe-c"
@@ -17058,14 +10206,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/motor_pool)
-"aDV" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/poddoor/almayer{
-	id = "synthbay";
-	name = "\improper Synthetic Storage Bay"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "aDW" = (
 /obj/structure/machinery/door/poddoor/shutters/almayer{
 	name = "\improper Squad One Equipment Locker";
@@ -17090,14 +10230,7 @@
 /turf/open/floor/almayer/edge{
 	dir = 1
 	},
-/area/golden_arrow/supply)
-"aDY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/vents/pump{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
+/area/golden_arrow/cargo_shuttle/upper)
 "aDZ" = (
 /obj/structure/machinery/light/double/blue{
 	dir = 1
@@ -17201,37 +10334,6 @@
 	dir = 4
 	},
 /area/golden_arrow/cryo_cells)
-"aEj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/item/ammo_box/magazine/mk1{
-	layer = 3.1;
-	pixel_x = 3;
-	pixel_y = 13
-	},
-/obj/item/facepaint/sunscreen_stick{
-	layer = 3.2;
-	pixel_x = -2;
-	pixel_y = 2
-	},
-/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 = 24;
-	serial_number = 11
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/platoonprep)
-"aEk" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
 "aEl" = (
 /obj/structure/cable/heavyduty{
 	icon_state = "4-8"
@@ -17250,42 +10352,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"aEm" = (
-/obj/structure/pipes/standard/manifold/hidden/supply,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"aEn" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/structure/closet/crate/trashcart{
-	pixel_y = 11
-	},
-/obj/item/prop/colony/usedbandage,
-/obj/item/prop/colony/usedbandage{
-	dir = 4
-	},
-/obj/item/prop/colony/usedbandage{
-	dir = 6;
-	pixel_y = 6
-	},
-/obj/item/prop/colony/usedbandage{
-	dir = 10;
-	pixel_y = 13
-	},
-/obj/item/storage/pill_bottle,
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/medical)
 "aEo" = (
 /obj/structure/platform_decoration{
 	dir = 8
@@ -17313,12 +10379,6 @@
 /area/golden_arrow/hangar)
 "aEq" = (
 /obj/structure/platform,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/platform,
 /obj/structure/cable/heavyduty{
 	icon_state = "1-2"
 	},
@@ -17413,19 +10473,6 @@
 	},
 /turf/closed/wall/almayer/outer,
 /area/golden_arrow/hangar)
-"aEz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/cryo_cells)
 "aEA" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -17489,18 +10536,6 @@
 	dir = 5
 	},
 /area/golden_arrow/cryo_cells)
-"aEJ" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/railing{
-	id = "apcbayrailing2"
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
 "aEK" = (
 /obj/structure/machinery/door/poddoor/almayer{
 	id = "cargolock";
@@ -17509,10 +10544,6 @@
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
 	},
-/area/golden_arrow/supply)
-"aEL" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
 /area/golden_arrow/prep_hallway)
 "aEM" = (
 /obj/effect/decal/warning_stripes{
@@ -17538,15 +10569,6 @@
 	},
 /area/golden_arrow/dorms)
 "aEO" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "door_warning";
-	dir = 1
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning";
 	dir = 1
@@ -17556,22 +10578,6 @@
 	},
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/motor_pool)
-"aEP" = (
-/obj/structure/bed/chair/dropship/pilot{
-	dir = 1
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
-	},
-/area/golden_arrow/hangar)
-"aEQ" = (
-/obj/structure/machinery/door/airlock/hatch/cockpit{
-	locked = 1
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
-	},
-/area/golden_arrow/hangar)
 "aER" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -17589,29 +10595,6 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"aET" = (
-/obj/structure/machinery/washing_machine,
-/obj/structure/machinery/washing_machine{
-	layer = 3.5;
-	pixel_y = 15
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
-"aEU" = (
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/engineering)
-"aEV" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/obj/item/stack/cable_coil{
-	pixel_x = 7
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aEW" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SW-out"
@@ -17695,16 +10678,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/platoonarmory)
-"aFe" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/item/weapon/gun/rifle/m4ra/pve{
-	pixel_y = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/platoonprep)
 "aFf" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -17713,11 +10686,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aFg" = (
-/obj/structure/pipes/vents/pump,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/shared_office)
 "aFh" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -17734,13 +10702,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/motor_pool)
-"aFi" = (
-/obj/structure/pipes/vents/pump,
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "aFj" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NW-out";
@@ -17752,57 +10713,18 @@
 	dir = 8
 	},
 /area/golden_arrow/hangar)
-"aFk" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
-"aFl" = (
-/obj/structure/surface/table/almayer,
-/obj/item/reagent_container/food/condiment/hotsauce/tabasco{
-	pixel_x = 7;
-	pixel_y = 14
-	},
-/obj/item/paper_bin{
-	pixel_x = -7;
-	pixel_y = 5
-	},
-/obj/item/reagent_container/food/condiment/hotsauce/tabasco{
-	pixel_x = 6;
-	pixel_y = 6
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/cryo_cells)
 "aFm" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
 	},
 /obj/item/stool{
-	pixel_y = 20;
-	pixel_x = 1
-	},
-/turf/open/floor/almayer/edge/smooth{
-	dir = 4
-	},
-/area/golden_arrow/platoonprep)
-"aFn" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S";
-	layer = 3.3
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
+	pixel_y = 20;
+	pixel_x = 1
 	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	icon_state = "plate"
+/turf/open/floor/almayer/edge/smooth{
+	dir = 4
 	},
-/area/golden_arrow/hangar)
+/area/golden_arrow/platoonprep)
 "aFo" = (
 /obj/structure/closet/secure_closet/marine_personal{
 	job = "Platoon Commander"
@@ -17814,35 +10736,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/cryo_cells)
-"aFp" = (
-/obj/structure/platform_decoration{
-	dir = 8
-	},
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/briefing)
-"aFq" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "aFr" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "cargo_arrow";
@@ -17855,18 +10748,6 @@
 	dir = 4
 	},
 /area/golden_arrow/motor_pool)
-"aFs" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aFt" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -17882,18 +10763,6 @@
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
 "aFv" = (
-/obj/structure/machinery/door_control{
-	id = "cargolock";
-	name = "GM cargo lock control";
-	pixel_y = 23;
-	pixel_x = -7;
-	needs_power = 0
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/machinery/door_control{
 	id = "cargolock";
 	name = "GM cargo lock control";
@@ -17908,28 +10777,7 @@
 	},
 /turf/open/space/basic,
 /area/space)
-"aFw" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/synthcloset)
 "aFx" = (
-/obj/structure/disposalpipe/segment{
-	layer = 5.1;
-	name = "water pipe"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
@@ -17963,54 +10811,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/medical)
-"aFB" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/prep_hallway)
-"aFC" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aFD" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_container/food/drinks/coffee/marine{
-	pixel_x = -4;
-	pixel_y = 14
-	},
-/obj/item/ashtray/plastic{
-	pixel_x = -10;
-	pixel_y = 3
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/medical)
-"aFE" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aFF" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -18062,15 +10862,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"aFJ" = (
-/obj/structure/machinery/door/poddoor/almayer{
-	dir = 4;
-	name = "\improper Storage Bay Two Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
 "aFK" = (
 /obj/structure/machinery/light/double/blue{
 	dir = 4;
@@ -18092,22 +10883,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/motor_pool)
-"aFM" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/safety/ammunition{
-	pixel_x = 32
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
-"aFN" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 10
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
 "aFO" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -18115,18 +10890,6 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
 /area/golden_arrow/dorms)
-"aFP" = (
-/turf/closed/shuttle/midway{
-	icon_state = "25";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
-"aFQ" = (
-/turf/closed/shuttle/midway{
-	icon_state = "77";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "aFR" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 8
@@ -18170,26 +10933,7 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"aFV" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "1-8"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aFW" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning"
@@ -18199,33 +10943,6 @@
 	},
 /area/golden_arrow/cryo_cells)
 "aFX" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	layer = 2.5;
-	pixel_y = 1
-	},
-/obj/structure/machinery/light/double/blue{
-	dir = 1;
-	light_color = "#dae2ff"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/sign/safety/bathunisex{
-	pixel_y = 28
-	},
-/obj/structure/sign/safety/water{
-	pixel_x = 15;
-	pixel_y = 28
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/machinery/light/double/blue{
 	dir = 1;
 	light_color = "#dae2ff"
@@ -18255,14 +10972,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/platoonprep)
-"aFZ" = (
-/obj/structure/surface/table/almayer,
-/obj/item/tool/soap/deluxe{
-	pixel_x = -7;
-	pixel_y = 10
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "aGa" = (
 /obj/structure/platform{
 	dir = 4;
@@ -18296,36 +11005,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/hangar)
-"aGd" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/vents/scrubber{
-	dir = 1
-	},
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	id = "equipment_conny";
-	name = "\improper Squad One Equipment Locker"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/platoonarmory)
-"aGe" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E"
-	},
-/obj/structure/bed/bedroll{
-	buckle_lying = null;
-	can_buckle = 0;
-	color = "#333333";
-	desc = "A black gym mat, useful if you don't want to use the cold hard floor for exercise.";
-	foldabletype = null;
-	name = "gym mat";
-	pixel_y = -4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aGf" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -18370,45 +11049,7 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/hangar)
-"aGj" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/box/bodybags{
-	pixel_x = -5;
-	pixel_y = 11
-	},
-/obj/item/storage/box/bodybags{
-	pixel_x = -2;
-	pixel_y = 3
-	},
-/obj/item/reagent_container/spray/cleaner{
-	pixel_x = 10;
-	pixel_y = 18
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/medical)
-"aGk" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/platoonprep)
 "aGl" = (
-/obj/structure/bed/chair/comfy,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/surface/table/almayer,
 /obj/item/prop{
 	icon = 'icons/obj/items/paper.dmi';
@@ -18435,15 +11076,6 @@
 /obj/structure/surface/rack,
 /turf/open/floor/almayer,
 /area/golden_arrow/platoonarmory)
-"aGn" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/landinglight/ds1/delayone{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aGo" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -18457,45 +11089,11 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/hangar)
-"aGp" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/oil,
-/obj/item/device/radio/intercom{
-	freerange = 1;
-	name = "General Listening Channel";
-	pixel_y = 28
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aGq" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S";
-	pixel_y = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
 "aGr" = (
 /turf/open/floor/almayer/edge{
 	dir = 5
 	},
 /area/golden_arrow/cryo_cells)
-"aGs" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/obj/structure/machinery/gear{
-	id = "supply_elevator_gear"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/engineering)
 "aGt" = (
 /obj/structure/sign/safety/bulkhead_door{
 	pixel_y = 27
@@ -18513,19 +11111,6 @@
 	},
 /area/golden_arrow/hangar)
 "aGu" = (
-/obj/structure/prop/almayer/computers/sensor_computer2{
-	pixel_y = 15;
-	density = 0;
-	pixel_x = 4
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/prop/almayer/computers/sensor_computer2{
 	pixel_y = 15;
 	density = 0;
@@ -18557,19 +11142,6 @@
 	icon_state = "plating"
 	},
 /area/golden_arrow/motor_pool)
-"aGw" = (
-/obj/structure/closet/secure_closet/marine_personal{
-	job = "Platoon Sergeant";
-	pixel_x = -7
-	},
-/obj/structure/closet/secure_closet/marine_personal{
-	job = "Platoon Corpsman";
-	pixel_x = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "aGx" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -18581,29 +11153,6 @@
 	dir = 4
 	},
 /area/golden_arrow/dorms)
-"aGy" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/barricade/handrail{
-	dir = 8
-	},
-/obj/effect/spawner/prop_gun/m41aMK1{
-	pixel_x = 6;
-	pixel_y = -3
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
-"aGz" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/obj/structure/machinery/floodlight/landing/floor,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aGA" = (
-/turf/closed/shuttle/elevator,
-/area/golden_arrow/supply)
 "aGB" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -18652,38 +11201,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aGG" = (
-/obj/structure/machinery/recharge_station,
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor5"
-	},
-/area/golden_arrow/synthcloset)
-"aGH" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-8"
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 1
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoonprep)
-"aGI" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/vents/pump{
-	dir = 8
-	},
-/obj/structure/surface/rack,
-/obj/item/book/manual/robotics_cyborgs{
-	pixel_y = 4
-	},
-/obj/item/tool/weldingtool/hugetank,
-/obj/item/tool/wirecutters,
-/turf/open/floor/almayer,
-/area/golden_arrow/synthcloset)
 "aGJ" = (
 /obj/structure/machinery/door/poddoor/almayer{
 	dir = 4;
@@ -18699,31 +11216,6 @@
 	icon_state = "mono"
 	},
 /area/space)
-"aGL" = (
-/obj/structure/surface/table/almayer,
-/obj/item/storage/firstaid/fire{
-	pixel_x = 6;
-	pixel_y = 8
-	},
-/obj/effect/decal/cleanable/cobweb2/dynamic,
-/obj/item/storage/firstaid/regular,
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
-"aGM" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
-	freerange = 1;
-	name = "General Listening Channel";
-	pixel_y = -29
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/structure/machinery/power/apc/almayer{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "aGN" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 9
@@ -18747,27 +11239,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"aGP" = (
-/obj/structure/bed/chair{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
-"aGQ" = (
-/obj/structure/machinery/power/terminal{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/catwalk{
-	pixel_x = 12;
-	pixel_y = -9
-	},
-/obj/item/tool/warning_cone{
-	pixel_y = 16
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/engineering)
 "aGR" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -18808,24 +11279,6 @@
 /obj/structure/pipes/vents/pump,
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aGV" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/landinglight/ds1,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aGW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "0-4";
-	layer = 2.36
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
 "aGX" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 4
@@ -18914,47 +11367,6 @@
 /obj/structure/curtain/red,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/cryo_cells)
-"aHe" = (
-/obj/structure/platform_decoration{
-	dir = 4
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin3"
-	},
-/area/golden_arrow/hangar)
-"aHf" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/structure/pipes/vents/scrubber{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
-"aHg" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/item/toy/plush/therapy/blue{
-	pixel_x = 6;
-	pixel_y = 9
-	},
-/obj/item/toy/plush/therapy/random_color,
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/medical)
 "aHh" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -18971,11 +11383,6 @@
 	dir = 1
 	},
 /area/golden_arrow/briefing)
-"aHi" = (
-/obj/structure/cargo_container/arious/mid,
-/obj/structure/blocker/invisible_wall,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aHj" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -19004,18 +11411,6 @@
 	icon_state = "black"
 	},
 /area/golden_arrow/hangar)
-"aHm" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/cryo_cells)
 "aHn" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 5
@@ -19024,45 +11419,10 @@
 	dir = 4
 	},
 /area/golden_arrow/hangar)
-"aHo" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/catwalk{
-	pixel_x = 2;
-	pixel_y = -9
-	},
-/obj/structure/machinery/landinglight/ds1/delayone{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aHp" = (
 /obj/structure/window/framed/almayer,
 /turf/open/floor/plating,
 /area/golden_arrow/medical)
-"aHq" = (
-/obj/structure/surface/table/almayer,
-/obj/item/tool/kitchen/tray{
-	pixel_y = 6;
-	pixel_x = -5
-	},
-/obj/item/trash/plate{
-	pixel_y = 5;
-	pixel_x = -5
-	},
-/obj/item/trash/plate{
-	pixel_y = 7;
-	pixel_x = -3
-	},
-/obj/item/trash/plate{
-	pixel_y = 9;
-	pixel_x = -4
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/cryo_cells)
 "aHr" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -19091,12 +11451,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aHv" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
 "aHw" = (
 /obj/structure/window/framed/almayer,
 /turf/open/floor/plating,
@@ -19117,17 +11471,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/prep_hallway)
-"aHy" = (
-/obj/structure/surface/table/almayer,
-/obj/item/trash/plate{
-	pixel_x = 4;
-	pixel_y = 13
-	},
-/obj/item/trash/plate{
-	pixel_x = -3
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "aHz" = (
 /obj/structure/platform_decoration,
 /obj/structure/platform_decoration{
@@ -19140,17 +11483,6 @@
 	},
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/motor_pool)
-"aHA" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aHB" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -19173,27 +11505,10 @@
 	desc = "A black gym mat, useful if you don't want to use the cold hard floor for exercise."
 	},
 /turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
-"aHD" = (
-/turf/closed/shuttle/midway/transparent{
-	icon_state = "38";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
-"aHE" = (
-/obj/structure/largecrate/supply/ammo{
-	fill_from_loc = 1;
-	name = "sentry crate"
-	},
-/obj/item/ammo_magazine/sentry{
-	layer = 3.01
+	dir = 4;
+	icon_state = "cargo_arrow"
 	},
-/obj/item/defenses/handheld/sentry,
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonarmory)
+/area/golden_arrow/hangar)
 "aHF" = (
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
@@ -19206,15 +11521,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aHH" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/structure/machinery/cm_vending/sorted/marine_food,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "aHI" = (
 /turf/open/floor/almayer/edge/smooth{
 	dir = 8
@@ -19234,23 +11540,6 @@
 	dir = 4
 	},
 /area/golden_arrow/hangar)
-"aHK" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"aHL" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "aHM" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -19262,25 +11551,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/medical)
-"aHN" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/power/apc/almayer{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "0-8";
-	layer = 2.36
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aHO" = (
-/obj/structure/shuttle/part/dropship1/left_outer_wing_connector{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "aHP" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -19312,30 +11582,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/medical)
-"aHS" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	dir = 10;
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
-"aHT" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "2-8"
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "0-4"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
 "aHU" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -19355,12 +11601,6 @@
 	dir = 1
 	},
 /area/golden_arrow/platoonprep)
-"aHW" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
 "aHX" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -19369,48 +11609,10 @@
 	icon_state = "plating_striped"
 	},
 /area/golden_arrow/engineering)
-"aHY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoonarmory)
 "aHZ" = (
 /turf/closed/wall/almayer/outer,
 /area/golden_arrow/platoonarmory)
-"aIa" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "0-8";
-	layer = 2.36
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonarmory)
 "aIb" = (
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
 	},
@@ -19424,9 +11626,8 @@
 	icon_state = "door_warning";
 	dir = 8
 	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
+/turf/open/floor/almayer/edge{
+	dir = 8
 	},
 /area/golden_arrow/platoonarmory)
 "aIc" = (
@@ -19438,18 +11639,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aId" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
-"aIe" = (
-/obj/effect/attach_point/fuel/midway,
-/turf/closed/shuttle/midway/transparent{
-	icon_state = "28";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "aIf" = (
 /obj/structure/machinery/door/poddoor/almayer/open{
 	dir = 4;
@@ -19471,23 +11660,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/motor_pool)
-"aIi" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 6
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/engineering)
-"aIj" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aIk" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -19511,19 +11683,6 @@
 	},
 /area/golden_arrow/hangar)
 "aIm" = (
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/structure/disposalpipe/segment{
-	layer = 5.1;
-	name = "water pipe"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
 	},
@@ -19565,12 +11724,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/hangar)
-"aIq" = (
-/turf/open/floor/almayer/uscm{
-	dir = 9;
-	icon_state = "logo_directional1"
-	},
-/area/golden_arrow/hangar)
 "aIr" = (
 /turf/closed/wall/almayer,
 /area/golden_arrow/platoonprep)
@@ -19583,15 +11736,6 @@
 	icon_state = "plating_striped"
 	},
 /area/golden_arrow/engineering)
-"aIt" = (
-/obj/effect/landmark/start/marine/alpha,
-/obj/effect/landmark/late_join/alpha,
-/obj/effect/landmark/late_join,
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/cryo_cells)
 "aIu" = (
 /obj/structure/sign/safety/rewire{
 	pixel_x = 32
@@ -19652,12 +11796,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/prep_hallway)
-"aIA" = (
-/turf/open/floor/almayer/uscm{
-	dir = 6;
-	icon_state = "logo_directional1"
-	},
-/area/golden_arrow/hangar)
 "aIB" = (
 /obj/structure/machinery/power/apc/almayer{
 	dir = 1
@@ -19671,63 +11809,6 @@
 "aIC" = (
 /turf/closed/wall/almayer/outer,
 /area/golden_arrow/engineering)
-"aID" = (
-/obj/structure/closet/crate/trashcart{
-	pixel_y = 11
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/sign/safety/coffee{
-	pixel_y = 29;
-	pixel_x = 13
-	},
-/obj/item/trash/candy,
-/obj/item/trash/burger,
-/obj/item/trash/cigbutt,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/closet/crate/trashcart{
-	pixel_y = 11
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/sign/safety/coffee{
-	pixel_x = 13;
-	pixel_y = 29
-	},
-/obj/item/trash/candy,
-/obj/item/trash/burger,
-/obj/item/trash/cigbutt,
-/turf/open/floor/almayer/edge/smooth/endcap_left{
-	dir = 8
-	},
-/area/golden_arrow/cryo_cells)
-"aIE" = (
-/obj/effect/landmark/start/marine/smartgunner/alpha,
-/obj/effect/landmark/late_join/alpha,
-/obj/effect/landmark/late_join,
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/cryo_cells)
-"aIF" = (
-/obj/structure/machinery/door/poddoor/railing,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/camera/autoname/golden_arrow{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/engineering)
 "aIG" = (
 /obj/structure/sign/safety/bulkhead_door{
 	pixel_y = 38
@@ -19747,35 +11828,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"aIH" = (
-/turf/closed/shuttle/elevator{
-	dir = 4
-	},
-/area/golden_arrow/supply)
-"aII" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/vents/pump{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aIJ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "2-4"
-	},
-/obj/structure/cable{
-	layer = 2.36
-	},
-/obj/structure/disposalpipe/junction{
-	dir = 2;
-	icon_state = "pipe-j2"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/prep_hallway)
 "aIK" = (
 /obj/structure/surface/table/almayer,
 /obj/item/clothing/suit/storage/jacket/marine/service{
@@ -19787,41 +11839,6 @@
 	},
 /turf/open/floor/almayer/edge,
 /area/golden_arrow/dorms)
-"aIL" = (
-/obj/structure/cargo_container/wy/right{
-	opacity = 0;
-	pixel_y = -17
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/obj/item/device/flashlight/lamp/on{
-	layer = 4.2;
-	pixel_x = 3;
-	pixel_y = 19
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aIM" = (
-/obj/structure/surface/table/almayer,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/ammo_box/magazine/misc/mre{
-	pixel_y = 11
-	},
-/obj/item/prop/helmetgarb/flair_io{
-	pixel_x = -5;
-	pixel_y = -9
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/platoonprep)
 "aIN" = (
 /obj/structure/machinery/light/double/blue{
 	dir = 8;
@@ -19834,20 +11851,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aIO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/safety/bulkhead_door{
-	pixel_y = -29
-	},
-/obj/structure/sign/safety/hazard{
-	pixel_x = 14;
-	pixel_y = -29
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
 "aIP" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -19946,17 +11949,6 @@
 /turf/open/floor/almayer,
 /area/golden_arrow/platoonarmory)
 "aIY" = (
-/obj/structure/machinery/door_control{
-	id = "hangarlockdownsouth";
-	name = "hangarlockdownsouth";
-	pixel_x = -23;
-	needs_power = 0
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/machinery/door_control{
 	id = "hangarlockdownsouth";
 	name = "hangarlockdownsouth";
@@ -19986,13 +11978,6 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aJb" = (
-/obj/structure/largecrate/random/case/double,
-/obj/structure/largecrate/random/mini/small_case{
-	pixel_y = 17
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
 "aJc" = (
 /obj/structure/machinery/light/double/blue{
 	dir = 8;
@@ -20006,11 +11991,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/platoon_commander_rooms)
-"aJd" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/manifold/hidden/supply,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/engineering)
 "aJe" = (
 /obj/structure/machinery/floodlight/landing/floor{
 	color = "#dae2ff";
@@ -20118,16 +12098,6 @@
 	dir = 8
 	},
 /area/golden_arrow/hangar)
-"aJm" = (
-/obj/structure/machinery/power/smes/buildable,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/toolbox/electrical{
-	pixel_y = 10
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/engineering)
 "aJn" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "cargo"
@@ -20137,17 +12107,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/motor_pool)
-"aJo" = (
-/obj/structure/machinery/computer/shuttle_control/ice_colony{
-	pixel_y = 33
-	},
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/golden_arrow/supply)
 "aJp" = (
 /obj/structure/machinery/camera/autoname/golden_arrow{
 	dir = 4
@@ -20187,13 +12146,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/medical)
-"aJt" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/alarm/almayer{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/briefing)
 "aJu" = (
 /turf/open/floor/almayer/edge{
 	dir = 8
@@ -20212,32 +12164,6 @@
 	layer = 2.52
 	},
 /obj/structure/surface/table/almayer,
-/obj/item/ammo_box/magazine/mk1{
-	layer = 3.1;
-	pixel_y = 13;
-	pixel_x = 3
-	},
-/obj/item/facepaint/sunscreen_stick{
-	pixel_y = 2;
-	pixel_x = -2;
-	layer = 3.2
-	},
-/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 = 24;
-	serial_number = 11
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/structure/surface/table/almayer,
 /obj/item/ammo_box/magazine/mk1{
 	layer = 3.1;
 	pixel_y = 13;
@@ -20262,36 +12188,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/platoonprep)
-"aJx" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 10
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "2-8"
-	},
-/obj/structure/cable{
-	icon_state = "0-4";
-	layer = 2.36
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonarmory)
-"aJy" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/item/stool{
-	pixel_x = -1;
-	pixel_y = 12
-	},
-/turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "plating"
-	},
-/area/golden_arrow/engineering)
 "aJz" = (
 /obj/structure/cargo_container/seegson/mid,
 /obj/effect/decal/warning_stripes{
@@ -20300,17 +12196,6 @@
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
 "aJA" = (
-/obj/structure/machinery/door_control{
-	id = "lowercargolocks";
-	name = "lowercargolocks";
-	needs_power = 0;
-	pixel_y = 32
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/machinery/door_control{
 	id = "lowercargolocks";
 	name = "lowercargolocks";
@@ -20332,29 +12217,11 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/cryo_cells)
-"aJC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
 "aJD" = (
 /turf/open/floor/almayer/edge/smooth/corner{
 	dir = 4
 	},
 /area/golden_arrow/motor_pool)
-"aJE" = (
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	dir = 4;
-	id = "squadarmory";
-	name = "\improper Gear Lockers"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
 "aJF" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/machinery/prop/almayer/computer/PC{
@@ -20362,61 +12229,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/engineering)
-"aJG" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aJH" = (
-/turf/closed/shuttle/midway/transparent{
-	icon_state = "89";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
-"aJI" = (
-/obj/structure/machinery/faxmachine/uscm/command/capt,
-/obj/structure/surface/table/reinforced/almayer_B,
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
-"aJJ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
-	freerange = 1;
-	name = "General Listening Channel";
-	pixel_y = 28
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aJK" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/light,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aJL" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/largecrate/supply/supplies/flares{
-	layer = 3.1
-	},
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aJM" = (
 /obj/structure/largecrate/supply/ammo/m41amk1,
 /obj/structure/largecrate/supply/ammo/m41amk1{
@@ -20437,20 +12249,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aJO" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	layer = 2.5;
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aJP" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -20479,15 +12277,6 @@
 /area/golden_arrow/platoonarmory)
 "aJS" = (
 /obj/structure/pipes/standard/manifold/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply,
 /obj/structure/cable/heavyduty{
 	icon_state = "4-8"
 	},
@@ -20499,16 +12288,6 @@
 	dir = 8
 	},
 /area/golden_arrow/platoon_commander_rooms)
-"aJT" = (
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 8;
-	id = "apcbayrailing1"
-	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
 "aJU" = (
 /obj/structure/largecrate/random/secure,
 /obj/effect/decal/cleanable/dirt{
@@ -20527,14 +12306,6 @@
 	icon_state = "plating"
 	},
 /area/golden_arrow/engineering)
-"aJW" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/bed/chair{
-	dir = 8;
-	pixel_y = 3
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aJX" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -20596,84 +12367,26 @@
 	name = "powerloader dock";
 	desc = "A square metal surface resting on four legs.";
 	dir = 8;
-	layer = 2.97
-	},
-/obj/structure/barricade/handrail{
-	dir = 8;
-	pixel_x = -1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/supply)
-"aKc" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/golden_arrow/supply)
-"aKd" = (
-/obj/structure/bed/chair/comfy,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/obj/structure/bed/chair/comfy{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"aKe" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S";
-	layer = 3.3
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aKf" = (
-/obj/structure/machinery/light,
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"aKg" = (
-/obj/structure/sign/safety/bulkhead_door{
-	pixel_y = 32
-	},
-/obj/structure/sign/safety/hazard{
-	pixel_x = 15;
-	pixel_y = 32
+	layer = 2.97
 	},
-/turf/open/floor/almayer{
+/obj/structure/barricade/handrail{
 	dir = 8;
-	icon_state = "cargo_arrow"
+	pixel_x = -1
 	},
-/area/golden_arrow/engineering)
-"aKh" = (
-/obj/effect/decal/cleanable/blood/oil,
-/obj/structure/machinery/light{
-	dir = 8
+/turf/open/floor/almayer{
+	icon_state = "plate"
 	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
+/area/golden_arrow/supply)
+"aKd" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/cable/heavyduty{
+	icon_state = "1-2"
 	},
-/area/golden_arrow/hangar)
+/obj/structure/bed/chair/comfy{
+	dir = 4
+	},
+/turf/open/floor/almayer,
+/area/golden_arrow/cryo_cells)
 "aKi" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -20710,15 +12423,6 @@
 	dir = 1
 	},
 /area/golden_arrow/supply)
-"aKm" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/item/device/flashlight/lamp/tripod/grey,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aKn" = (
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/engineering)
@@ -20726,12 +12430,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/closed/wall/almayer/outer,
 /area/golden_arrow/dorms)
-"aKp" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aKq" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -20757,14 +12455,6 @@
 	},
 /area/golden_arrow/cryo_cells)
 "aKs" = (
-/obj/structure/bed/chair{
-	dir = 1
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/bed/chair{
 	dir = 1
 	},
@@ -20824,52 +12514,12 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/shared_office)
-"aKy" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3;
-	pixel_x = -1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aKz" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/cryo_cells)
-"aKA" = (
-/turf/closed/shuttle/midway/transparent{
-	icon_state = "23";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
-"aKB" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/cobweb2/dynamic,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 10
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aKC" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
 "aKD" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "cargo"
@@ -20879,13 +12529,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aKE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/camera/autoname/golden_arrow{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "aKF" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -20942,63 +12585,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/hangar)
-"aKJ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/door/poddoor/almayer/locked{
-	dir = 2;
-	name = "\improper Hangar Lockdown Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
-"aKK" = (
-/obj/structure/cable{
-	layer = 2.36;
-	pixel_x = -3;
-	pixel_y = 12
-	},
-/obj/structure/cable{
-	layer = 2.36;
-	pixel_x = -1;
-	pixel_y = 12
-	},
-/obj/structure/cable{
-	layer = 2.36;
-	pixel_x = 1;
-	pixel_y = 12
-	},
-/obj/structure/cable{
-	layer = 2.36;
-	pixel_x = 3;
-	pixel_y = 12
-	},
-/obj/structure/cable{
-	icon_state = "0-2";
-	layer = 2.36;
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/structure/cable{
-	icon_state = "0-2";
-	layer = 2.36;
-	pixel_x = -1;
-	pixel_y = -3
-	},
-/obj/structure/cable{
-	icon_state = "0-2";
-	layer = 2.36;
-	pixel_x = 1;
-	pixel_y = -3
-	},
-/obj/structure/cable{
-	icon_state = "0-2";
-	layer = 2.36;
-	pixel_x = 3;
-	pixel_y = -3
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "aKL" = (
 /turf/open/floor/almayer/edge{
 	dir = 1
@@ -21019,23 +12605,6 @@
 	dir = 1
 	},
 /area/golden_arrow/hangar)
-"aKO" = (
-/obj/structure/prop/invuln/lifeboat_hatch_placeholder/terminal{
-	layer = 2.1;
-	name = "non-functional maintenance airlock"
-	},
-/obj/structure/sign/safety/airlock{
-	pixel_x = 8;
-	pixel_y = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aKP" = (
-/turf/closed/shuttle/midway/transparent{
-	icon_state = "29";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "aKQ" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/largecrate/random/secure{
@@ -21045,17 +12614,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aKR" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aKS" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W";
@@ -21070,26 +12628,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/medical)
-"aKT" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aKU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/camera/autoname/golden_arrow{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "aKV" = (
 /obj/effect/decal/cleanable/blood/oil,
 /turf/open/floor/almayer,
@@ -21122,18 +12660,6 @@
 	},
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/supply)
-"aLa" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/briefing)
 "aLb" = (
 /obj/structure/machinery/light/double/blue{
 	dir = 8;
@@ -21143,11 +12669,6 @@
 	dir = 8
 	},
 /area/golden_arrow/cryo_cells)
-"aLc" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/firecloset/full,
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "aLd" = (
 /obj/structure/bed/chair{
 	dir = 1
@@ -21161,46 +12682,7 @@
 	dir = 1
 	},
 /area/golden_arrow/supply)
-"aLf" = (
-/turf/open/shuttle/elevator,
-/area/golden_arrow/supply)
-"aLg" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/paper_bin/uscm{
-	pixel_x = -6;
-	pixel_y = 7
-	},
-/obj/item/tool/pen{
-	pixel_x = -7;
-	pixel_y = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/medical)
-"aLh" = (
-/obj/structure/machinery/power/terminal,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/cable_coil,
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/obj/item/tool/warning_cone{
-	pixel_x = -15;
-	pixel_y = 16
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/engineering)
 "aLi" = (
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
 	},
@@ -21233,38 +12715,12 @@
 	dir = 8
 	},
 /area/golden_arrow/platoonarmory)
-"aLl" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/golden_arrow/cryo_cells)
 "aLm" = (
 /obj/effect/decal/siding{
 	icon_state = "siding2"
 	},
 /turf/open/floor/plating,
 /area/golden_arrow/hangar)
-"aLn" = (
-/obj/structure/barricade/handrail{
-	dir = 8
-	},
-/obj/structure/closet/secure_closet,
-/obj/structure/barricade/handrail{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
-"aLo" = (
-/turf/closed/shuttle/elevator/gears,
-/area/golden_arrow/supply)
 "aLp" = (
 /obj/structure/barricade/handrail{
 	dir = 8
@@ -21276,20 +12732,6 @@
 	dir = 8
 	},
 /area/golden_arrow/platoonarmory)
-"aLq" = (
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
-"aLr" = (
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
 "aLs" = (
 /obj/structure/platform{
 	dir = 1
@@ -21302,28 +12744,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/motor_pool)
-"aLt" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/structure/machinery/door/poddoor/almayer/open{
-	closed_layer = 3.3;
-	dir = 4;
-	id = "squadblastdoor";
-	layer = 3.3;
-	name = "First Platoon Ready Bay Blast Door";
-	open_layer = 3.3
-	},
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	layer = 1.9
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/platoonarmory)
 "aLu" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -21333,18 +12753,6 @@
 	},
 /area/golden_arrow/hangar)
 "aLv" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "door_warning";
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning";
 	dir = 4
@@ -21360,24 +12768,6 @@
 	},
 /area/golden_arrow/motor_pool)
 "aLw" = (
-/obj/structure/surface/table/almayer,
-/obj/item/trash/plate{
-	pixel_y = 8;
-	pixel_x = 7
-	},
-/obj/item/reagent_container/food/condiment/saltshaker{
-	pixel_x = -4;
-	pixel_y = 13
-	},
-/obj/item/reagent_container/food/snacks/protein_pack{
-	pixel_y = 9;
-	pixel_x = 3
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/bed/chair/comfy{
 	dir = 1
 	},
@@ -21386,22 +12776,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/cryo_cells)
-"aLx" = (
-/obj/structure/filingcabinet/chestdrawer{
-	density = 0;
-	pixel_x = -8;
-	pixel_y = 16
-	},
-/obj/structure/filingcabinet{
-	density = 0;
-	pixel_x = 8;
-	pixel_y = 16
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/shared_office)
 "aLy" = (
 /obj/structure/bed/chair{
 	dir = 8;
@@ -21441,14 +12815,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/motor_pool)
-"aLC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/computer/ares_console{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "aLD" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -21466,14 +12832,6 @@
 	},
 /area/golden_arrow/hangar)
 "aLE" = (
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
 	},
@@ -21494,17 +12852,6 @@
 	},
 /area/golden_arrow/hangar)
 "aLG" = (
-/obj/structure/machinery/door_control{
-	id = "cargolockswest";
-	name = "cargolockswest";
-	needs_power = 0;
-	pixel_y = 32
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/machinery/door_control{
 	id = "cargolockswest";
 	name = "cargolockswest";
@@ -21518,32 +12865,6 @@
 	},
 /turf/open/space/basic,
 /area/space)
-"aLH" = (
-/obj/structure/machinery/camera/autoname/golden_arrow{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aLI" = (
-/obj/structure/machinery/light,
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
-"aLJ" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	dir = 10;
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "aLK" = (
 /turf/open/floor/almayer/edge/smooth/endcap_left{
 	dir = 8
@@ -21578,15 +12899,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/motor_pool)
-"aLO" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/prop/almayer/CICmap{
-	layer = 4;
-	pixel_x = -1;
-	pixel_y = 5
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aLP" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SE-out";
@@ -21613,11 +12925,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aLQ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/engineering)
 "aLR" = (
 /obj/structure/machinery/door_control/brbutton{
 	pixel_y = 28;
@@ -21666,17 +12973,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aLU" = (
-/obj/structure/platform{
-	dir = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/briefing)
 "aLV" = (
 /obj/structure/cable/heavyduty{
 	icon_state = "4-8"
@@ -21698,13 +12994,6 @@
 	dir = 4
 	},
 /area/golden_arrow/hangar)
-"aLX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
 "aLY" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -21720,18 +13009,6 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/hangar)
-"aMa" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out"
-	},
-/obj/structure/machinery/light,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aMb" = (
 /obj/item/tool/warning_cone,
 /obj/structure/pipes/vents/pump,
@@ -21747,10 +13024,6 @@
 	icon_state = "plating_striped"
 	},
 /area/golden_arrow/engineering)
-"aMd" = (
-/obj/structure/pipes/standard/manifold/hidden/supply,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aMe" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -21762,15 +13035,6 @@
 	dir = 8
 	},
 /area/golden_arrow/hangar)
-"aMf" = (
-/obj/structure/machinery/computer/supply_drop_console/limited/alternate{
-	density = 1
-	},
-/turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "plating"
-	},
-/area/golden_arrow/engineering)
 "aMg" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -21780,60 +13044,12 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/dorms)
-"aMh" = (
-/obj/structure/platform{
-	dir = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/briefing)
 "aMi" = (
 /obj/structure/machinery/landinglight/ds1,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aMj" = (
-/obj/item/stack/sheet/metal,
-/obj/item/stack/rods{
-	pixel_x = -13;
-	pixel_y = 16
-	},
-/obj/effect/decal/siding{
-	icon_state = "siding8"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
-"aMk" = (
-/obj/effect/decal/strata_decals/grime/grime1,
-/obj/structure/machinery/firealarm{
-	pixel_y = 28
-	},
-/obj/structure/machinery/disposal{
-	density = 0;
-	layer = 3.2;
-	pixel_y = 12
-	},
-/obj/structure/sign/poster{
-	desc = "The Armat Battlefield Systems Model 41 Derivative 'A' Pulse Rifle Mark One. The only pinup you'll ever need.";
-	icon_state = "poster15";
-	name = "pulse rifle pinup";
-	pixel_x = -27;
-	pixel_y = 6
-	},
-/obj/structure/disposalpipe/trunk{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
 "aMl" = (
 /obj/structure/pipes/standard/manifold/hidden/supply,
 /obj/structure/cable/heavyduty{
@@ -21841,115 +13057,44 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aMm" = (
-/obj/structure/sink{
-	layer = 3.1;
-	pixel_y = 24
-	},
-/obj/structure/mirror{
-	pixel_x = -1;
-	pixel_y = 35
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/cryo_cells)
-"aMn" = (
-/turf/closed/shuttle/midway/transparent{
-	icon_state = "80";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "aMo" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
 	},
-/obj/structure/machinery/light/double/blue{
-	dir = 8;
-	light_color = "#dae2ff"
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/structure/pipes/vents/pump{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
-"aMp" = (
-/obj/structure/bed/chair{
-	dir = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/briefing)
-"aMq" = (
-/obj/structure/sign/safety/airlock{
-	pixel_y = 1;
-	pixel_x = 8
-	},
-/obj/effect/decal/warning_stripes{
-	icon = 'icons/obj/structures/machinery/bolt_terminal.dmi';
-	icon_state = "closed";
-	name = "non-functional maintenance airlock"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aMr" = (
-/obj/structure/largecrate/supply/medicine/medkits{
-	layer = 3.1;
-	pixel_x = 8;
-	pixel_y = 24
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
-"aMs" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
-"aMt" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3;
-	pixel_x = -1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aMu" = (
-/obj/structure/shuttle/part/dropship2/transparent/engine_left_cap{
-	name = "\improper Tripoli"
+/obj/structure/machinery/light/double/blue{
+	dir = 8;
+	light_color = "#dae2ff"
 	},
-/obj/item/tool/screwdriver{
-	icon_state = "screwdriver5";
-	layer = 3.03;
-	pixel_x = -4;
-	pixel_y = 5
+/obj/effect/decal/cleanable/dirt{
+	layer = 2.52
 	},
-/obj/item/trash/eat{
-	pixel_x = 10
+/obj/structure/pipes/vents/pump{
+	dir = 4
 	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
-"aMv" = (
-/obj/structure/machinery/light,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
+/area/golden_arrow/cryo_cells)
+"aMp" = (
+/obj/structure/bed/chair{
+	dir = 1
+	},
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/golden_arrow/briefing)
+"aMq" = (
+/obj/structure/sign/safety/airlock{
+	pixel_y = 1;
+	pixel_x = 8
+	},
+/obj/effect/decal/warning_stripes{
+	icon = 'icons/obj/structures/machinery/bolt_terminal.dmi';
+	icon_state = "closed";
+	name = "non-functional maintenance airlock"
+	},
+/turf/open/floor/almayer,
 /area/golden_arrow/hangar)
 "aMw" = (
 /obj/effect/decal/warning_stripes{
@@ -22003,25 +13148,6 @@
 /obj/structure/prop/dam/crane,
 /turf/open/floor/almayer,
 /area/golden_arrow/motor_pool)
-"aMB" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aMC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
 "aMD" = (
 /obj/item/prop/magazine/book/starshiptroopers{
 	layer = 4.1;
@@ -22038,50 +13164,7 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aMF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "plating"
-	},
-/area/golden_arrow/engineering)
-"aMG" = (
-/obj/structure/barricade/handrail{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonarmory)
-"aMH" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/largecrate/random/mini/small_case/c{
-	pixel_x = -15;
-	pixel_y = 9
-	},
-/obj/item/clothing/mask/cigarette/cigar/tarbacks{
-	pixel_x = -13;
-	pixel_y = 10
-	},
-/obj/item/storage/fancy/cigar/matchbook/brown{
-	pixel_y = 2
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aMI" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "cargo_arrow"
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "cargo_arrow"
 	},
@@ -22093,69 +13176,14 @@
 	},
 /turf/open/floor/almayer/edge,
 /area/golden_arrow/supply)
-"aMJ" = (
-/obj/structure/shuttle/part/dropship1/transparent/lower_left_wing{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "aMK" = (
 /obj/structure/surface/table/almayer,
-/obj/item/prop/tableflag/uscm{
-	pixel_y = -1;
-	pixel_x = -12
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/surface/table/almayer,
 /obj/item/prop/tableflag/uscm{
 	pixel_y = 2;
 	pixel_x = -3
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/briefing)
-"aML" = (
-/obj/item/prop/almayer/comp_open{
-	pixel_x = 40;
-	pixel_y = 4
-	},
-/obj/structure/prop{
-	color = "#b30000";
-	icon = 'icons/obj/pipes/power_cond_white.dmi';
-	icon_state = "4-5";
-	layer = 2.8;
-	name = "cable";
-	pixel_x = 5;
-	pixel_y = 2
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin14"
-	},
-/area/golden_arrow/hangar)
-"aMM" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/siding{
-	icon_state = "siding8"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
-"aMN" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 4
-	},
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 4;
-	id = "apcbayrailing2"
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
 "aMO" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -22182,17 +13210,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/dorms)
-"aMR" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S";
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
 "aMS" = (
 /obj/effect/decal/strata_decals/grime/grime1,
 /obj/structure/machinery/firealarm{
@@ -22218,23 +13235,6 @@
 	dir = 9
 	},
 /area/golden_arrow/platoonprep)
-"aMT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
-	pixel_y = 25
-	},
-/obj/structure/janitorialcart,
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
-"aMU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/landinglight/ds1{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aMV" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SW-out"
@@ -22261,27 +13261,12 @@
 	dir = 8
 	},
 /area/golden_arrow/hangar)
-"aMX" = (
-/obj/structure/barricade/handrail{
-	dir = 4
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aMY" = (
 /obj/structure/machinery/cm_vending/gear/medic_chemical,
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/medical)
-"aMZ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
 "aNa" = (
 /obj/structure/machinery/door/poddoor/almayer/locked{
 	name = "\improper Vehicle Bay One Blast Door";
@@ -22292,29 +13277,7 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/motor_pool)
-"aNb" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "aNc" = (
-/obj/structure/machinery/door_control{
-	id = "lowervehiclebay1";
-	needs_power = 0;
-	pixel_y = 28;
-	name = "lowervehiclebay1"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/machinery/door_control{
 	id = "lowervehiclebay1";
 	needs_power = 0;
@@ -22347,15 +13310,6 @@
 	dir = 4
 	},
 /area/golden_arrow/hangar)
-"aNe" = (
-/obj/structure/sign/safety/rewire{
-	pixel_x = 32
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/supply)
 "aNf" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "cargo"
@@ -22365,15 +13319,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aNg" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
 "aNh" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -22382,12 +13327,6 @@
 	dir = 8
 	},
 /area/golden_arrow/hangar)
-"aNi" = (
-/turf/open/floor/almayer/uscm{
-	dir = 10;
-	icon_state = "logo_directional1"
-	},
-/area/golden_arrow/hangar)
 "aNj" = (
 /obj/structure/machinery/camera/autoname/golden_arrow{
 	dir = 8
@@ -22444,37 +13383,17 @@
 	},
 /area/golden_arrow/hangar)
 "aNn" = (
-/obj/structure/surface/table/almayer,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/bed/chair/comfy{
 	dir = 1
 	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"aNo" = (
-/obj/effect/attach_point/fuel/midway{
-	pixel_x = -32
-	},
-/turf/closed/shuttle/midway/transparent{
-	icon_state = "33";
-	name = "\improper Tripoli"
+/turf/open/floor/almayer{
+	icon_state = "mono"
 	},
-/area/golden_arrow/hangar)
+/area/golden_arrow/cryo_cells)
 "aNp" = (
 /obj/structure/pipes/vents/scrubber,
 /turf/open/floor/almayer,
 /area/golden_arrow/cryo_cells)
-"aNq" = (
-/obj/structure/blocker/invisible_wall,
-/obj/structure/machinery/computer/shuttle/dropship/flight,
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
-	},
-/area/golden_arrow/hangar)
 "aNr" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -22490,75 +13409,6 @@
 	dir = 10
 	},
 /area/golden_arrow/dorms)
-"aNs" = (
-/obj/structure/bed/bedroll{
-	buckle_lying = null;
-	can_buckle = 0;
-	color = "#333333";
-	desc = "A black gym mat, useful if you don't want to use the cold hard floor for exercise.";
-	foldabletype = null;
-	name = "gym mat";
-	pixel_x = -2;
-	pixel_y = -3
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
-"aNt" = (
-/obj/effect/decal/strata_decals/grime/grime1{
-	dir = 4
-	},
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aNu" = (
-/obj/structure/closet/secure_closet{
-	icon_broken = "fridgebroken";
-	icon_closed = "fridge";
-	icon_locked = "fridge1";
-	icon_off = "fridge1";
-	icon_opened = "fridgeopen";
-	icon_state = "fridge1";
-	name = "beverage fridge"
-	},
-/obj/item/reagent_container/food/drinks/bottle/orangejuice{
-	pixel_x = 8;
-	pixel_y = -7
-	},
-/obj/item/reagent_container/food/drinks/bottle/orangejuice{
-	pixel_y = -1
-	},
-/obj/item/reagent_container/food/drinks/bottle/orangejuice{
-	pixel_x = -2;
-	pixel_y = -4
-	},
-/obj/item/reagent_container/food/drinks/bottle/orangejuice{
-	pixel_y = -9
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
-"aNv" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aNw" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -22573,19 +13423,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/almayer,
 /area/space)
-"aNy" = (
-/obj/structure/surface/table/almayer,
-/obj/item/notepad/black,
-/obj/item/tool/pen{
-	pixel_x = -10;
-	pixel_y = 8
-	},
-/obj/item/prop/tableflag{
-	pixel_x = 12;
-	pixel_y = -1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/briefing)
 "aNz" = (
 /obj/structure/machinery/microwave{
 	density = 0;
@@ -22604,24 +13441,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/cryo_cells)
-"aNA" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"aNB" = (
-/obj/structure/bed/chair/comfy{
-	dir = 4
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/bed/chair/comfy{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "aNC" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8
@@ -22634,54 +13453,12 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/motor_pool)
-"aND" = (
-/obj/structure/bed/chair/comfy{
-	buckling_y = 2;
-	dir = 8;
-	pixel_y = 2
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/bed/chair/comfy,
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "aNE" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer/edge/smooth{
 	dir = 8
 	},
 /area/golden_arrow/platoon_commander_rooms)
-"aNF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aNG" = (
-/obj/effect/decal/strata_decals/grime/grime1{
-	dir = 8
-	},
-/obj/structure/sign/safety/storage{
-	pixel_x = 33
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/prep_hallway)
-"aNH" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/medical)
 "aNI" = (
 /obj/structure/pipes/vents/pump{
 	dir = 1
@@ -22690,11 +13467,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/medical)
-"aNJ" = (
-/obj/structure/cargo_container/arious/leftmid,
-/obj/structure/blocker/invisible_wall,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aNK" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SW-out";
@@ -22720,12 +13492,6 @@
 	dir = 1
 	},
 /area/golden_arrow/hangar)
-"aNM" = (
-/turf/closed/shuttle/midway/transparent{
-	icon_state = "32";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "aNN" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -22766,14 +13532,6 @@
 	dir = 4
 	},
 /area/golden_arrow/hangar)
-"aNQ" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/computer/emails{
-	pixel_y = 6
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/shared_office)
 "aNR" = (
 /obj/structure/largecrate/supply/weapons/m56d{
 	pixel_x = 9;
@@ -22795,18 +13553,12 @@
 	},
 /area/golden_arrow/hangar)
 "aNS" = (
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning";
 	dir = 8
 	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
+/turf/open/floor/almayer/edge{
+	dir = 8
 	},
 /area/golden_arrow/platoonarmory)
 "aNT" = (
@@ -22817,20 +13569,6 @@
 	dir = 6
 	},
 /area/golden_arrow/cryo_cells)
-"aNU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/safety/ammunition{
-	pixel_x = -18
-	},
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	id = "weapons_conny";
-	name = "\improper Squad One Weapons Locker";
-	pixel_y = -4
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/platoonarmory)
 "aNV" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -22840,35 +13578,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aNW" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aNX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/structure/barricade/handrail{
-	dir = 4
-	},
-/obj/item/storage/toolbox/mechanical{
-	pixel_x = -11;
-	pixel_y = 14
-	},
-/obj/item/tool/hand_labeler{
-	pixel_x = -3;
-	pixel_y = 2
-	},
-/obj/item/spacecash/c10{
-	layer = 2.7;
-	pixel_x = 11;
-	pixel_y = 2
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
 "aNY" = (
 /obj/structure/machinery/medical_pod/sleeper{
 	pixel_y = 6
@@ -22877,42 +13586,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/medical)
-"aNZ" = (
-/obj/structure/prop/invuln/lattice_prop{
-	icon_state = "lattice1";
-	pixel_x = 16;
-	pixel_y = -15
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
-"aOa" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3;
-	pixel_x = -1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-8"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aOb" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aOc" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 5
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/engineering)
 "aOd" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -22934,31 +13607,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/platoonprep)
-"aOf" = (
-/obj/structure/surface/rack,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/under/marine/officer/boiler,
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
-"aOg" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/pipes/vents/scrubber{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"aOh" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/prep_hallway)
 "aOi" = (
 /obj/structure/machinery/power/terminal{
 	dir = 4
@@ -22972,15 +13620,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/engineering)
-"aOj" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aOk" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -22997,18 +13636,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aOl" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/almayer{
-	dir = 4;
-	name = "\improper Storage Bay Two Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
 "aOm" = (
 /turf/open/floor/almayer/edge/smooth{
 	dir = 8
@@ -23026,41 +13653,10 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/prep_hallway)
-"aOo" = (
-/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{
-	icon_state = "lattice1";
-	pixel_x = 16;
-	pixel_y = -15
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "aOp" = (
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/supply)
 "aOq" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "door_warning";
-	dir = 4
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning";
 	dir = 4
@@ -23073,18 +13669,6 @@
 	},
 /area/golden_arrow/motor_pool)
 "aOr" = (
-/obj/structure/machinery/door_control{
-	id = "cargobay4";
-	name = "cargobay4";
-	pixel_y = -23;
-	pixel_x = -7;
-	needs_power = 0
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/machinery/door_control{
 	id = "cargobay4";
 	name = "cargobay4";
@@ -23127,19 +13711,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/cryo_cells)
-"aOv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/photocopier{
-	pixel_y = 4
-	},
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
 "aOw" = (
 /obj/structure/machinery/door/poddoor/almayer/locked{
 	name = "\improper Vehicle Bay Two Blast Door";
@@ -23154,26 +13725,9 @@
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
 	},
-/obj/structure/blocker/invisible_wall,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aOy" = (
-/turf/closed/shuttle/midway{
-	icon_state = "73";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
-"aOz" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoonprep)
+/obj/structure/blocker/invisible_wall,
+/turf/open/floor/almayer,
+/area/golden_arrow/hangar)
 "aOA" = (
 /obj/structure/prop{
 	name = "\improper seat-like case";
@@ -23188,12 +13742,6 @@
 	dir = 4
 	},
 /area/golden_arrow/hangar)
-"aOB" = (
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/platoonarmory)
 "aOC" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -23205,17 +13753,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aOD" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/vents/scrubber{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aOE" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NW-out";
@@ -23229,17 +13766,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/cryo_cells)
-"aOF" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aOG" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -23272,57 +13798,15 @@
 	},
 /turf/open/floor/almayer/edge/smooth/corner,
 /area/golden_arrow/motor_pool)
-"aOI" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply,
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/platoon_commander_rooms)
-"aOJ" = (
-/obj/structure/prop{
-	can_buckle = 1;
-	desc = "It's a case made into an impromptu seat.";
-	icon = 'icons/obj/structures/crates.dmi';
-	icon_state = "case";
-	layer = 3.6;
-	name = "\improper seat-like case";
-	pixel_y = -2
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aOK" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/space/basic,
 /area/space)
-"aOL" = (
-/obj/structure/prop/invuln/lifeboat_hatch_placeholder{
-	layer = 2.1;
-	name = "non-functional maintenance airlock"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aOM" = (
 /turf/open/floor/almayer/edge{
 	dir = 10
 	},
 /area/golden_arrow/cryo_cells)
-"aON" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "aOO" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -23335,15 +13819,6 @@
 	dir = 1
 	},
 /area/golden_arrow/prep_hallway)
-"aOP" = (
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 2
-	},
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/engineering)
 "aOQ" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -23380,22 +13855,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/platoon_commander_rooms)
-"aOU" = (
-/obj/effect/decal/strata_decals/grime/grime2,
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
 "aOV" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -23421,13 +13880,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aOX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aOY" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -23436,25 +13888,6 @@
 	dir = 1
 	},
 /area/golden_arrow/hangar)
-"aOZ" = (
-/obj/structure/largecrate/supply/medicine/medkits{
-	pixel_x = -11;
-	pixel_y = 9
-	},
-/obj/structure/largecrate/supply/medicine/medkits{
-	pixel_x = 14;
-	pixel_y = 9
-	},
-/obj/structure/largecrate/supply/medicine/medkits{
-	layer = 3.1;
-	pixel_x = 8;
-	pixel_y = 24
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "aPa" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NE-out";
@@ -23477,37 +13910,6 @@
 	dir = 1
 	},
 /area/golden_arrow/supply)
-"aPc" = (
-/obj/structure/barricade/handrail{
-	dir = 8
-	},
-/obj/structure/surface/table/almayer,
-/obj/item/prop/magazine/dirty/torn{
-	pixel_x = 2;
-	pixel_y = 6
-	},
-/obj/item/trash/cigbutt{
-	pixel_x = -7;
-	pixel_y = 10
-	},
-/obj/item/trash/eat{
-	pixel_x = 10
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
-"aPd" = (
-/turf/closed/shuttle/midway{
-	icon_state = "42";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
-"aPe" = (
-/obj/structure/shuttle/part/dropship1/transparent/inner_left_weapons{
-	name = "\improper Tripoli"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "aPf" = (
 /turf/open/floor/almayer/edge{
 	dir = 8
@@ -23524,19 +13926,6 @@
 "aPh" = (
 /turf/open/floor/almayer,
 /area/space)
-"aPi" = (
-/obj/structure/cargo_container/wy/left{
-	pixel_y = 5
-	},
-/obj/structure/blocker/invisible_wall,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aPj" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "test_floor5"
-	},
-/area/golden_arrow/medical)
 "aPk" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S";
@@ -23623,19 +14012,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/motor_pool)
-"aPr" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/dorms)
 "aPs" = (
 /obj/structure/machinery/camera/autoname/golden_arrow{
 	dir = 1
@@ -23647,7 +14023,9 @@
 	pixel_x = 14;
 	pixel_y = -26
 	},
-/turf/open/floor/almayer,
+/turf/open/floor/almayer/edge{
+	dir = 10
+	},
 /area/golden_arrow/platoonarmory)
 "aPt" = (
 /obj/structure/machinery/autodoc_console{
@@ -23676,13 +14054,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/medical)
-"aPu" = (
-/obj/structure/bed/chair/office/dark{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/shared_office)
 "aPv" = (
 /obj/structure/cable/heavyduty{
 	icon_state = "4-8"
@@ -23792,23 +14163,6 @@
 	dir = 8
 	},
 /area/golden_arrow/motor_pool)
-"aPF" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	layer = 2.5;
-	pixel_y = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_y = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aPG" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "cargo"
@@ -23845,73 +14199,7 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/supply)
-"aPH" = (
-/obj/structure/surface/table/almayer,
-/obj/item/trash/wy_chips_pepper{
-	pixel_x = -5;
-	pixel_y = 5
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aPI" = (
-/obj/structure/sign/safety/bulkhead_door{
-	pixel_y = -29
-	},
-/obj/structure/sign/safety/hazard{
-	pixel_x = 14;
-	pixel_y = -29
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
-"aPJ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/safety/storage{
-	pixel_x = -18;
-	pixel_y = -7
-	},
-/obj/structure/sign/safety/one{
-	pixel_x = -18;
-	pixel_y = 7
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
-"aPK" = (
-/obj/structure/bed/bedroll{
-	buckle_lying = null;
-	can_buckle = 0;
-	color = "#006db0";
-	desc = "A mechanic's mat.";
-	foldabletype = null;
-	name = "floor mat";
-	pixel_y = -4
-	},
-/obj/effect/decal/cleanable/blood/oil,
-/obj/item/tool/weldingtool{
-	pixel_y = 21
-	},
-/obj/item/tool/wrench{
-	pixel_y = 7
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "aPL" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 2
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
 	pixel_y = 2
@@ -23937,19 +14225,6 @@
 	icon_state = "plating"
 	},
 /area/golden_arrow/motor_pool)
-"aPN" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aPO" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -23959,13 +14234,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aPP" = (
-/obj/structure/machinery/firealarm{
-	dir = 8;
-	pixel_x = -24
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
 "aPQ" = (
 /obj/structure/platform_decoration{
 	dir = 4
@@ -23979,25 +14247,10 @@
 	},
 /turf/open/floor/almayer/edge/smooth/endcap_right,
 /area/golden_arrow/briefing)
-"aPR" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/engineering)
 "aPS" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/dorms)
-"aPT" = (
-/obj/structure/platform_decoration{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/engineering)
 "aPU" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -24006,42 +14259,6 @@
 	dir = 4
 	},
 /area/golden_arrow/motor_pool)
-"aPV" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/prop/dam/crane/cargo{
-	desc = "Standard cargo crane used by the USCM. Looks like this one has replacement parts for the Tripoli on it. You probably couldn't name half of these.";
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
-"aPW" = (
-/obj/structure/cargo_container/wy/right{
-	pixel_y = 5
-	},
-/obj/structure/blocker/invisible_wall,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aPX" = (
-/turf/closed/shuttle/elevator{
-	dir = 10
-	},
-/area/golden_arrow/supply)
-"aPY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	id = "equipment_conny";
-	name = "\improper Squad One Equipment Locker"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/platoonarmory)
-"aPZ" = (
-/obj/structure/shuttle/part/dropship1/transparent/outer_left_weapons{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "aQa" = (
 /obj/docking_port/stationary/marine_dropship/golden_arrow_hangar{
 	name = "Hangar Bay Aft";
@@ -24103,17 +14320,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/supply)
-"aQg" = (
-/obj/structure/bed/chair{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/camera/autoname/golden_arrow{
-	dir = 4;
-	name = "ship-grade camera"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "aQh" = (
 /obj/structure/surface/table/almayer,
 /obj/item/storage/bible{
@@ -24138,20 +14344,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/shared_office)
-"aQi" = (
-/obj/structure/platform{
-	dir = 4;
-	layer = 2.7
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
-	},
-/area/golden_arrow/hangar)
-"aQj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/bed/chair,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aQk" = (
 /obj/structure/largecrate/random/secure,
 /turf/open/floor/almayer{
@@ -24173,100 +14365,11 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/cryo_cells)
-"aQn" = (
-/obj/structure/machinery/light,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
-"aQo" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/medical/bruise_pack{
-	pixel_x = -12;
-	pixel_y = 7
-	},
-/obj/item/stack/medical/ointment{
-	pixel_x = 2;
-	pixel_y = 12
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/medical)
-"aQp" = (
-/obj/structure/machinery/floodlight/landing/floor,
-/turf/open/floor/almayer{
-	allow_construction = 0;
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aQq" = (
-/obj/structure/bed/chair/comfy{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/surface/table/almayer,
-/obj/item/reagent_container/food/condiment/saltshaker{
-	pixel_x = -7;
-	pixel_y = 13
-	},
-/obj/item/reagent_container/food/condiment/peppermill{
-	pixel_x = -11;
-	pixel_y = 5
-	},
-/obj/item/clothing/head/cmcap{
-	pixel_x = 1;
-	pixel_y = -3
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "aQr" = (
 /turf/open/floor/almayer{
 	icon_state = "mono"
 	},
 /area/golden_arrow/cryo_cells)
-"aQs" = (
-/obj/structure/surface/table/almayer,
-/obj/item/prop/almayer/comp_open{
-	pixel_x = 2;
-	pixel_y = 6
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
-"aQt" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aQu" = (
-/obj/structure/barricade/handrail{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "aQv" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -24289,68 +14392,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/cryo_cells)
-"aQx" = (
-/obj/structure/machinery/camera/autoname/golden_arrow{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
-"aQy" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/almayer{
-	dir = 4;
-	id = "apc2blastdoor";
-	name = "\improper Vehicle Bay Two Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
-"aQz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/supply_drop/echo,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/platform{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor5"
-	},
-/area/golden_arrow/engineering)
-"aQA" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/camera/autoname/golden_arrow{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoon_commander_rooms)
-"aQB" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
-"aQC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/manifold/hidden/supply,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aQD" = (
-/turf/closed/shuttle/midway{
-	icon_state = "67";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
-"aQE" = (
-/turf/open/shuttle/elevator/grating,
-/area/golden_arrow/supply)
 "aQF" = (
 /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep{
 	req_one_access_txt = "8;12;39;40";
@@ -24358,19 +14399,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/platoonprep)
-"aQG" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/hardpoint/locomotion/apc_wheels,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aQH" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "aQI" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E"
@@ -24398,19 +14426,6 @@
 /obj/structure/pipes/standard/manifold/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/platoonarmory)
-"aQK" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 9
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/machinery/firealarm{
-	dir = 4;
-	pixel_x = 21
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoon_commander_rooms)
 "aQL" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SE-out";
@@ -24424,57 +14439,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aQM" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/landinglight/ds1{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aQN" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 4
-	},
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aQO" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/obj/structure/machinery/gear{
-	id = "supply_elevator_gear"
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aQP" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/prep_hallway)
 "aQQ" = (
 /obj/effect/landmark/start/marine/medic/alpha,
 /obj/effect/landmark/late_join/alpha,
@@ -24538,23 +14502,9 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/platoonprep)
-"aQV" = (
-/obj/structure/machinery/cm_vending/sorted/medical/no_access{
-	density = 0;
-	pixel_y = 24
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor5"
-	},
-/area/golden_arrow/medical)
 "aQW" = (
 /turf/open/floor/almayer,
 /area/golden_arrow/briefing)
-"aQX" = (
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/platoonprep)
 "aQY" = (
 /obj/structure/pipes/vents/scrubber{
 	dir = 4
@@ -24562,18 +14512,6 @@
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
 "aQZ" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 4
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "SW-out";
 	pixel_x = -1
@@ -24589,26 +14527,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/cryo_cells)
-"aRa" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/dartboard{
-	layer = 3.2;
-	pixel_y = 41
-	},
-/obj/structure/bed/chair,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aRb" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aRc" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "aRd" = (
 /obj/structure/barricade/handrail{
 	dir = 4
@@ -24640,31 +14558,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/motor_pool)
-"aRh" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	id = "equipment_conny";
-	name = "\improper Squad Two Equipment Locker"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/platoonarmory)
-"aRi" = (
-/obj/structure/closet,
-/obj/item/maintenance_jack,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "test_floor5"
-	},
-/area/golden_arrow/synthcloset)
-"aRj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cargo_container/wy/right{
-	opacity = 0
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aRk" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -24694,15 +14587,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/hangar)
-"aRn" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aRo" = (
 /obj/structure/surface/table/almayer,
 /obj/item/reagent_container/food/condiment/saltshaker{
@@ -24751,7 +14635,7 @@
 /obj/structure/sign/safety/ammunition{
 	pixel_y = -26
 	},
-/turf/open/floor/almayer,
+/turf/open/floor/almayer/edge,
 /area/golden_arrow/platoonarmory)
 "aRr" = (
 /obj/effect/decal/warning_stripes{
@@ -24769,50 +14653,7 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aRs" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer/edge/smooth{
-	dir = 8
-	},
-/area/golden_arrow/cryo_cells)
 "aRt" = (
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/structure/sign/banners/colonial_marines_flag_worn{
-	pixel_y = 28;
-	desc = "A well worn flag of the USCM recovered from the original USS Golden Arrow. Nobody knows who recovered it, and whoever did has yet to step forth."
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
@@ -24824,15 +14665,6 @@
 	dir = 1
 	},
 /area/golden_arrow/platoonprep)
-"aRu" = (
-/obj/structure/machinery/door/poddoor/railing{
-	id = "apcbayrailing1"
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
 "aRv" = (
 /obj/structure/disposalpipe/junction{
 	dir = 8
@@ -24859,15 +14691,7 @@
 	},
 /area/golden_arrow/hangar)
 "aRy" = (
-/obj/docking_port/stationary/shipmap_elevator/two{
-	id = "garrow_vehicle_elevator_two"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/docking_port/stationary/shipmap_elevator/two{
+/obj/docking_port/stationary/trijent_elevator/shipmap_elevator/two{
 	id = "garrow_vehicle_elevator_two";
 	name = "Vehicle Elevator Two Upper";
 	elevator_network = "ArrowVehicleTwo"
@@ -24943,12 +14767,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"aRH" = (
-/obj/structure/pipes/vents/scrubber{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
 "aRI" = (
 /obj/structure/machinery/medical_pod/autodoc{
 	dir = 1;
@@ -24960,7 +14778,7 @@
 /area/golden_arrow/medical)
 "aRJ" = (
 /turf/open/floor/almayer/empty,
-/area/golden_arrow/supply)
+/area/golden_arrow/cargo_shuttle/upper)
 "aRK" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -24978,88 +14796,22 @@
 	},
 /area/golden_arrow/hangar)
 "aRL" = (
-/obj/docking_port/stationary/shipmap_elevator/two{
-	id = "garrow_vehicle_elevator_two_storage";
-	roundstart_template = /datum/map_template/shuttle/golden_arrow_vehicle_one
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/docking_port/stationary/shipmap_elevator/two{
+/obj/docking_port/stationary/trijent_elevator/shipmap_elevator/two{
 	id = "garrow_vehicle_elevator_two_storage";
-	roundstart_template = /datum/map_template/shuttle/golden_arrow/vehicletwo;
+	roundstart_template = /datum/map_template/shuttle/trijent_elevator/golden_arrow/vehicletwo;
 	name = "Vehicle Elevator Two Storage";
 	elevator_network = "ArrowVehicleTwo"
 	},
-/turf/open/floor/almayer/empty,
+/turf/open/floor/corsat,
 /area/golden_arrow/motor_pool)
-"aRM" = (
-/obj/structure/shuttle/part/dropship2/transparent/engine_right_cap{
-	name = "\improper Tripoli"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/cigbutt{
-	pixel_x = 1;
-	pixel_y = 13
-	},
-/obj/item/trash/cigbutt{
-	pixel_x = 1;
-	pixel_y = 8
-	},
-/obj/item/trash/cigbutt{
-	layer = 3.2;
-	pixel_x = 4;
-	pixel_y = 10
-	},
-/obj/item/trash/cigbutt{
-	pixel_x = -10;
-	pixel_y = 13
-	},
-/obj/item/trash/cigbutt{
-	pixel_x = -1;
-	pixel_y = 17
-	},
-/obj/item/trash/cigbutt{
-	pixel_x = -7;
-	pixel_y = 10
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "aRN" = (
 /obj/structure/surface/table/almayer,
-/obj/item/notepad/black,
-/obj/item/tool/pen{
-	pixel_x = -10;
-	pixel_y = 8
-	},
-/obj/item/prop/tableflag{
-	pixel_x = 12;
-	pixel_y = -1
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/surface/table/almayer,
 /obj/item/prop/tableflag{
 	pixel_x = 3;
 	pixel_y = 2
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/briefing)
-"aRO" = (
-/obj/structure/stairs/perspective,
-/obj/structure/platform{
-	dir = 4;
-	layer = 2.7
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin3"
-	},
-/area/golden_arrow/hangar)
 "aRP" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -25086,27 +14838,6 @@
 /obj/effect/decal/siding,
 /turf/open/floor/plating,
 /area/golden_arrow/hangar)
-"aRS" = (
-/obj/structure/machinery/autodoc_console,
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3;
-	pixel_x = -1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/safety/autodoc{
-	pixel_x = 32
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/medical)
-"aRT" = (
-/obj/structure/shuttle/part/dropship1/transparent/engine_right_exhaust{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "aRU" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -25145,29 +14876,6 @@
 	dir = 1
 	},
 /area/golden_arrow/hangar)
-"aRY" = (
-/obj/structure/largecrate/random/secure,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
-"aRZ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/prop/invuln/lattice_prop{
-	icon_state = "lattice3";
-	pixel_x = 16;
-	pixel_y = -15
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/prep_hallway)
 "aSa" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -25180,44 +14888,9 @@
 	dir = 1
 	},
 /area/golden_arrow/hangar)
-"aSb" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"aSc" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/ds1{
-	locked = 1;
-	name = "\improper Tripoli cargo door"
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
-	},
-/area/golden_arrow/hangar)
 "aSd" = (
-/turf/open/floor/almayer/empty,
+/turf/open/floor/corsat,
 /area/golden_arrow/motor_pool)
-"aSe" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2-8"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aSf" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aSg" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "cargo"
@@ -25244,11 +14917,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aSi" = (
-/turf/closed/shuttle/elevator{
-	dir = 5
-	},
-/area/golden_arrow/supply)
 "aSj" = (
 /obj/structure/machinery/landinglight/ds1/delayone{
 	dir = 4
@@ -25267,13 +14935,6 @@
 	dir = 4
 	},
 /area/golden_arrow/platoonprep)
-"aSl" = (
-/obj/structure/shuttle/part/dropship2/transparent/engine_left_cap{
-	name = "\improper Tripoli"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "aSm" = (
 /obj/structure/machinery/door/poddoor/almayer/locked{
 	name = "\improper Cargo Elevator Blast Door";
@@ -25312,10 +14973,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aSp" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/engineering)
 "aSq" = (
 /obj/effect/decal/siding{
 	icon_state = "siding8"
@@ -25331,15 +14988,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/platoonarmory)
-"aSs" = (
-/obj/structure/bed/chair{
-	buckling_y = 10;
-	dir = 4;
-	pixel_y = 10
-	},
-/obj/structure/machinery/light,
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "aSt" = (
 /obj/structure/machinery/camera/autoname/golden_arrow{
 	dir = 4;
@@ -25370,55 +15018,20 @@
 	layer = 2.52
 	},
 /obj/structure/machinery/door/poddoor/shutters/almayer{
-	name = "\improper Squad One Weapons Locker";
-	id = "squadarmory";
-	pixel_y = -4
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/platoonarmory)
-"aSw" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aSx" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/briefing)
-"aSy" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
-"aSz" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
+	name = "\improper Squad One Weapons Locker";
+	id = "squadarmory";
+	pixel_y = -4
 	},
 /turf/open/floor/almayer{
-	icon_state = "plate"
+	icon_state = "test_floor4"
 	},
-/area/golden_arrow/briefing)
+/area/golden_arrow/platoonarmory)
+"aSw" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 8
+	},
+/turf/open/floor/almayer,
+/area/golden_arrow/hangar)
 "aSA" = (
 /obj/structure/machinery/door/poddoor/almayer/locked{
 	name = "\improper Hangar Lockdown Blast Door"
@@ -25467,13 +15080,6 @@
 	dir = 1
 	},
 /area/golden_arrow/supply)
-"aSE" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/dorms)
 "aSF" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -25492,17 +15098,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/platoonarmory)
-"aSH" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/obj/structure/machinery/floodlight/landing/floor,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aSI" = (
 /obj/structure/largecrate/random/case/double{
 	pixel_y = 5;
@@ -25546,17 +15141,6 @@
 	},
 /turf/open/floor/almayer/edge/smooth/corner,
 /area/golden_arrow/hangar)
-"aSL" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "plating"
-	},
-/area/golden_arrow/engineering)
 "aSM" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NE-out";
@@ -25565,43 +15149,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aSN" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out"
-	},
-/obj/structure/machinery/light,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aSO" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/structure/prop{
-	density = 1;
-	desc = "A targeting system for dropships. It improves firing accuracy on laser targets. Far beyond repair.";
-	icon = 'icons/obj/structures/props/almayer_props.dmi';
-	icon_state = "targeting_system";
-	layer = 3.1;
-	name = "\improper Broken AN/AAQ-178 Weapon Targeting System";
-	pixel_x = 7;
-	pixel_y = 3
-	},
-/obj/item/prop/almayer/flight_recorder{
-	pixel_x = -8;
-	pixel_y = 9
-	},
-/obj/item/reagent_container/food/drinks/coffee/marine{
-	layer = 3.11;
-	pixel_x = 7;
-	pixel_y = 15
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aSP" = (
 /obj/structure/machinery/door_control{
 	id = "hangarlockdownwest";
@@ -25611,18 +15158,6 @@
 	},
 /turf/open/space/basic,
 /area/space)
-"aSQ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
-	pixel_y = 25
-	},
-/obj/structure/pipes/vents/pump,
-/obj/item/trash/uscm_mre{
-	pixel_x = 9;
-	pixel_y = 14
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "aSR" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NE-out"
@@ -25647,16 +15182,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aSU" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
 "aSV" = (
 /obj/structure/bed/chair{
 	dir = 1
@@ -25669,74 +15194,6 @@
 	icon_state = "cargo"
 	},
 /area/golden_arrow/briefing)
-"aSW" = (
-/turf/closed/shuttle/midway{
-	icon_state = "31";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
-"aSX" = (
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 2;
-	id = "apcbayrailing1"
-	},
-/turf/open/floor/almayer{
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
-"aSY" = (
-/obj/structure/machinery/power/apc/almayer{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/supply)
-"aSZ" = (
-/obj/structure/barricade/handrail,
-/obj/structure/reagent_dispensers/fueltank{
-	anchored = 1;
-	icon = 'icons/obj/structures/props/generic_props.dmi';
-	icon_state = "weldtank_old";
-	layer = 2.9
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
-"aTa" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/briefing)
-"aTb" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/effect/decal/cleanable/blood/oil,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoonprep)
 "aTc" = (
 /obj/structure/machinery/door/poddoor/almayer/locked{
 	dir = 2;
@@ -25747,17 +15204,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/prep_hallway)
-"aTd" = (
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply,
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
 "aTe" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "cargo"
@@ -25775,17 +15221,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/shared_office)
-"aTg" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/door/poddoor/almayer{
-	dir = 2;
-	name = "\improper Storage Bay Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
 "aTh" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -25798,17 +15233,6 @@
 	},
 /area/golden_arrow/hangar)
 "aTi" = (
-/obj/structure/machinery/door_control{
-	id = "lowervehiclebay2";
-	needs_power = 0;
-	pixel_y = -28;
-	name = "lowervehiclebay2"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/machinery/door_control{
 	id = "lowervehiclebay2";
 	needs_power = 0;
@@ -25828,30 +15252,7 @@
 	dir = 4
 	},
 /area/golden_arrow/cryo_cells)
-"aTk" = (
-/obj/structure/machinery/prop{
-	density = 1;
-	desc = "A pump used for refueling the dropship.";
-	icon_state = "pipe_d";
-	layer = 2.7;
-	name = "refueling pump";
-	pixel_y = -5
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aTl" = (
-/obj/structure/machinery/door_control{
-	id = "weaponsbay1";
-	name = "weaponsbay1";
-	pixel_y = -23;
-	pixel_x = -7;
-	needs_power = 0
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/machinery/door_control{
 	id = "weaponsbay1";
 	name = "weaponsbay1";
@@ -25865,18 +15266,6 @@
 	},
 /turf/open/floor/plating,
 /area/golden_arrow/hangar)
-"aTm" = (
-/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 = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aTn" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -25905,12 +15294,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"aTq" = (
-/obj/structure/machinery/medical_pod/sleeper,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/medical)
 "aTr" = (
 /turf/open/floor/almayer/edge/smooth{
 	dir = 10
@@ -25924,12 +15307,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/engineering)
-"aTt" = (
-/obj/structure/shuttle/part/dropship1/transparent/inner_right_weapons{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "aTu" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -25965,26 +15342,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"aTy" = (
-/obj/structure/surface/table/almayer,
-/obj/effect/spawner/random/technology_scanner{
-	pixel_x = 15
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_container/food/drinks/coffee/marine{
-	pixel_x = 5;
-	pixel_y = 12
-	},
-/obj/item/reagent_container/food/drinks/dry_ramen{
-	pixel_x = 2;
-	pixel_y = 5
-	},
-/obj/item/reagent_container/food/drinks/coffee/marine{
-	pixel_x = -10;
-	pixel_y = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "aTz" = (
 /obj/structure/pipes/vents/scrubber{
 	dir = 8
@@ -25999,13 +15356,6 @@
 	dir = 1
 	},
 /area/golden_arrow/hangar)
-"aTB" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
 "aTC" = (
 /obj/structure/pipes/vents/pump{
 	dir = 8
@@ -26031,20 +15381,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/platoonarmory)
-"aTF" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/obj/structure/machinery/gear{
-	id = "supply_elevator_gear"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/engineering)
 "aTG" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -26071,71 +15407,17 @@
 	dir = 8
 	},
 /area/golden_arrow/prep_hallway)
-"aTI" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aTJ" = (
-/obj/structure/ladder{
-	id = "enginorth"
-	},
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aTK" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 2
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aTL" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aTM" = (
-/obj/docking_port/stationary/shipmap_elevator/cargo{
-	id = "garrow_cargo_elevator";
-	name = "Cargo Elevator Storage";
-	roundstart_template = /datum/map_template/shuttle/golden_arrow_cargo
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/docking_port/stationary/trijent_elevator{
+/obj/docking_port/stationary/trijent_elevator/shipmap_elevator/cargo{
+	id = "garrow_cargo_elevator_storage";
 	name = "Cargo Elevator Storage";
-	id = "garrow_cargo_elevator_lower";
-	roundstart_template = /datum/map_template/shuttle/golden_arrow/cargo;
-	width = 8;
+	roundstart_template = /datum/map_template/shuttle/trijent_elevator/golden_arrow/cargo;
 	elevator_network = "ArrowCargo";
-	airlock_area = /area/golden_arrow/cargo_shuttle/elevator
+	airlock_area = /area/golden_arrow/cargo_shuttle/lower;
+	airlock_exit = "north"
 	},
-/turf/open/floor/almayer/empty,
-/area/golden_arrow/supply)
+/turf/open/floor/corsat,
+/area/golden_arrow/cargo_shuttle/lower)
 "aTN" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -26162,50 +15444,6 @@
 	},
 /turf/open/floor/almayer/edge/smooth/corner,
 /area/golden_arrow/briefing)
-"aTP" = (
-/obj/effect/decal/cleanable/blood/oil,
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin3"
-	},
-/area/golden_arrow/hangar)
-"aTQ" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/cryo_cells)
-"aTR" = (
-/obj/structure/reagent_dispensers/water_cooler/stacks{
-	pixel_y = 6;
-	density = 0;
-	pixel_x = -10
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/machinery/microwave{
-	density = 0;
-	pixel_y = 9
-	},
-/obj/item/reagent_container/food/drinks/coffee/marine{
-	pixel_x = 9;
-	pixel_y = -3
-	},
-/obj/item/storage/box/donkpockets{
-	pixel_x = 4;
-	pixel_y = 22
-	},
-/obj/structure/surface/table/almayer,
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/cryo_cells)
 "aTS" = (
 /obj/structure/machinery/camera/autoname/golden_arrow{
 	dir = 8
@@ -26233,12 +15471,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/platoon_commander_rooms)
-"aTU" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/hangar)
 "aTV" = (
 /obj/structure/machinery/door/poddoor/almayer/locked{
 	name = "\improper Hangar Lockdown Blast Door";
@@ -26248,20 +15480,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/hangar)
-"aTW" = (
-/obj/structure/platform{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/briefing)
 "aTX" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -26274,42 +15492,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/platoonprep)
-"aTY" = (
-/obj/structure/sign/banners/united_americas_flag{
-	pixel_x = -16;
-	pixel_y = 30
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/briefing)
-"aTZ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/almayer,
-/obj/item/storage/fancy/cigarettes/lucky_strikes_4{
-	pixel_x = 7;
-	pixel_y = 7
-	},
-/obj/item/storage/fancy/cigar/matchbook{
-	pixel_x = -1;
-	pixel_y = 6
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/platoonprep)
-"aUa" = (
-/obj/structure/pipes/vents/pump,
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	id = "weapons_conny";
-	name = "\improper Squad Two Weapons Locker";
-	pixel_y = -4
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/platoonarmory)
 "aUb" = (
 /turf/open/floor/almayer/uscm{
 	icon_state = "logo_directional1";
@@ -26359,29 +15541,6 @@
 	},
 /turf/open/floor/almayer/edge,
 /area/golden_arrow/dorms)
-"aUf" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	dir = 4;
-	id = "squadarmory";
-	name = "\improper Gear Lockers"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/platoonprep)
-"aUg" = (
-/obj/structure/machinery/gear{
-	id = "supply_elevator_gear"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "blackcorner"
-	},
-/area/golden_arrow/hangar)
 "aUh" = (
 /obj/structure/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
@@ -26402,30 +15561,6 @@
 	dir = 8
 	},
 /area/golden_arrow/cryo_cells)
-"aUj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/landinglight/ds1/delaythree,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aUk" = (
-/obj/structure/machinery/door_control/brbutton{
-	id = "apc2blastdoor";
-	name = "vehicle bay blast door control";
-	pixel_y = 28
-	},
-/obj/structure/machinery/door_control/brbutton{
-	id = "apcbayrailing2";
-	name = "vehicle bay railing control";
-	pixel_x = 13;
-	pixel_y = 28
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aUl" = (
 /obj/effect/decal/strata_decals/grime/grime1{
 	dir = 4
@@ -26437,16 +15572,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aUm" = (
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/light,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoonarmory)
 "aUn" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -26467,17 +15592,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"aUp" = (
-/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep{
-	req_access = list();
-	req_one_access_txt = "8;12;39;40"
-	},
-/obj/item/reagent_container/food/drinks/cans/souto/lime{
-	pixel_x = 10;
-	pixel_y = 21
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
 "aUq" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -26490,53 +15604,6 @@
 	icon_state = "plating"
 	},
 /area/golden_arrow/motor_pool)
-"aUr" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aUs" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/prep_hallway)
-"aUt" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 4;
-	id = "apcbayrailing2"
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
-"aUu" = (
-/obj/structure/machinery/gear{
-	id = "supply_elevator_gear"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 6
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "blackcorner"
-	},
-/area/golden_arrow/hangar)
 "aUv" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -26547,19 +15614,6 @@
 	},
 /turf/closed/wall/almayer/outer,
 /area/golden_arrow/platoonarmory)
-"aUw" = (
-/obj/structure/machinery/autolathe,
-/obj/item/stack/sheet/mineral/phoron/small_stack{
-	pixel_y = 15
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
-"aUx" = (
-/obj/structure/shuttle/part/dropship1/transparent/middle_right_wing{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "aUy" = (
 /obj/vehicle/powerloader{
 	dir = 1
@@ -26580,55 +15634,24 @@
 	},
 /obj/structure/prop{
 	icon = 'icons/obj/structures/props/platforms.dmi';
-	icon_state = "platform";
-	name = "powerloader dock";
-	desc = "A square metal surface resting on four legs.";
-	dir = 8;
-	layer = 2.97
-	},
-/obj/structure/prop{
-	icon = 'icons/obj/structures/props/platforms.dmi';
-	icon_state = "platform";
-	name = "powerloader dock";
-	desc = "A square metal surface resting on four legs.";
-	dir = 4;
-	layer = 2.97
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/supply)
-"aUz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/landinglight/ds1/delayone{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
-"aUA" = (
-/obj/structure/cargo_container/wy/left{
-	opacity = 0;
-	pixel_y = -17
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
+	icon_state = "platform";
+	name = "powerloader dock";
+	desc = "A square metal surface resting on four legs.";
+	dir = 8;
+	layer = 2.97
 	},
-/obj/item/toy/plush/therapy/red{
-	desc = "An unapproved bootleg copy of the patented Sergeant Huggs. Looks like he's seen better days.";
-	force = 15;
-	layer = 4.1;
-	name = "Discharged Huggs";
-	pixel_x = 5;
-	pixel_y = 32;
-	throwforce = 15
+/obj/structure/prop{
+	icon = 'icons/obj/structures/props/platforms.dmi';
+	icon_state = "platform";
+	name = "powerloader dock";
+	desc = "A square metal surface resting on four legs.";
+	dir = 4;
+	layer = 2.97
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/golden_arrow/hangar)
+/area/golden_arrow/supply)
 "aUB" = (
 /obj/structure/surface/table/almayer,
 /obj/item/storage/toolbox/mechanical/green{
@@ -26681,18 +15704,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aUH" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/door/poddoor/almayer/open{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "aUI" = (
 /obj/structure/machinery/power/fusion_engine{
 	name = "\improper S-52 fusion reactor 17"
@@ -26714,12 +15725,6 @@
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aUK" = (
-/obj/structure/machinery/camera/autoname/golden_arrow{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
 "aUL" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 6
@@ -26757,15 +15762,6 @@
 /area/golden_arrow/supply)
 "aUP" = (
 /obj/structure/platform,
-/obj/structure/machinery/alarm/almayer{
-	dir = 1
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/platform,
 /obj/structure/machinery/alarm/almayer{
 	dir = 1
 	},
@@ -26774,13 +15770,6 @@
 	},
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/motor_pool)
-"aUQ" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/bedsheetbin{
-	pixel_y = 6
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "aUR" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -26792,14 +15781,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aUS" = (
-/obj/structure/barricade/handrail{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aUT" = (
 /obj/structure/platform{
 	dir = 4;
@@ -26809,19 +15790,6 @@
 	dir = 4
 	},
 /area/golden_arrow/motor_pool)
-"aUU" = (
-/obj/structure/closet/secure_closet/marine_personal{
-	job = "Smartgunner";
-	pixel_x = -7
-	},
-/obj/structure/closet/secure_closet/marine_personal{
-	job = "Squad Sergeant";
-	pixel_x = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "aUV" = (
 /obj/structure/largecrate/supply/floodlights,
 /obj/effect/decal/cleanable/dirt{
@@ -26831,13 +15799,6 @@
 	icon_state = "cargo"
 	},
 /area/golden_arrow/hangar)
-"aUW" = (
-/obj/item/storage/toolbox/mechanical{
-	pixel_x = 2;
-	pixel_y = -6
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aUX" = (
 /obj/structure/machinery/light/small/blue{
 	dir = 4;
@@ -26858,23 +15819,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/cryo_cells)
-"aUZ" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	layer = 1.9
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/dorms)
 "aVa" = (
 /obj/structure/closet/emcloset,
 /turf/open/floor/almayer{
@@ -26902,25 +15846,6 @@
 /obj/structure/cargo_container/hd/left,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"aVd" = (
-/obj/structure/platform{
-	dir = 8;
-	layer = 2.7
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
-	},
-/area/golden_arrow/hangar)
-"aVe" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aVf" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -26940,17 +15865,6 @@
 /obj/structure/cargo_container/horizontal/blue/bottom,
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aVh" = (
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoonprep)
 "aVi" = (
 /obj/structure/foamed_metal,
 /turf/open/floor/plating,
@@ -26994,32 +15908,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/hangar)
-"aVn" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{
-	layer = 3.1;
-	name = "Midway Remote Control Console";
-	pixel_y = 6;
-	shuttleId = "dropship_midway"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aVo" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/vents/pump,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aVp" = (
 /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep{
 	req_one_access_txt = "8;12;39;40";
@@ -27052,27 +15940,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"aVs" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/barricade/handrail{
-	dir = 8
-	},
-/obj/item/tool/hand_labeler{
-	pixel_x = 1;
-	pixel_y = 13
-	},
-/obj/item/device/flashlight/flare{
-	pixel_x = 19;
-	pixel_y = -1
-	},
-/obj/structure/machinery/door_control/brbutton{
-	id = "squadarmory";
-	name = "gear locker shutter control";
-	pixel_y = 28;
-	req_one_access_txt = "19;12"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
 "aVt" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -27086,44 +15953,6 @@
 	dir = 1
 	},
 /area/golden_arrow/hangar)
-"aVu" = (
-/obj/structure/surface/table/almayer,
-/obj/item/storage/bible{
-	desc = "As the legendary US Army chaplain once said, 'There are no Athiests in fancy offices'.";
-	name = "Holy Bible";
-	pixel_x = -5;
-	pixel_y = 4
-	},
-/obj/item/device/flashlight/lamp/on{
-	pixel_x = 5;
-	pixel_y = 14
-	},
-/obj/item/ashtray/plastic{
-	icon_state = "ashtray_full_bl";
-	pixel_x = 9;
-	pixel_y = 2
-	},
-/obj/item/trash/cigbutt{
-	pixel_x = 1;
-	pixel_y = 10;
-	randpixel = 0
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/shared_office)
-"aVv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_container/glass/bucket/janibucket{
-	pixel_x = -7;
-	pixel_y = 15
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
-"aVw" = (
-/obj/structure/shuttle/part/dropship1/transparent/nose_top_right{
-	name = "\improper Tripoli"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "aVx" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -27148,15 +15977,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"aVz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/landinglight/ds1{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aVA" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning";
@@ -27169,9 +15989,6 @@
 	dir = 4
 	},
 /area/golden_arrow/motor_pool)
-"aVB" = (
-/turf/closed/shuttle/elevator/freight,
-/area/golden_arrow/supply)
 "aVC" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -27188,13 +16005,6 @@
 "aVD" = (
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"aVE" = (
-/obj/structure/machinery/floodlight/landing/floor,
-/obj/structure/machinery/landinglight/ds1,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aVF" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "cargo"
@@ -27209,16 +16019,6 @@
 /obj/structure/barricade/handrail,
 /turf/open/floor/almayer,
 /area/golden_arrow/motor_pool)
-"aVH" = (
-/obj/structure/closet/secure_closet/smartgunner{
-	name = "squad two smartgunner locker";
-	req_access_txt = "14;40";
-	req_one_access = list()
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/platoonprep)
 "aVI" = (
 /obj/structure/machinery/light/double/blue{
 	dir = 4;
@@ -27249,12 +16049,6 @@
 	dir = 10
 	},
 /area/golden_arrow/dorms)
-"aVK" = (
-/obj/structure/pipes/vents/pump{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
 "aVL" = (
 /obj/structure/barricade/handrail{
 	layer = 3.7;
@@ -27273,21 +16067,6 @@
 	icon_state = "plating"
 	},
 /area/golden_arrow/motor_pool)
-"aVM" = (
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aVN" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/cryo_cells)
 "aVO" = (
 /obj/structure/closet/secure_closet/platoon_sergeant,
 /obj/effect/decal/cleanable/dirt{
@@ -27337,16 +16116,6 @@
 	dir = 8
 	},
 /area/golden_arrow/hangar)
-"aVS" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
 "aVT" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -27369,13 +16138,6 @@
 	},
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/hangar)
-"aVV" = (
-/obj/structure/sign/safety/storage{
-	pixel_x = 9;
-	pixel_y = 29
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "aVW" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8
@@ -27428,48 +16190,6 @@
 	},
 /turf/open/floor/almayer/edge,
 /area/golden_arrow/prep_hallway)
-"aWd" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/supply)
-"aWe" = (
-/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,
-/area/golden_arrow/dorms)
-"aWf" = (
-/obj/structure/machinery/camera/autoname/golden_arrow{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
-"aWg" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "aWh" = (
 /turf/closed/wall/almayer/outer,
 /area/golden_arrow/cryo_cells)
@@ -27492,18 +16212,6 @@
 	dir = 8
 	},
 /area/golden_arrow/hangar)
-"aWk" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/platoonprep)
 "aWl" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -27518,13 +16226,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aWn" = (
-/obj/structure/pipes/vents/pump,
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aWo" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning"
@@ -27539,80 +16240,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/engineering)
-"aWp" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aWq" = (
-/obj/structure/surface/table/almayer,
-/obj/item/reagent_container/food/condiment/peppermill{
-	pixel_x = 1;
-	pixel_y = 12
-	},
-/obj/item/prop{
-	desc = "An issue of The Marine Corps Gazette, the official newspaper of the United States Colonial Marines.";
-	icon = 'icons/obj/items/paper.dmi';
-	icon_state = "newspaper";
-	name = "The Marine Corps Gazette";
-	pixel_x = -1;
-	pixel_y = -2
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
-"aWr" = (
-/obj/structure/barricade/handrail{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
-"aWs" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aWt" = (
-/obj/structure/barricade/handrail,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/engineering)
-"aWu" = (
-/obj/structure/sign/safety/bulkhead_door{
-	pixel_y = 38
-	},
-/obj/structure/sign/safety/hazard{
-	pixel_x = 14;
-	pixel_y = 38
-	},
-/obj/structure/sign/safety/ammunition{
-	pixel_y = 26
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
-"aWv" = (
-/obj/structure/surface/table/almayer,
-/obj/item/reagent_container/food/drinks/coffeecup{
-	pixel_x = -8
-	},
-/obj/item/reagent_container/food/drinks/h_chocolate{
-	pixel_y = 7
-	},
-/obj/item/clothing/glasses/disco_fever{
-	pixel_x = 7;
-	pixel_y = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "aWw" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SW-out";
@@ -27629,28 +16256,6 @@
 /turf/open/floor/almayer,
 /area/golden_arrow/dorms)
 "aWy" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
-	pixel_y = 25
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
 	},
@@ -27667,42 +16272,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/cryo_cells)
-"aWz" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer{
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
-"aWA" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/heavyduty{
-	icon_state = "2-4"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aWB" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/bed{
-	can_buckle = 0;
-	desc = "A lightweight support lattice.";
-	icon = 'icons/obj/structures/structures.dmi';
-	icon_state = "latticefull";
-	layer = 2.1;
-	name = "lattice"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "aWC" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -27715,55 +16284,13 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/prep_hallway)
-"aWD" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-4"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aWE" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 10
 	},
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/hangar)
-"aWF" = (
-/turf/closed/shuttle/midway{
-	icon_state = "62";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
-"aWG" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aWH" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 8
-	},
-/obj/item/trash/plate{
-	pixel_y = 4;
-	pixel_x = -4
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 8
 	},
@@ -27793,17 +16320,6 @@
 	},
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/prep_hallway)
-"aWK" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "aWL" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 9
@@ -27828,11 +16344,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/hangar)
-"aWO" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aWP" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S";
@@ -27852,44 +16363,7 @@
 	},
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/briefing)
-"aWR" = (
-/obj/structure/toilet{
-	dir = 1
-	},
-/obj/structure/barricade/metal{
-	dir = 8;
-	pixel_x = -1
-	},
-/obj/structure/barricade/metal{
-	dir = 4;
-	pixel_x = 1
-	},
-/obj/structure/barricade/metal{
-	dir = 8;
-	pixel_x = -1;
-	pixel_y = 8
-	},
-/obj/structure/barricade/metal{
-	dir = 4;
-	pixel_x = 1;
-	pixel_y = 8
-	},
-/obj/structure/curtain/red,
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/cryo_cells)
 "aWS" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "door_warning";
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "door_warning";
 	dir = 8
@@ -27904,14 +16378,6 @@
 	icon_state = "mono"
 	},
 /area/golden_arrow/motor_pool)
-"aWT" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3;
-	pixel_x = -1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aWU" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -27956,20 +16422,6 @@
 "aWX" = (
 /turf/open/floor/almayer/empty,
 /area/golden_arrow/hangar)
-"aWY" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/obj/structure/machinery/gear{
-	id = "supply_elevator_gear"
-	},
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aWZ" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -27991,27 +16443,10 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/hangar)
-"aXb" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
 "aXc" = (
 /obj/structure/barricade/handrail,
 /turf/open/floor/almayer,
 /area/golden_arrow/supply)
-"aXd" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aXe" = (
 /obj/effect/decal/cleanable/blood/oil,
 /turf/open/floor/plating/plating_catwalk,
@@ -28056,12 +16491,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/medical)
-"aXi" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 9
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "aXj" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/cable/heavyduty{
@@ -28095,60 +16524,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/platoonarmory)
-"aXm" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "mono"
-	},
-/area/golden_arrow/cryo_cells)
-"aXn" = (
-/obj/structure/sign/safety/bulkhead_door{
-	pixel_y = 27
-	},
-/obj/structure/sign/safety/hazard{
-	pixel_x = 14;
-	pixel_y = 27
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
-"aXo" = (
-/obj/structure/machinery/firealarm{
-	dir = 4;
-	pixel_x = 21
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
-"aXp" = (
-/obj/item/reagent_container/food/drinks/milk{
-	pixel_y = 10
-	},
-/obj/item/reagent_container/food/drinks/milk{
-	pixel_x = 6;
-	pixel_y = 8
-	},
-/obj/item/reagent_container/food/drinks/milk{
-	pixel_x = 5
-	},
-/obj/item/reagent_container/food/drinks/milk,
-/obj/structure/closet/secure_closet{
-	icon_broken = "fridgebroken";
-	icon_closed = "fridge";
-	icon_locked = "fridge1";
-	icon_off = "fridge1";
-	icon_opened = "fridgeopen";
-	icon_state = "fridge1";
-	name = "beverage fridge"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
 "aXq" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/item/tool/warning_cone{
@@ -28188,57 +16563,6 @@
 	dir = 1
 	},
 /area/golden_arrow/platoonprep)
-"aXu" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
-"aXv" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3;
-	pixel_x = -1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aXw" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	layer = 2.5;
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aXx" = (
-/obj/structure/bed/chair/office/dark{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
-"aXy" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
-"aXz" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/briefing)
 "aXA" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -28262,22 +16586,6 @@
 	dir = 8
 	},
 /area/golden_arrow/supply)
-"aXC" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/obj/structure/prop/dam/crane,
-/obj/structure/prop{
-	density = 1;
-	desc = "A cooling system for the Tripoli. It produces additional cooling reducing delays between launch. The pipes are crooked and bent,  hoses are sliced open, and that's not even mentioning the bullet holes. Looks to be an older model as well.";
-	icon = 'icons/obj/structures/props/almayer_props64.dmi';
-	icon_state = "cooling_system";
-	layer = 3.1;
-	name = "Damaged FS/ACS-9 cooling system";
-	pixel_y = 16
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aXD" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SW-out"
@@ -28291,32 +16599,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aXE" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoonprep)
-"aXF" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	layer = 1.9
-	},
-/obj/structure/machinery/door/poddoor/almayer/open{
-	closed_layer = 3.3;
-	dir = 4;
-	layer = 3.3;
-	name = "Maintenance Bay Blast Door";
-	open_layer = 3.3
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aXG" = (
 /obj/structure/machinery/door/firedoor/border_only/almayer{
 	layer = 1.9
@@ -28368,12 +16650,6 @@
 	dir = 1
 	},
 /area/golden_arrow/platoonarmory)
-"aXK" = (
-/turf/closed/shuttle/midway/transparent{
-	icon_state = "26";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "aXL" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -28407,22 +16683,6 @@
 	},
 /turf/closed/wall/almayer,
 /area/golden_arrow/medical)
-"aXO" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	pixel_y = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/vents/pump,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aXP" = (
 /obj/structure/machinery/light/double/blue{
 	dir = 1;
@@ -28435,21 +16695,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aXQ" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	pixel_x = -1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	layer = 2.5;
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/golden_arrow/medical)
 "aXR" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SW-out";
@@ -28466,17 +16711,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aXT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/largecrate/random/case/double,
-/obj/item/storage/box/cups{
-	pixel_x = -1;
-	pixel_y = 16
-	},
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "aXU" = (
 /obj/structure/curtain/red,
 /obj/structure/machinery/door/firedoor/border_only/almayer{
@@ -28533,26 +16767,6 @@
 	dir = 4
 	},
 /area/golden_arrow/platoonarmory)
-"aXZ" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/structure/largecrate/random/case,
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin3"
-	},
-/area/golden_arrow/hangar)
-"aYa" = (
-/obj/structure/prop{
-	can_buckle = 1;
-	desc = "A rather cozy case you can sit on. The label says it's full of pillows - though it's probably empty.";
-	icon = 'icons/obj/structures/crates.dmi';
-	icon_state = "case";
-	name = "\improper cozy case";
-	pixel_y = 6
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aYb" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -28563,38 +16777,12 @@
 	},
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/cryo_cells)
-"aYc" = (
-/obj/structure/closet/secure_closet,
-/obj/structure/machinery/prop{
-	desc = "This stylized recruitment poster for the USCM depicts a the head of a screaming eagle breaking into orbit, surrounded by flames. Death from above.";
-	icon = 'icons/obj/structures/props/posters.dmi';
-	icon_state = "poster41";
-	layer = 3.5;
-	name = "USCM recruitment poster";
-	pixel_x = -1;
-	pixel_y = 34
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
 "aYd" = (
 /obj/structure/machinery/power/apc/almayer{
 	dir = 1
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/motor_pool)
-"aYe" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/platoonarmory)
 "aYf" = (
 /obj/structure/pipes/vents/pump{
 	dir = 8
@@ -28620,14 +16808,6 @@
 	icon_state = "cargo"
 	},
 /area/golden_arrow/hangar)
-"aYi" = (
-/obj/structure/machinery/alarm/almayer{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/vents/pump,
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
 "aYj" = (
 /obj/structure/platform{
 	dir = 8;
@@ -28675,13 +16855,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/cryo_cells)
-"aYo" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/engineering)
 "aYp" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/barricade/handrail{
@@ -28704,9 +16877,6 @@
 	icon_state = "plating"
 	},
 /area/golden_arrow/engineering)
-"aYr" = (
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
 "aYs" = (
 /obj/structure/machinery/door/poddoor/railing{
 	dir = 4
@@ -28715,12 +16885,6 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/engineering)
-"aYt" = (
-/obj/structure/largecrate/supply/generator,
-/turf/open/floor/almayer{
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "aYu" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
@@ -28728,23 +16892,6 @@
 "aYv" = (
 /turf/closed/wall/almayer/outer,
 /area/golden_arrow/synthcloset)
-"aYw" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/cryo_cells)
-"aYx" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/hangar)
 "aYy" = (
 /obj/structure/machinery/light/double/blue{
 	light_color = "#dae2ff"
@@ -28794,40 +16941,10 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
-"aYD" = (
-/obj/structure/machinery/cm_vending/sorted/medical/blood{
-	density = 0;
-	pixel_y = 24;
-	req_access = list()
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "test_floor5"
-	},
-/area/golden_arrow/medical)
 "aYE" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer/edge/smooth,
 /area/golden_arrow/hangar)
-"aYF" = (
-/obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/phone_base{
-	name = "overwatch receiver";
-	phone_id = "Overwatch";
-	pixel_x = 9;
-	pixel_y = 30
-	},
-/obj/structure/machinery/computer/ares_console{
-	dir = 4;
-	pixel_x = 2;
-	pixel_y = 6
-	},
-/obj/item/tool/pen{
-	pixel_x = -5;
-	pixel_y = -11
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
 "aYG" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -28869,36 +16986,10 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/platoonprep)
-"aYJ" = (
-/turf/closed/shuttle/midway{
-	icon_state = "104";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "aYK" = (
 /obj/structure/window/framed/almayer,
 /turf/open/floor/plating,
 /area/golden_arrow/shared_office)
-"aYL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stool{
-	pixel_x = 1;
-	pixel_y = 20
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonprep)
-"aYM" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/poddoor/railing{
-	dir = 4;
-	id = "apcbayrailing2"
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "black"
-	},
-/area/golden_arrow/hangar)
 "aYN" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SW-out"
@@ -28966,15 +17057,6 @@
 	dir = 8
 	},
 /area/golden_arrow/hangar)
-"aYS" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/cryo_cells)
 "aYT" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NW-out";
@@ -28991,19 +17073,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aYU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/cable/heavyduty{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
 "aYV" = (
 /obj/structure/machinery/door/airlock/almayer/medical{
 	dir = 8;
@@ -29025,13 +17094,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/medical)
-"aYW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/vents/pump{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/prep_hallway)
 "aYX" = (
 /obj/structure/pipes/vents/pump,
 /obj/structure/disposalpipe/segment{
@@ -29047,10 +17109,6 @@
 "aYY" = (
 /turf/closed/wall/almayer,
 /area/golden_arrow/briefing)
-"aYZ" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/shared_office)
 "aZa" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W";
@@ -29069,44 +17127,6 @@
 /obj/effect/decal/cleanable/blood/oil,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"aZc" = (
-/obj/structure/bed/bedroll{
-	layer = 3.1;
-	pixel_x = 3;
-	pixel_y = -8
-	},
-/obj/item/clothing/head/cmcap{
-	layer = 4.2;
-	pixel_x = 4;
-	pixel_y = 6
-	},
-/turf/closed/wall/almayer/outer,
-/area/golden_arrow/hangar)
-"aZd" = (
-/obj/structure/surface/table/almayer,
-/obj/item/prop/almayer/chaff_launcher{
-	pixel_x = 3;
-	pixel_y = 9
-	},
-/obj/item/prop/almayer/flare_launcher{
-	pixel_x = 5;
-	pixel_y = 19
-	},
-/obj/item/prop/almayer/handheld1{
-	pixel_x = 6;
-	pixel_y = -8
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/engineering)
-"aZe" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/cryo_cells)
 "aZf" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -29118,67 +17138,6 @@
 	dir = 4
 	},
 /area/golden_arrow/hangar)
-"aZg" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/platoonprep)
-"aZh" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/obj/structure/prop/invuln/lattice_prop{
-	icon_state = "lattice3";
-	pixel_x = 16;
-	pixel_y = -15
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/dorms)
-"aZi" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/prop/almayer/computer/PC{
-	dir = 8;
-	pixel_y = 10
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
-"aZj" = (
-/turf/closed/shuttle/midway{
-	icon_state = "92";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
-"aZk" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S";
-	pixel_y = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "cargo_arrow"
-	},
-/area/golden_arrow/hangar)
 "aZl" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
@@ -29229,23 +17188,6 @@
 	dir = 5
 	},
 /area/golden_arrow/platoon_commander_rooms)
-"aZn" = (
-/obj/structure/machinery/door/poddoor/almayer{
-	dir = 4;
-	id = "apc1blastdoor";
-	name = "\improper Vehicle Bay One Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
-"aZo" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 4
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/engineering)
 "aZp" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W";
@@ -29256,68 +17198,13 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/medical)
-"aZq" = (
-/obj/structure/ladder{
-	height = -1;
-	id = "engisouth"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/engineering)
 "aZr" = (
-/obj/structure/surface/table/almayer,
-/obj/item/trash/plate{
-	pixel_y = 13;
-	pixel_x = 4
-	},
-/obj/item/trash/plate{
-	pixel_x = -3
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 8
 	},
 /obj/structure/surface/table/almayer,
 /turf/open/floor/almayer,
 /area/golden_arrow/cryo_cells)
-"aZs" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aZt" = (
-/obj/structure/machinery/door/poddoor/almayer,
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/prep_hallway)
-"aZu" = (
-/obj/structure/surface/table/almayer,
-/obj/item/weapon/straight_razor{
-	pixel_x = -5;
-	pixel_y = -5
-	},
-/obj/item/clothing/head/cmcap/bridge{
-	pixel_x = 5;
-	pixel_y = 6
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/platoon_commander_rooms)
-"aZv" = (
-/turf/closed/shuttle/midway{
-	icon_state = "64";
-	name = "\improper Tripoli"
-	},
-/area/golden_arrow/hangar)
 "aZw" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -29327,16 +17214,6 @@
 "aZx" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
 /obj/structure/cable/heavyduty{
 	icon_state = "1-2"
 	},
@@ -29359,24 +17236,6 @@
 	icon_state = "cargo"
 	},
 /area/golden_arrow/hangar)
-"aZz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/oil,
-/obj/effect/decal/siding{
-	icon_state = "siding6"
-	},
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
-"aZA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/door/poddoor/almayer{
-	dir = 2;
-	name = "\improper Storage Bay Blast Door"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/golden_arrow/hangar)
 "aZB" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SE-out";
@@ -29417,22 +17276,6 @@
 	icon_state = "plating"
 	},
 /area/golden_arrow/motor_pool)
-"aZE" = (
-/obj/structure/bed/chair/office/dark{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/shared_office)
-"aZF" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	dir = 10;
-	icon_state = "cargo"
-	},
-/area/golden_arrow/hangar)
 "aZG" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -29457,28 +17300,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aZI" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/obj/item/tool/warning_cone,
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
-"aZJ" = (
-/obj/structure/pipes/vents/scrubber{
-	dir = 8
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/briefing)
 "aZK" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -29507,35 +17328,8 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"aZN" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 8
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/platoon_commander_rooms)
-"aZO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/hangar)
 "aZP" = (
 /obj/structure/surface/table/almayer,
-/obj/structure/machinery/light/small/blue{
-	dir = 4;
-	light_color = "#dae2ff";
-	light_power = 0.5
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/surface/table/almayer,
 /obj/structure/machinery/light/small/blue{
 	dir = 4;
 	light_color = "#dae2ff";
@@ -29569,17 +17363,6 @@
 	},
 /area/golden_arrow/hangar)
 "aZR" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 1
 	},
@@ -29593,37 +17376,6 @@
 	dir = 1
 	},
 /area/golden_arrow/supply)
-"aZS" = (
-/obj/structure/machinery/gear{
-	id = "supply_elevator_gear"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out"
-	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "blackcorner"
-	},
-/area/golden_arrow/hangar)
-"aZT" = (
-/obj/structure/pipes/standard/manifold/hidden/supply,
-/obj/structure/cable/heavyduty{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "0-4";
-	layer = 2.36
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/golden_arrow/prep_hallway)
-"aZU" = (
-/obj/structure/shuttle/part/dropship1/transparent/lower_right_wing{
-	name = "\improper Tripoli"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/golden_arrow/hangar)
 "aZV" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -29647,20 +17399,6 @@
 	dir = 4
 	},
 /area/golden_arrow/platoonprep)
-"aZX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/vending/walkman{
-	density = 0;
-	pixel_x = 10;
-	pixel_y = 21
-	},
-/obj/item/trash/kepler{
-	pixel_x = 8;
-	pixel_y = 44
-	},
-/obj/item/trash/barcardine,
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "aZY" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -29929,6 +17667,9 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/supplydrop)
+"cGQ" = (
+/turf/open/floor/corsat,
+/area/golden_arrow/cargo_shuttle/lower)
 "cHw" = (
 /obj/structure/sign/safety/storage{
 	pixel_y = 25
@@ -30022,15 +17763,6 @@
 /turf/open/floor/almayer,
 /area/golden_arrow/engineering)
 "dLT" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "cargo_arrow";
-	dir = 1
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "cargo_arrow";
 	dir = 1
@@ -30185,6 +17917,9 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/engineering)
+"fbw" = (
+/turf/closed/wall/almayer/outer,
+/area/golden_arrow/cargo_shuttle/lower)
 "fpt" = (
 /obj/structure/machinery/cm_vending/sorted/tech/tool_storage{
 	req_one_access = list()
@@ -30195,14 +17930,6 @@
 /turf/open/floor/almayer,
 /area/golden_arrow/engineering)
 "fqq" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
 	},
@@ -30285,6 +18012,17 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/engineering)
+"gjM" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 8
+	},
+/obj/structure/cable/heavyduty{
+	icon_state = "4-8"
+	},
+/turf/open/floor/almayer/edge{
+	dir = 5
+	},
+/area/golden_arrow/platoonarmory)
 "gkN" = (
 /obj/structure/machinery/door_control{
 	id = "lowerstorage5";
@@ -30415,6 +18153,9 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/supplydrop)
+"hxJ" = (
+/turf/closed/wall/almayer/outer,
+/area/golden_arrow/cargo_shuttle/upper)
 "hCn" = (
 /obj/structure/cable/heavyduty{
 	icon_state = "1-2"
@@ -31161,17 +18902,6 @@
 	},
 /area/golden_arrow/supply)
 "odN" = (
-/obj/structure/machinery/door_control{
-	id = "cargolocksnorth";
-	name = "cargolocksnorth";
-	needs_power = 0;
-	pixel_x = 32
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/structure/machinery/door_control{
 	id = "cargolocksnorth";
 	name = "cargolocksnorth";
@@ -31252,15 +18982,6 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/supply)
 "oRK" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
 	pixel_x = 1
@@ -31615,12 +19336,6 @@
 /area/golden_arrow/supply)
 "rnt" = (
 /obj/structure/pipes/vents/pump,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/pipes/vents/pump,
 /obj/structure/cable/heavyduty{
 	icon_state = "1-2"
 	},
@@ -31948,6 +19663,17 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/supply)
+"uoJ" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 8
+	},
+/obj/structure/cable/heavyduty{
+	icon_state = "4-8"
+	},
+/turf/open/floor/almayer/edge{
+	dir = 10
+	},
+/area/golden_arrow/platoonarmory)
 "uEm" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -32112,12 +19838,26 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/engineering)
+"wDL" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 8
+	},
+/obj/structure/cable/heavyduty{
+	icon_state = "4-8"
+	},
+/turf/open/floor/almayer/edge{
+	dir = 9
+	},
+/area/golden_arrow/platoonarmory)
 "wRv" = (
 /obj/structure/machinery/recharge_station,
 /turf/open/floor/almayer{
 	icon_state = "test_floor5"
 	},
 /area/golden_arrow/synthcloset)
+"wSf" = (
+/turf/open/space/basic,
+/area/golden_arrow/supply)
 "xiW" = (
 /obj/structure/barricade/handrail{
 	pixel_y = -2;
@@ -33823,14 +21563,14 @@ acz
 aUn
 ahl
 ahl
-ahl
-ahl
-ahl
-ahl
-ahl
-ahl
-ahl
-ahl
+fbw
+fbw
+fbw
+fbw
+fbw
+fbw
+fbw
+fbw
 aEG
 aEG
 aEG
@@ -33975,14 +21715,14 @@ aLS
 auc
 ahl
 aUE
-ahl
-aRJ
-aRJ
-aRJ
-aRJ
-aRJ
+fbw
+cGQ
+cGQ
+cGQ
+cGQ
+cGQ
 aTM
-ahl
+fbw
 aEG
 aEG
 aEG
@@ -34127,14 +21867,14 @@ avB
 aho
 ahl
 ahl
-ahl
-aRJ
-aRJ
-aRJ
-aRJ
-aRJ
-aRJ
-ahl
+fbw
+cGQ
+cGQ
+cGQ
+cGQ
+cGQ
+cGQ
+fbw
 aEG
 aEG
 aEG
@@ -34280,13 +22020,13 @@ aho
 aMI
 aps
 aof
-aRJ
-aRJ
-aRJ
-aRJ
-aRJ
-aRJ
-ahl
+cGQ
+cGQ
+cGQ
+cGQ
+cGQ
+cGQ
+fbw
 aEG
 aEG
 aEG
@@ -34432,13 +22172,13 @@ aOp
 aVX
 aps
 azo
-aRJ
-aRJ
-aRJ
-aRJ
-aRJ
-aRJ
-ahl
+cGQ
+cGQ
+cGQ
+cGQ
+cGQ
+cGQ
+fbw
 aJA
 aEG
 aEG
@@ -34584,13 +22324,13 @@ aOp
 aVX
 aps
 azo
-aRJ
-aRJ
-aRJ
-aRJ
-aRJ
-aRJ
-ahl
+cGQ
+cGQ
+cGQ
+cGQ
+cGQ
+cGQ
+fbw
 aEG
 aEG
 aEG
@@ -34736,13 +22476,13 @@ aOp
 ayP
 aSm
 azo
-aRJ
-aRJ
-aRJ
-aRJ
-aRJ
-aRJ
-ahl
+cGQ
+cGQ
+cGQ
+cGQ
+cGQ
+cGQ
+fbw
 aEG
 aEG
 aEG
@@ -34887,14 +22627,14 @@ aTN
 aOp
 ahl
 ahl
-ahl
-aRJ
-aRJ
-aRJ
-aRJ
-aRJ
-aRJ
-ahl
+fbw
+cGQ
+cGQ
+cGQ
+cGQ
+cGQ
+cGQ
+fbw
 aEG
 aEG
 aEG
@@ -35039,14 +22779,14 @@ aSD
 aOp
 ahl
 aUE
-ahl
-aRJ
-aRJ
-aRJ
-aRJ
-aRJ
-aRJ
-ahl
+fbw
+cGQ
+cGQ
+cGQ
+cGQ
+cGQ
+cGQ
+fbw
 aEG
 aEG
 aEG
@@ -35191,14 +22931,14 @@ aSD
 aOp
 aYm
 ahl
-ahl
-ahl
-ahl
-ahl
-ahl
-ahl
-ahl
-ahl
+fbw
+fbw
+fbw
+fbw
+fbw
+fbw
+fbw
+fbw
 aEG
 aEG
 aEG
@@ -36076,13 +23816,13 @@ aEG
 aEG
 aEG
 aEG
-ahl
-ahl
-ahl
-ahl
-ahl
-ahl
-ahl
+wSf
+wSf
+wSf
+wSf
+wSf
+wSf
+wSf
 aYv
 aYv
 aYv
@@ -37055,8 +24795,8 @@ aog
 aFX
 aBk
 aht
-aQq
-aNB
+aRo
+aQm
 aQr
 aBw
 atm
@@ -37206,7 +24946,7 @@ aog
 arr
 azv
 aNp
-azI
+aKk
 anJ
 aNn
 aAs
@@ -37358,7 +25098,7 @@ aog
 arr
 asL
 aBk
-aBX
+aKk
 ahK
 aLw
 ahS
@@ -37510,9 +25250,9 @@ aWh
 aIQ
 asS
 aBk
-aND
+aht
 aCB
-aqZ
+aQm
 ahS
 aBw
 adt
@@ -37814,9 +25554,9 @@ aWh
 ajq
 aXX
 aLz
-aBb
-aRo
-aQm
+aLz
+aBk
+aBk
 aRP
 axK
 akA
@@ -38272,7 +26012,7 @@ alD
 ave
 anG
 atc
-ahr
+aUc
 aBk
 aBk
 aDS
@@ -38422,9 +26162,9 @@ aWh
 aog
 azT
 aBk
-akH
-aeB
-aQm
+aBk
+aEY
+aBk
 aBk
 aLz
 aDS
@@ -38726,9 +26466,9 @@ aWh
 aWh
 aWh
 aWh
-aID
-aRs
-awO
+azB
+aYn
+apy
 aog
 aog
 aog
@@ -39033,8 +26773,8 @@ afl
 aHF
 arQ
 aHF
-aHq
-aog
+aHF
+aHF
 aog
 aVa
 apO
@@ -39185,7 +26925,7 @@ azG
 aaA
 acr
 anW
-aTR
+aNz
 aaq
 aog
 anp
@@ -39201,7 +26941,7 @@ aRJ
 aRJ
 aRJ
 aah
-ahl
+hxJ
 aEG
 aEG
 aEG
@@ -39339,7 +27079,7 @@ aIr
 aIr
 aIr
 aIr
-aVi
+aog
 aog
 aJq
 aIz
@@ -39353,7 +27093,7 @@ aRJ
 aRJ
 aRJ
 aRJ
-ahl
+hxJ
 aEG
 aEG
 aEG
@@ -39505,7 +27245,7 @@ aRJ
 aRJ
 aRJ
 aRJ
-ahl
+hxJ
 aEG
 aEG
 aEG
@@ -39657,7 +27397,7 @@ aRJ
 aRJ
 aRJ
 aRJ
-ahl
+hxJ
 aEG
 aEG
 aEG
@@ -39809,7 +27549,7 @@ aRJ
 aRJ
 aRJ
 aRJ
-ahl
+hxJ
 aFv
 aEG
 aEG
@@ -39961,7 +27701,7 @@ aRJ
 aRJ
 aRJ
 aRJ
-ahl
+hxJ
 aEG
 aEG
 aEG
@@ -40113,7 +27853,7 @@ aRJ
 aRJ
 aRJ
 aRJ
-ahl
+hxJ
 aEG
 aEG
 aEG
@@ -40265,7 +28005,7 @@ aRJ
 aRJ
 aRJ
 aRJ
-ahl
+hxJ
 aEG
 aEG
 aEG
@@ -40415,9 +28155,9 @@ aTD
 aTD
 aTD
 aTD
-ahl
-ahl
-ahl
+hxJ
+hxJ
+hxJ
 aEG
 aEG
 aEG
@@ -41302,7 +29042,7 @@ aEG
 aHZ
 afk
 aSv
-aqk
+gjM
 aXY
 aqb
 aJX
@@ -41910,11 +29650,11 @@ aEG
 aHZ
 afk
 agS
-aqk
+wDL
 aAF
 aLp
 aLk
-aqk
+uoJ
 aSG
 aSr
 akb
@@ -44325,9 +32065,9 @@ aEG
 aEG
 atb
 axa
-atQ
+aoV
 ayU
-aAX
+arE
 aic
 aRU
 aVt
diff --git a/maps/shuttles/garrow_cargo_elevator.dmm b/maps/shuttles/garrow_cargo_elevator.dmm
index 7eaa7a1b74..295cbb22ee 100644
--- a/maps/shuttles/garrow_cargo_elevator.dmm
+++ b/maps/shuttles/garrow_cargo_elevator.dmm
@@ -36,15 +36,15 @@
 	},
 /area/shuttle/elevator1)
 "s" = (
-/obj/structure/machinery/computer/shuttle/elevator_controller/elevator_call{
-	pixel_y = 32;
-	shuttleId = "garrow_cargo_elevator"
-	},
 /obj/structure/machinery/light/small/blue{
 	dir = 4;
 	light_color = "#dae2ff";
 	light_power = 0.25
 	},
+/obj/structure/machinery/computer/shuttle/elevator_controller{
+	pixel_y = 32;
+	shuttleId = "garrow_cargo_elevator"
+	},
 /turf/open/floor/almayer{
 	icon_state = "mono"
 	},
@@ -61,8 +61,14 @@
 /turf/open/shuttle/elevator,
 /area/shuttle/elevator1)
 "E" = (
-/obj/structure/machinery/door/airlock/multi_tile/elevator/research{
-	name = "\improper Supply Elevator Hatch"
+/obj/structure/machinery/door/poddoor/two_tile/four_tile/pivot{
+	base_icon_state = "hatch";
+	icon_state = "hatch1";
+	openspeed = 22;
+	name = "\improper Elevator Hatch";
+	dir = 4;
+	unacidable = 1;
+	id = "north"
 	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
@@ -88,7 +94,9 @@
 /turf/closed/shuttle/elevator/gears,
 /area/shuttle/elevator1)
 "W" = (
-/obj/docking_port/mobile/shipmap_elevator/cargo,
+/obj/docking_port/mobile/trijent_elevator/shipmap_elevator/cargo{
+	elevator_network = "ArrowCargo"
+	},
 /turf/closed/shuttle/elevator{
 	dir = 10
 	},
diff --git a/maps/shuttles/garrow_vehicle_elevator_one.dmm b/maps/shuttles/garrow_vehicle_elevator_one.dmm
index 2610433f6c..4c6e5ed9ad 100644
--- a/maps/shuttles/garrow_vehicle_elevator_one.dmm
+++ b/maps/shuttles/garrow_vehicle_elevator_one.dmm
@@ -4,7 +4,7 @@
 /area/shuttle/vehicle_elevator)
 "o" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/docking_port/mobile/shipmap_elevator,
+/obj/docking_port/mobile/trijent_elevator/shipmap_elevator,
 /turf/open/floor/plating/plating_catwalk,
 /area/shuttle/vehicle_elevator)
 "u" = (
diff --git a/maps/shuttles/garrow_vehicle_elevator_two.dmm b/maps/shuttles/garrow_vehicle_elevator_two.dmm
index 19c7f63918..72c625169a 100644
--- a/maps/shuttles/garrow_vehicle_elevator_two.dmm
+++ b/maps/shuttles/garrow_vehicle_elevator_two.dmm
@@ -4,7 +4,7 @@
 /area/shuttle/vehicle_elevator)
 "o" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/docking_port/mobile/shipmap_elevator/two,
+/obj/docking_port/mobile/trijent_elevator/shipmap_elevator/two,
 /turf/open/floor/plating/plating_catwalk,
 /area/shuttle/vehicle_elevator)
 "u" = (