diff --git a/icons/turf/fancy_shuttles/orangeline.dmi b/icons/turf/fancy_shuttles/orangeline.dmi
index de62f36f5bb..4be7dc19215 100644
Binary files a/icons/turf/fancy_shuttles/orangeline.dmi and b/icons/turf/fancy_shuttles/orangeline.dmi differ
diff --git a/icons/turf/fancy_shuttles/orangeline_preview.dmi b/icons/turf/fancy_shuttles/orangeline_preview.dmi
index 1826583b2f6..cd6fe630451 100644
Binary files a/icons/turf/fancy_shuttles/orangeline_preview.dmi and b/icons/turf/fancy_shuttles/orangeline_preview.dmi differ
diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm
index 8697685e25c..bbf9cd0b509 100644
--- a/maps/tether/submaps/tether_misc.dmm
+++ b/maps/tether/submaps/tether_misc.dmm
@@ -1676,16 +1676,11 @@
 /turf/simulated/floor/holofloor/tiled,
 /area/holodeck/source_thunderdomecourt)
 "fi" = (
-/obj/structure/bed/chair/sofa/bench/right{
-	padding_color = "#99AAFF"
+/obj/effect/floor_decal/transit/orange{
+	dir = 8
 	},
-/obj/effect/floor_decal/fancy_shuttle{
-	fancy_shuttle_tag = "tram"
-	},
-/turf/simulated/floor/tiled,
-/area/shuttle/escape{
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	})
+/turf/simulated/floor/tiled/techfloor/grid/transit,
+/area/space)
 "fn" = (
 /obj/structure/holostool,
 /obj/effect/floor_decal/carpet{
@@ -1973,12 +1968,8 @@
 /turf/simulated/floor/holofloor/snow,
 /area/holodeck/holodorm/source_snow)
 "gv" = (
-/obj/effect/shuttle_landmark{
-	base_area = null;
-	base_turf = null;
-	docking_controller = null;
-	landmark_tag = "escape_transit";
-	name = "Escape Transit"
+/obj/effect/floor_decal/transit/orange{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor/grid/transit,
 /area/space)
@@ -2004,23 +1995,20 @@
 "gS" = (
 /turf/simulated/floor/holofloor/reinforced,
 /area/holodeck/holodorm/source_off)
+"gT" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/steel_grid,
+/area/centcom/simulated/terminal)
 "gU" = (
 /obj/machinery/light,
 /obj/effect/floor_decal/industrial/danger,
 /turf/simulated/floor/tiled/steel,
 /area/centcom/simulated/main_hall)
-"he" = (
-/obj/structure/bed/chair/sofa/bench/left{
-	dir = 4;
-	padding_color = "#99AAFF"
-	},
-/obj/effect/floor_decal/fancy_shuttle{
-	fancy_shuttle_tag = "tram"
-	},
-/turf/simulated/floor/tiled,
-/area/shuttle/escape{
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	})
 "hg" = (
 /obj/structure/flora/ausbushes/ywflowers,
 /obj/effect/landmark{
@@ -2089,6 +2077,9 @@
 /obj/effect/floor_decal/transit/orange{
 	dir = 8
 	},
+/obj/effect/transit/light{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor/grid/transit,
 /area/space)
 "hJ" = (
@@ -2152,14 +2143,21 @@
 /obj/effect/floor_decal/transit/orange{
 	dir = 4
 	},
+/obj/effect/transit/light{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor/grid/transit,
 /area/space)
 "in" = (
 /obj/effect/floor_decal/transit/orange{
 	dir = 8
 	},
-/obj/effect/transit/light{
-	dir = 8
+/obj/effect/step_trigger/thrower{
+	affect_ghosts = 1;
+	name = "thrower_throwdownside";
+	nostop = 1;
+	stopper = 0;
+	tiles = 0
 	},
 /turf/simulated/floor/tiled/techfloor/grid/transit,
 /area/space)
@@ -2176,8 +2174,12 @@
 /obj/effect/floor_decal/transit/orange{
 	dir = 4
 	},
-/obj/effect/transit/light{
-	dir = 4
+/obj/effect/step_trigger/thrower{
+	affect_ghosts = 1;
+	name = "thrower_throwdownside";
+	nostop = 1;
+	stopper = 0;
+	tiles = 0
 	},
 /turf/simulated/floor/tiled/techfloor/grid/transit,
 /area/space)
@@ -2197,28 +2199,6 @@
 "jf" = (
 /turf/space/transit/north,
 /area/space)
-"jA" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/effect/floor_decal/fancy_shuttle{
-	fancy_shuttle_tag = "tram"
-	},
-/obj/structure/table/standard,
-/obj/random/forgotten_tram,
-/turf/simulated/floor/tiled,
-/area/shuttle/escape{
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	})
-"jL" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/centcom/simulated/terminal)
 "jQ" = (
 /obj/effect/shuttle_landmark/transit{
 	base_area = /area/space;
@@ -2242,6 +2222,15 @@
 /obj/effect/floor_decal/sign/small_5,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
+"kK" = (
+/obj/effect/floor_decal/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
+	},
+/obj/machinery/light,
+/turf/simulated/floor/tiled,
+/area/shuttle/escape{
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	})
 "kU" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/storage/box/donkpockets,
@@ -2269,6 +2258,18 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid/transit,
 /area/space)
+"lo" = (
+/obj/effect/floor_decal/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
+	},
+/obj/structure/bed/chair/sofa/bench{
+	dir = 4;
+	padding_color = "#99AAFF"
+	},
+/turf/simulated/floor/tiled,
+/area/shuttle/escape{
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	})
 "lu" = (
 /obj/effect/step_trigger/thrower{
 	affect_ghosts = 1;
@@ -2286,32 +2287,6 @@
 /turf/simulated/floor/tiled/techfloor/grid/transit,
 /area/space)
 "lW" = (
-/obj/random/forgotten_tram,
-/obj/structure/bed/chair/sofa/bench/left{
-	dir = 4;
-	padding_color = "#99AAFF"
-	},
-/obj/effect/floor_decal/fancy_shuttle{
-	fancy_shuttle_tag = "tram"
-	},
-/turf/simulated/floor/tiled,
-/area/shuttle/escape{
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	})
-"mb" = (
-/obj/effect/floor_decal/transit/orange{
-	dir = 8
-	},
-/obj/effect/step_trigger/thrower{
-	affect_ghosts = 1;
-	name = "thrower_throwdownside";
-	nostop = 1;
-	stopper = 0;
-	tiles = 0
-	},
-/turf/simulated/floor/tiled/techfloor/grid/transit,
-/area/space)
-"mF" = (
 /obj/effect/step_trigger/thrower{
 	affect_ghosts = 1;
 	name = "thrower_throwdownside";
@@ -2324,6 +2299,29 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid/transit,
 /area/space)
+"mb" = (
+/obj/effect/shuttle_landmark{
+	landmark_tag = "escape_transit";
+	name = "Escape Transit"
+	},
+/turf/simulated/floor/tiled/techfloor/grid/transit,
+/area/space)
+"mF" = (
+/obj/effect/floor_decal/transit/orange{
+	dir = 8
+	},
+/obj/effect/transit/light{
+	dir = 8
+	},
+/obj/effect/step_trigger/thrower{
+	affect_ghosts = 1;
+	name = "thrower_throwdownside";
+	nostop = 1;
+	stopper = 0;
+	tiles = 0
+	},
+/turf/simulated/floor/tiled/techfloor/grid/transit,
+/area/space)
 "mN" = (
 /obj/structure/table/glass,
 /obj/machinery/chemical_dispenser/full,
@@ -2339,31 +2337,6 @@
 	},
 /turf/unsimulated/floor/steel,
 /area/centcom/control)
-"nz" = (
-/obj/effect/floor_decal/fancy_shuttle{
-	fancy_shuttle_tag = "tram"
-	},
-/obj/structure/closet/walllocker/medical/west{
-	dir = 1;
-	pixel_x = 0;
-	pixel_y = -32
-	},
-/obj/structure/bed/chair/shuttle_padded{
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
-/area/shuttle/escape{
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	})
-"nB" = (
-/obj/effect/floor_decal/fancy_shuttle{
-	fancy_shuttle_tag = "tram"
-	},
-/obj/machinery/vending/snack,
-/turf/simulated/floor/tiled,
-/area/shuttle/escape{
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	})
 "nV" = (
 /obj/item/toy/chess/rook_black,
 /turf/simulated/floor/holofloor/wmarble,
@@ -2371,31 +2344,12 @@
 "nW" = (
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
-"nZ" = (
-/obj/effect/floor_decal/fancy_shuttle{
-	fancy_shuttle_tag = "tram"
-	},
-/obj/structure/closet/walllocker/emerglocker/east{
-	dir = 2;
-	pixel_x = 0;
-	pixel_y = 32
-	},
-/obj/structure/bed/chair/shuttle_padded{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/shuttle/escape{
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	})
 "oI" = (
 /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b,
 /turf/space/transit/east,
 /area/space)
 "oL" = (
-/obj/effect/floor_decal/transit/orange{
-	dir = 8
-	},
-/obj/effect/transit/light{
+/obj/effect/floor_decal/techfloor/orange{
 	dir = 8
 	},
 /obj/effect/step_trigger/thrower{
@@ -2421,7 +2375,7 @@
 /area/holodeck/source_chess)
 "pv" = (
 /obj/effect/floor_decal/techfloor/orange{
-	dir = 8
+	dir = 4
 	},
 /obj/effect/step_trigger/thrower{
 	affect_ghosts = 1;
@@ -2430,6 +2384,9 @@
 	stopper = 0;
 	tiles = 0
 	},
+/obj/effect/floor_decal/transit/orange{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor/grid/transit,
 /area/space)
 "pz" = (
@@ -2446,18 +2403,11 @@
 /turf/space/transit/east,
 /area/space)
 "pQ" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/obj/effect/step_trigger/thrower{
-	affect_ghosts = 1;
-	name = "thrower_throwdownside";
-	nostop = 1;
-	stopper = 0;
-	tiles = 0
+/obj/effect/transit/light{
+	dir = 8
 	},
 /obj/effect/floor_decal/transit/orange{
-	dir = 4
+	dir = 8
 	},
 /turf/simulated/floor/tiled/techfloor/grid/transit,
 /area/space)
@@ -2474,9 +2424,7 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/centcom/simulated/terminal)
 "qa" = (
-/obj/machinery/light{
-	dir = 8
-	},
+/obj/structure/table/standard,
 /obj/effect/floor_decal/fancy_shuttle{
 	fancy_shuttle_tag = "tram"
 	},
@@ -2486,10 +2434,10 @@
 	})
 "qc" = (
 /obj/effect/transit/light{
-	dir = 8
+	dir = 4
 	},
 /obj/effect/floor_decal/transit/orange{
-	dir = 8
+	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor/grid/transit,
 /area/space)
@@ -2508,22 +2456,35 @@
 /turf/space,
 /turf/space/internal_edge/bottomright,
 /area/space)
+"qQ" = (
+/obj/structure/sign/warning/docking_area,
+/turf/unsimulated/wall,
+/area/centcom/simulated/terminal)
 "qV" = (
 /obj/effect/floor_decal/sign/small_6,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
-"ra" = (
+"qY" = (
+/obj/effect/fancy_shuttle/orangeline{
+	dir = 1;
+	fancy_shuttle_tag = "tram";
+	plane = -45
+	},
+/obj/effect/fancy_shuttle_floor_preview/orangeline{
+	dir = 1;
+	plane = -45
+	},
+/turf/simulated/wall/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
+	},
+/area/shuttle/escape{
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	})
+"ri" = (
 /obj/effect/floor_decal/fancy_shuttle{
 	fancy_shuttle_tag = "tram"
 	},
-/obj/structure/closet/walllocker/emerglocker/east{
-	dir = 2;
-	pixel_x = 0;
-	pixel_y = 32
-	},
-/obj/structure/bed/chair/shuttle_padded{
-	dir = 8
-	},
+/obj/structure/closet/walllocker_double/hydrant/west,
 /turf/simulated/floor/tiled,
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
@@ -2532,10 +2493,46 @@
 /obj/item/toy/chess/pawn_black,
 /turf/simulated/floor/holofloor/bmarble,
 /area/holodeck/source_chess)
+"rD" = (
+/obj/effect/floor_decal/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
+	},
+/obj/structure/bed/chair/sofa/bench{
+	dir = 8;
+	padding_color = "#99AAFF"
+	},
+/obj/random/forgotten_tram,
+/turf/simulated/floor/tiled,
+/area/shuttle/escape{
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	})
 "rE" = (
 /obj/machinery/telecomms/bus/preset_cent,
 /turf/unsimulated/floor/steel,
 /area/centcom/control)
+"rJ" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/obj/machinery/light,
+/turf/simulated/floor/tiled/steel_grid,
+/area/centcom/simulated/terminal)
+"rW" = (
+/obj/effect/floor_decal/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
+	},
+/obj/structure/bed/chair/sofa/bench/right{
+	dir = 8;
+	padding_color = "#99AAFF"
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/random/forgotten_tram,
+/turf/simulated/floor/tiled,
+/area/shuttle/escape{
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	})
 "sb" = (
 /obj/item/toy/chess/knight_white,
 /turf/simulated/floor/holofloor/wmarble,
@@ -2544,32 +2541,28 @@
 /turf/space/internal_edge/top,
 /area/space)
 "sp" = (
-/obj/effect/transit/light{
-	dir = 4
-	},
-/obj/effect/floor_decal/transit/orange{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid/transit,
-/area/space)
-"st" = (
-/obj/structure/sign/warning/docking_area,
-/turf/unsimulated/wall,
-/area/centcom/simulated/terminal)
-"sw" = (
 /obj/effect/step_trigger/lost_in_space/tram,
 /obj/effect/floor_decal/transit/orange{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/techfloor/grid/transit,
 /area/space)
-"sx" = (
+"st" = (
 /obj/effect/step_trigger/lost_in_space/tram,
 /obj/effect/floor_decal/transit/orange{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor/grid/transit,
 /area/space)
+"sw" = (
+/obj/effect/floor_decal/techfloor/orange{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/centcom/simulated/terminal)
+"sx" = (
+/turf/simulated/floor/maglev,
+/area/centcom/simulated/terminal)
 "sB" = (
 /obj/structure/table/glass,
 /obj/item/weapon/storage/pill_bottle/spaceacillin,
@@ -2579,22 +2572,19 @@
 /obj/effect/overmap/bluespace_rift,
 /turf/unsimulated/map,
 /area/overmap)
-"sH" = (
-/obj/structure/closet/walllocker_double/hydrant/south,
-/obj/structure/bed/chair/sofa/bench/right{
-	dir = 4;
-	padding_color = "#99AAFF"
-	},
+"sN" = (
 /obj/effect/floor_decal/fancy_shuttle{
 	fancy_shuttle_tag = "tram"
 	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/effect/floor_decal/industrial/outline/blue,
+/obj/structure/closet/emcloset,
 /turf/simulated/floor/tiled,
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
 	})
-"sN" = (
-/turf/simulated/floor/maglev,
-/area/centcom/simulated/terminal)
 "sQ" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/melee/baton/loaded,
@@ -2617,11 +2607,25 @@
 /turf/simulated/floor/tiled/steel,
 /area/centcom/simulated/main_hall)
 "tu" = (
-/obj/structure/sign/warning{
-	name = "\improper STAND AWAY FROM TRACK EDGE"
+/obj/effect/floor_decal/techfloor/orange{
+	dir = 8
 	},
-/turf/unsimulated/wall,
-/area/space)
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/centcom/simulated/terminal)
+"tz" = (
+/obj/effect/floor_decal/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
+	},
+/obj/structure/bed/chair/shuttle{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/shuttle/escape{
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	})
 "tC" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -2637,32 +2641,6 @@
 	},
 /turf/space/transit/east,
 /area/space)
-"tH" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/random/forgotten_tram,
-/obj/effect/floor_decal/fancy_shuttle{
-	fancy_shuttle_tag = "tram"
-	},
-/obj/structure/table/standard,
-/obj/item/weapon/storage/firstaid/toxin,
-/obj/item/weapon/storage/firstaid/o2,
-/turf/simulated/floor/tiled,
-/area/shuttle/escape{
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	})
-"tL" = (
-/obj/effect/floor_decal/fancy_shuttle{
-	fancy_shuttle_tag = "tram"
-	},
-/obj/structure/bed/chair/shuttle_padded{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/shuttle/escape{
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	})
 "tV" = (
 /obj/structure/table/standard,
 /obj/random/forgotten_tram,
@@ -2673,14 +2651,6 @@
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
 	})
-"tW" = (
-/obj/structure/sign/securearea{
-	desc = "A warning sign which reads 'HIGH VOLTAGE'";
-	icon_state = "shock";
-	name = "HIGH VOLTAGE"
-	},
-/turf/unsimulated/wall,
-/area/centcom/simulated/terminal)
 "uc" = (
 /turf/unsimulated/wall,
 /area/centcom/suppy)
@@ -2710,22 +2680,23 @@
 	},
 /area/centcom/suppy)
 "uj" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/centcom/simulated/terminal)
-"uE" = (
-/obj/machinery/door/airlock/glass_external{
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "escape_shuttle_hatch_station";
-	locked = 1;
-	name = "Shuttle Hatch"
-	},
 /obj/effect/floor_decal/fancy_shuttle{
 	fancy_shuttle_tag = "tram"
 	},
+/obj/structure/bed/chair/sofa/bench/left{
+	dir = 4;
+	padding_color = "#99AAFF"
+	},
+/turf/simulated/floor/tiled,
+/area/shuttle/escape{
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	})
+"uE" = (
+/obj/effect/floor_decal/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
+	},
+/obj/structure/table/standard,
+/obj/random/forgotten_tram,
 /turf/simulated/floor/tiled,
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
@@ -2816,13 +2787,15 @@
 /turf/unsimulated/floor/steel,
 /area/centcom/control)
 "xm" = (
-/obj/machinery/light,
-/obj/random/forgotten_tram,
 /obj/effect/floor_decal/fancy_shuttle{
 	fancy_shuttle_tag = "tram"
 	},
+/obj/machinery/light,
+/obj/structure/bed/chair/sofa/bench/left{
+	dir = 8;
+	padding_color = "#99AAFF"
+	},
 /obj/random/forgotten_tram,
-/obj/structure/table/standard,
 /turf/simulated/floor/tiled,
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
@@ -2865,6 +2838,17 @@
 	},
 /turf/simulated/floor/wood,
 /area/centcom/simulated/bar)
+"xZ" = (
+/obj/effect/floor_decal/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
+	},
+/obj/structure/bed/chair/shuttle{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/shuttle/escape{
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	})
 "ya" = (
 /obj/effect/step_trigger/thrower{
 	affect_ghosts = 1;
@@ -2874,6 +2858,21 @@
 	},
 /turf/simulated/sky/virgo3b/south,
 /area/space)
+"yb" = (
+/obj/effect/floor_decal/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
+	},
+/obj/structure/bed/chair/sofa/bench/left{
+	dir = 4;
+	padding_color = "#99AAFF"
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/shuttle/escape{
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	})
 "yk" = (
 /obj/effect/step_trigger/lost_in_space/tram,
 /turf/simulated/floor/maglev{
@@ -2944,13 +2943,18 @@
 /area/centcom/simulated/security{
 	name = "\improper CentCom Security Arrivals"
 	})
-"zK" = (
-/obj/effect/shuttle_landmark{
-	base_area = /area/centcom/simulated/terminal;
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid;
-	docking_controller = null;
-	landmark_tag = "escape_cc";
-	name = "Escape Centcom"
+"zN" = (
+/obj/effect/floor_decal/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
+	},
+/obj/structure/closet/walllocker/medical/east,
+/turf/simulated/floor/tiled,
+/area/shuttle/escape{
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	})
+"As" = (
+/obj/effect/floor_decal/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
 	},
 /obj/machinery/door/airlock/glass_external{
 	frequency = 1380;
@@ -2959,24 +2963,6 @@
 	locked = 1;
 	name = "Shuttle Hatch"
 	},
-/obj/effect/floor_decal/fancy_shuttle{
-	fancy_shuttle_tag = "tram"
-	},
-/turf/simulated/floor/tiled,
-/area/shuttle/escape{
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	})
-"As" = (
-/obj/machinery/door/airlock/glass_external{
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "escape_shuttle_hatch_offsite";
-	locked = 1;
-	name = "Shuttle Hatch"
-	},
-/obj/effect/floor_decal/fancy_shuttle{
-	fancy_shuttle_tag = "tram"
-	},
 /turf/simulated/floor/tiled,
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
@@ -3111,33 +3097,11 @@
 	},
 /turf/simulated/floor/wood,
 /area/centcom/simulated/restaurant)
-"Ey" = (
-/obj/effect/floor_decal/fancy_shuttle{
-	fancy_shuttle_tag = "tram"
-	},
-/obj/structure/closet/walllocker/medical/west{
-	dir = 1;
-	pixel_x = 0;
-	pixel_y = -32
-	},
-/obj/structure/bed/chair/shuttle_padded{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/shuttle/escape{
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	})
-"EC" = (
-/obj/effect/floor_decal/fancy_shuttle{
-	fancy_shuttle_tag = "tram"
-	},
-/obj/machinery/status_display{
-	pixel_x = 34
-	},
-/turf/simulated/floor/tiled,
-/area/shuttle/escape{
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	})
+"EO" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/turf/simulated/floor/plating,
+/area/centcom/simulated/terminal)
 "ET" = (
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/centcom/simulated/terminal)
@@ -3158,18 +3122,6 @@
 	icon_state = "rock"
 	},
 /area/space)
-"Fz" = (
-/obj/effect/floor_decal/fancy_shuttle{
-	fancy_shuttle_tag = "tram"
-	},
-/obj/structure/bed/chair/sofa/bench/right{
-	dir = 8;
-	padding_color = "#99AAFF"
-	},
-/turf/simulated/floor/tiled,
-/area/shuttle/escape{
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	})
 "FC" = (
 /turf/simulated/floor/wood,
 /area/centcom/simulated/bar)
@@ -3214,6 +3166,19 @@
 /obj/item/toy/chess/king_white,
 /turf/simulated/floor/holofloor/bmarble,
 /area/holodeck/source_chess)
+"GX" = (
+/obj/effect/floor_decal/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
+	},
+/obj/structure/bed/chair/sofa/bench{
+	dir = 4;
+	padding_color = "#99AAFF"
+	},
+/obj/random/forgotten_tram,
+/turf/simulated/floor/tiled,
+/area/shuttle/escape{
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	})
 "Hf" = (
 /obj/effect/shuttle_landmark/transit{
 	base_area = /area/space;
@@ -3277,14 +3242,6 @@
 /obj/machinery/telecomms/hub/preset_cent,
 /turf/unsimulated/floor/steel,
 /area/centcom/control)
-"IN" = (
-/obj/effect/floor_decal/fancy_shuttle{
-	fancy_shuttle_tag = "tram"
-	},
-/turf/simulated/floor/tiled,
-/area/shuttle/escape{
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	})
 "IR" = (
 /obj/effect/step_trigger/thrower{
 	affect_ghosts = 1;
@@ -3294,6 +3251,18 @@
 	},
 /turf/simulated/sky/virgo3b/south,
 /area/space)
+"IV" = (
+/obj/effect/floor_decal/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
+	},
+/obj/structure/bed/chair/sofa/bench/left{
+	dir = 8;
+	padding_color = "#99AAFF"
+	},
+/turf/simulated/floor/tiled,
+/area/shuttle/escape{
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	})
 "IX" = (
 /obj/structure/table/glass,
 /obj/item/device/defib_kit/loaded,
@@ -3303,6 +3272,17 @@
 /obj/item/toy/chess/bishop_white,
 /turf/simulated/floor/holofloor/bmarble,
 /area/holodeck/source_chess)
+"Jw" = (
+/obj/effect/floor_decal/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
+	},
+/obj/machinery/status_display{
+	pixel_x = 32
+	},
+/turf/simulated/floor/tiled,
+/area/shuttle/escape{
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	})
 "Jz" = (
 /obj/effect/step_trigger/teleporter/random{
 	affect_ghosts = 1;
@@ -3320,6 +3300,18 @@
 /obj/machinery/smartfridge/drinks,
 /turf/simulated/floor/wood,
 /area/centcom/simulated/bar)
+"JC" = (
+/obj/effect/floor_decal/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
+	},
+/obj/structure/bed/chair/sofa/bench{
+	dir = 8;
+	padding_color = "#99AAFF"
+	},
+/turf/simulated/floor/tiled,
+/area/shuttle/escape{
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	})
 "JI" = (
 /obj/item/toy/chess/rook_white,
 /turf/simulated/floor/holofloor/bmarble,
@@ -3389,7 +3381,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/space)
 "Lm" = (
-/obj/structure/bed/chair/sofa/bench{
+/obj/structure/bed/chair/sofa/bench/right{
 	padding_color = "#99AAFF"
 	},
 /obj/effect/floor_decal/fancy_shuttle{
@@ -3400,14 +3392,21 @@
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
 	})
 "Lu" = (
-/obj/structure/closet/walllocker_double/hydrant/north,
-/obj/structure/bed/chair/sofa/bench/right{
-	dir = 8;
-	padding_color = "#99AAFF"
-	},
 /obj/effect/floor_decal/fancy_shuttle{
 	fancy_shuttle_tag = "tram"
 	},
+/obj/structure/closet/walllocker/medical/west,
+/turf/simulated/floor/tiled,
+/area/shuttle/escape{
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	})
+"Lx" = (
+/obj/effect/floor_decal/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
+	},
+/obj/effect/floor_decal/industrial/outline/blue,
+/obj/machinery/light,
+/obj/structure/closet/emcloset,
 /turf/simulated/floor/tiled,
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
@@ -3417,13 +3416,13 @@
 /turf/simulated/sky/virgo3b/south,
 /area/space)
 "LD" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
 /obj/structure/railing,
 /obj/structure/railing{
 	dir = 4
 	},
