From 02b93082ef492df25388458796970c87dccbd37d Mon Sep 17 00:00:00 2001
From: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Date: Mon, 5 Apr 2021 06:06:45 +0100
Subject: [PATCH] tram+station take 2

---
 code/game/objects/random/mapping_vr.dm |  145 +-
 maps/tether/submaps/tether_misc.dmm    | 3971 ++++++++++++------------
 maps/tether/tether-01-surface1.dmm     |  690 ++--
 maps/tether/tether-02-surface2.dmm     |   80 +-
 4 files changed, 2585 insertions(+), 2301 deletions(-)

diff --git a/code/game/objects/random/mapping_vr.dm b/code/game/objects/random/mapping_vr.dm
index 43431a8b16f..b9ebfd1dc06 100644
--- a/code/game/objects/random/mapping_vr.dm
+++ b/code/game/objects/random/mapping_vr.dm
@@ -7,4 +7,147 @@
 
 /obj/random/empty_or_lootable_crate/item_to_spawn()
 	return pick(/obj/random/crate,
-			/obj/random/multiple/corp_crate)
\ No newline at end of file
+			/obj/random/multiple/corp_crate)
+			
+/obj/random/forgotten_tram
+	name = "random forgotten tram item"
+	desc = "Spawns a random item that someone might accidentally leave on a tram. Sometimes spawns nothing."
+	spawn_nothing_percentage = 30
+
+/obj/random/forgotten_tram/item_to_spawn()
+	return pick(prob(2);/obj/item/device/flashlight,
+			prob(2);/obj/item/device/flashlight/glowstick,
+			prob(2);/obj/item/device/flashlight/glowstick/blue,
+			prob(1);/obj/item/device/flashlight/glowstick/orange,
+			prob(1);/obj/item/device/flashlight/glowstick/red,
+			prob(1);/obj/item/device/flashlight/glowstick/yellow,
+			prob(1);/obj/item/device/flashlight/pen,
+			prob(2);/obj/item/device/flashlight/maglight,
+			prob(5);/obj/random/cigarettes,
+			prob(5);/obj/random/soap,
+			prob(5);/obj/random/drinksoft,
+			prob(5);/obj/random/snack,
+			prob(5);/obj/random/plushie,
+			prob(2);/obj/item/weapon/storage/secure/briefcase,
+			prob(4);/obj/item/weapon/storage/briefcase,
+			prob(5);/obj/item/weapon/storage/backpack,
+			prob(5);/obj/item/weapon/storage/backpack/medic,
+			prob(5);/obj/item/weapon/storage/backpack/industrial,
+			prob(5);/obj/item/weapon/storage/backpack/toxins,
+			prob(3);/obj/item/weapon/storage/backpack/dufflebag,
+			prob(3);/obj/item/weapon/storage/backpack/dufflebag/med,
+			prob(3);/obj/item/weapon/storage/backpack/dufflebag/eng,
+			prob(1);/obj/item/weapon/storage/backpack/dufflebag/syndie,
+			prob(1);/obj/item/weapon/storage/backpack/dufflebag/syndie/med,
+			prob(1);/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo,
+			prob(4);/obj/item/weapon/storage/backpack/satchel,
+			prob(5);/obj/item/weapon/storage/backpack/satchel/norm,
+			prob(5);/obj/item/weapon/storage/backpack/satchel/med,
+			prob(5);/obj/item/weapon/storage/backpack/satchel/eng,
+			prob(5);/obj/item/weapon/storage/backpack/satchel/tox,
+			prob(5);/obj/item/weapon/storage/backpack/messenger/med,
+			prob(5);/obj/item/weapon/storage/backpack/messenger/engi,
+			prob(5);/obj/item/weapon/storage/backpack/messenger/tox,
+			prob(3);/obj/item/weapon/storage/wallet,
+			prob(1);/obj/item/clothing/gloves/black,
+			prob(1);/obj/item/clothing/gloves/blue,
+			prob(1);/obj/item/clothing/gloves/brown,
+			prob(1);/obj/item/clothing/gloves/duty,
+			prob(1);/obj/item/clothing/gloves/fingerless,
+			prob(1);/obj/item/clothing/gloves/green,
+			prob(1);/obj/item/clothing/gloves/grey,
+			prob(1);/obj/item/clothing/gloves/orange,
+			prob(1);/obj/item/clothing/gloves/yellow,
+			prob(3);/obj/item/clothing/gloves/botanic_leather,
+			prob(2);/obj/item/clothing/gloves/sterile/latex,
+			prob(5);/obj/item/clothing/gloves/white,
+			prob(5);/obj/item/clothing/gloves/rainbow,
+			prob(2);/obj/item/clothing/gloves/fyellow,
+			prob(1);/obj/item/clothing/glasses/rimless,
+			prob(1);/obj/item/clothing/glasses/thin,
+			prob(1);/obj/item/clothing/glasses/regular,
+			prob(1);/obj/item/clothing/glasses/regular/rimless,
+			prob(1);/obj/item/clothing/glasses/regular/thin,
+			prob(1);/obj/item/clothing/glasses/fakesunglasses,
+			prob(1);/obj/item/clothing/glasses/fakesunglasses/aviator,
+			prob(1);/obj/item/clothing/glasses/omnihud,
+			prob(4);/obj/item/clothing/head/hardhat,
+			prob(3);/obj/item/clothing/head/hardhat/red,
+			prob(2);/obj/item/clothing/head/hardhat/dblue,
+			prob(2);/obj/item/clothing/head/hardhat/orange,
+			prob(4);/obj/item/clothing/head/soft/,
+			prob(4);/obj/item/clothing/head/soft/black,
+			prob(4);/obj/item/clothing/head/soft/blue,
+			prob(4);/obj/item/clothing/head/soft/green,
+			prob(4);/obj/item/clothing/head/soft/grey,
+			prob(4);/obj/item/clothing/head/soft/med,
+			prob(4);/obj/item/clothing/head/soft/nanotrasen,
+			prob(4);/obj/item/clothing/head/soft/red,
+			prob(4);/obj/item/clothing/head/soft/orange,
+			prob(4);/obj/item/clothing/head/soft/sec,
+			prob(4);/obj/item/clothing/head/soft/sec/corp,
+			prob(3);/obj/item/clothing/head/soft/yellow,
+			prob(1);/obj/item/clothing/head/ushanka,
+			prob(3);/obj/item/clothing/head/beret,
+			prob(3);/obj/item/clothing/head/beret/engineering,
+			prob(1);/obj/item/clothing/head/beret/purple,
+			prob(3);/obj/item/clothing/head/beret/sec,
+			prob(3);/obj/item/clothing/head/beret/sec/corporate/officer,
+			prob(3);/obj/item/clothing/head/beret/sec/navy/officer,
+			prob(3);/obj/item/clothing/head/soft/yellow,
+			prob(2);/obj/item/clothing/head/orangebandana,
+			prob(3);/obj/item/clothing/suit/storage/toggle/bomber,
+			prob(3);/obj/item/clothing/suit/storage/toggle/hoodie/black,
+			prob(3);/obj/item/clothing/suit/storage/toggle/hoodie/blue,
+			prob(3);/obj/item/clothing/suit/storage/toggle/hoodie/red,
+			prob(3);/obj/item/clothing/suit/storage/toggle/hoodie/yellow,
+			prob(3);/obj/item/clothing/suit/storage/toggle/brown_jacket,
+			prob(3);/obj/item/clothing/suit/storage/toggle/leather_jacket,
+			prob(4);/obj/item/clothing/suit/storage/toggle/labcoat,
+			prob(4);/obj/item/clothing/suit/storage/toggle/labcoat/science,
+			prob(4);/obj/item/clothing/suit/storage/miljacket,
+			prob(4);/obj/item/clothing/suit/storage/miljacket/alt,
+			prob(4);/obj/item/clothing/suit/storage/miljacket/black,
+			prob(4);/obj/item/clothing/suit/storage/miljacket/green,
+			prob(4);/obj/item/clothing/suit/storage/miljacket/grey,
+			prob(4);/obj/item/clothing/suit/storage/miljacket/navy,
+			prob(4);/obj/item/clothing/suit/storage/miljacket/tan,
+			prob(4);/obj/item/clothing/suit/storage/miljacket/white,
+			prob(4);/obj/item/clothing/suit/storage/trench,
+			prob(3);/obj/item/clothing/suit/varsity,
+			prob(3);/obj/item/clothing/suit/varsity/blue,
+			prob(3);/obj/item/clothing/suit/varsity/brown,
+			prob(3);/obj/item/clothing/suit/varsity/green,
+			prob(3);/obj/item/clothing/suit/varsity/purple,
+			prob(3);/obj/item/clothing/suit/varsity/red,
+			prob(3);/obj/item/clothing/accessory/poncho,
+			prob(3);/obj/item/clothing/accessory/poncho/blue,
+			prob(3);/obj/item/clothing/accessory/poncho/green,
+			prob(3);/obj/item/clothing/accessory/poncho/purple,
+			prob(3);/obj/item/clothing/accessory/poncho/red,
+			prob(3);/obj/item/clothing/accessory/poncho/roles/cargo,
+			prob(3);/obj/item/clothing/accessory/poncho/roles/engineering,
+			prob(3);/obj/item/clothing/accessory/poncho/roles/medical,
+			prob(3);/obj/item/clothing/accessory/poncho/roles/science,
+			prob(3);/obj/item/clothing/accessory/poncho/roles/security,
+			prob(3);/obj/item/clothing/accessory/poncho/roles/cloak/atmos,
+			prob(3);/obj/item/clothing/accessory/poncho/roles/cloak/cargo,
+			prob(3);/obj/item/clothing/accessory/poncho/roles/cloak/engineer,
+			prob(3);/obj/item/clothing/accessory/poncho/roles/cloak/medical,
+			prob(3);/obj/item/clothing/accessory/poncho/roles/cloak/mining,
+			prob(3);/obj/item/clothing/accessory/poncho/roles/cloak/research,
+			prob(3);/obj/item/clothing/accessory/poncho/roles/cloak/security,
+			prob(2);/obj/item/clothing/accessory/stethoscope,
+			prob(2);/obj/item/device/camera,
+			prob(3);/obj/item/device/pda,
+			prob(3);/obj/item/device/radio/headset,
+			prob(2);/obj/item/toy/tennis,
+			prob(2);/obj/item/toy/tennis/red,
+			prob(2);/obj/item/toy/tennis/yellow,
+			prob(2);/obj/item/toy/tennis/green,
+			prob(2);/obj/item/toy/tennis/cyan,
+			prob(2);/obj/item/toy/tennis/blue,
+			prob(2);/obj/item/toy/tennis/purple,
+			prob(2);/obj/item/clothing/ears/earmuffs,
+			prob(2);/obj/item/clothing/ears/earmuffs/headphones
+			)
\ No newline at end of file
diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm
index cae7622ae35..effdb42267c 100644
--- a/maps/tether/submaps/tether_misc.dmm
+++ b/maps/tether/submaps/tether_misc.dmm
@@ -71,10 +71,8 @@
 	},
 /area/shuttle/supply)
 "aj" = (
-/obj/structure/sign/warning{
-	name = "\improper STAND AWAY FROM TRACK EDGE"
-	},
-/turf/unsimulated/wall,
+/obj/machinery/light,
+/turf/simulated/floor/tiled/steel_grid,
 /area/centcom/simulated/terminal)
 "ak" = (
 /obj/structure/table/woodentable/holotable,
@@ -783,11 +781,10 @@
 /turf/simulated/shuttle/floor/alien,
 /area/unknown/dorm3)
 "cq" = (
-/obj/structure/bed/chair/shuttle{
-	dir = 1
+/turf/simulated/floor/maglev{
+	icon = 'icons/turf/transit_vr.dmi'
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/escape)
+/area/space)
 "cr" = (
 /turf/simulated/shuttle/wall/alien/blue/hard_corner,
 /area/unknown/dorm5)
@@ -1225,22 +1222,6 @@
 /obj/structure/closet/alien,
 /turf/simulated/shuttle/floor/alien,
 /area/unknown/dorm6)