+/obj/effect/floor_decal/techfloor/orange{
+	dir = 6
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/centcom/simulated/terminal)
 "LR" = (
@@ -3433,13 +3432,10 @@
 /turf/simulated/floor/tiled/white,
 /area/centcom/simulated/medical)
 "Mb" = (
-/obj/structure/bed/chair/sofa/bench/right{
-	dir = 4;
-	padding_color = "#99AAFF"
-	},
 /obj/effect/floor_decal/fancy_shuttle{
 	fancy_shuttle_tag = "tram"
 	},
+/obj/structure/table/standard,
 /turf/simulated/floor/tiled,
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
@@ -3451,17 +3447,6 @@
 /obj/item/toy/chess/bishop_white,
 /turf/simulated/floor/holofloor/wmarble,
 /area/holodeck/source_chess)
-"Mm" = (
-/obj/effect/floor_decal/fancy_shuttle{
-	fancy_shuttle_tag = "tram"
-	},
-/obj/structure/bed/chair/shuttle_padded{
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
-/area/shuttle/escape{
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	})
 "MB" = (
 /obj/machinery/sleeper{
 	dir = 4
@@ -3540,8 +3525,9 @@
 /obj/effect/floor_decal/fancy_shuttle{
 	fancy_shuttle_tag = "tram"
 	},
-/obj/structure/bed/chair/sofa/bench/left{
-	dir = 8;
+/obj/machinery/light,
+/obj/structure/bed/chair/sofa/bench/right{
+	dir = 4;
 	padding_color = "#99AAFF"
 	},
 /turf/simulated/floor/tiled,
@@ -3549,13 +3535,16 @@
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
 	})
 "ND" = (
-/obj/effect/floor_decal/fancy_shuttle{
+/obj/effect/shuttle_landmark{
+	base_area = /area/centcom/simulated/terminal;
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid;
+	docking_controller = null;
+	landmark_tag = "escape_cc";
+	name = "Escape Centcom"
+	},
+/turf/simulated/wall/fancy_shuttle{
 	fancy_shuttle_tag = "tram"
 	},
-/obj/machinery/vending/cola/soft{
-	dir = 1
-	},
-/turf/simulated/floor/tiled,
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
 	})
@@ -3566,18 +3555,6 @@
 /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask,
 /turf/simulated/floor/wood,
 /area/centcom/simulated/bar)
-"NW" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/random/forgotten_tram,
-/obj/effect/floor_decal/fancy_shuttle{
-	fancy_shuttle_tag = "tram"
-	},
-/turf/simulated/floor/tiled,
-/area/shuttle/escape{
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	})
 "Oj" = (
 /obj/effect/step_trigger/thrower{
 	affect_ghosts = 1;
@@ -3600,6 +3577,19 @@
 /area/centcom/simulated/security{
 	name = "\improper CentCom Security Arrivals"
 	})
+"OT" = (
+/obj/effect/floor_decal/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
+	},
+/obj/structure/bed/chair/sofa/bench/left{
+	dir = 8;
+	padding_color = "#99AAFF"
+	},
+/obj/machinery/light,
+/turf/simulated/floor/tiled,
+/area/shuttle/escape{
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	})
 "OY" = (
 /turf/unsimulated/map,
 /area/overmap)
@@ -3623,23 +3613,16 @@
 /turf/space/transit/west,
 /area/space)
 "Pk" = (
-/obj/effect/fancy_shuttle/orangeline{
-	dir = 1;
-	fancy_shuttle_tag = "tram";
-	plane = -50
-	},
-/obj/effect/fancy_shuttle_floor_preview/orangeline{
-	dir = 1;
-	plane = -45
-	},
-/turf/simulated/wall/fancy_shuttle{
+/obj/effect/floor_decal/fancy_shuttle{
 	fancy_shuttle_tag = "tram"
 	},
+/obj/structure/closet/walllocker_double/hydrant/east,
+/turf/simulated/floor/tiled,
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
 	})
 "Pn" = (
-/obj/structure/bed/chair/sofa/bench{
+/obj/structure/bed/chair/sofa/bench/left{
 	dir = 1;
 	padding_color = "#99AAFF"
 	},
@@ -3657,25 +3640,36 @@
 /turf/simulated/floor/wood,
 /area/centcom/simulated/restaurant)
 "Pr" = (
-/obj/machinery/light{
-	dir = 4
-	},
 /obj/effect/floor_decal/fancy_shuttle{
 	fancy_shuttle_tag = "tram"
 	},
-/obj/structure/table/standard,
+/obj/structure/bed/chair/sofa/bench/right{
+	dir = 8;
+	padding_color = "#99AAFF"
+	},
 /turf/simulated/floor/tiled,
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
 	})
 "Py" = (
+/obj/structure/sign/securearea{
+	desc = "A warning sign which reads 'HIGH VOLTAGE'";
+	icon_state = "shock";
+	name = "HIGH VOLTAGE"
+	},
+/turf/unsimulated/wall,
+/area/centcom/simulated/terminal)
+"PF" = (
 /obj/structure/bed/chair/sofa/bench/left{
-	dir = 1;
+	dir = 4;
 	padding_color = "#99AAFF"
 	},
 /obj/effect/floor_decal/fancy_shuttle{
 	fancy_shuttle_tag = "tram"
 	},
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
@@ -3766,13 +3760,25 @@
 /turf/simulated/floor/tiled/white,
 /area/centcom/simulated/medical)
 "RA" = (
-/obj/machinery/light,
 /obj/effect/floor_decal/fancy_shuttle{
 	fancy_shuttle_tag = "tram"
 	},
-/obj/structure/table/standard,
-/obj/item/weapon/storage/firstaid/toxin,
-/obj/item/weapon/storage/firstaid/o2,
+/obj/machinery/status_display{
+	pixel_x = -32
+	},
+/turf/simulated/floor/tiled,
+/area/shuttle/escape{
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	})
+"RM" = (
+/obj/structure/bed/chair/sofa/bench/right{
+	dir = 4;
+	padding_color = "#99AAFF"
+	},
+/obj/effect/floor_decal/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
+	},
+/obj/random/forgotten_tram,
 /turf/simulated/floor/tiled,
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
@@ -3843,6 +3849,18 @@
 /obj/machinery/door/airlock/alien/blue/public,
 /turf/simulated/shuttle/floor/alienplating,
 /area/unknown/dorm4)