-"dD" = (
-/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/borderfloor{
-	dir = 4
-	},
-/obj/effect/floor_decal/borderfloor{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/steel,
-/area/shuttle/escape)
 "dE" = (
 /obj/structure/shuttle/engine/heater,
 /obj/structure/window/reinforced{
@@ -1805,6 +1786,13 @@
 	icon_state = "beach"
 	},
 /area/holodeck/source_beach)
+"fN" = (
+/obj/machinery/door/airlock/multi_tile/glass{
+	req_access = list(5)
+	},
+/obj/machinery/door/firedoor/multi_tile,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
 "fO" = (
 /obj/structure/holostool,
 /obj/effect/floor_decal/carpet{
@@ -1974,15 +1962,9 @@
 /turf/simulated/floor/holofloor/snow,
 /area/holodeck/holodorm/source_snow)
 "gE" = (
-/obj/structure/closet/hydrant{
-	pixel_y = 32
-	},
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
-/obj/effect/floor_decal/borderfloor/corner{
-	dir = 4
-	},
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
 "gN" = (
@@ -2012,6 +1994,12 @@
 /obj/effect/floor_decal/industrial/danger,
 /turf/simulated/floor/tiled/steel,
 /area/centcom/simulated/main_hall)
+"gX" = (
+/obj/effect/floor_decal/borderfloor{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/escape)
 "hg" = (
 /obj/structure/flora/ausbushes/ywflowers,
 /obj/effect/landmark{
@@ -2153,32 +2141,46 @@
 	},
 /area/space)
 "ih" = (
-/obj/machinery/light{
+/obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
-/obj/effect/floor_decal/industrial/warning/corner{
-	dir = 1
-	},
+/obj/effect/floor_decal/borderfloor/corner,
+/obj/structure/closet/walllocker_double/hydrant/south,
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
 "ii" = (
-/obj/structure/bed/chair/shuttle{
-	dir = 1
+/obj/effect/floor_decal/borderfloor/corner{
+	dir = 8
 	},
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
 "in" = (
-/obj/effect/step_trigger/lost_in_space/tram,
 /obj/effect/floor_decal/transit/orange{
-	dir = 4
+	dir = 8
+	},
+/obj/effect/transit/light{
+	dir = 8
 	},
 /turf/simulated/floor/tiled/techfloor/grid{
 	icon = 'icons/turf/transit_vr.dmi';
 	initial_flooring = null
 	},
 /area/space)
+"iq" = (
+/obj/structure/closet/secure_closet/nanotrasen_security,
+/obj/item/weapon/storage/box/handcuffs,
+/obj/item/weapon/gun/energy/gun,
+/obj/item/weapon/shield/riot,
+/turf/simulated/floor/tiled,
+/area/centcom/simulated/security{
+	name = "\improper CentCom Security Arrivals"
+	})
+"is" = (
+/obj/machinery/vending/snack,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
 "ix" = (
-/obj/effect/floor_decal/industrial/warning{
+/obj/effect/floor_decal/industrial/warning/corner{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/steel,
@@ -2203,16 +2205,17 @@
 "jf" = (
 /turf/space/transit/north,
 /area/space)
-"jr" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/steel,
-/area/shuttle/escape)
 "jL" = (
-/obj/effect/step_trigger/lost_in_space/tram,
-/turf/simulated/floor/maglev{
-	icon = 'icons/turf/transit_vr.dmi'
+/obj/effect/shuttle_landmark{
+	base_area = null;
+	base_turf = null;
+	docking_controller = null;
+	landmark_tag = "escape_transit";
+	name = "Escape Transit"
+	},
+/turf/simulated/floor/tiled/techfloor/grid{
+	icon = 'icons/turf/transit_vr.dmi';
+	initial_flooring = null
 	},
 /area/space)
 "jQ" = (
@@ -2238,28 +2241,56 @@
 /obj/effect/floor_decal/sign/small_5,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
-"lf" = (
-/obj/effect/floor_decal/borderfloor/corner{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/steel,
-/area/shuttle/escape)
-"li" = (
-/obj/structure/window/reinforced/full,
-/obj/structure/window/reinforced{
+"kU" = (
+/obj/structure/table/reinforced,
+/obj/item/weapon/storage/box/donkpockets,
+/obj/item/weapon/storage/box/donkpockets,
+/obj/machinery/light/small{
 	dir = 8
 	},
-/obj/structure/grille,
-/turf/simulated/floor/plating/eris/under,
-/area/shuttle/escape)
-"lE" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 10
+/turf/simulated/floor/tiled,
+/area/centcom/simulated/security{
+	name = "\improper CentCom Security Arrivals"
+	})
+"lf" = (
+/obj/effect/floor_decal/techfloor/orange{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/steel,
-/area/shuttle/escape)
+/obj/effect/step_trigger/thrower{
+	affect_ghosts = 1;
+	name = "thrower_throwdownside";
+	nostop = 1;
+	stopper = 0;
+	tiles = 0
+	},
+/turf/simulated/floor/tiled/techfloor/grid{
+	icon = 'icons/turf/transit_vr.dmi';
+	initial_flooring = null
+	},
+/area/space)
 "mb" = (
-/obj/effect/step_trigger/lost_in_space/tram,
+/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/floor_decal/transit/orange{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techfloor/grid{
+	icon = 'icons/turf/transit_vr.dmi';
+	initial_flooring = null
+	},
+/area/space)
+"mF" = (
+/obj/effect/transit/light{
+	dir = 8
+	},
 /obj/effect/floor_decal/transit/orange{
 	dir = 8
 	},
@@ -2268,19 +2299,11 @@
 	initial_flooring = null
 	},
 /area/space)
-"mF" = (
-/obj/effect/shuttle_landmark{
-	base_area = null;
-	base_turf = null;
-	docking_controller = null;
-	landmark_tag = "escape_transit";
-	name = "Escape Transit"
-	},
-/turf/simulated/floor/tiled/techfloor/grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	initial_flooring = null
-	},
-/area/space)
+"mN" = (
+/obj/structure/table/glass,
+/obj/machinery/chemical_dispenser/full,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
 "nj" = (
 /obj/item/toy/chess/rook_white,
 /turf/simulated/floor/holofloor/wmarble,
@@ -2301,12 +2324,12 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
 "nC" = (
-/obj/structure/table/standard,
-/obj/structure/closet/walllocker/emerglocker{
-	pixel_x = 32
+/obj/structure/bed/chair/shuttle{
+	dir = 8
+	},
+/obj/effect/floor_decal/borderfloor{
+	dir = 5
 	},
-/obj/item/toy/nanotrasenballoon,
-/obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
 "nV" = (
@@ -2333,27 +2356,30 @@
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "pk" = (
+/obj/structure/bed/chair/shuttle{
+	dir = 8
+	},
 /obj/effect/floor_decal/borderfloor{
-	dir = 4
+	dir = 6
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
 "pv" = (
-/obj/effect/floor_decal/borderfloor{
+/obj/effect/transit/light{
 	dir = 4
 	},
-/obj/effect/floor_decal/borderfloor{
-	dir = 8
+/obj/effect/floor_decal/transit/orange{
+	dir = 4
 	},
-/obj/machinery/door/airlock/glass_external{
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "escape_shuttle_hatch_offsite";
-	locked = 1;
-	name = "Shuttle Hatch"
+/turf/simulated/floor/tiled/techfloor/grid{
+	icon = 'icons/turf/transit_vr.dmi';
+	initial_flooring = null
 	},
-/turf/simulated/floor/tiled/steel,
-/area/shuttle/escape)
+/area/space)
+"pz" = (
+/obj/machinery/transhuman/resleever,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
 "pF" = (
 /obj/effect/shuttle_landmark/transit{
 	base_area = /area/space;
@@ -2370,23 +2396,22 @@
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 4
 	},
-/obj/machinery/light{
+/obj/structure/railing{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/centcom/simulated/terminal)
 "qc" = (
-/obj/structure/bed/chair/shuttle{
-	dir = 8
-	},
-/obj/effect/floor_decal/borderfloor{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/escape)
+/obj/structure/sign/warning/docking_area,
+/turf/unsimulated/wall,
+/area/centcom/simulated/terminal)
 "qn" = (
 /turf/space/transit/east,
 /area/space)
+"qu" = (
+/obj/structure/table/woodentable,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/bar)
 "qv" = (
 /obj/effect/floor_decal/sign/small_h,
 /turf/simulated/floor/holofloor/wood,
@@ -2399,17 +2424,13 @@
 /obj/effect/floor_decal/sign/small_6,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
-"qY" = (
-/obj/effect/floor_decal/borderfloor/corner{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/steel,
-/area/shuttle/escape)
 "rh" = (
+/obj/structure/table/standard,
 /obj/effect/floor_decal/borderfloor{
-	dir = 4
+	dir = 1
 	},
-/turf/simulated/floor/tiled/steel,
+/obj/random/forgotten_tram,
+/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
 "ru" = (
 /obj/item/toy/chess/pawn_black,
@@ -2427,7 +2448,10 @@
 /turf/space/internal_edge/top,
 /area/space)
 "sp" = (
-/obj/effect/floor_decal/techfloor/orange{
+/obj/effect/floor_decal/transit/orange{
+	dir = 8
+	},
+/obj/effect/transit/light{
 	dir = 8
 	},
 /obj/effect/step_trigger/thrower{
@@ -2448,71 +2472,45 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/centcom/simulated/terminal)
+"sB" = (
+/obj/structure/table/glass,
+/obj/item/weapon/storage/pill_bottle/spaceacillin,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
 "sF" = (
 /obj/effect/overmap/bluespace_rift,
 /turf/unsimulated/map,
 /area/overmap)
 "sN" = (
+/obj/effect/step_trigger/lost_in_space/tram,
 /obj/effect/floor_decal/transit/orange{
 	dir = 8
 	},
-/obj/effect/transit/light{
-	dir = 8
-	},
 /turf/simulated/floor/tiled/techfloor/grid{
 	icon = 'icons/turf/transit_vr.dmi';
 	initial_flooring = null
 	},
 /area/space)
+"sQ" = (
+/obj/structure/table/reinforced,
+/obj/item/weapon/melee/baton/loaded,
+/obj/item/weapon/melee/baton/loaded,
+/obj/item/weapon/gun/energy/taser,
+/turf/simulated/floor/tiled,
+/area/centcom/simulated/security{
+	name = "\improper CentCom Security Arrivals"
+	})
 "sT" = (
-/obj/structure/closet/hydrant{
-	pixel_y = -32
-	},
-/obj/effect/floor_decal/industrial/warning{
+/obj/machinery/door/blast/regular{
 	dir = 4
 	},
-/obj/effect/floor_decal/borderfloor/corner{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/steel,
-/area/shuttle/escape)
-"ti" = (
-/obj/machinery/status_display{
-	pixel_y = 32
-	},
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/effect/floor_decal/borderfloor{
-	dir = 9
-	},
-/turf/simulated/floor/tiled/steel,
-/area/shuttle/escape)
-"tp" = (
-/obj/structure/bed/chair/shuttle{
-	dir = 4
-	},
-/obj/effect/floor_decal/borderfloor,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/escape)
+/turf/unsimulated/wall,
+/area/centcom/simulated/terminal)
 "tu" = (
-/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/floor_decal/transit/orange{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	initial_flooring = null
+/obj/structure/sign/warning{
+	name = "\improper STAND AWAY FROM TRACK EDGE"
 	},
+/turf/unsimulated/wall,
 /area/space)
 "tC" = (
 /obj/effect/floor_decal/industrial/warning{
@@ -2533,9 +2531,6 @@
 /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";
@@ -2543,6 +2538,9 @@
 	stopper = 0;
 	tiles = 0
 	},
+/obj/effect/transit/light{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor/grid{
 	icon = 'icons/turf/transit_vr.dmi';
 	initial_flooring = null
@@ -2550,10 +2548,9 @@
 /area/space)
 "tS" = (
 /obj/structure/bed/chair/shuttle{
-	dir = 8
+	dir = 1
 	},
-/obj/effect/floor_decal/borderfloor,
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
 "uc" = (
 /turf/unsimulated/wall,
@@ -2584,25 +2581,33 @@
 	},
 /area/centcom/suppy)
 "uG" = (
-/obj/machinery/light{
-	dir = 4
+/obj/effect/step_trigger/lost_in_space/tram,
+/turf/simulated/floor/tiled/techfloor/grid{
+	icon = 'icons/turf/transit_vr.dmi';
+	initial_flooring = null
 	},
-/obj/effect/floor_decal/industrial/warning/corner,
-/turf/simulated/floor/tiled/steel,
-/area/shuttle/escape)
+/area/space)
 "uM" = (
 /obj/item/toy/chess/knight_black,
 /turf/simulated/floor/holofloor/wmarble,
 /area/holodeck/source_chess)
 "vu" = (
-/obj/structure/window/reinforced/full,
-/obj/structure/window/reinforced,
-/obj/structure/grille,
-/turf/simulated/floor/plating/eris/under,
-/area/shuttle/escape)
+/obj/effect/floor_decal/transit/orange{
+	dir = 4
+	},
+/obj/effect/transit/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techfloor/grid{
+	icon = 'icons/turf/transit_vr.dmi';
+	initial_flooring = null
+	},
+/area/space)
 "vz" = (
-/obj/effect/floor_decal/industrial/outline/blue,
-/turf/simulated/floor/tiled/steel,
+/obj/effect/floor_decal/borderfloor{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
 "vW" = (
 /obj/effect/floor_decal/sign/small_a,
@@ -2632,9 +2637,31 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/centcom/simulated/main_hall)
+"ws" = (
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/food/snacks/meatballsoup,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
 "wy" = (
 /turf/unsimulated/wall,
 /area/centcom/control)
+"wT" = (
+/obj/machinery/bodyscanner{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner_steel_grid{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"wV" = (
+/obj/structure/sign/department/operational,
+/turf/unsimulated/wall,
+/area/centcom/simulated/medical)
+"wW" = (
+/obj/machinery/clonepod/transhuman/full,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
 "wZ" = (
 /turf/unsimulated/floor{
 	icon_state = "sandwater"
@@ -2648,24 +2675,42 @@
 /turf/unsimulated/floor/steel,
 /area/centcom/control)
 "xi" = (
-/obj/structure/sign/securearea{
-	desc = "A warning sign which reads 'HIGH VOLTAGE'";
-	icon_state = "shock";
-	name = "HIGH VOLTAGE"
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+	dir = 1
 	},
-/turf/unsimulated/wall,
-/area/centcom/simulated/terminal)
-"xl" = (
-/obj/structure/table/standard,
-/obj/random/maintenance/clean,
-/turf/simulated/floor/tiled/techfloor,
+/obj/structure/grille,
+/turf/simulated/floor/plating/eris/under,
 /area/shuttle/escape)
+"xB" = (
+/obj/machinery/atmospherics/portables_connector{
+	dir = 1
+	},
+/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"xE" = (
+/obj/structure/table/glass,
+/obj/machinery/chemical_dispenser/ert,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
 "xM" = (
 /obj/machinery/light{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/steel,
 /area/centcom/simulated/main_hall)
+"xT" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"xY" = (
+/obj/structure/table/reinforced,
+/obj/machinery/chemical_dispenser/bar_soft/full,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/bar)
 "ya" = (
 /obj/effect/step_trigger/thrower{
 	affect_ghosts = 1;
@@ -2675,6 +2720,10 @@
 	},
 /turf/simulated/sky/virgo3b/south,
 /area/space)
+"yk" = (
+/obj/machinery/vending/coffee,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
 "ym" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -2698,6 +2747,18 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
+"yV" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"za" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/centcom/simulated/security{
+	name = "\improper CentCom Security Arrivals"
+	})
 "zb" = (
 /obj/effect/step_trigger/thrower{
 	direction = 1;
@@ -2706,18 +2767,19 @@
 	},
 /turf/space/transit/east,
 /area/space)
+"zp" = (
+/obj/machinery/chem_master,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
 "zv" = (
-/obj/effect/transit/light{
-	dir = 8
+/obj/effect/floor_decal/techfloor/orange{
+	dir = 4
 	},
-/obj/effect/floor_decal/transit/orange{
-	dir = 8
+/obj/machinery/light{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor/grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	initial_flooring = null
-	},
-/area/space)
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/centcom/simulated/terminal)
 "zw" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
@@ -2734,7 +2796,21 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
+"zF" = (
+/obj/structure/reagent_dispensers/peppertank{
+	pixel_x = 30
+	},
+/turf/simulated/floor/tiled,
+/area/centcom/simulated/security{
+	name = "\improper CentCom Security Arrivals"
+	})
 "zH" = (
+/obj/effect/floor_decal/borderfloor{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/escape)
+"zK" = (
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 8
 	},
@@ -2743,16 +2819,16 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/centcom/simulated/terminal)
-"zK" = (
-/obj/machinery/door/blast/regular{
-	dir = 4
-	},
-/turf/unsimulated/wall,
-/area/centcom/simulated/terminal)
 "Al" = (
-/obj/structure/bed/chair/shuttle,
-/turf/simulated/floor/tiled/techfloor,
+/obj/effect/floor_decal/borderfloor{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
+"As" = (
+/obj/machinery/vending/sovietsoda,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
 "Av" = (
 /obj/effect/step_trigger/thrower{
 	affect_ghosts = 1;
@@ -2775,28 +2851,36 @@
 /turf/unsimulated/beach/coastline,
 /area/beach)
 "AD" = (
-/obj/effect/floor_decal/borderfloor/corner,
+/obj/effect/floor_decal/borderfloor{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
+"AK" = (
+/obj/machinery/door/airlock/medical{
+	name = "Operating Theatre";
+	req_access = list(45)
+	},
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"Bc" = (
+/obj/structure/filingcabinet/chestdrawer{
+	name = "Medical Forms"
+	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
 "Bm" = (
 /obj/item/toy/chess/bishop_black,
 /turf/simulated/floor/holofloor/bmarble,
 /area/holodeck/source_chess)
 "Bs" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 4
-	},
-/obj/effect/floor_decal/borderfloor{
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/machinery/door/airlock/glass_external{
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "escape_shuttle_hatch_station";
-	locked = 1;
-	name = "Shuttle Hatch"
-	},
-/turf/simulated/floor/tiled/steel,
+/obj/structure/grille,
+/turf/simulated/floor/plating/eris/under,
 /area/shuttle/escape)
 "Bw" = (
 /turf/unsimulated/beach/water,
@@ -2814,28 +2898,29 @@
 /turf/space/internal_edge/bottomleft,
 /area/space)
 "Cd" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/steel,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced,
+/obj/structure/grille,
+/turf/simulated/floor/plating/eris/under,
 /area/shuttle/escape)
 "Cn" = (
 /turf/simulated/sky/virgo3b/south,
 /area/space)
 "Cp" = (
-/obj/structure/window/reinforced/full,
-/obj/structure/window/reinforced{
+/obj/effect/floor_decal/borderfloor{
+	dir = 4
+	},
+/obj/effect/floor_decal/borderfloor{
 	dir = 8
 	},
-/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"
+/obj/machinery/door/airlock/glass_external{
+	frequency = 1380;
+	icon_state = "door_locked";
+	id_tag = "escape_shuttle_hatch_station";
+	locked = 1;
+	name = "Shuttle Hatch"
 	},
-/obj/structure/grille,
-/turf/simulated/floor/plating/eris/under,
+/turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
 "Ct" = (
 /obj/machinery/ntnet_relay,
@@ -2851,14 +2936,23 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/centcom/simulated/main_hall)
-"CG" = (
-/obj/structure/bed/chair/shuttle{
-	dir = 4
+"CC" = (
+/obj/structure/sign/warning{
+	name = "\improper STAND AWAY FROM TRACK EDGE"
 	},
+/turf/unsimulated/wall,
+/area/centcom/simulated/terminal)
+"CD" = (
 /obj/effect/floor_decal/borderfloor{
-	dir = 1
+	dir = 10
 	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/escape)
+"CG" = (
+/obj/effect/floor_decal/borderfloor{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
 "CJ" = (
 /obj/item/toy/chess/pawn_white,
@@ -2878,18 +2972,14 @@
 /turf/simulated/floor/tiled/steel,
 /area/space)
 "Dm" = (
-/obj/effect/floor_decal/industrial/warning/corner,
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/effect/floor_decal/industrial/warning/corner{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
-"Dn" = (
-/obj/structure/bed/chair/shuttle{
-	dir = 8
-	},
-/obj/effect/floor_decal/borderfloor{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/escape)
 "Dw" = (
 /obj/structure/table/standard,
 /obj/item/weapon/reagent_containers/food/snacks/chips,
@@ -2900,15 +2990,25 @@
 /turf/space/internal_edge/topright,
 /area/space)
 "DI" = (
-/obj/effect/floor_decal/borderfloor{
+/obj/machinery/status_display{
+	pixel_y = 32
+	},
+/obj/machinery/light{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/techfloor,
+/obj/effect/floor_decal/borderfloor{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
 "DL" = (
 /obj/effect/floor_decal/sign/small_b,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
+"DR" = (
+/obj/machinery/atmospherics/pipe/manifold4w/hidden,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
 "El" = (
 /turf/space/transit/west,
 /area/space)
@@ -2917,14 +3017,8 @@
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "Et" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/machinery/status_display{
-	pixel_y = 32
-	},
-/obj/effect/floor_decal/borderfloor{
-	dir = 5
+/obj/effect/floor_decal/borderfloor/corner{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
@@ -2940,28 +3034,30 @@
 /turf/unsimulated/beach/sand,
 /area/beach)
 "Fe" = (
-/obj/structure/window/reinforced/full,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/grille,
-/turf/simulated/floor/plating/eris/under,
+/obj/structure/sign/nanotrasen,
+/turf/simulated/wall/thull,
 /area/shuttle/escape)
 "Fp" = (
-/turf/simulated/floor/maglev,
-/area/centcom/simulated/terminal)
-"Ft" = (
-/obj/effect/transit/light{
-	dir = 4
-	},
-/obj/effect/floor_decal/transit/orange{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	initial_flooring = null
+/obj/effect/step_trigger/lost_in_space/tram,
+/turf/simulated/floor/maglev{
+	icon = 'icons/turf/transit_vr.dmi'
 	},
 /area/space)
+"Ft" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/machinery/status_display{
+	pixel_y = 32
+	},
+/obj/effect/floor_decal/borderfloor{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/escape)
+"FC" = (
+/turf/simulated/floor/wood,
+/area/centcom/simulated/bar)
 "FH" = (
 /obj/structure/bed/chair,
 /obj/effect/landmark{
@@ -2974,12 +3070,7 @@
 /turf/unsimulated/beach/sand,
 /area/beach)
 "FJ" = (
-/obj/structure/bed/chair/shuttle{
-	dir = 4
-	},
-/obj/effect/floor_decal/borderfloor{
-	dir = 10
-	},
+/obj/structure/bed/chair/shuttle,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
 "FT" = (
@@ -2989,20 +3080,21 @@
 	},
 /area/space)
 "FX" = (
+/obj/effect/step_trigger/lost_in_space/tram,
 /obj/effect/floor_decal/transit/orange{
 	dir = 4
 	},
-/obj/effect/transit/light{
-	dir = 4
-	},
 /turf/simulated/floor/tiled/techfloor/grid{
 	icon = 'icons/turf/transit_vr.dmi';
 	initial_flooring = null
 	},
 /area/space)
 "FY" = (
+/obj/structure/bed/chair/shuttle{
+	dir = 4
+	},
 /obj/effect/floor_decal/borderfloor{
-	dir = 8
+	dir = 10
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
@@ -3020,6 +3112,16 @@
 /obj/effect/overlay/palmtree_l,
 /turf/unsimulated/beach/sand,
 /area/beach)
+"Gz" = (
+/obj/machinery/light,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
+"GC" = (
+/obj/structure/table/standard,
+/obj/effect/floor_decal/borderfloor,
+/obj/random/forgotten_tram,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/escape)
 "GW" = (
 /obj/item/toy/chess/king_white,
 /turf/simulated/floor/holofloor/bmarble,
@@ -3041,6 +3143,11 @@
 /obj/item/toy/chess/rook_black,
 /turf/simulated/floor/holofloor/bmarble,
 /area/holodeck/source_chess)
+"Hv" = (
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/food/snacks/grilledcheese,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
 "Hy" = (
 /turf/unsimulated/mineral{
 	icon = 'icons/turf/transit_vr.dmi';
@@ -3056,23 +3163,21 @@
 /turf/unsimulated/floor/steel,
 /area/centcom/control)
 "HW" = (
-/obj/machinery/status_display{
-	pixel_y = -30
-	},
-/obj/structure/bed/chair/shuttle{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/escape)
+/turf/simulated/floor/maglev,
+/area/centcom/simulated/terminal)
 "HX" = (
-/obj/structure/table/standard,
-/obj/structure/closet/walllocker/medical/west,
-/obj/item/weapon/storage/firstaid,
+/obj/structure/bed/chair/shuttle{
+	dir = 4
+	},
+/obj/effect/floor_decal/borderfloor{
+	dir = 9
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
 "Ic" = (
-/obj/effect/floor_decal/borderfloor,
-/turf/simulated/floor/tiled/steel,
+/obj/structure/table/standard,
+/obj/structure/closet/walllocker/emerglocker/west,
+/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
 "Ik" = (
 /obj/structure/table/standard,
@@ -3122,33 +3227,29 @@
 	},
 /turf/simulated/sky/virgo3b/south,
 /area/space)
+"IX" = (
+/obj/structure/table/glass,
+/obj/item/device/defib_kit/loaded,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
 "Jc" = (
 /obj/item/toy/chess/bishop_white,
 /turf/simulated/floor/holofloor/bmarble,
 /area/holodeck/source_chess)
 "Jq" = (
-/obj/structure/sign/warning/docking_area,
-/turf/unsimulated/wall,
-/area/centcom/simulated/terminal)
-"Jw" = (
-/obj/structure/bed/chair/shuttle{
-	dir = 4
-	},
-/obj/effect/floor_decal/borderfloor{
-	dir = 9
-	},
+/obj/structure/table/standard,
+/obj/item/weapon/storage/firstaid,
+/obj/item/toy/nanotrasenballoon,
+/obj/item/weapon/storage/firstaid/toxin,
+/obj/item/weapon/storage/firstaid/o2,
+/obj/structure/closet/walllocker/medical/west,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/escape)
+"Jw" = (
+/obj/structure/table/standard,
+/obj/structure/closet/walllocker/emerglocker/east,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
-"Jx" = (
-/obj/effect/floor_decal/corner_steel_grid/diagonal,
-/obj/effect/floor_decal/corner_steel_grid/diagonal{
-	dir = 4
-	},
-/obj/effect/floor_decal/industrial/danger{
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
-/area/centcom/simulated/terminal)
 "Jz" = (
 /obj/effect/step_trigger/teleporter/random{
 	affect_ghosts = 1;
@@ -3162,6 +3263,10 @@
 	},
 /turf/space/transit/north,
 /area/space)
+"JA" = (
+/obj/machinery/smartfridge/drinks,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/bar)
 "JI" = (
 /obj/item/toy/chess/rook_white,
 /turf/simulated/floor/holofloor/bmarble,
@@ -3213,6 +3318,13 @@
 /obj/effect/floor_decal/sign/small_d,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
+"KO" = (
+/obj/machinery/body_scanconsole,
+/obj/effect/floor_decal/corner_steel_grid{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
 "KQ" = (
 /obj/effect/floor_decal/sign/small_f,
 /turf/simulated/floor/holofloor/wood,
@@ -3228,14 +3340,21 @@
 /turf/simulated/sky/virgo3b/south,
 /area/space)
 "LD" = (
-/obj/machinery/light{
-	dir = 8
+/obj/effect/floor_decal/techfloor/orange{
+	dir = 4
 	},
-/obj/effect/floor_decal/industrial/warning/corner{
-	dir = 8
+/obj/structure/railing,
+/obj/structure/railing{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/steel,
-/area/shuttle/escape)
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/centcom/simulated/terminal)
+"LR" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
 "Mb" = (
 /obj/effect/floor_decal/transit/orange{
 	dir = 8
@@ -3248,23 +3367,25 @@
 "Me" = (
 /turf/simulated/floor/smole/desert,
 /area/holodeck/source_smoleworld)
-"Mf" = (
-/obj/effect/step_trigger/lost_in_space/tram,
-/turf/simulated/floor/tiled/techfloor/grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	initial_flooring = null
-	},
-/area/space)
 "Mi" = (
 /obj/item/toy/chess/bishop_white,
 /turf/simulated/floor/holofloor/wmarble,
 /area/holodeck/source_chess)
 "Mq" = (
-/obj/effect/floor_decal/industrial/warning/corner{
+/obj/machinery/light{
 	dir = 8
 	},
+/obj/effect/floor_decal/industrial/warning/corner{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
+"MB" = (
+/obj/machinery/sleeper{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
 "ME" = (
 /obj/machinery/computer/rdservercontrol{
 	badmin = 1;
@@ -3310,22 +3431,33 @@
 	opacity = 1
 	},
 /area/beach)
-"NA" = (
-/obj/structure/closet/hydrant{
-	pixel_y = -32
+"Nw" = (
+/obj/machinery/sleep_console{
+	dir = 4
 	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"NA" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
-/obj/effect/floor_decal/borderfloor/corner,
-/turf/simulated/floor/tiled/steel,
-/area/shuttle/escape)
+/turf/simulated/floor/tiled/steel_grid,
+/area/centcom/simulated/terminal)
+"NJ" = (
+/obj/structure/table/reinforced,
+/obj/item/weapon/reagent_containers/food/drinks/flask/barflask,
+/obj/item/weapon/reagent_containers/glass/rag,
+/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/bar)
 "NW" = (
-/obj/structure/table/standard,
-/obj/item/weapon/storage/firstaid/adv,
-/obj/structure/closet/walllocker/medical/east,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/escape)
+/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)
 "Oj" = (
 /obj/effect/step_trigger/thrower{
 	affect_ghosts = 1;
@@ -3335,20 +3467,27 @@
 	},
 /turf/simulated/sky/virgo3b/south,
 /area/space)
+"Om" = (
+/turf/unsimulated/wall,
+/area/centcom/simulated/bar)
 "Or" = (
 /obj/item/toy/chess/knight_white,
 /turf/simulated/floor/holofloor/bmarble,
 /area/holodeck/source_chess)
+"OS" = (
+/obj/machinery/camera/network/crescent,
+/turf/simulated/floor/tiled,
+/area/centcom/simulated/security{
+	name = "\improper CentCom Security Arrivals"
+	})
 "OY" = (
 /turf/unsimulated/map,
 /area/overmap)
 "Pe" = (
-/obj/structure/window/reinforced/full,
-/obj/structure/window/reinforced{
+/obj/effect/floor_decal/borderfloor/corner{
 	dir = 1
 	},
-/obj/structure/grille,
-/turf/simulated/floor/plating/eris/under,
+/turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
 "Pf" = (
 /obj/structure/table/woodentable{
@@ -3376,8 +3515,12 @@
 /turf/space/transit/west,
 /area/space)
 "Pq" = (
-/turf/simulated/floor/maglev{
-	icon = 'icons/turf/transit_vr.dmi'
+/obj/effect/transit/light{
+	dir = 8
+	},
+/turf/unsimulated/mineral{
+	icon = 'icons/turf/transit_vr.dmi';
+	icon_state = "rock"
 	},
 /area/space)
 "Py" = (
@@ -3408,11 +3551,10 @@
 	initial_flooring = null
 	},
 /area/space)
-"Qa" = (
-/obj/structure/table/standard,
-/obj/random/soap,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/escape)
+"Qo" = (
+/obj/machinery/vending/cigarette,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
 "Qs" = (
 /obj/item/toy/chess/queen_black,
 /turf/simulated/floor/holofloor/bmarble,
@@ -3430,46 +3572,48 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/centcom/simulated/terminal)
 "Rd" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 9
-	},
-/turf/simulated/floor/tiled/steel,
-/area/shuttle/escape)
-"Re" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
+/obj/structure/bed/chair/shuttle,
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
 "Rg" = (
-/obj/effect/floor_decal/borderfloor/corner{
-	dir = 1
+/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/borderfloor{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/steel,
-/area/shuttle/escape)
-"Ri" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
+"Ri" = (
+/obj/structure/table/standard,
+/obj/effect/floor_decal/borderfloor{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/escape)
 "Rk" = (
-/obj/structure/bed/chair/shuttle,
-/turf/simulated/floor/tiled/steel,
+/obj/structure/bed/chair/shuttle{
+	dir = 8
+	},
+/obj/effect/floor_decal/borderfloor{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
 "Rm" = (
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
 "Ro" = (
-/obj/structure/closet/hydrant{
-	pixel_y = 32
-	},
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
-/obj/effect/floor_decal/borderfloor/corner{
-	dir = 1
-	},
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
 "Rq" = (
@@ -3489,14 +3633,20 @@
 /obj/structure/flora/pottedplant{
 	icon_state = "plant-22"
 	},
+/obj/effect/floor_decal/steeldecal/steel_decals9{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/steel,
 /area/centcom/simulated/main_hall)
 "Rs" = (
-/obj/structure/table/standard,
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/techfloor,
+/obj/effect/floor_decal/borderfloor/corner{
+	dir = 4
+	},
+/obj/structure/closet/walllocker_double/hydrant/north,
+/turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
 "Ru" = (
 /turf/simulated/floor/tiled/steel,
@@ -3516,6 +3666,14 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/steel,
 /area/centcom/simulated/living)
+"Ry" = (
+/obj/structure/table/glass,
+/obj/item/weapon/storage/firstaid/adv,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
 "Rz" = (
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
@@ -3526,9 +3684,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
 "RC" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 4
-	},
+/obj/effect/floor_decal/industrial/warning/corner,
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
 "RD" = (
@@ -3538,22 +3694,24 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
 "RE" = (
-/obj/machinery/light{
+/obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
-/obj/effect/floor_decal/industrial/warning/corner{
-	dir = 4
+/obj/effect/floor_decal/borderfloor/corner{
+	dir = 8
 	},
+/obj/structure/closet/walllocker_double/hydrant/south,
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
 "RF" = (
-/obj/effect/floor_decal/borderfloor,
-/turf/simulated/floor/tiled/techfloor,
+/obj/effect/floor_decal/industrial/outline/blue,
+/turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
 "RG" = (
-/obj/structure/table/standard,
-/obj/effect/floor_decal/borderfloor,
-/turf/simulated/floor/tiled/techfloor,
+/obj/effect/floor_decal/borderfloor{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
 "RV" = (
 /obj/effect/step_trigger/teleporter/random{
@@ -3569,12 +3727,20 @@
 /turf/simulated/sky/virgo3b/south,
 /area/space)
 "RY" = (
-/obj/machinery/light,
-/obj/effect/floor_decal/borderfloor{
-	dir = 10
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
 	},
+/obj/effect/floor_decal/borderfloor/corner{
+	dir = 1
+	},
+/obj/structure/closet/walllocker_double/hydrant/north,
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
+"Sf" = (
+/obj/structure/table/reinforced,
+/obj/machinery/chemical_dispenser/bar_alc/full,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/bar)
 "Sh" = (
 /obj/effect/step_trigger/thrower{
 	affect_ghosts = 1;
@@ -3589,8 +3755,10 @@
 	},
 /area/space)
 "Sl" = (
-/obj/structure/sign/nanotrasen,
-/turf/simulated/wall/thull,
+/obj/structure/bed/chair/shuttle{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
 "Sm" = (
 /turf/simulated/shuttle/wall/alien/blue/hard_corner,
@@ -3635,11 +3803,13 @@
 /turf/simulated/shuttle/floor/alien,
 /area/unknown/dorm4)
 "Sy" = (
-/obj/machinery/light,
-/obj/effect/floor_decal/borderfloor{
-	dir = 6
+/obj/structure/bed/chair/shuttle{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/steel,
+/obj/effect/floor_decal/borderfloor{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
 "Sz" = (
 /obj/machinery/smartfridge/survival_pod,
@@ -3694,13 +3864,13 @@
 /turf/simulated/shuttle/floor/alien,
 /area/unknown/dorm4)
 "SG" = (
-/obj/structure/table/standard,
-/obj/structure/closet/walllocker/emerglocker{
-	pixel_x = -32
+/obj/machinery/light{
+	dir = 8
 	},
-/obj/item/clothing/head/beret/nanotrasen,
-/obj/item/clothing/head/soft/nanotrasen,
-/turf/simulated/floor/tiled/techfloor,
+/obj/effect/floor_decal/industrial/warning/corner{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
 "SH" = (
 /obj/structure/bed/chair{
@@ -3872,13 +4042,11 @@
 /turf/unsimulated/beach/sand,
 /area/beach)
 "Tv" = (
-/obj/structure/bed/chair/shuttle{
-	dir = 8
+/obj/machinery/light{
+	dir = 4
 	},
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
+/obj/effect/floor_decal/industrial/warning/corner,
+/turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
 "Tx" = (
 /obj/structure/prop/alien/dispenser,
@@ -4008,10 +4176,6 @@
 /obj/machinery/sleeper/survival_pod,
 /turf/simulated/shuttle/floor/alien,
 /area/unknown/dorm2)
-"TY" = (
-/obj/machinery/door/firedoor,
-/turf/unsimulated/floor/steel,
-/area/centcom/simulated/terminal)
 "TZ" = (
 /obj/effect/floor_decal/industrial/warning/dust/corner,
 /turf/simulated/floor/tiled/steel,
@@ -4196,6 +4360,10 @@
 	},
 /turf/simulated/shuttle/floor/alienplating,
 /area/unknown/dorm1)
+"UO" = (
+/obj/machinery/vending/boozeomat,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/bar)
 "UP" = (
 /obj/item/weapon/bedsheet/rddouble,
 /obj/structure/bed/double/padded,
@@ -4267,13 +4435,11 @@
 /turf/unsimulated/wall,
 /area/centcom/simulated/medical)
 "Ve" = (
-/obj/effect/wingrille_spawn/reinforced/crescent,
-/obj/structure/sign/department/medbay,
-/turf/unsimulated/floor{
-	icon_state = "plating";
-	name = "plating"
+/obj/effect/floor_decal/borderfloor{
+	dir = 8
 	},
-/area/centcom/simulated/medical)
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/escape)
 "Vf" = (
 /obj/machinery/door/airlock{
 	name = "Unit 4"
@@ -4284,17 +4450,10 @@
 /turf/unsimulated/wall,
 /area/centcom/simulated/living)
 "Vh" = (
-/obj/effect/floor_decal/corner_steel_grid/diagonal,
-/obj/effect/floor_decal/corner_steel_grid/diagonal{
-	dir = 4
-	},
-/obj/effect/floor_decal/industrial/danger{
-	dir = 8
-	},
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/steel_grid,
 /area/centcom/simulated/terminal)
 "Vi" = (
 /obj/effect/floor_decal/industrial/warning/dust{
@@ -4361,10 +4520,9 @@
 /turf/unsimulated/wall,
 /area/centcom/simulated/main_hall)
 "Vv" = (
-/obj/machinery/door/airlock/multi_tile/glass{
-	dir = 1
+/obj/machinery/door/firedoor/glass/hidden/steel{
+	dir = 8
 	},
-/obj/machinery/door/firedoor,
 /turf/unsimulated/floor/steel,
 /area/centcom/simulated/terminal)
 "Vw" = (
@@ -4427,14 +4585,15 @@
 /turf/simulated/floor/tiled/steel,
 /area/centcom/simulated/evac)
 "VK" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/multi_tile/glass,
-/turf/simulated/floor/tiled/steel,
-/area/centcom/simulated/restaurant)
+/obj/effect/floor_decal/borderfloor{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/escape)
 "VL" = (
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled/steel,
-/area/centcom/simulated/restaurant)
+/obj/effect/floor_decal/steeldecal/steel_decals9,
+/turf/simulated/floor/tiled,
+/area/centcom/simulated/terminal)
 "VM" = (
 /turf/unsimulated/wall,
 /area/centcom/simulated/restaurant)
@@ -4460,9 +4619,13 @@
 /turf/simulated/floor/wood,
 /area/centcom/simulated/restaurant)
 "VR" = (
-/obj/structure/bed/chair/wood/wings,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/restaurant)
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/grille,
+/turf/simulated/floor/plating/eris/under,
+/area/shuttle/escape)
 "VS" = (
 /obj/effect/floor_decal/corner_steel_grid/diagonal,
 /obj/effect/floor_decal/industrial/warning/dust/corner{
@@ -4494,35 +4657,23 @@
 /turf/simulated/floor/tiled/steel,
 /area/centcom/simulated/evac)
 "VY" = (
-/obj/structure/closet/crate/bin,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/restaurant)
-"VZ" = (
-/obj/structure/bed/chair/wood/wings{
+/obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 4
 	},
-/turf/simulated/floor/wood,
-/area/centcom/simulated/restaurant)
-"Wb" = (
-/obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/snacks/pastatomato,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/restaurant)
+/obj/effect/floor_decal/steeldecal/steel_decals9,
+/obj/effect/floor_decal/steeldecal/steel_decals9{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/centcom/simulated/terminal)
 "Wc" = (
-/obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/snacks/meatballspagetti,
-/turf/simulated/floor/wood,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/multi_tile/glass,
+/turf/simulated/floor/tiled/steel,
 /area/centcom/simulated/restaurant)
 "Wd" = (
-/obj/structure/bed/chair/wood/wings{
-	dir = 8
-	},
-/turf/simulated/floor/wood,
-/area/centcom/simulated/restaurant)
-"We" = (
-/obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/snacks/fries,
-/turf/simulated/floor/wood,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled/steel,
 /area/centcom/simulated/restaurant)
 "Wf" = (
 /obj/item/toy/chess/queen_white,
@@ -4548,32 +4699,8 @@
 /turf/simulated/floor/tiled/white,
 /area/centcom/simulated/living)
 "Wk" = (
-/obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/snacks/cheeseburger{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/weapon/reagent_containers/food/snacks/cheeseburger,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/restaurant)
-"Wl" = (
-/obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/snacks/kitsuneudon,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/restaurant)
-"Wm" = (
-/obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/snacks/lasagna,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/restaurant)
-"Wo" = (
-/obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/snacks/hotdog,
-/obj/item/weapon/reagent_containers/food/snacks/hotdog{
-	pixel_x = -5;
-	pixel_y = -3
-	},
-/turf/simulated/floor/wood,
+/obj/effect/wingrille_spawn/reinforced/crescent,
+/turf/simulated/floor/plating,
 /area/centcom/simulated/restaurant)
 "Wp" = (
 /obj/machinery/cryopod/robot/door/dorms,
@@ -4602,51 +4729,199 @@
 /turf/simulated/floor/tiled/steel,
 /area/centcom/simulated/living)
 "Wt" = (
-/obj/machinery/porta_turret/crescent{
-	density = 1
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+	dir = 8
 	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/simulated/floor/tiled/steel,
-/area/centcom/simulated/security{
-	name = "\improper CentCom Security Arrivals"
-	})
-"Wu" = (
-/obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/restaurant)
-"Wv" = (
-/obj/effect/floor_decal/industrial/outline,
-/turf/simulated/floor/tiled/steel,
-/area/centcom/simulated/security{
-	name = "\improper CentCom Security Arrivals"
-	})
+/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"
+	},
+/obj/structure/grille,
+/turf/simulated/floor/plating/eris/under,
+/area/shuttle/escape)
 "Wz" = (
-/obj/structure/bed/chair/wood/wings{
-	dir = 1
-	},
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/food/snacks/pastatomato,
 /turf/simulated/floor/wood,
 /area/centcom/simulated/restaurant)
 "WA" = (
-/obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/snacks/grilledcheese,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/restaurant)
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+	dir = 4
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals9,
+/obj/effect/floor_decal/steeldecal/steel_decals9{
+	dir = 4
+	},
+/turf/unsimulated/floor/steel,
+/area/centcom/simulated/terminal)
 "WB" = (
-/obj/effect/wingrille_spawn/reinforced/crescent,
-/turf/simulated/floor/plating,
-/area/centcom/simulated/restaurant)
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+	dir = 8
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals9{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals9{
+	dir = 8
+	},
+/turf/unsimulated/floor/steel,
+/area/centcom/simulated/main_hall)
 "WC" = (
-/obj/effect/wingrille_spawn/reinforced/crescent,
-/turf/simulated/floor/plating,
-/area/centcom/simulated/medical)
+/obj/effect/floor_decal/steeldecal/steel_decals9{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/centcom/simulated/terminal)
 "WD" = (
 /obj/effect/overlay/palmtree_r,
 /obj/effect/overlay/coconut,
 /turf/unsimulated/beach/sand,
 /area/beach)
 "WE" = (
+/obj/structure/flora/pottedplant{
+	icon_state = "plant-22"
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals9{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/steel,
+/area/centcom/simulated/main_hall)
+"WF" = (
+/obj/structure/table/standard,
+/obj/random/forgotten_tram,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/escape)
+"WH" = (
+/obj/structure/bed/chair/wood/wings{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
+"WJ" = (
+/obj/effect/floor_decal/industrial/loading,
+/turf/simulated/floor/tiled/steel,
+/area/centcom/simulated/main_hall)
+"WK" = (
+/obj/effect/floor_decal/industrial/loading{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/steel,
+/area/centcom/simulated/main_hall)
+"WL" = (
+/obj/structure/bed/chair/wood/wings,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
+"WN" = (
 /obj/effect/wingrille_spawn/reinforced/crescent,
+/turf/simulated/floor/plating,
+/area/centcom/simulated/medical)
+"WO" = (
+/obj/effect/wingrille_spawn/reinforced/crescent,
+/obj/structure/sign/department/medbay,
+/turf/unsimulated/floor{
+	icon_state = "plating";
+	name = "plating"
+	},
+/area/centcom/simulated/medical)
+"WP" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/multi_tile/glass,
+/turf/unsimulated/floor/steel{
+	icon_state = "white"
+	},
+/area/centcom/simulated/medical)
+"WQ" = (
+/obj/machinery/door/firedoor,
+/turf/unsimulated/floor/steel{
+	icon_state = "white"
+	},
+/area/centcom/simulated/medical)
+"WR" = (
+/obj/structure/sign/greencross,
+/turf/unsimulated/wall,
+/area/centcom/simulated/medical)
+"WS" = (
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"WT" = (
+/obj/structure/table/standard,
+/obj/effect/floor_decal/borderfloor,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/escape)
+"WU" = (
+/obj/structure/bed/chair/shuttle{
+	dir = 8
+	},
+/obj/effect/floor_decal/borderfloor,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/escape)
+"WV" = (
+/obj/effect/floor_decal/borderfloor,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/escape)
+"WW" = (
+/obj/item/weapon/stool/padded,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/bar)
+"WZ" = (
+/obj/structure/bed/chair/shuttle{
+	dir = 4
+	},
+/obj/effect/floor_decal/borderfloor,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/escape)
+"Xa" = (
+/obj/structure/bed/chair/wood/wings{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
+"Xb" = (
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/food/snacks/roastbeef,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
+"Xc" = (
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/food/snacks/meatsteak,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
+"Xe" = (
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/centcom/simulated/bar)
+"Xf" = (
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/food/drinks/bottle/cola,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/bar)
+"Xg" = (
+/obj/structure/table/woodentable,
+/obj/machinery/cash_register/civilian,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/bar)
+"Xh" = (
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/bar)
+"Xj" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/machinery/door/window/brigdoor/northright{
+	req_access = list(63);
+	req_one_access = list(1)
+	},
 /obj/machinery/door/blast/regular{
 	density = 0;
 	dir = 4;
@@ -4655,26 +4930,100 @@
 	name = "Security Door";
 	opacity = 0
 	},
+/obj/machinery/computer/skills,
 /obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled,
 /area/centcom/simulated/security{
 	name = "\improper CentCom Security Arrivals"
 	})
-"WF" = (
-/obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/snacks/meatballsoup,
+"Xk" = (
+/obj/structure/closet/crate/bin,
 /turf/simulated/floor/wood,
 /area/centcom/simulated/restaurant)
-"WH" = (
-/obj/item/weapon/stool/padded,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/bar)
-"WI" = (
-/obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/snacks/roastbeef,
+"Xl" = (
+/turf/unsimulated/map/edge,
+/area/overmap)
+"Xm" = (
+/obj/structure/bed/chair,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"Xn" = (
+/obj/effect/floor_decal/borderfloor,
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/escape)
+"Xp" = (
+/obj/structure/toilet{
+	dir = 8
+	},
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/bathroom)
+"Xr" = (
+/obj/effect/floor_decal/borderfloor/corner,
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/escape)
+"Xw" = (
+/obj/effect/floor_decal/industrial/outline,
+/turf/simulated/floor/tiled/steel,
+/area/centcom/simulated/security{
+	name = "\improper CentCom Security Arrivals"
+	})
+"Xx" = (
+/obj/machinery/porta_turret/crescent{
+	density = 1
+	},
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled/steel,
+/area/centcom/simulated/security{
+	name = "\improper CentCom Security Arrivals"
+	})
+"Xy" = (
+/obj/effect/floor_decal/borderfloor{
+	dir = 4
+	},
+/obj/effect/floor_decal/borderfloor{
+	dir = 8
+	},
+/obj/machinery/door/airlock/glass_external{
+	frequency = 1380;
+	icon_state = "door_locked";
+	id_tag = "escape_shuttle_hatch_offsite";
+	locked = 1;
+	name = "Shuttle Hatch"
+	},
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/escape)
+"Xz" = (
+/obj/structure/bed/chair/office/dark{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/centcom/simulated/security{
+	name = "\improper CentCom Security Arrivals"
+	})
+"XA" = (
+/obj/structure/bed/chair/office/dark{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/centcom/simulated/security{
+	name = "\improper CentCom Security Arrivals"
+	})
+"XB" = (
+/obj/structure/bed/chair/wood/wings{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/wood,
 /area/centcom/simulated/restaurant)
-"WJ" = (
+"XD" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/window/brigdoor/northleft{
 	req_access = list(63);
@@ -4695,252 +5044,6 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled,
-/area/centcom/simulated/security{
-	name = "\improper CentCom Security Arrivals"
-	})
-"WK" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/machinery/door/window/brigdoor/northright{
-	req_access = list(63);
-	req_one_access = list(1)
-	},
-/obj/machinery/door/blast/regular{
-	density = 0;
-	dir = 4;
-	icon_state = "pdoor0";
-	id = "FrontlockC2";
-	name = "Security Door";
-	opacity = 0
-	},
-/obj/machinery/computer/skills,
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled,
-/area/centcom/simulated/security{
-	name = "\improper CentCom Security Arrivals"
-	})
-"WL" = (
-/obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/snacks/meatsteak,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/restaurant)
-"WN" = (
-/obj/structure/bed/chair/wood/wings{
-	dir = 4
-	},
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/simulated/floor/wood,
-/area/centcom/simulated/restaurant)
-"WO" = (
-/obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/cola,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/bar)
-"WP" = (
-/obj/structure/table/woodentable,
-/obj/machinery/cash_register/civilian,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/bar)
-"WQ" = (
-/obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/bar)
-"WR" = (
-/obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich{
-	pixel_y = 10
-	},
-/turf/simulated/floor/wood,
-/area/centcom/simulated/bar)
-"WS" = (
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"WT" = (
-/obj/structure/bed/chair,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"WU" = (
-/obj/structure/table/standard,
-/obj/item/weapon/reagent_containers/spray/cleaner{
-	desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
-	name = "Surgery Cleaner";
-	pixel_x = 2;
-	pixel_y = 2
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"WV" = (
-/obj/structure/table/woodentable,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/bar)
-"WW" = (
-/turf/simulated/floor/wood,
-/area/centcom/simulated/bar)
-"WZ" = (
-/obj/machinery/vending/coffee,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/restaurant)
-"Xa" = (
-/obj/machinery/vending/sovietsoda,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/restaurant)
-"Xb" = (
-/obj/machinery/vending/snack,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/restaurant)
-"Xc" = (
-/obj/machinery/vending/cola,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/restaurant)
-"Xd" = (
-/obj/machinery/vending/cigarette,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/restaurant)
-"Xe" = (
-/obj/machinery/smartfridge/drinks,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/bar)
-"Xf" = (
-/obj/machinery/vending/boozeomat,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/bar)
-"Xg" = (
-/obj/structure/table/reinforced,
-/obj/machinery/chemical_dispenser/bar_soft/full,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/bar)
-"Xh" = (
-/obj/structure/table/reinforced,
-/obj/machinery/chemical_dispenser/bar_alc/full,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/bar)
-"Xi" = (
-/turf/unsimulated/wall,
-/area/centcom/simulated/bar)
-"Xj" = (
-/obj/structure/table/standard,
-/obj/item/weapon/storage/firstaid/surgery,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"Xk" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/multi_tile/glass,
-/turf/unsimulated/floor/steel{
-	icon_state = "white"
-	},
-/area/centcom/simulated/medical)
-"Xl" = (
-/turf/unsimulated/map/edge,
-/area/overmap)
-"Xm" = (
-/obj/machinery/door/firedoor,
-/turf/unsimulated/floor/steel{
-	icon_state = "white"
-	},
-/area/centcom/simulated/medical)
-"Xn" = (
-/obj/structure/sign/greencross,
-/turf/unsimulated/wall,
-/area/centcom/simulated/medical)
-"Xp" = (
-/obj/structure/toilet{
-	dir = 8
-	},
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/bathroom)
-"Xr" = (
-/obj/structure/bed/chair,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"Xs" = (
-/obj/machinery/computer/card{
-	dir = 4
-	},
-/obj/item/device/radio/intercom{
-	dir = 1;
-	frequency = 1475;
-	name = "Station Intercom (Security)";
-	pixel_y = 27
-	},
-/turf/simulated/floor/tiled,
-/area/centcom/simulated/security{
-	name = "\improper CentCom Security Arrivals"
-	})
-"Xv" = (
-/obj/structure/bed/chair/office/dark{
-	dir = 1
-	},
-/turf/simulated/floor/tiled,
-/area/centcom/simulated/security{
-	name = "\improper CentCom Security Arrivals"
-	})
-"Xw" = (
-/obj/structure/bed/chair/office/dark{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/centcom/simulated/security{
-	name = "\improper CentCom Security Arrivals"
-	})
-"Xx" = (
-/obj/machinery/computer/security{
-	dir = 8
-	},
-/obj/machinery/camera/network/crescent,
-/turf/simulated/floor/tiled,
-/area/centcom/simulated/security{
-	name = "\improper CentCom Security Arrivals"
-	})
-"Xy" = (
-/obj/structure/table/standard,
-/obj/item/stack/nanopaste,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"Xz" = (
-/obj/effect/floor_decal/industrial/loading,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"XA" = (
-/obj/effect/floor_decal/steeldecal/steel_decals6{
-	dir = 5
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals6{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"XB" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
-	},
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = 12;
-	pixel_y = 8
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"XC" = (
-/obj/machinery/computer/secure_data{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/centcom/simulated/security{
-	name = "\improper CentCom Security Arrivals"
-	})
-"XD" = (
-/turf/simulated/floor/tiled,
 /area/centcom/simulated/security{
 	name = "\improper CentCom Security Arrivals"
 	})
@@ -4957,28 +5060,21 @@
 /turf/simulated/floor/tiled,
 /area/centcom/simulated/terminal)
 "XJ" = (
-/obj/structure/table/glass,
-/obj/item/device/healthanalyzer/improved,
+/obj/structure/bed/chair,
 /turf/simulated/floor/tiled/white,
 /area/centcom/simulated/medical)
 "XK" = (
-/obj/structure/table/glass,
-/obj/machinery/computer/med_data{
-	icon_keyboard = "laptop_key";
-	icon_screen = "medlaptop";
-	icon_state = "laptop";
-	light_color = "#00b000"
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/food/snacks/meatballspagetti,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
 "XM" = (
-/obj/structure/table/glass{
-	desc = "It's a table, it has some scracthes..they say 'Mlem'."
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/food/snacks/fries,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
 "XN" = (
-/obj/structure/table/glass,
+/obj/machinery/atmospherics/unary/freezer,
 /turf/simulated/floor/tiled/white,
 /area/centcom/simulated/medical)
 "XO" = (
@@ -4986,33 +5082,37 @@
 /turf/unsimulated/beach/sand,
 /area/beach)
 "XP" = (
-/obj/machinery/oxygen_pump/anesthetic,
-/turf/unsimulated/wall,
+/obj/structure/table/standard,
+/obj/item/weapon/reagent_containers/spray/cleaner{
+	desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
+	name = "Surgery Cleaner";
+	pixel_x = 2;
+	pixel_y = 2
+	},
+/turf/simulated/floor/tiled/white,
 /area/centcom/simulated/medical)
 "XQ" = (
-/obj/machinery/optable,
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/structure/table/standard,
+/obj/item/weapon/storage/firstaid/surgery,
 /turf/simulated/floor/tiled/white,
 /area/centcom/simulated/medical)
 "XR" = (
-/obj/machinery/computer/operating{
-	dir = 4
+/obj/structure/table/standard,
+/obj/item/device/healthanalyzer,
+/obj/machinery/light{
+	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
 /area/centcom/simulated/medical)
 "XS" = (
-/obj/structure/closet/crate/freezer,
-/obj/item/weapon/reagent_containers/blood/OMinus,
-/obj/item/weapon/reagent_containers/blood/OMinus,
-/obj/item/weapon/reagent_containers/blood/OMinus,
-/obj/item/weapon/reagent_containers/blood/OMinus,
-/obj/item/weapon/reagent_containers/blood/OMinus,
-/obj/item/weapon/reagent_containers/blood/OMinus,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/food/snacks/cheeseburger{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/weapon/reagent_containers/food/snacks/cheeseburger,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
 "XU" = (
 /obj/effect/floor_decal/industrial/warning/dust{
 	dir = 1
@@ -5021,15 +5121,10 @@
 /turf/simulated/floor/tiled/steel,
 /area/centcom/simulated/evac)
 "XV" = (
-/obj/machinery/turretid/stun{
-	check_access = 0;
-	check_anomalies = 0;
-	check_records = 0;
-	control_area = "\improper CentCom Security Arrivals";
-	pixel_x = 32;
-	req_access = list(101);
-	req_one_access = list(101)
+/obj/machinery/computer/security{
+	dir = 8
 	},
+/obj/machinery/camera/network/crescent,
 /turf/simulated/floor/tiled,
 /area/centcom/simulated/security{
 	name = "\improper CentCom Security Arrivals"
@@ -5044,46 +5139,38 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
 "XX" = (
-/obj/machinery/computer/crew{
+/obj/machinery/light{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
 "XY" = (
 /obj/structure/closet,
 /turf/unsimulated/beach/sand,
 /area/beach)
 "XZ" = (
-/obj/structure/bed/chair/office/dark,
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 12;
+	pixel_y = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/centcom/simulated/medical)
 "Ya" = (
-/obj/machinery/camera/network/crescent,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"Yb" = (
-/obj/structure/table/glass,
-/obj/item/weapon/paper_bin{
-	pixel_x = -1;
-	pixel_y = 3
+/obj/effect/transit/light{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
+/turf/unsimulated/mineral{
+	icon = 'icons/turf/transit_vr.dmi';
+	icon_state = "rock"
+	},
+/area/space)
 "Yc" = (
 /obj/structure/table/standard,
+/obj/item/stack/nanopaste,
 /turf/simulated/floor/tiled/white,
 /area/centcom/simulated/medical)
 "Yg" = (
-/obj/structure/sign/department/operational,
-/turf/unsimulated/wall,
-/area/centcom/simulated/medical)
-"Yh" = (
-/obj/effect/floor_decal/industrial/loading{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"Yj" = (
 /obj/effect/floor_decal/steeldecal/steel_decals6{
 	dir = 9
 	},
@@ -5092,43 +5179,68 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/centcom/simulated/medical)
-"Yk" = (
-/obj/structure/medical_stand,
-/obj/machinery/light{
-	dir = 4
+"Yh" = (
+/obj/effect/floor_decal/industrial/loading,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"Yj" = (
+/obj/effect/floor_decal/steeldecal/steel_decals6{
+	dir = 5
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals6{
+	dir = 6
 	},
 /turf/simulated/floor/tiled/white,
 /area/centcom/simulated/medical)
-"Yl" = (
-/obj/machinery/door/airlock/security{
-	name = "Security"
+"Yk" = (
+/obj/machinery/computer/secure_data{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/centcom/simulated/security{
+	name = "\improper CentCom Security Arrivals"
+	})
+"Yl" = (
+/obj/structure/table/reinforced,
+/obj/item/device/camera,
+/obj/item/weapon/storage/box/ids,
+/obj/machinery/light/small{
+	dir = 4
 	},
-/obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled,
 /area/centcom/simulated/security{
 	name = "\improper CentCom Security Arrivals"
 	})
 "Ym" = (
-/obj/machinery/vending/medical,
+/obj/structure/table/glass,
+/obj/item/weapon/backup_implanter{
+	pixel_y = -8
+	},
+/obj/item/weapon/backup_implanter{
+	pixel_y = 8
+	},
+/obj/item/weapon/backup_implanter,
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/centcom/simulated/medical)
 "Yo" = (
-/obj/structure/closet/secure_closet/medical2,
+/obj/structure/closet/crate/freezer,
+/obj/item/weapon/reagent_containers/blood/OMinus,
+/obj/item/weapon/reagent_containers/blood/OMinus,
+/obj/item/weapon/reagent_containers/blood/OMinus,
+/obj/item/weapon/reagent_containers/blood/OMinus,
+/obj/item/weapon/reagent_containers/blood/OMinus,
+/obj/item/weapon/reagent_containers/blood/OMinus,
 /turf/simulated/floor/tiled/white,
 /area/centcom/simulated/medical)
 "Yr" = (
 /obj/structure/table/reinforced,
-/obj/machinery/microwave{
-	pixel_y = 5
-	},
-/turf/simulated/floor/tiled,
-/area/centcom/simulated/security{
-	name = "\improper CentCom Security Arrivals"
-	})
-"Ys" = (
-/obj/machinery/recharger/wallcharger{
-	pixel_x = 4;
-	pixel_y = 26
+/obj/item/weapon/book/manual/security_space_law,
+/obj/item/weapon/book/manual/security_space_law,
+/obj/machinery/light/small{
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/centcom/simulated/security{
@@ -5143,26 +5255,20 @@
 /turf/simulated/floor/tiled/steel,
 /area/centcom/simulated/evac)
 "Yu" = (
-/obj/machinery/camera/network/crescent,
 /turf/simulated/floor/tiled,
 /area/centcom/simulated/security{
 	name = "\improper CentCom Security Arrivals"
 	})
 "Yv" = (
-/obj/machinery/door/airlock/multi_tile/glass{
-	req_access = list(5)
-	},
-/obj/machinery/door/firedoor/multi_tile,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/food/snacks/kitsuneudon,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
 "Yw" = (
-/obj/machinery/door/airlock/medical{
-	name = "Operating Theatre";
-	req_access = list(45)
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/food/snacks/lasagna,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
 "Yx" = (
 /obj/machinery/light{
 	dir = 4
@@ -5170,14 +5276,102 @@
 /turf/simulated/floor/tiled,
 /area/centcom/simulated/terminal)
 "Yy" = (
-/obj/structure/reagent_dispensers/peppertank{
-	pixel_x = 30
+/obj/machinery/door/airlock/security{
+	name = "Security"
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled,
 /area/centcom/simulated/security{
 	name = "\improper CentCom Security Arrivals"
 	})
 "YB" = (
+/obj/machinery/vending/medical,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"YC" = (
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/food/snacks/hotdog,
+/obj/item/weapon/reagent_containers/food/snacks/hotdog{
+	pixel_x = -5;
+	pixel_y = -3
+	},
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
+"YD" = (
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
+"YE" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/steel,
+/area/centcom/simulated/main_hall)
+"YF" = (
+/obj/structure/table/glass,
+/obj/item/device/healthanalyzer/improved,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"YG" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/steel,
+/area/centcom/simulated/living)
+"YI" = (
+/obj/structure/table/reinforced,
+/obj/machinery/microwave{
+	pixel_y = 5
+	},
+/turf/simulated/floor/tiled,
+/area/centcom/simulated/security{
+	name = "\improper CentCom Security Arrivals"
+	})
+"YJ" = (
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 4;
+	pixel_y = 26
+	},
+/turf/simulated/floor/tiled,
+/area/centcom/simulated/security{
+	name = "\improper CentCom Security Arrivals"
+	})
+"YK" = (
+/obj/structure/table/glass,
+/obj/machinery/computer/med_data{
+	icon_keyboard = "laptop_key";
+	icon_screen = "medlaptop";
+	icon_state = "laptop";
+	light_color = "#00b000"
+	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"YL" = (
+/obj/structure/table/glass{
+	desc = "It's a table, it has some scracthes..they say 'Mlem'."
+	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"YM" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"YN" = (
+/obj/machinery/oxygen_pump/anesthetic,
+/turf/unsimulated/wall,
+/area/centcom/simulated/medical)
+"YO" = (
+/obj/machinery/optable,
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"YP" = (
 /obj/structure/table/standard,
 /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{
 	pixel_x = 5;
@@ -5191,284 +5385,23 @@
 /obj/item/weapon/tool/wrench,
 /turf/simulated/floor/tiled/white,
 /area/centcom/simulated/medical)
-"YC" = (
-/obj/machinery/atmospherics/unary/cryo_cell,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"YD" = (
-/obj/machinery/atmospherics/unary/freezer,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"YE" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/steel,
-/area/centcom/simulated/main_hall)
-"YF" = (
-/obj/structure/table/glass,
-/obj/item/device/defib_kit/loaded,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"YG" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/steel,
-/area/centcom/simulated/living)
-"YH" = (
-/obj/structure/table/glass,
-/obj/item/weapon/storage/pill_bottle/spaceacillin,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"YI" = (
-/obj/structure/table/reinforced,
-/obj/item/weapon/melee/baton/loaded,
-/obj/item/weapon/melee/baton/loaded,
-/obj/item/weapon/gun/energy/taser,
-/turf/simulated/floor/tiled,
-/area/centcom/simulated/security{
-	name = "\improper CentCom Security Arrivals"
-	})
-"YJ" = (
-/obj/structure/closet/secure_closet/nanotrasen_security,
-/obj/item/weapon/storage/box/handcuffs,
-/obj/item/weapon/gun/energy/gun,
-/obj/item/weapon/shield/riot,
-/turf/simulated/floor/tiled,
-/area/centcom/simulated/security{
-	name = "\improper CentCom Security Arrivals"
-	})
-"YK" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"YL" = (
-/obj/machinery/atmospherics/pipe/manifold4w/hidden,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"YM" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"YN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 9
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"YO" = (
-/obj/machinery/computer/transhuman/designer{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"YP" = (
-/obj/machinery/atmospherics/portables_connector{
-	dir = 1
-	},
-/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
 "YQ" = (
-/obj/structure/table/glass,
-/obj/machinery/chemical_dispenser/full,
+/obj/machinery/atmospherics/unary/cryo_cell,
 /turf/simulated/floor/tiled/white,
 /area/centcom/simulated/medical)
 "YR" = (
 /turf/unsimulated/floor/steel,
 /area/centcom/simulated/main_hall)
 "YT" = (
-/obj/machinery/chem_master,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"YU" = (
 /obj/structure/table/glass,
-/obj/machinery/chemical_dispenser/ert,
+/obj/item/weapon/reagent_containers/glass/beaker/large,
+/obj/item/weapon/reagent_containers/glass/beaker/large,
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/white,
 /area/centcom/simulated/medical)
 "YV" = (
-/obj/machinery/transhuman/synthprinter,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"YW" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"YX" = (
-/obj/effect/floor_decal/sign/small_e,
-/turf/simulated/floor/holofloor/wood,
-/area/holodeck/source_chess)
-"YY" = (
-/obj/machinery/bodyscanner{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner_steel_grid{
-	dir = 10
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"YZ" = (
-/obj/machinery/body_scanconsole,
-/obj/effect/floor_decal/corner_steel_grid{
-	dir = 10
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"Zb" = (
-/obj/machinery/sleep_console{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"Zc" = (
-/obj/machinery/sleeper{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"Zd" = (
-/obj/machinery/computer/transhuman/resleeving{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"Ze" = (
-/obj/machinery/transhuman/resleever,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"Zf" = (
-/obj/structure/filingcabinet/chestdrawer{
-	name = "Medical Forms"
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"Zg" = (
-/obj/machinery/clonepod/transhuman/full,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"Zh" = (
-/obj/structure/table/reinforced,
-/obj/item/weapon/reagent_containers/food/drinks/flask/barflask,
-/obj/item/weapon/reagent_containers/glass/rag,
-/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask,
-/turf/simulated/floor/wood,
-/area/centcom/simulated/bar)
-"Zi" = (
-/obj/machinery/light,
-/turf/simulated/floor/tiled/steel,
-/area/centcom/simulated/main_hall)
-"Zj" = (
-/obj/structure/table/standard,
-/obj/item/device/healthanalyzer,
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"Zk" = (
-/obj/structure/table/reinforced,
-/obj/item/device/camera,
-/obj/item/weapon/storage/box/ids,
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/centcom/simulated/security{
-	name = "\improper CentCom Security Arrivals"
-	})
-"Zl" = (
-/obj/structure/table/glass,
-/obj/item/weapon/backup_implanter{
-	pixel_y = -8
-	},
-/obj/item/weapon/backup_implanter{
-	pixel_y = 8
-	},
-/obj/item/weapon/backup_implanter,
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"Zn" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"Zp" = (
-/obj/structure/table/reinforced,
-/obj/item/weapon/book/manual/security_space_law,
-/obj/item/weapon/book/manual/security_space_law,
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
-/area/centcom/simulated/security{
-	name = "\improper CentCom Security Arrivals"
-	})
-"Zq" = (
-/obj/machinery/light,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"Zr" = (
-/obj/structure/table/standard,
-/obj/machinery/light,
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"Zs" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
-/area/centcom/simulated/security{
-	name = "\improper CentCom Security Arrivals"
-	})
-"Zt" = (
-/obj/effect/floor_decal/corner_steel_grid/diagonal,
-/obj/effect/floor_decal/corner_steel_grid/diagonal{
-	dir = 4
-	},
-/obj/effect/floor_decal/industrial/danger{
-	dir = 8
-	},
-/obj/machinery/light,
-/turf/simulated/floor/tiled,
-/area/centcom/simulated/terminal)
-"Zw" = (
-/obj/structure/table/reinforced,
-/obj/item/weapon/storage/box/donkpockets,
-/obj/item/weapon/storage/box/donkpockets,
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
-/area/centcom/simulated/security{
-	name = "\improper CentCom Security Arrivals"
-	})
-"Zx" = (
-/obj/structure/table/glass,
-/obj/item/weapon/reagent_containers/glass/beaker/large,
-/obj/item/weapon/reagent_containers/glass/beaker/large,
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"Zy" = (
-/obj/structure/table/glass,
-/obj/item/weapon/storage/firstaid/adv,
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
-"Zz" = (
 /obj/structure/table/glass,
 /obj/item/weapon/reagent_containers/glass/bottle/biomass{
 	pixel_x = -4;
@@ -5487,28 +5420,208 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/centcom/simulated/medical)
-"ZC" = (
+"YW" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"YX" = (
+/obj/effect/floor_decal/sign/small_e,
+/turf/simulated/floor/holofloor/wood,
+/area/holodeck/source_chess)
+"YY" = (
+/obj/structure/table/standard,
+/obj/item/weapon/storage/firstaid/regular,
+/obj/item/weapon/storage/firstaid/toxin,
+/obj/item/weapon/storage/firstaid/o2,
+/obj/structure/closet/walllocker/medical/east,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/escape)
+"YZ" = (
+/obj/effect/floor_decal/techfloor/orange{
+	dir = 4
+	},
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/structure/railing{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/centcom/simulated/terminal)
+"Zb" = (
+/obj/machinery/computer/crew{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"Zc" = (
+/obj/structure/bed/chair/office/dark,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"Zd" = (
+/obj/machinery/computer/transhuman/designer{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"Ze" = (
+/obj/machinery/transhuman/synthprinter,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"Zf" = (
+/obj/machinery/camera/network/crescent,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"Zg" = (
+/obj/machinery/computer/transhuman/resleeving{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"Zh" = (
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich{
+	pixel_y = 10
+	},
+/turf/simulated/floor/wood,
+/area/centcom/simulated/bar)
+"Zi" = (
+/obj/machinery/light,
+/turf/simulated/floor/tiled/steel,
+/area/centcom/simulated/main_hall)
+"Zj" = (
+/obj/structure/table/glass,
+/obj/item/weapon/paper_bin{
+	pixel_x = -1;
+	pixel_y = 3
+	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"Zk" = (
+/obj/effect/wingrille_spawn/reinforced/crescent,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "FrontlockC2";
+	name = "Security Door";
+	opacity = 0
+	},
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/centcom/simulated/security{
+	name = "\improper CentCom Security Arrivals"
+	})
+"Zl" = (
+/obj/effect/floor_decal/industrial/loading{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"Zn" = (
+/obj/structure/medical_stand,
 /obj/machinery/light{
 	dir = 4
 	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"Zp" = (
+/obj/machinery/computer/card{
+	dir = 4
+	},
+/obj/item/device/radio/intercom{
+	dir = 1;
+	frequency = 1475;
+	name = "Station Intercom (Security)";
+	pixel_y = 27
+	},
+/turf/simulated/floor/tiled,
+/area/centcom/simulated/security{
+	name = "\improper CentCom Security Arrivals"
+	})
+"Zq" = (
+/obj/structure/table/glass,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"Zr" = (
+/obj/machinery/computer/operating{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"Zs" = (
+/obj/machinery/turretid/stun{
+	check_access = 0;
+	check_anomalies = 0;
+	check_records = 0;
+	control_area = "\improper CentCom Security Arrivals";
+	pixel_x = 32;
+	req_access = list(101);
+	req_one_access = list(101)
+	},
+/turf/simulated/floor/tiled,
+/area/centcom/simulated/security{
+	name = "\improper CentCom Security Arrivals"
+	})
+"Zt" = (
+/turf/simulated/floor/tiled/steel_grid,
+/area/centcom/simulated/terminal)
+"Zw" = (
+/obj/machinery/status_display{
+	pixel_y = -30
+	},
+/obj/structure/bed/chair/shuttle{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/escape)
+"Zx" = (
+/obj/machinery/light,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"Zy" = (
+/obj/structure/table/standard,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"Zz" = (
+/obj/structure/closet/secure_closet/medical2,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
+"ZC" = (
+/obj/structure/bed/chair/wood/wings{
+	dir = 8
+	},
 /turf/simulated/floor/wood,
 /area/centcom/simulated/restaurant)
 "ZD" = (
-/obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine,
-/obj/machinery/light{
-	dir = 8
+/obj/machinery/light,
+/obj/effect/floor_decal/borderfloor{
+	dir = 10
 	},
-/turf/simulated/floor/wood,
-/area/centcom/simulated/bar)
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/escape)
 "ZE" = (
 /obj/machinery/light,
+/obj/effect/floor_decal/borderfloor{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/escape)
+"ZF" = (
+/obj/machinery/vending/cola,
 /turf/simulated/floor/wood,
 /area/centcom/simulated/restaurant)
 "ZQ" = (
 /obj/effect/floor_decal/sign/small_c,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
+"ZZ" = (
+/obj/structure/table/standard,
+/obj/machinery/light,
+/turf/simulated/floor/tiled/white,
+/area/centcom/simulated/medical)
 
 (1,1,1) = {"
 ap
@@ -9389,7 +9502,7 @@ Hy
 Hy
 Hy
 Hy
-ap
+Hy
 ap
 ap
 ap
@@ -9531,7 +9644,7 @@ Hy
 Hy
 Hy
 Hy
-ap
+Hy
 ap
 ap
 ap
@@ -9673,7 +9786,7 @@ Hy
 Hy
 Hy
 Hy
-ap
+Hy
 ap
 ap
 ap
@@ -9815,7 +9928,7 @@ Hy
 Hy
 Hy
 Hy
-ap
+Hy
 ap
 ap
 ap
@@ -9956,12 +10069,12 @@ dg
 dg
 dg
 dg
+dg
 Hy
 ap
 ap
 ap
 ap
-ap
 ae
 ae
 ae
@@ -10059,13 +10172,10 @@ Hy
 Hy
 Mb
 Mb
-zv
+in
+Mb
 Mb
 Mb
-sN
-IN
-IN
-IN
 tH
 IN
 IN
@@ -10075,31 +10185,34 @@ IN
 IN
 IN
 tH
+IN
+IN
+IN
+sp
+lf
+IN
+IN
 sp
 IN
 IN
-tH
+IN
+sp
 IN
 IN
 IN
-tH
-IN
-IN
-IN
-tH
+sp
 Mb
 Mb
 Mb
-zv
+mF
 Mb
 Mb
+Mb
+in
 sN
 Mb
-mb
-sN
 dg
-Hy
-ap
+Pq
 ap
 ap
 ap
@@ -10216,7 +10329,8 @@ FT
 FT
 FT
 FT
-mF
+FT
+jL
 FT
 FT
 FT
@@ -10237,7 +10351,7 @@ FT
 FT
 FT
 FT
-Mf
+uG
 FT
 dg
 Hy
@@ -10245,7 +10359,6 @@ ap
 ap
 ap
 ap
-ap
 ae
 ae
 ae
@@ -10341,53 +10454,53 @@ Xl
 (35,1,1) = {"
 Hy
 Hy
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Av
-Av
-Av
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Av
-Av
-Av
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-jL
-Pq
+FT
+FT
+FT
+FT
+FT
+FT
+Sh
+Sh
+Sh
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+Sh
+Sh
+Sh
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+uG
+FT
 dg
 Hy
 ap
 ap
 ap
 ap
-ap
 ae
 ae
 ae
@@ -10483,53 +10596,53 @@ Xl
 (36,1,1) = {"
 Hy
 Hy
-FT
-FT
-FT
-FT
-FT
-FT
-Sh
-Sh
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-Sh
-Sh
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-Mf
-FT
+cq
+cq
+cq
+cq
+cq
+cq
+Av
+Av
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+Av
+Av
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+Fp
+cq
 dg
 Hy
 ap
 ap
 ap
 ap
-ap
 ae
 ae
 ae
@@ -10654,6 +10767,7 @@ FT
 FT
 FT
 FT
+FT
 Sh
 FT
 FT
@@ -10663,7 +10777,7 @@ FT
 FT
 FT
 FT
-Mf
+uG
 FT
 dg
 Hy
@@ -10671,7 +10785,6 @@ ap
 ap
 ap
 ap
-ap
 ae
 ae
 ae
@@ -10796,6 +10909,7 @@ FT
 FT
 FT
 FT
+FT
 Sh
 FT
 FT
@@ -10805,7 +10919,7 @@ FT
 FT
 FT
 FT
-Mf
+uG
 FT
 dg
 Hy
@@ -10813,7 +10927,6 @@ ap
 ap
 ap
 ap
-ap
 ae
 ae
 ae
@@ -10938,6 +11051,7 @@ FT
 FT
 FT
 FT
+FT
 Sh
 FT
 FT
@@ -10947,7 +11061,7 @@ FT
 FT
 FT
 FT
-Mf
+uG
 FT
 dg
 Hy
@@ -10955,7 +11069,6 @@ ap
 ap
 ap
 ap
-ap
 ae
 ae
 ae
@@ -11080,6 +11193,7 @@ FT
 FT
 FT
 FT
+FT
 Sh
 FT
 FT
@@ -11089,7 +11203,7 @@ FT
 FT
 FT
 FT
-Mf
+uG
 FT
 dg
 Hy
@@ -11097,7 +11211,6 @@ ap
 ap
 ap
 ap
-ap
 ae
 ae
 ae
@@ -11222,6 +11335,7 @@ FT
 FT
 FT
 FT
+FT
 Sh
 FT
 FT
@@ -11231,7 +11345,7 @@ FT
 FT
 FT
 FT
-Mf
+uG
 FT
 dg
 Hy
@@ -11239,7 +11353,6 @@ ap
 ap
 ap
 ap
-ap
 ae
 ae
 ae
@@ -11335,46 +11448,47 @@ Xl
 (42,1,1) = {"
 Hy
 Hy
-FT
-FT
-FT
-FT
-FT
-FT
-Sh
-Sh
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-Sh
-Sh
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-FT
-Mf
-FT
+cq
+cq
+cq
+cq
+cq
+cq
+Av
+Av
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+Av
+Av
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+Fp
+cq
 dg
 Hy
 ap
@@ -11383,7 +11497,6 @@ ap
 ap
 ap
 ap
-ap
 Xl
 Xl
 Xl
@@ -11477,46 +11590,47 @@ Xl
 (43,1,1) = {"
 Hy
 Hy
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Av
-Av
-Av
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Av
-Av
-Av
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-Pq
-jL
-Pq
+FT
+FT
+FT
+FT
+FT
+FT
+Sh
+Sh
+Sh
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+Sh
+Sh
+Sh
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+uG
+FT
 dg
 Hy
 ap
@@ -11525,7 +11639,6 @@ ap
 ap
 ap
 ap
-ap
 Xl
 OY
 OY
@@ -11644,6 +11757,7 @@ FT
 FT
 FT
 FT
+FT
 Sh
 Sh
 Sh
@@ -11657,7 +11771,7 @@ FT
 FT
 FT
 FT
-Mf
+uG
 FT
 dg
 Hy
@@ -11667,7 +11781,6 @@ ap
 ap
 ap
 ap
-ap
 Xl
 OY
 OY
@@ -11763,10 +11876,11 @@ Hy
 Hy
 PU
 PU
-Ft
+vu
 PU
 PU
-FX
+PU
+ig
 Py
 Py
 Py
@@ -11779,7 +11893,7 @@ Py
 Py
 Py
 ig
-tu
+mb
 Py
 Py
 ig
@@ -11794,16 +11908,15 @@ ig
 PU
 PU
 PU
-Ft
+pv
 PU
 PU
+PU
+vu
 FX
 PU
-in
-FX
 dg
-Hy
-ap
+Ya
 ap
 ap
 ap
@@ -11944,6 +12057,7 @@ dg
 dg
 dg
 dg
+dg
 Hy
 ap
 ap
@@ -11951,7 +12065,6 @@ ap
 ap
 ap
 ap
-ap
 Xl
 OY
 OY
@@ -12087,7 +12200,7 @@ Hy
 Hy
 Hy
 Hy
-ap
+Hy
 ap
 ap
 ap
@@ -12229,7 +12342,7 @@ Hy
 Hy
 Hy
 Hy
-ap
+Hy
 ap
 ap
 ap
@@ -12371,7 +12484,7 @@ Hy
 Hy
 Hy
 Hy
-ap
+Hy
 ap
 ap
 ap
@@ -12513,7 +12626,7 @@ Hy
 Hy
 Hy
 Hy
-ap
+Hy
 ap
 ap
 ap
@@ -16627,39 +16740,39 @@ ae
 ae
 ae
 ae
+qc
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+NW
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+NW
+dZ
+dZ
+dZ
+dZ
+dZ
+dZ
+CC
 ae
 ae
 ae
 ae
-Jq
-dZ
-dZ
-dZ
-dZ
-dZ
-dZ
-xi
-dZ
-dZ
-dZ
-dZ
-dZ
-dZ
-dZ
-dZ
-dZ
-dZ
-dZ
-xi
-dZ
-dZ
-dZ
-dZ
-dZ
-dZ
-aj
-ae
-ae
 ae
 ae
 ae
@@ -16769,37 +16882,37 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
+sT
+sx
+sx
+sx
 zK
 sx
 sx
-zH
-sx
-sx
-sx
-zH
-sx
-sx
-sx
-sx
-zH
-sx
-zH
-sx
-sx
-sx
-sx
-zH
-sx
-sx
-sx
-zH
 sx
 sx
 zK
+sx
+sx
+sx
+sx
+zK
+sx
+sx
+sx
+sx
+zK
+sx
+sx
+sx
+sx
+zK
+sx
+sx
+sx
+sT
+ae
+ae
 ae
 ae
 ae
@@ -16911,11 +17024,8 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-zK
+sT
+ET
 ET
 ET
 ET
@@ -16923,16 +17033,17 @@ ET
 ET
 XE
 XE
-dD
+Rg
 XE
-Sl
+Fe
+Cp
+Bs
+Wt
 Bs
 Cp
-li
-Bs
-Sl
+Fe
 XE
-dD
+Rg
 XE
 XE
 ET
@@ -16941,7 +17052,9 @@ ET
 ET
 ET
 ET
-zK
+sT
+ae
+ae
 ae
 ae
 ae
@@ -17053,37 +17166,37 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-zK
-Fp
-Fp
-Fp
+sT
+ET
+ET
+ET
+ET
 XE
 XE
 XE
 XE
+Rs
+yU
+SG
 gE
 yU
-LD
+Rm
 ix
-yU
+gE
 Mq
 ix
 ih
-Mq
-NA
 XE
 XE
 XE
 XE
-Fp
-Fp
-Fp
-Fp
-zK
+ET
+ET
+ET
+ET
+sT
+ae
+ae
 ae
 ae
 ae
@@ -17195,37 +17308,37 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-zK
-ET
-ET
+sT
+HW
+HW
+HW
 XE
+Fe
+FJ
+Jq
 Sl
 Al
 HX
-cq
-Re
-Jw
+XW
+Ve
+XW
+XW
+XW
+Ve
 XW
 FY
-XW
-XW
-FY
-XW
+Xn
 FJ
 Ic
-Al
-SG
+Zw
+XE
+XE
 HW
-XE
-XE
-ET
-ET
-ET
-zK
+HW
+HW
+sT
+ae
+ae
 ae
 ae
 ae
@@ -17337,37 +17450,37 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-zK
+sT
+ET
 ET
 XE
 XE
 XE
-ti
-Ri
-Ri
-Rg
-Rs
-iU
-RA
-iU
-iU
-RA
-iU
+DI
 RG
-qY
+RG
+Pe
 Ri
-Ri
-RY
-Sl
+WF
+RA
+WF
+iU
+iU
+RA
+WF
+WT
+ii
+RG
+RG
+ZD
+Fe
 XE
 XE
 ET
 ET
-zK
+sT
+ae
+ae
 ae
 ae
 ae
@@ -17479,37 +17592,37 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-zK
+sT
 ET
+ET
+xi
+Pg
+zH
 Pe
-Pg
 Rd
-Rg
-Rk
-Rk
+Rd
 Rm
-Tv
+Rk
 RD
 RA
 RD
 RD
+RD
 RA
 RD
+WU
+Rm
+tS
 tS
-Rm
 ii
-ii
-qY
-lE
+CD
 Pg
-vu
+Cd
 ET
 ET
-zK
+sT
+ae
+ae
 ae
 ae
 ae
@@ -17621,37 +17734,37 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-zK
+sT
 ET
-Pe
-Qa
-Re
+ET
+xi
+WF
+Al
 Rm
-vz
-vz
-Rm
-DI
-RA
-RA
-RA
-RA
-RA
-RA
+RF
 RF
 Rm
 vz
-vz
+RA
+RA
+RA
+RA
+RA
+RA
+RA
+WV
 Rm
-Ic
-xl
-vu
+RF
+RF
+Rm
+Xn
+WF
+Cd
 ET
 ET
-zK
+sT
+ae
+ae
 ae
 ae
 ae
@@ -17763,37 +17876,37 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-zK
+sT
 ET
-Pe
+ET
+xi
 RD
-jr
-lf
-Rk
-Rk
-Rm
 CG
-Pg
-RA
-Pg
-Pg
-RA
-Pg
-tp
+Et
+Rd
+Rd
 Rm
-ii
-ii
-AD
-Cd
+Sy
+Pg
+RA
+Pg
+Pg
+Pg
+RA
+Pg
+WZ
+Rm
+tS
+tS
+Xr
+gX
 RD
-vu
+Cd
 ET
 ET
-zK
+sT
+ae
+ae
 ae
 ae
 ae
@@ -17905,37 +18018,37 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-zK
+sT
+ET
 ET
 XE
 XE
 XE
+Ft
+AD
+AD
 Et
 rh
-rh
-lf
-Rs
 iU
 RA
 iU
+WF
 iU
 RA
 iU
-RG
+GC
+Xr
 AD
-rh
-rh
-Sy
-Sl
+AD
+ZE
+Fe
 XE
 XE
 ET
 ET
-zK
+sT
+ae
+ae
 ae
 ae
 ae
@@ -18047,37 +18160,37 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-zK
-ET
-ET
+sT
+HW
+HW
+HW
 XE
+Fe
+FJ
+Jw
 Sl
 Al
 nC
-cq
-Re
-qc
+nB
+VK
+nB
+nB
+nB
+VK
 nB
 pk
-nB
-nB
-pk
-nB
-Dn
-Ic
-Al
-NW
+Xn
+FJ
+YY
+Zw
+XE
+XE
 HW
-XE
-XE
-ET
-ET
-ET
-zK
+HW
+HW
+sT
+ae
+ae
 ae
 ae
 ae
@@ -18189,37 +18302,37 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-zK
-Fp
-Fp
-Fp
+sT
+ET
+ET
+ET
+ET
 XE
 XE
 XE
 XE
+RY
+Rz
+Tv
 Ro
 Rz
-uG
+Rm
 RC
-Rz
+Ro
 Dm
 RC
 RE
-Dm
+XE
+XE
+XE
+XE
+ET
+ET
+ET
+ET
 sT
-XE
-XE
-XE
-XE
-Fp
-Fp
-Fp
-Fp
-zK
+ae
+ae
 ae
 ae
 ae
@@ -18331,11 +18444,8 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-zK
+sT
+ET
 ET
 ET
 ET
@@ -18345,14 +18455,15 @@ XE
 XE
 zw
 XE
-Sl
-zw
-Fe
 Fe
 zw
-Sl
+VR
+VR
+VR
+zw
+Fe
 XE
-pv
+Xy
 XE
 XE
 ET
@@ -18361,7 +18472,9 @@ ET
 ET
 ET
 ET
-zK
+sT
+ae
+ae
 ae
 ae
 ae
@@ -18473,37 +18586,37 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-zK
-Rc
-Rc
-Rc
-Rc
-Rc
-Rc
-Rc
-Rc
-Rc
-Rc
-Rc
-Rc
-Rc
-Rc
-Rc
+sT
 Rc
 Rc
 Rc
+zv
 pX
-Rc
-Rc
-Rc
 pX
+LD
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+YZ
+pX
+pX
+zv
 Rc
 Rc
-zK
+Rc
+sT
+ae
+ae
 ae
 ae
 ae
@@ -18615,37 +18728,37 @@ ae
 ae
 ae
 ae
-ae
+tu
 Vg
 Vg
 Vg
 Vl
 Vh
-Jx
-Jx
-Jx
-Jx
-Jx
-Jx
-Jx
-Jx
-Jx
-Jx
-Jx
-Jx
-Jx
-Jx
-Jx
-Jx
+Zt
+Zt
+Zt
+Nq
+Nq
+Nq
+Nq
+Nq
+Nq
+Nq
+Nq
+Nq
+Nq
+Nq
+Zt
+Zt
 Zt
 aj
+CC
 dZ
 dZ
 dZ
-dZ
-dZ
-dZ
-aj
+CC
+ae
+ae
 ae
 ae
 ae
@@ -18769,10 +18882,11 @@ Nq
 Nq
 Nq
 Yx
-Nq
-Nq
-Nq
-Nq
+VL
+VY
+WA
+VY
+WC
 Yx
 Nq
 Nq
@@ -18793,7 +18907,6 @@ ae
 ae
 ae
 ae
-ae
 ap
 ap
 ap
@@ -18912,7 +19025,8 @@ Nq
 Nq
 wd
 dZ
-TY
+Vv
+Vv
 Vv
 dZ
 dZ
@@ -18935,7 +19049,6 @@ ae
 ae
 ae
 ae
-ae
 ap
 ap
 ap
@@ -19055,8 +19168,9 @@ QY
 TI
 Rr
 SV
+WB
 SV
-Rr
+WE
 TI
 QY
 SH
@@ -19077,7 +19191,6 @@ ae
 ae
 ae
 ae
-ae
 ap
 ap
 ap
@@ -19195,10 +19308,11 @@ TI
 TI
 TI
 dZ
+YE
 Ru
 Ru
 Ru
-Ru
+Zi
 dZ
 dZ
 dZ
@@ -19219,7 +19333,6 @@ ae
 ae
 ae
 ae
-ae
 ap
 ap
 ap
@@ -19337,21 +19450,21 @@ VJ
 Vi
 VS
 Vu
-YE
 Ru
 Ru
-Wt
-WE
-Xs
-XC
+Ru
+Ru
+Ru
+Xx
+Zk
 Zp
-VI
+Yk
 Yr
-Zw
-YI
 VI
-ae
-ae
+YI
+kU
+sQ
+VI
 ae
 ae
 ae
@@ -19482,22 +19595,22 @@ Vu
 Ru
 Ru
 Ru
-Wv
+Ru
 WJ
-Xv
-XD
+Xw
 XD
+Xz
+Yu
+Yu
 VI
-Ys
-XD
 YJ
+Yu
+iq
 VI
 ae
 ae
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -19624,18 +19737,18 @@ Vu
 Ru
 Ru
 Ru
-Wv
+Ru
 WK
 Xw
-XD
-XD
-VI
+Xj
+XA
+Yu
 Yu
-XD
-YJ
 VI
-ae
-ae
+OS
+Yu
+iq
+VI
 ae
 ae
 ae
@@ -19766,22 +19879,22 @@ Vu
 Ru
 Ru
 Ru
-Wt
-WE
+Ru
+Ru
 Xx
 Zk
 XV
 Yl
 Zs
 Yy
-XD
+za
+zF
+Yu
 VI
 ae
 ae
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -19907,7 +20020,9 @@ VU
 Vu
 Ru
 Ru
-Zi
+Ru
+Ru
+Ru
 VI
 VI
 VI
@@ -19916,11 +20031,9 @@ VI
 VI
 VI
 VI
-Yl
+Yy
 VI
-Xi
-ae
-ae
+Om
 ae
 ae
 ae
@@ -20047,22 +20160,22 @@ Vj
 Vj
 VU
 Vu
+YE
 Ru
 Ru
 Ru
+Zi
 VM
 VQ
-WN
-VZ
+XB
+Xa
 VQ
 VQ
-WH
-ZD
 WW
 Xe
-Xi
-ae
-ae
+FC
+JA
+Om
 ae
 ae
 ae
@@ -20192,19 +20305,19 @@ TJ
 Ru
 Ru
 Ru
-WB
-VR
-Wb
-Wl
+Ru
+Ru
+Wk
+WL
 Wz
-VQ
+Yv
 WH
-WO
+VQ
 WW
 Xf
-Xi
-ae
-ae
+FC
+UO
+Om
 ae
 ae
 ae
@@ -20334,19 +20447,19 @@ Vw
 Ru
 Ru
 Ru
-VK
-VR
+Ru
+Ru
 Wc
-Wm
-Wz
-VQ
+WL
+XK
+Yw
 WH
-WP
+VQ
 WW
 Xg
-Xi
-ae
-ae
+FC
+xY
+Om
 ae
 ae
 ae
@@ -20473,22 +20586,22 @@ Vj
 Vj
 VU
 Vu
-YE
 Ru
 Ru
-VL
-VQ
-Wd
+Ru
+Ru
+Ru
 Wd
 VQ
+ZC
+ZC
+VQ
 VQ
-WH
-WQ
 WW
 Xh
-Xi
-ae
-ae
+FC
+Sf
+Om
 ae
 ae
 ae
@@ -20615,22 +20728,22 @@ VN
 Vj
 VU
 Vu
+YE
 Ru
 Ru
 Ru
-WB
+Ru
+Wk
 VQ
 VQ
 VQ
 VQ
 VQ
-WH
-WR
 WW
 Zh
-Xi
-ae
-ae
+FC
+NJ
+Om
 ae
 ae
 ae
@@ -20760,19 +20873,19 @@ Vu
 Ru
 Ru
 Ru
-WB
+Ru
+Ru
+Wk
 VQ
-VZ
-VZ
+Xa
+Xa
 VQ
 VQ
-WH
-WV
 WW
-WW
-Xi
-ae
-ae
+qu
+FC
+FC
+Om
 ae
 ae
 ae
@@ -20902,19 +21015,19 @@ Vu
 Ru
 Ru
 Ru
-WB
-VR
-We
-Wo
-Wz
+Ru
+Ru
+Wk
+WL
+XM
+YC
+WH
 VQ
 VQ
 VQ
-ZE
+Gz
 VM
-Xi
-ae
-ae
+Om
 ae
 ae
 ae
@@ -21043,23 +21156,23 @@ VP
 Vu
 Ru
 Ru
-Zi
-WB
-VR
+Ru
+Ru
+Ru
 Wk
-Wu
-Wz
+WL
+XS
+YD
+WH
 VQ
 VQ
 VQ
-WZ
+yk
 VM
 ae
 ae
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -21183,25 +21296,25 @@ Vs
 VP
 Ut
 Vu
+YE
 Ru
 Ru
 Ru
-VK
+Ru
+Wc
 VQ
-Wd
-Wd
-VQ
-VZ
-VZ
+ZC
+ZC
 VQ
 Xa
+Xa
+VQ
+As
 VM
 ae
 ae
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -21328,22 +21441,22 @@ Vu
 Ru
 Ru
 Ru
-VL
+Ru
+Ru
+Wd
 VQ
 VQ
 VQ
-VR
-WA
-WI
-Wz
+WL
+Hv
 Xb
+WH
+is
 VM
 ae
 ae
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -21470,22 +21583,22 @@ Vu
 Ru
 Ru
 Ru
-WB
+Ru
+Ru
+Wk
 VQ
 VQ
 VQ
-VR
-WF
 WL
-Wz
+ws
 Xc
+WH
+ZF
 VM
 ae
 ae
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -21609,25 +21722,25 @@ Ut
 Ut
 VU
 Vu
-YE
+Ru
+Ru
+Ru
 Ru
 Ru
 VM
-VY
-ZC
+Xk
+XX
 VQ
 VQ
-Wd
-Wd
 ZC
-Xd
+ZC
+XX
+Qo
 VM
 ae
 ae
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -21751,9 +21864,11 @@ Vr
 Ut
 VU
 Vu
+YE
 Ru
 Ru
 Ru
+Zi
 VM
 VM
 VM
@@ -21770,8 +21885,6 @@ ae
 ae
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -21896,19 +22009,19 @@ Vu
 Ru
 Ru
 Ru
+Ru
+Ru
 Vd
 WS
 WS
-Zl
-XX
 Ym
-Vd
+Zb
 YB
-YK
-YP
 Vd
-ae
-ae
+YP
+xT
+xB
+Vd
 ae
 ae
 ae
@@ -22038,24 +22151,24 @@ Vu
 Ru
 Ru
 Ru
-WC
-WT
-WS
+Ru
+Ru
+WN
 XJ
-XZ
+WS
+YF
+Zc
 WS
 Vd
-YC
-YL
-YP
+YQ
+DR
+xB
 Vd
 ae
 ae
 ae
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -22179,25 +22292,25 @@ Wh
 Vu
 Ru
 Ru
-Zi
-Ve
+Ru
+Ru
+Ru
+WO
 WS
 WS
-XK
-Ya
+YK
+Zf
 WS
 Vd
-YD
-YM
 XN
+yV
+Zq
 Vd
 ae
 ae
 ae
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -22322,24 +22435,24 @@ TJ
 Ru
 Ru
 Ru
-Xk
+Ru
+Ru
+WP
 WS
 WS
-XM
-XZ
+YL
+Zc
 WS
 Vd
-YC
-YN
 YQ
+LR
+mN
 Vd
 ae
 ae
 ae
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -22464,19 +22577,19 @@ Vw
 Ru
 Ru
 Ru
-Xm
+Ru
+Ru
+WQ
 WS
 WS
-XN
-Yb
 Zq
-Vd
+Zj
 Zx
-XZ
-YT
 Vd
-ae
-ae
+YT
+Zc
+zp
+Vd
 ae
 ae
 ae
@@ -22603,27 +22716,27 @@ Ut
 Vr
 VV
 Vu
+YE
 Ru
 Ru
 Ru
-Xn
+Zi
+WR
 WS
 WS
 WS
 WS
 WS
 Vd
-XN
+Zq
 WS
-YU
+xE
 Vd
 ae
 ae
 ae
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -22745,18 +22858,20 @@ Ut
 Ut
 VU
 Vu
-YE
 Ru
 Ru
-WC
-WT
+Ru
+Ru
+Ru
+WN
+XJ
 WS
 WS
 WS
 WS
 Vd
 Vd
-Yw
+AK
 Vd
 Vd
 Vd
@@ -22764,8 +22879,6 @@ Vd
 Vd
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -22890,24 +23003,24 @@ Vu
 Ru
 Ru
 Ru
-WC
-WT
+Ru
+Ru
+WN
+XJ
 WS
 WS
 WS
 WS
 Vd
-Ym
+YB
 WS
 WS
 WS
 WS
-Zf
+Bc
 Vd
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -23032,24 +23145,24 @@ Vu
 Ru
 Ru
 Ru
-WC
-WT
+Ru
+Ru
+WN
+XJ
 WS
 WS
 WS
 WS
-Yv
+fN
 WS
 WS
 WS
-YY
+wT
 WS
 WS
 Vd
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -23174,24 +23287,24 @@ Vu
 Ru
 Ru
 Ru
+Ru
+Ru
 Vd
 WS
 WS
-Zn
+YM
 WS
 WS
 WS
 WS
 WS
 WS
-YZ
+KO
 WS
-Zq
+Zx
 Vd
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -23315,7 +23428,9 @@ Ut
 Vu
 Ru
 Ru
-Zi
+Ru
+Ru
+Ru
 Vd
 Vd
 Vd
@@ -23323,7 +23438,7 @@ Vd
 Vd
 Vd
 Vd
-YF
+IX
 WS
 WS
 WS
@@ -23332,8 +23447,6 @@ WS
 Vd
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -23455,17 +23568,19 @@ Vo
 Vo
 wl
 Vu
+YE
 Ru
 Ru
 Ru
+Zi
 Vd
-WU
-Xy
 XP
 Yc
-Yc
-Vd
+YN
 Zy
+Zy
+Vd
+Ry
 WS
 WS
 WS
@@ -23474,8 +23589,6 @@ WS
 Vd
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -23600,24 +23713,24 @@ Uv
 Ru
 Ru
 Ru
+Ru
+Ru
 Vd
-Xj
-Xz
 XQ
 Yh
-Yc
+YO
+Zl
+Zy
 Vd
-YH
+sB
 WS
 WS
-Zb
+Nw
 WS
 WS
 Vd
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -23742,24 +23855,24 @@ YR
 Ru
 Ru
 Ru
+Ru
+Ru
 Vd
-Zj
-XA
 XR
 Yj
 Zr
 Yg
+ZZ
+wV
 WS
 WS
 WS
-Zc
+MB
 WS
 WS
 Vd
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -23884,24 +23997,24 @@ UE
 Ru
 Ru
 Ru
+Ru
+Ru
 Vd
-Xr
-XB
+Xm
+XZ
 YW
 YW
 YW
-Yw
+AK
 WS
 WS
 WS
 WS
 WS
-Zq
+Zx
 Vd
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -24026,6 +24139,8 @@ Vg
 Wq
 Ws
 Ws
+Ws
+Ws
 Vg
 Vg
 Vg
@@ -24042,8 +24157,6 @@ WS
 Vd
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -24168,24 +24281,24 @@ Wp
 Ti
 YG
 Ti
+YG
+Ti
 Wp
 Wj
 Vg
-XS
-Yk
 Yo
-Vd
+Zn
 Zz
-YO
+Vd
 YV
 Zd
 Ze
 Zg
+pz
+wW
 Vd
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -24311,6 +24424,8 @@ Wp
 Vg
 Wp
 Vg
+Wp
+Vg
 Vg
 Vg
 Vd
@@ -24326,8 +24441,6 @@ Vd
 Vd
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -24453,8 +24566,8 @@ Wj
 Vg
 Wj
 Vg
-ae
-ae
+Wj
+Vg
 ae
 ae
 ae
@@ -24595,8 +24708,8 @@ Vg
 Vg
 Vg
 Vg
-ae
-ae
+Vg
+Vg
 ae
 ae
 ae
diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index aa78ff5bfff..467f3c358a5 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -3474,13 +3474,7 @@
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
 "afH" = (
-/obj/effect/floor_decal/industrial/danger{
-	dir = 4
-	},
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/steel_grid,
+/turf/simulated/floor/maglev,
 /area/tether/surfacebase/tram)
 "afI" = (
 /obj/item/device/radio/intercom{
@@ -3603,8 +3597,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1;
-	icon_state = "map-scrubbers"
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hardstorage)
@@ -11575,22 +11568,19 @@
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 8
 	},
-/obj/machinery/light{
-	dir = 8
-	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/tether/surfacebase/tram)
 "atA" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
 	},
-/obj/structure/railing{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/simulated/floor/tiled/steel_grid,
 /area/tether/surfacebase/tram)
 "atB" = (
-/turf/simulated/floor/maglev,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/steel_grid,
 /area/tether/surfacebase/tram)
 "atC" = (
 /obj/effect/floor_decal/techfloor/orange{
@@ -11856,15 +11846,17 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/tether/surfacebase/tram)
 "aub" = (
-/obj/effect/floor_decal/industrial/danger{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/steel_grid,
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/turf/simulated/floor/plating,
 /area/tether/surfacebase/tram)
 "auc" = (
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 8
 	},
+/obj/structure/railing{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/tether/surfacebase/tram)
 "aud" = (
@@ -12339,7 +12331,6 @@
 /area/tether/surfacebase/tram)
 "auV" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
 "auW" = (
@@ -12401,8 +12392,7 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9;
-	pixel_y = 0
+	dir = 9
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/lower/first_west)
@@ -12834,14 +12824,19 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
 "avD" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
 "avE" = (
@@ -18154,6 +18149,7 @@
 	dir = 4;
 	pixel_x = -30
 	},
+/obj/structure/flora/pottedplant/stoutbush,
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
 "aEc" = (
@@ -18475,19 +18471,23 @@
 /turf/simulated/floor/tiled,
 /area/crew_quarters/visitor_dining)
 "aEN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
+/obj/structure/bed/chair/wood,
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
 "aEO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/structure/bed/chair/wood,
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
 "aEP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
@@ -18496,6 +18496,9 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
 "aEQ" = (
@@ -19005,25 +19008,27 @@
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
 "aFF" = (
-/obj/structure/bed/chair/wood,
+/obj/structure/bed/chair/wood{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
 "aFG" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 1
-	},
-/obj/structure/bed/chair/wood,
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/tram)
-"aFH" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
+/obj/structure/table/woodentable,
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/tram)
+"aFH" = (
 /obj/structure/cable/orange{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/structure/bed/chair/wood{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
 "aFI" = (
@@ -19213,18 +19218,18 @@
 /turf/simulated/floor/tiled,
 /area/crew_quarters/visitor_dining)
 "aFU" = (
-/obj/structure/bed/chair/wood{
-	dir = 4
+/obj/effect/floor_decal/techfloor/orange{
+	dir = 8
 	},
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/tram)
-"aFV" = (
-/obj/structure/table/woodentable,
-/turf/simulated/floor/tiled,
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/railing,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/tether/surfacebase/tram)
 "aFW" = (
 /obj/structure/bed/chair/wood{
-	dir = 8
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
@@ -19591,20 +19596,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/visitor_dining)
-"aGz" = (
-/obj/structure/bed/chair/wood{
-	dir = 1
-	},
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/tram)
 "aGA" = (
 /obj/machinery/firealarm{
 	dir = 1;
 	pixel_y = -25
 	},
-/obj/structure/bed/chair/wood{
-	dir = 1
-	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
 "aGB" = (
@@ -19612,11 +19608,12 @@
 /obj/machinery/power/apc/high{
 	pixel_y = -28
 	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
 "aGC" = (
 /obj/machinery/light,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/steel_grid,
 /area/tether/surfacebase/tram)
 "aGD" = (
 /obj/structure/cable/ender{
@@ -20704,16 +20701,19 @@
 /turf/simulated/floor/lino,
 /area/crew_quarters/visitor_dining)
 "aIy" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/lino,
 /area/crew_quarters/visitor_dining)
 "aIz" = (
-/obj/structure/bed/chair/wood,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
+/obj/structure/table/woodentable,
 /turf/simulated/floor/lino,
 /area/crew_quarters/visitor_dining)
 "aIA" = (
@@ -21172,19 +21172,22 @@
 /turf/simulated/floor/lino,
 /area/crew_quarters/visitor_dining)
 "aJp" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/lino,
-/area/crew_quarters/visitor_dining)
+/obj/machinery/light,
+/turf/simulated/floor/tiled/steel_grid,
+/area/tether/surfacebase/tram)
 "aJq" = (
-/obj/structure/table/woodentable,
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
+/obj/effect/shuttle_landmark{
+	base_area = /area/tether/surfacebase/tram;
+	base_turf = /turf/simulated/floor/tiled/techfloor/grid;
+	docking_controller = null;
+	landmark_tag = "escape_station";
+	name = "Tether Surface Base"
 	},
-/turf/simulated/floor/lino,
-/area/crew_quarters/visitor_dining)
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/tether/surfacebase/tram)
 "aJr" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
@@ -33514,6 +33517,10 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/tether/surfacebase/security/brig)
+"jCv" = (
+/obj/structure/bed/chair/wood,
+/turf/simulated/floor/lino,
+/area/crew_quarters/visitor_dining)
 "jCD" = (
 /obj/machinery/door/airlock/glass_security{
 	id_tag = "briginner";
@@ -34166,6 +34173,13 @@
 "lry" = (
 /turf/simulated/wall,
 /area/tether/surfacebase/funny/mimeoffice)
+"lsh" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
+	},
+/obj/structure/table/woodentable,
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/tram)
 "lwL" = (
 /obj/machinery/door/airlock/glass_security{
 	id_tag = "brigouter";
@@ -34548,6 +34562,18 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/surface_one_hall)
+"mtl" = (
+/obj/effect/floor_decal/techfloor/orange{
+	dir = 8
+	},
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/railing{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/tether/surfacebase/tram)
 "mvM" = (
 /obj/structure/cable/green{
 	d1 = 4;
@@ -35172,6 +35198,9 @@
 "odn" = (
 /turf/simulated/wall,
 /area/tether/surfacebase/security/lowerhall)
+"oeA" = (
+/turf/simulated/floor/tiled/steel_grid,
+/area/tether/surfacebase/tram)
 "oeB" = (
 /obj/structure/closet/crate,
 /turf/simulated/floor/plating,
@@ -37637,14 +37666,13 @@
 /turf/simulated/floor/plating,
 /area/maintenance/lower/trash_pit)
 "wXW" = (
-/obj/effect/shuttle_landmark{
-	base_area = /area/tether/surfacebase/tram;
-	base_turf = /turf/simulated/floor/tiled/techfloor/grid;
-	docking_controller = null;
-	landmark_tag = "escape_station";
-	name = "Tether Surface Base"
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/steel_grid,
 /area/tether/surfacebase/tram)
 "xdV" = (
 /obj/structure/cable/green{
@@ -53827,7 +53855,7 @@ atx
 aEb
 auB
 aFE
-aFU
+auB
 aLK
 act
 aDu
@@ -53969,8 +53997,8 @@ atx
 afY
 auB
 aFF
-aFV
-aGz
+auB
+auB
 aCO
 aHH
 aIu
@@ -54111,12 +54139,12 @@ atx
 aEc
 aEN
 aFG
-aFV
+aFW
 aGA
 aCO
 aHI
 aIy
-aJp
+aJW
 aJW
 aJW
 aLk
@@ -54238,7 +54266,7 @@ aah
 atx
 atY
 auB
-auU
+auV
 avC
 auB
 awR
@@ -54252,15 +54280,15 @@ aCT
 aDw
 auB
 aEO
-auU
+lsh
 aFW
 auB
 aCO
-aCS
+jCv
 aIz
-aJq
 aJV
 aDu
+aDu
 aLl
 aJn
 aCO
@@ -54380,7 +54408,7 @@ aah
 atx
 atZ
 auC
-auV
+auC
 avD
 awj
 awj
@@ -54401,7 +54429,7 @@ aCO
 aHJ
 aHJ
 aHJ
-aHJ
+aCO
 aHJ
 aHJ
 aHJ
@@ -54522,6 +54550,7 @@ aah
 atx
 auB
 auB
+auU
 auB
 auB
 auB
@@ -54535,10 +54564,13 @@ auB
 auB
 auB
 auB
+auU
 auB
 auB
 auB
-aGC
+auB
+auB
+atW
 atx
 aad
 aad
@@ -54550,10 +54582,6 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
 aah
 aah
 aah
@@ -54656,36 +54684,36 @@ lry
 lry
 aah
 aah
-aty
+aah
+aah
+aah
+aah
+aah
 atx
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
 atx
-atx
-atx
-aty
-afH
-aub
-aub
-aub
-aub
-aub
-aub
-aub
-aub
-aub
-aub
-aub
-aub
-aub
-aub
-aub
-aub
-aub
-aub
-aty
-aad
-aad
-aad
-aad
 aad
 aad
 aad
@@ -54798,36 +54826,36 @@ aah
 aah
 aah
 aah
-auD
-auc
-auc
-atz
-auc
-auc
-atA
-atA
-atA
-atA
-atA
-auc
-auc
-auc
-atA
-auc
-atA
-auc
-auc
-auc
-atA
-atA
-atA
-atA
-atA
-auD
-aad
-aad
-aad
-aad
+aty
+atx
+atx
+atx
+atx
+aty
+atB
+oeA
+oeA
+oeA
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+auB
+oeA
+oeA
+oeA
+oeA
+oeA
+oeA
+oeA
+aGC
+aty
 aad
 aad
 aad
@@ -54941,30 +54969,34 @@ 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
+atz
+atz
+atz
+atz
+atz
+auc
+auc
+aFU
+atA
+atA
+atA
+atA
+atA
+aJp
+aub
+wXW
+atA
+atA
+atA
+atA
+atA
+mtl
+auc
+auc
+auc
+auc
+auc
+auc
 auD
 aad
 aad
@@ -55024,10 +55056,6 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
 aaa
 "}
 (121,1,1) = {"
@@ -55094,7 +55122,11 @@ aud
 aud
 aud
 aud
-wXW
+aud
+aud
+aud
+aJq
+aud
 aud
 aud
 aud
@@ -55166,10 +55198,6 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
 aaa
 "}
 (122,1,1) = {"
@@ -55225,30 +55253,34 @@ aad
 aad
 aad
 auD
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
+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
@@ -55308,10 +55340,6 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
 aaa
 "}
 (123,1,1) = {"
@@ -55367,30 +55395,34 @@ aad
 aad
 aad
 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
+afH
 auD
 aad
 aad
@@ -55450,10 +55482,6 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
 aaa
 "}
 (124,1,1) = {"
@@ -55533,6 +55561,10 @@ aud
 aud
 aud
 aud
+aud
+aud
+aud
+aud
 auD
 aad
 aad
@@ -55592,10 +55624,6 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
 aaa
 "}
 (125,1,1) = {"
@@ -55675,6 +55703,10 @@ aud
 aud
 aud
 aud
+aud
+aud
+aud
+aud
 auD
 aad
 aad
@@ -55734,10 +55766,6 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
 aaa
 "}
 (126,1,1) = {"
@@ -55817,6 +55845,10 @@ aud
 aud
 aud
 aud
+aud
+aud
+aud
+aud
 auD
 aad
 aad
@@ -55876,10 +55908,6 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
 aaa
 "}
 (127,1,1) = {"
@@ -55959,6 +55987,10 @@ aud
 aud
 aud
 aud
+aud
+aud
+aud
+aud
 auD
 aad
 aad
@@ -56007,10 +56039,6 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
 bcV
 aad
 aad
@@ -56101,6 +56129,10 @@ aud
 aud
 aud
 aud
+aud
+aud
+aud
+aud
 auD
 aad
 aad
@@ -56160,10 +56192,6 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
 aaa
 "}
 (129,1,1) = {"
@@ -56219,30 +56247,34 @@ aad
 aad
 aad
 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
+afH
 auD
 aad
 aad
@@ -56302,10 +56334,6 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
 aaa
 "}
 (130,1,1) = {"
@@ -56361,30 +56389,34 @@ aad
 aad
 aad
 auD
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
-atB
+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
@@ -56444,10 +56476,6 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
 aaa
 "}
 (131,1,1) = {"
@@ -56527,6 +56555,10 @@ aud
 aud
 aud
 aud
+aud
+aud
+aud
+aud
 auD
 aad
 aad
@@ -56538,10 +56570,6 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
 bcV
 aad
 aad
@@ -56647,28 +56675,32 @@ aad
 auD
 atC
 atC
+atC
+atC
 aua
 atC
 atC
 atC
-aua
-atC
 atC
 aue
 aua
 atC
 atC
+atC
 aua
 atC
 atC
 atC
 aua
-atC
 aue
 atC
+atC
+atC
 aua
 atC
 atC
+atC
+atC
 auD
 aad
 aad
@@ -56728,10 +56760,6 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
 aaa
 "}
 (133,1,1) = {"
@@ -56811,6 +56839,10 @@ atx
 atx
 atx
 atx
+atx
+atx
+atx
+atx
 aty
 aad
 aad
@@ -56870,10 +56902,6 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
 aaa
 "}
 (134,1,1) = {"
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index ad2bb5668a4..dbddf78a12f 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -52226,7 +52226,7 @@ abn
 abn
 abn
 abn
-aab
+aeG
 aab
 aab
 aab
@@ -52367,8 +52367,8 @@ abn
 abn
 abn
 abn
-aab
-aab
+aeG
+aeG
 aab
 aab
 aab
@@ -52508,9 +52508,9 @@ abn
 abn
 abn
 abn
-aab
-aab
-aab
+aeG
+aeG
+aeG
 aab
 aab
 aab
@@ -52650,9 +52650,9 @@ abn
 abn
 abn
 abn
-aab
-aab
-aab
+aeG
+aeG
+aeG
 aab
 aab
 aab
@@ -52792,9 +52792,9 @@ abn
 abn
 abn
 abn
-aab
-aab
-aab
+aeG
+aeG
+aeG
 aab
 aab
 aab
@@ -52933,10 +52933,10 @@ aeG
 abn
 abn
 abn
-aab
-aab
-aab
-aab
+aeG
+aeG
+aeG
+aeG
 aab
 aab
 aab
@@ -53075,10 +53075,10 @@ aeG
 aeG
 aeG
 aeG
-aab
-aab
-aab
-aab
+aeG
+aeG
+aeG
+aeG
 aab
 aab
 aab
@@ -53217,10 +53217,10 @@ aeG
 aeG
 aeG
 aeG
-aab
-aab
-aab
-aab
+aeG
+aeG
+aeG
+aeG
 aab
 aab
 aab
@@ -53359,10 +53359,10 @@ aeG
 aeG
 aeG
 aeG
-aab
-aab
-aab
-aab
+aeG
+aeG
+aeG
+aeG
 aab
 aab
 aab
@@ -53501,10 +53501,10 @@ aeG
 aeG
 aeG
 aeG
-aab
-aab
-aab
-aab
+aeG
+aeG
+aeG
+aeG
 aab
 aab
 aab
@@ -53643,10 +53643,10 @@ aeG
 aeG
 aeG
 aeG
-aab
-aab
-aab
-aab
+aeG
+aeG
+aeG
+aeG
 aab
 aab
 aab
@@ -53785,10 +53785,10 @@ aeG
 aeG
 aeG
 aeG
-aab
-aab
-aab
-aab
+aeG
+aeG
+aeG
+aeG
 aab
 aab
 aab