+"St" = (
+/obj/effect/floor_decal/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
+	},
+/obj/structure/bed/chair/sofa/bench/right{
+	dir = 4;
+	padding_color = "#99AAFF"
+	},
+/turf/simulated/floor/tiled,
+/area/shuttle/escape{
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	})
 "Su" = (
 /obj/structure/closet/alien,
 /turf/simulated/shuttle/floor/alien,
@@ -4146,14 +4164,12 @@
 /turf/simulated/shuttle/floor/alienplating,
 /area/unknown/dorm2)
 "TO" = (
-/obj/structure/bed/chair/sofa/bench/left{
-	dir = 8;
-	padding_color = "#99AAFF"
-	},
-/obj/random/forgotten_tram,
 /obj/effect/floor_decal/fancy_shuttle{
 	fancy_shuttle_tag = "tram"
 	},
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
@@ -4319,17 +4335,6 @@
 "Ux" = (
 /turf/simulated/shuttle/wall/alien,
 /area/unknown/dorm1)
-"Uy" = (
-/obj/effect/floor_decal/fancy_shuttle{
-	fancy_shuttle_tag = "tram"
-	},
-/obj/machinery/status_display{
-	pixel_x = -34
-	},
-/turf/simulated/floor/tiled,
-/area/shuttle/escape{
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid
-	})
 "Uz" = (
 /obj/machinery/recharge_station,
 /turf/simulated/shuttle/floor/alienplating,
@@ -4697,6 +4702,14 @@
 	},
 /turf/simulated/floor/tiled,
 /area/centcom/simulated/terminal)
+"VZ" = (
+/obj/effect/floor_decal/fancy_shuttle{
+	fancy_shuttle_tag = "tram"
+	},
+/turf/simulated/floor/tiled,
+/area/shuttle/escape{
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid
+	})
 "Wc" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/multi_tile/glass,
@@ -5386,15 +5399,15 @@
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "YZ" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
 /obj/structure/railing{
 	dir = 4
 	},
 /obj/structure/railing{
 	dir = 1
 	},
+/obj/effect/floor_decal/techfloor/orange{
+	dir = 5
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/centcom/simulated/terminal)
 "Zb" = (
@@ -9961,48 +9974,48 @@ Xl
 (32,1,1) = {"
 Hy
 Hy
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
 Hy
 ap
 ap
@@ -10103,47 +10116,47 @@ Xl
 (33,1,1) = {"
 Hy
 Hy
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
+fi
+fi
+hI
+in
+in
+in
+lf
+in
+in
+in
+lf
+in
+in
+in
+lf
+in
+in
+in
+mF
+oL
+in
+in
+mF
+in
+in
+in
+mF
+in
+in
+in
+mF
+in
+in
+in
+pQ
+fi
+fi
+fi
+hI
+sp
+fi
 dg
 Av
 ap
@@ -10245,47 +10258,47 @@ Xl
 (34,1,1) = {"
 Hy
 Hy
-hI
-hI
-in
-hI
-hI
-hI
-lf
+FT
+FT
+FT
+Sh
+Sh
+Sh
+Sh
+FT
+FT
+FT
+FT
+FT
 mb
-mb
-mb
-lf
-mb
-mb
-mb
-lf
-mb
-mb
-mb
-oL
-pv
-mb
-mb
-oL
-mb
-mb
-mb
-oL
-mb
-mb
-mb
-oL
-hI
-hI
-hI
-qc
-hI
-hI
-hI
-in
-sw
-hI
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+Sh
+Sh
+Sh
+Sh
+FT
+FT
+FT
+FT
+FT
+uG
+FT
 dg
 Hy
 ap
@@ -10390,17 +10403,20 @@ Hy
 FT
 FT
 FT
-FT
-FT
-FT
-Sh
 Sh
 Sh
 Sh
 Sh
 FT
 FT
-gv
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
 FT
 FT
 FT
@@ -10423,9 +10439,6 @@ FT
 FT
 FT
 FT
-FT
-FT
-FT
 uG
 FT
 dg
@@ -10532,14 +10545,17 @@ Hy
 cq
 cq
 cq
+vu
+vu
+vu
+vu
+cq
+cq
+cq
+cq
 cq
 cq
 cq
-vu
-vu
-vu
-vu
-vu
 cq
 cq
 cq
@@ -10565,9 +10581,6 @@ cq
 cq
 cq
 cq
-cq
-cq
-cq
 yk
 cq
 dg
@@ -10674,14 +10687,17 @@ Hy
 FT
 FT
 FT
+Sh
+Sh
+Sh
+Sh
+FT
+FT
+FT
+FT
 FT
 FT
 FT
-Sh
-Sh
-Sh
-Sh
-Sh
 FT
 FT
 FT
@@ -10707,9 +10723,6 @@ FT
 FT
 FT
 FT
-FT
-FT
-FT
 uG
 FT
 dg
@@ -10816,14 +10829,17 @@ Hy
 FT
 FT
 FT
+Sh
+Sh
+Sh
+Sh
+FT
+FT
+FT
+FT
 FT
 FT
 FT
-Sh
-Sh
-Sh
-Sh
-Sh
 FT
 FT
 FT
@@ -10849,9 +10865,6 @@ FT
 FT
 FT
 FT
-FT
-FT
-FT
 uG
 FT
 dg
@@ -10958,14 +10971,17 @@ Hy
 FT
 FT
 FT
+Sh
+Sh
+Sh
+Sh
+FT
+FT
+FT
+FT
 FT
 FT
 FT
-Sh
-Sh
-Sh
-Sh
-Sh
 FT
 FT
 FT
@@ -10991,9 +11007,6 @@ FT
 FT
 FT
 FT
-FT
-FT
-FT
 uG
 FT
 dg
@@ -11100,14 +11113,17 @@ Hy
 FT
 FT
 FT
+Sh
+Sh
+Sh
+Sh
+FT
+FT
+FT
+FT
 FT
 FT
 FT
-Sh
-Sh
-Sh
-Sh
-Sh
 FT
 FT
 FT
@@ -11133,9 +11149,6 @@ FT
 FT
 FT
 FT
-FT
-FT
-FT
 uG
 FT
 dg
@@ -11242,14 +11255,17 @@ Hy
 FT
 FT
 FT
+Sh
+Sh
+Sh
+Sh
+FT
+FT
+FT
+FT
 FT
 FT
 FT
-Sh
-Sh
-Sh
-Sh
-Sh
 FT
 FT
 FT
@@ -11275,9 +11291,6 @@ FT
 FT
 FT
 FT
-FT
-FT
-FT
 uG
 FT
 dg
@@ -11384,14 +11397,17 @@ Hy
 cq
 cq
 cq
+vu
+vu
+vu
+vu
+cq
+cq
+cq
+cq
 cq
 cq
 cq
-vu
-vu
-vu
-vu
-vu
 cq
 cq
 cq
@@ -11417,9 +11433,6 @@ cq
 cq
 cq
 cq
-cq
-cq
-cq
 yk
 cq
 dg
@@ -11526,14 +11539,17 @@ Hy
 FT
 FT
 FT
+Sh
+Sh
+Sh
+Sh
+FT
+FT
+FT
+FT
 FT
 FT
 FT
-Sh
-Sh
-Sh
-Sh
-Sh
 FT
 FT
 FT
@@ -11559,9 +11575,6 @@ FT
 FT
 FT
 FT
-FT
-FT
-FT
 uG
 FT
 dg
@@ -11665,47 +11678,47 @@ Xl
 (44,1,1) = {"
 Hy
 Hy
-ig
-ig
-is
-ig
-ig
-ig
-lu
-mF
-mF
-mF
-lu
-mF
-mF
-mF
-lu
-mF
-mF
-mF
-lu
-pQ
-mF
-mF
-lu
-mF
-mF
-mF
-lu
-mF
-mF
-mF
-lu
-ig
-ig
-ig
-sp
-ig
-ig
-ig
-is
-sx
-ig
+FT
+FT
+FT
+Sh
+Sh
+Sh
+Sh
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+Sh
+Sh
+Sh
+Sh
+FT
+FT
+FT
+FT
+FT
+uG
+FT
 dg
 Hy
 ap
@@ -11807,47 +11820,47 @@ Xl
 (45,1,1) = {"
 Hy
 Hy
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
+gv
+gv
+ig
+is
+is
+is
+lu
+lW
+lW
+lW
+lu
+lW
+lW
+lW
+lu
+lW
+lW
+lW
+lu
+pv
+lW
+lW
+lu
+lW
+lW
+lW
+lu
+lW
+lW
+lW
+lu
+is
+is
+is
+qc
+gv
+gv
+gv
+ig
+st
+gv
 dg
 Fp
 ap
@@ -11949,48 +11962,48 @@ Xl
 (46,1,1) = {"
 Hy
 Hy
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
+dg
 Hy
 ap
 ap
@@ -16673,35 +16686,35 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
+qQ
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+Py
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+Py
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+CC
 ae
 ae
 ae
@@ -16815,35 +16828,35 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
+sT
+sw
+sw
+sw
+tu
+sw
+sw
+sw
+sw
+tu
+sw
+sw
+sw
+sw
+tu
+sw
+sw
+sw
+sw
+tu
+sw
+sw
+sw
+sw
+tu
+sw
+sw
+sw
+sT
 ae
 ae
 ae
@@ -16957,35 +16970,35 @@ ae
 ae
 ae
 ae
-st
-dZ
-dZ
-dZ
-dZ
-dZ
-dZ
-dZ
-dZ
-tW
-dZ
-dZ
-dZ
-dZ
-dZ
-dZ
-dZ
-dZ
-dZ
-dZ
-dZ
-tW
-dZ
-dZ
-dZ
-dZ
-dZ
-dZ
-CC
+sT
+ET
+ET
+ZE
+ZE
+RN
+RN
+ZE
+ND
+As
+As
+ZE
+ZE
+RN
+RN
+RN
+ZE
+ZE
+As
+As
+ZE
+ZE
+RN
+RN
+ZE
+qY
+ET
+ET
+sT
 ae
 ae
 ae
@@ -17100,33 +17113,33 @@ ae
 ae
 ae
 sT
+ET
+ET
+ZE
+sN
 uj
-uj
-uj
-jL
-uj
-uj
-uj
-uj
-jL
-uj
-uj
-uj
-uj
-jL
-uj
-uj
-uj
-uj
-jL
-uj
-uj
-uj
-uj
-jL
-uj
-uj
-uj
+GX
+NC
+ZE
+TO
+VZ
+ZE
+PF
+lo
+lo
+RM
+kK
+ZE
+TO
+kK
+ZE
+yb
+GX
+St
+Lx
+ZE
+ET
+ET
 sT
 ae
 ae
@@ -17242,33 +17255,33 @@ ae
 ae
 ae
 sT
-ET
-ET
-ET
-ET
-ET
-ET
+sx
+sx
 ZE
+VZ
+VZ
+VZ
+VZ
+Lu
+VZ
+VZ
+RA
+VZ
+VZ
+VZ
+VZ
+VZ
+RA
+VZ
+VZ
+ri
+VZ
+VZ
+VZ
+VZ
 ZE
-zK
-ZE
-RN
-RN
-ZE
-RN
-RN
-ZE
-RN
-RN
-ZE
-uE
-ZE
-Pk
-ET
-ET
-ET
-ET
-ET
+sx
+sx
 sT
 ae
 ae
@@ -17384,33 +17397,33 @@ ae
 ae
 ae
 sT
-sN
-sN
-sN
-sN
-sN
-sN
+ET
+ET
 ZE
-tL
-IN
-ZE
-lW
-Mb
-NW
-he
-Mb
+VZ
+VZ
+VZ
+VZ
+VZ
+VZ
+VZ
+Lm
+tV
+Pn
+VZ
+Lm
 qa
-he
-sH
+Pn
+VZ
+VZ
+VZ
+VZ
+VZ
+VZ
+VZ
 ZE
-IN
-tL
-ZE
-sN
-sN
-sN
-sN
-sN
+ET
+ET
 sT
 ae
 ae
@@ -17528,29 +17541,29 @@ ae
 sT
 ET
 ET
-ET
-ET
-ET
-ET
+RN
+tz
+tz
+VZ
+tz
+tz
+VZ
+VZ
+MP
+qa
+PU
+VZ
+MP
+tV
+PU
+VZ
+VZ
+tz
+tz
+VZ
+tz
+tz
 ZE
-tH
-IN
-ZE
-IN
-IN
-IN
-IN
-IN
-IN
-IN
-IN
-ZE
-IN
-RA
-ZE
-ET
-ET
-ET
 ET
 ET
 sT
@@ -17670,29 +17683,29 @@ ae
 sT
 ET
 ET
-ET
-ET
-ET
-ET
+RN
+uE
+Mb
+VZ
+uE
+Mb
+VZ
+VZ
+VZ
+VZ
+VZ
+VZ
+VZ
+VZ
+VZ
+VZ
+VZ
+Mb
+Mb
+VZ
+Mb
+uE
 ZE
-ra
-IN
-Uy
-IN
-fi
-tV
-Py
-fi
-tV
-Py
-IN
-Uy
-IN
-nz
-ZE
-ET
-ET
-ET
 ET
 ET
 sT
@@ -17812,31 +17825,31 @@ ae
 sT
 ET
 ET
-ET
-ET
-ET
-ET
-ZE
-nB
-IN
-IN
-IN
+RN
+xZ
+xZ
+VZ
+xZ
+xZ
+VZ
+VZ
 Lm
-tV
+qa
 Pn
+VZ
 Lm
-tV
+qa
 Pn
-IN
-IN
-IN
-ND
+VZ
+VZ
+xZ
+xZ
+VZ
+xZ
+xZ
 ZE
 ET
 ET
-ET
-ET
-ET
 sT
 ae
 ae
@@ -17954,31 +17967,31 @@ ae
 sT
 ET
 ET
-ET
-ET
-ET
-ET
 ZE
-nZ
-IN
-EC
-IN
+VZ
+VZ
+VZ
+VZ
+VZ
+VZ
+VZ
 MP
 tV
 PU
+VZ
 MP
-tV
+qa
 PU
-IN
-EC
-IN
-Ey
+VZ
+VZ
+VZ
+VZ
+VZ
+VZ
+VZ
 ZE
 ET
 ET
-ET
-ET
-ET
 sT
 ae
 ae
@@ -18094,33 +18107,33 @@ ae
 ae
 ae
 sT
-ET
-ET
-ET
-ET
-ET
-ET
+sx
+sx
 ZE
-jA
-IN
+VZ
+VZ
+VZ
+VZ
+Pk
+VZ
+VZ
+Jw
+VZ
+VZ
+VZ
+VZ
+VZ
+Jw
+VZ
+VZ
+zN
+VZ
+VZ
+VZ
+VZ
 ZE
-IN
-IN
-IN
-IN
-IN
-IN
-IN
-IN
-ZE
-IN
-xm
-ZE
-ET
-ET
-ET
-ET
-ET
+sx
+sx
 sT
 ae
 ae
@@ -18236,33 +18249,33 @@ ae
 ae
 ae
 sT
-sN
-sN
-sN
-sN
-sN
-sN
+ET
+ET
 ZE
-Mm
-IN
+sN
+Pr
+JC
+xm
 ZE
-Lu
-NC
-Pr
-Fz
-NC
-Pr
-Fz
 TO
+VZ
 ZE
-IN
-Mm
+TO
+Pr
+JC
+rD
+OT
 ZE
-sN
-sN
-sN
-sN
-sN
+TO
+kK
+ZE
+rW
+JC
+IV
+Lx
+ZE
+ET
+ET
 sT
 ae
 ae
@@ -18380,29 +18393,29 @@ ae
 sT
 ET
 ET
-ET
-ET
-ET
-ET
+ZE
+ZE
+RN
+RN
 ZE
 ZE
 As
-ZE
-RN
-RN
-ZE
-RN
-RN
-ZE
-RN
-RN
-ZE
 As
 ZE
 ZE
-ET
-ET
-ET
+RN
+RN
+RN
+ZE
+ZE
+As
+As
+ZE
+ZE
+RN
+RN
+ZE
+ZE
 ET
 ET
 sT
@@ -18526,17 +18539,17 @@ Rc
 zv
 pX
 pX
-pX
 LD
 NA
 NA
 NA
-NA
-NA
-NA
-NA
-NA
-NA
+rJ
+EO
+EO
+EO
+EO
+EO
+gT
 NA
 NA
 NA
@@ -18661,7 +18674,7 @@ ae
 ae
 ae
 ae
-tu
+Vl
 Vg
 Vg
 Vg
diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index 654064f0b6b..f5c203d4ca8 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -3455,10 +3455,7 @@
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
 "afH" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/simulated/floor/maglev,
 /area/tether/surfacebase/tram)
 "afI" = (
 /obj/item/device/radio/intercom{
@@ -11610,9 +11607,6 @@
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 4
 	},
-/obj/machinery/light{
-	dir = 4
-	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/tether/surfacebase/tram)
 "atD" = (
@@ -11871,6 +11865,9 @@
 	landmark_tag = "escape_station";
 	name = "Tether Surface Base"
 	},
+/obj/effect/floor_decal/techfloor/orange{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/tether/surfacebase/tram)
 "aub" = (
@@ -11894,8 +11891,8 @@
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 4
 	},
-/obj/machinery/camera/network/civilian{
-	dir = 9
+/obj/machinery/light{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/tether/surfacebase/tram)
@@ -19281,13 +19278,13 @@
 /turf/simulated/floor/tiled,
 /area/crew_quarters/visitor_dining)
 "aFU" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
 /obj/structure/railing{
 	dir = 8
 	},
 /obj/structure/railing,
+/obj/effect/floor_decal/techfloor/orange{
+	dir = 10
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/tether/surfacebase/tram)
 "aFV" = (
@@ -21247,7 +21244,13 @@
 /turf/simulated/floor/tiled/steel_grid,
 /area/tether/surfacebase/tram)
 "aJq" = (
-/turf/simulated/floor/maglev,
+/obj/effect/floor_decal/techfloor/orange{
+	dir = 4
+	},
+/obj/machinery/camera/network/civilian{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/tether/surfacebase/tram)
 "aJr" = (
 /obj/effect/floor_decal/borderfloor{
@@ -32411,6 +32414,12 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/security/brig/bathroom)
+"eDV" = (
+/obj/effect/floor_decal/techfloor/orange/corner{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/tether/surfacebase/tram)
 "eEn" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -33088,6 +33097,18 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/carpet/gaycarpet,
 /area/tether/surfacebase/funny/clownoffice)
+"gIa" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/effect/floor_decal/techfloor/orange{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/tether/surfacebase/tram)
 "gIt" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -35110,15 +35131,9 @@
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/surface_one_hall)
 "mtl" = (
-/obj/effect/floor_decal/techfloor/orange{
+/obj/effect/floor_decal/techfloor/orange/corner{
 	dir = 8
 	},
-/obj/structure/railing{
-	dir = 8
-	},
-/obj/structure/railing{
-	dir = 1
-	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/tether/surfacebase/tram)
 "mtL" = (
@@ -39947,7 +39962,7 @@ aad
 aad
 aad
 aad
-aad
+bcV
 aad
 aad
 aad
@@ -40086,7 +40101,7 @@ aah
 aah
 aah
 aad
-bcV
+aad
 aad
 aad
 aad
@@ -55575,11 +55590,11 @@ baU
 aah
 aah
 aah
+aah
 aty
 atx
 atx
 atx
-atx
 aty
 atB
 oeA
@@ -55717,12 +55732,12 @@ baU
 aah
 aah
 aah
+aah
 auD
 atz
 atz
 atz
 atz
-atz
 auc
 auc
 aFU
@@ -55734,12 +55749,12 @@ aub
 aub
 aub
 aub
+aub
 wXW
 atA
 atA
 atA
-mtl
-auc
+gIa
 auc
 auc
 auc
@@ -55853,9 +55868,10 @@ aah
 aad
 aad
 aad
-aad
-aad
 baU
+baU
+baU
+aah
 aah
 aah
 aah
@@ -55866,22 +55882,21 @@ aud
 aud
 aud
 aud
-aud
-aud
+mtl
 aua
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
+atz
+atz
+atz
+atz
+atz
+atz
+atz
+atz
+atz
+atz
+atz
+atz
+eDV
 aud
 aud
 aud
@@ -55996,40 +56011,40 @@ aad
 aad
 aad
 aad
-aad
 baU
 baU
+baU
+aah
 aah
 aah
 auD
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
 auD
 aad
 aad
@@ -56143,35 +56158,35 @@ baU
 baU
 aah
 aah
+aah
 auD
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
 auD
 aad
 aad
@@ -56285,6 +56300,7 @@ baU
 baU
 aah
 aah
+aah
 auD
 aud
 aud
@@ -56313,7 +56329,6 @@ aud
 aud
 aud
 aud
-aud
 auD
 aad
 aad
@@ -56427,6 +56442,7 @@ aad
 baU
 aah
 aah
+aah
 auD
 aud
 aud
@@ -56455,7 +56471,6 @@ aud
 aud
 aud
 aud
-aud
 auD
 aad
 aad
@@ -56566,9 +56581,10 @@ aad
 aad
 aad
 aad
-aad
+baU
 baU
 aah
+aah
 auD
 aud
 aud
@@ -56597,7 +56613,6 @@ aud
 aud
 aud
 aud
-aud
 auD
 aad
 aad
@@ -56709,7 +56724,8 @@ aad
 aad
 aad
 aad
-aad
+baU
+aah
 aah
 auD
 aud
@@ -56739,7 +56755,6 @@ aud
 aud
 aud
 aud
-aud
 auD
 aad
 aad
@@ -56851,37 +56866,37 @@ aad
 aad
 aad
 aad
-aad
+baU
+aah
 aah
 auD
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
-aJq
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
 auD
 aad
 aad
@@ -56995,35 +57010,35 @@ aad
 aad
 aad
 aah
+aah
 auD
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
-aud
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
+afH
 auD
 aad
 aad
@@ -57137,35 +57152,35 @@ aad
 aad
 aad
 aah
+aah
 auD
-afH
-afH
-afH
-afH
-atC
-afH
-afH
-afH
-afH
-aue
-atC
-afH
-afH
-afH
-atC
-afH
-afH
-afH
-atC
-aue
-afH
-afH
-afH
-atC
-afH
-afH
-afH
-afH
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
 auD
 aad
 aad
@@ -57279,36 +57294,36 @@ aad
 aad
 aad
 aad
-aty
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-atx
-aty
+aah
+auD
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+auD
 aad
 aad
 aad
@@ -57421,36 +57436,36 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+auD
+atC
+atC
+atC
+aue
+atC
+atC
+atC
+atC
+aJq
+aue
+atC
+atC
+atC
+aue
+atC
+atC
+atC
+aue
+aJq
+atC
+atC
+atC
+aue
+atC
+atC
+atC
+atC
+auD
 aad
 aad
 aad
@@ -57564,35 +57579,35 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aty
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+atx
+aty
 aad
 aad
 aad