diff --git a/code/game/objects/random/mapping_vr.dm b/code/game/objects/random/mapping_vr.dm
index 43431a8b16..b9ebfd1dc0 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 9cdf3360fb..6f16ef1811 100644
--- a/maps/tether/submaps/tether_misc.dmm
+++ b/maps/tether/submaps/tether_misc.dmm
@@ -57,10 +57,8 @@
 /turf/simulated/floor/holofloor/carpet,
 /area/holodeck/source_courtroom)
 "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,
@@ -774,11 +772,24 @@
 /turf/simulated/floor/holofloor/wmarble,
 /area/holodeck/source_chess)
 "cq" = (
-/obj/structure/bed/chair/shuttle{
-	dir = 1
+/turf/simulated/floor/maglev{
+	icon = 'icons/turf/transit_vr.dmi'
 	},
+<<<<<<< HEAD
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/escape)
+"cr" = (
+/turf/simulated/shuttle/wall/alien/blue/hard_corner,
+/area/unknown/dorm5)
+=======
+/area/space)
+"cr" = (
+/turf/simulated/shuttle/wall/alien/blue/hard_corner,
+/area/unknown/dorm5)
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 "cs" = (
 /obj/machinery/door/airlock/glass_external{
 	frequency = 1380;
@@ -1060,6 +1071,7 @@
 /obj/structure/window/reinforced,
 /turf/unsimulated/wall,
 /area/space)
+<<<<<<< HEAD
 "dD" = (
 /obj/machinery/door/airlock/glass_external{
 	frequency = 1380;
@@ -1076,6 +1088,33 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/shuttle/escape)
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+"dC" = (
+/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)
+=======
+"dC" = (
+/obj/structure/closet/alien,
+/turf/simulated/shuttle/floor/alien,
+/area/unknown/dorm6)
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 "dE" = (
 /obj/structure/shuttle/engine/heater,
 /obj/structure/window/reinforced{
@@ -1512,6 +1551,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{
@@ -1681,15 +1727,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" = (
@@ -1719,6 +1759,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{
@@ -1860,23 +1906,45 @@
 	},
 /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 = 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/effect/floor_decal/transit/orange{
+	dir = 4
+	},
+/obj/effect/transit/light{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor/grid{
@@ -1885,7 +1953,7 @@
 	},
 /area/space)
 "ix" = (
-/obj/effect/floor_decal/industrial/warning{
+/obj/effect/floor_decal/industrial/warning/corner{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/steel,
@@ -1910,16 +1978,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" = (
@@ -1949,28 +2018,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
 	},
@@ -1979,19 +2076,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,
@@ -2012,11 +2101,19 @@
 /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
+	},
+<<<<<<< HEAD
 /obj/item/clothing/head/beret/nanotrasen,
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+/obj/item/toy/nanotrasenballoon,
+/obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen,
+=======
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
 "nV" = (
@@ -2043,27 +2140,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;
@@ -2080,23 +2180,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,
@@ -2109,17 +2208,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,
@@ -2137,7 +2232,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{
@@ -2158,71 +2256,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{
@@ -2243,9 +2315,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";
@@ -2253,6 +2322,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
@@ -2260,10 +2332,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,
@@ -2294,25 +2365,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/step_trigger/thrower{
+	affect_ghosts = 1;
+	name = "thrower_throwdownside";
+	nostop = 1;
+	stopper = 0;
+	tiles = 0
+	},
+/turf/simulated/floor/maglev{
+	icon = 'icons/turf/transit_vr.dmi'
+	},
+/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,
@@ -2342,9 +2421,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"
@@ -2358,24 +2459,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;
@@ -2385,6 +2504,12 @@
 	},
 /turf/simulated/sky/virgo3b/south,
 /area/space)
+"yk" = (
+/obj/effect/step_trigger/lost_in_space/tram,
+/turf/simulated/floor/maglev{
+	icon = 'icons/turf/transit_vr.dmi'
+	},
+/area/space)
 "ym" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -2408,6 +2533,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;
@@ -2416,18 +2553,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
@@ -2444,7 +2582,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
 	},
@@ -2453,26 +2605,22 @@
 	},
 /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,
-/area/shuttle/escape)
-"Av" = (
-/obj/effect/step_trigger/thrower{
-	affect_ghosts = 1;
-	name = "thrower_throwdownside";
-	nostop = 1;
-	stopper = 0;
-	tiles = 0
+/obj/effect/floor_decal/borderfloor{
+	dir = 1
 	},
-/turf/simulated/floor/maglev{
-	icon = 'icons/turf/transit_vr.dmi'
+/turf/simulated/floor/tiled/steel,
+/area/shuttle/escape)
+"As" = (
+/turf/simulated/floor/maglev,
+/area/centcom/simulated/terminal)
+"Av" = (
+/obj/effect/transit/light{
+	dir = 8
+	},
+/turf/unsimulated/mineral{
+	icon = 'icons/turf/transit_vr.dmi';
+	icon_state = "rock"
 	},
 /area/space)
 "Ax" = (
@@ -2485,28 +2633,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,
@@ -2524,28 +2680,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,
@@ -2561,14 +2718,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,
@@ -2588,18 +2754,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,
@@ -2610,15 +2772,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)
@@ -2627,14 +2799,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)
@@ -2650,28 +2816,33 @@
 /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{
+/turf/unsimulated/mineral{
 	icon = 'icons/turf/transit_vr.dmi';
-	initial_flooring = null
+	icon_state = "rock"
 	},
 /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{
@@ -2684,12 +2855,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" = (
@@ -2699,20 +2865,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)
@@ -2730,6 +2897,12 @@
 /obj/effect/overlay/palmtree_l,
 /turf/unsimulated/beach/sand,
 /area/beach)
+"Gz" = (
+/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,
@@ -2751,6 +2924,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';
@@ -2766,25 +2944,38 @@
 /turf/unsimulated/floor/steel,
 /area/centcom/control)
 "HW" = (
-/obj/machinery/status_display{
-	pixel_y = -30
-	},
+/obj/machinery/light,
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
+"HX" = (
 /obj/structure/bed/chair/shuttle{
-	dir = 1
+	dir = 4
+	},
+/obj/effect/floor_decal/borderfloor{
+	dir = 9
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
+<<<<<<< HEAD
 "HX" = (
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = -32
 	},
 /obj/random/maintenance/clean,
-/obj/structure/table/standard,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/escape)
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+"HX" = (
+=======
 "Ic" = (
-/obj/effect/floor_decal/borderfloor,
-/turf/simulated/floor/tiled/steel,
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+/obj/structure/table/standard,
+<<<<<<< HEAD
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+/obj/structure/closet/walllocker/medical/west,
+/obj/item/weapon/storage/firstaid,
+=======
+/obj/structure/closet/walllocker/emerglocker/west,
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+/turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
 "Ik" = (
 /obj/structure/table/standard,
@@ -2834,33 +3025,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;
@@ -2874,6 +3061,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,
@@ -2925,6 +3116,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,
@@ -2940,14 +3138,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
@@ -2957,6 +3162,7 @@
 	initial_flooring = null
 	},
 /area/space)
+<<<<<<< HEAD
 "Mf" = (
 /obj/effect/step_trigger/lost_in_space/tram,
 /turf/simulated/floor/tiled/techfloor/grid{
@@ -2964,16 +3170,41 @@
 	initial_flooring = null
 	},
 /area/space)
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+"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)
+=======
+"Me" = (
+/turf/simulated/floor/smole/desert,
+/area/holodeck/source_smoleworld)
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 "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;
@@ -3019,17 +3250,27 @@
 	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" = (
+<<<<<<< HEAD
 /obj/structure/table/standard,
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = 32
@@ -3037,6 +3278,21 @@
 /obj/random/maintenance/clean,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape)
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+/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)
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 "Oj" = (
 /obj/effect/step_trigger/thrower{
 	affect_ghosts = 1;
@@ -3046,20 +3302,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{
@@ -3087,10 +3350,11 @@
 /turf/space/transit/west,
 /area/space)
 "Pq" = (
-/turf/simulated/floor/maglev{
-	icon = 'icons/turf/transit_vr.dmi'
+/obj/machinery/vending/coffee{
+	dir = 1
 	},
-/area/space)
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
 "Py" = (
 /obj/effect/step_trigger/thrower{
 	affect_ghosts = 1;
@@ -3116,11 +3380,12 @@
 	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/sovietsoda{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
 "Qs" = (
 /obj/item/toy/chess/queen_black,
 /turf/simulated/floor/holofloor/bmarble,
@@ -3138,46 +3403,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" = (
@@ -3197,14 +3464,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,
@@ -3224,6 +3497,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
@@ -3234,9 +3515,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" = (
@@ -3246,22 +3525,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{
@@ -3277,12 +3558,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;
@@ -3297,8 +3586,18 @@
 	},
 /area/space)
 "Sl" = (
+<<<<<<< HEAD
 /obj/structure/sign/nanotrasen,
 /turf/simulated/wall/rshull,
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+/obj/structure/sign/nanotrasen,
+/turf/simulated/wall/thull,
+=======
+/obj/structure/bed/chair/shuttle{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 /area/shuttle/escape)
 "Sm" = (
 /turf/simulated/shuttle/wall/alien/blue/hard_corner,
@@ -3343,11 +3642,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,
@@ -3402,12 +3703,22 @@
 /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
 	},
+<<<<<<< HEAD
 /obj/item/clothing/head/beret/nanotrasen,
 /turf/simulated/floor/tiled/techfloor,
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+/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,
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 /area/shuttle/escape)
 "SH" = (
 /obj/structure/bed/chair{
@@ -3600,13 +3911,11 @@
 /turf/simulated/shuttle/floor/alien,
 /area/unknown/dorm3)
 "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,
@@ -3740,10 +4049,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,
@@ -3928,6 +4233,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,
@@ -3999,13 +4308,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"
@@ -4016,17 +4323,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{
@@ -4093,10 +4393,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" = (
@@ -4159,14 +4458,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)
@@ -4192,9 +4492,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{
@@ -4226,35 +4530,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,
@@ -4280,32 +4572,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,
@@ -4334,51 +4602,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;
@@ -4387,26 +4803,106 @@
 	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)
+"Xv" = (
+/obj/machinery/vending/cigarette{
+	dir = 1
+	},
 /turf/simulated/floor/wood,
 /area/centcom/simulated/restaurant)
-"WJ" = (
+"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)
+"XD" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/window/brigdoor/northleft{
 	req_access = list(63);
@@ -4427,252 +4923,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"
 	})
@@ -4689,28 +4939,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" = (
@@ -4718,33 +4961,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
@@ -4753,15 +5000,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"
@@ -4776,46 +5018,35 @@
 /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/machinery/vending/snack{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/white,
-/area/centcom/simulated/medical)
+/turf/simulated/floor/wood,
+/area/centcom/simulated/restaurant)
 "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
 	},
@@ -4824,43 +5055,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{
@@ -4875,26 +5131,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
@@ -4902,14 +5152,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;
@@ -4923,284 +5261,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;
@@ -5219,28 +5296,210 @@
 	},
 /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{
+	dir = 1
+	},
 /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
@@ -115798,7 +116057,7 @@ Hy
 Hy
 Hy
 Hy
-ap
+Hy
 ap
 ap
 ap
@@ -115940,7 +116199,7 @@ Hy
 Hy
 Hy
 Hy
-ap
+Hy
 ap
 ap
 ap
@@ -116082,7 +116341,7 @@ Hy
 Hy
 Hy
 Hy
-ap
+Hy
 ap
 ap
 ap
@@ -116224,7 +116483,7 @@ Hy
 Hy
 Hy
 Hy
-ap
+Hy
 ap
 ap
 ap
@@ -116365,12 +116624,12 @@ dg
 dg
 dg
 dg
+dg
 Hy
 ap
 ap
 ap
 ap
-ap
 ae
 ae
 ae
@@ -116468,13 +116727,10 @@ Hy
 Hy
 Mb
 Mb
-zv
+in
+Mb
 Mb
 Mb
-sN
-IN
-IN
-IN
 tH
 IN
 IN
@@ -116484,31 +116740,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
+Av
 ap
 ap
 ap
@@ -116625,7 +116884,8 @@ FT
 FT
 FT
 FT
-mF
+FT
+jL
 FT
 FT
 FT
@@ -116646,7 +116906,7 @@ FT
 FT
 FT
 FT
-Mf
+uG
 FT
 dg
 Hy
@@ -116654,7 +116914,6 @@ ap
 ap
 ap
 ap
-ap
 ae
 ae
 ae
@@ -116750,53 +117009,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
@@ -116892,53 +117151,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
+vu
+vu
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+vu
+vu
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+yk
+cq
 dg
 Hy
 ap
 ap
 ap
 ap
-ap
 ae
 ae
 ae
@@ -117063,6 +117322,7 @@ FT
 FT
 FT
 FT
+FT
 Sh
 FT
 FT
@@ -117072,7 +117332,7 @@ FT
 FT
 FT
 FT
-Mf
+uG
 FT
 dg
 Hy
@@ -117080,7 +117340,6 @@ ap
 ap
 ap
 ap
-ap
 ae
 ae
 ae
@@ -117205,6 +117464,7 @@ FT
 FT
 FT
 FT
+FT
 Sh
 FT
 FT
@@ -117214,7 +117474,7 @@ FT
 FT
 FT
 FT
-Mf
+uG
 FT
 dg
 Hy
@@ -117222,7 +117482,6 @@ ap
 ap
 ap
 ap
-ap
 ae
 ae
 ae
@@ -117347,6 +117606,7 @@ FT
 FT
 FT
 FT
+FT
 Sh
 FT
 FT
@@ -117356,7 +117616,7 @@ FT
 FT
 FT
 FT
-Mf
+uG
 FT
 dg
 Hy
@@ -117364,7 +117624,6 @@ ap
 ap
 ap
 ap
-ap
 ae
 ae
 ae
@@ -117489,6 +117748,7 @@ FT
 FT
 FT
 FT
+FT
 Sh
 FT
 FT
@@ -117498,7 +117758,7 @@ FT
 FT
 FT
 FT
-Mf
+uG
 FT
 dg
 Hy
@@ -117506,7 +117766,6 @@ ap
 ap
 ap
 ap
-ap
 ae
 ae
 ae
@@ -117631,6 +117890,7 @@ FT
 FT
 FT
 FT
+FT
 Sh
 FT
 FT
@@ -117640,7 +117900,7 @@ FT
 FT
 FT
 FT
-Mf
+uG
 FT
 dg
 Hy
@@ -117648,7 +117908,6 @@ ap
 ap
 ap
 ap
-ap
 ae
 ae
 ae
@@ -117744,46 +118003,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
+vu
+vu
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+vu
+vu
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+cq
+yk
+cq
 dg
 Hy
 ap
@@ -117792,7 +118052,6 @@ ap
 ap
 ap
 ap
-ap
 Xl
 Xl
 Xl
@@ -117886,6 +118145,7 @@ Xl
 (43,1,1) = {"
 Hy
 Hy
+<<<<<<< HEAD
 Pq
 Pq
 Pq
@@ -117935,6 +118195,221 @@ ap
 ap
 ap
 ap
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+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
+dg
+Hy
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+=======
+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
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 OY
 OY
 OY
@@ -118053,6 +118528,7 @@ FT
 FT
 FT
 FT
+FT
 Sh
 Sh
 Sh
@@ -118066,7 +118542,7 @@ FT
 FT
 FT
 FT
-Mf
+uG
 FT
 dg
 Hy
@@ -118076,7 +118552,22 @@ ap
 ap
 ap
 ap
+<<<<<<< HEAD
 ap
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+ap
+Xl
+OY
+OY
+OY
+OY
+=======
+Xl
+OY
+OY
+OY
+OY
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 OY
 OY
 OY
@@ -118172,10 +118663,11 @@ Hy
 Hy
 PU
 PU
-Ft
+is
 PU
 PU
-FX
+PU
+ig
 Py
 Py
 Py
@@ -118188,7 +118680,7 @@ Py
 Py
 Py
 ig
-tu
+mb
 Py
 Py
 ig
@@ -118203,16 +118695,15 @@ ig
 PU
 PU
 PU
-Ft
+pv
 PU
 PU
+PU
+is
 FX
 PU
-in
-FX
 dg
-Hy
-ap
+Fp
 ap
 ap
 ap
@@ -118353,6 +118844,7 @@ dg
 dg
 dg
 dg
+dg
 Hy
 ap
 ap
@@ -118360,7 +118852,22 @@ ap
 ap
 ap
 ap
+<<<<<<< HEAD
 ap
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+ap
+Xl
+OY
+OY
+OY
+OY
+=======
+Xl
+OY
+OY
+OY
+OY
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 OY
 OY
 OY
@@ -118496,7 +119003,7 @@ Hy
 Hy
 Hy
 Hy
-ap
+Hy
 ap
 ap
 ap
@@ -118638,7 +119145,7 @@ Hy
 Hy
 Hy
 Hy
-ap
+Hy
 ap
 ap
 ap
@@ -118780,7 +119287,7 @@ Hy
 Hy
 Hy
 Hy
-ap
+Hy
 ap
 ap
 ap
@@ -118922,7 +119429,7 @@ Hy
 Hy
 Hy
 Hy
-ap
+Hy
 ap
 ap
 ap
@@ -123036,39 +123543,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
@@ -123178,37 +123685,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
@@ -123320,11 +123827,8 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-zK
+sT
+ET
 ET
 ET
 ET
@@ -123332,16 +123836,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
@@ -123350,7 +123855,9 @@ ET
 ET
 ET
 ET
-zK
+sT
+ae
+ae
 ae
 ae
 ae
@@ -123462,37 +123969,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
@@ -123604,37 +124111,37 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-zK
-ET
-ET
+sT
+As
+As
+As
 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
-HW
+Zw
 XE
 XE
-ET
-ET
-ET
-zK
+As
+As
+As
+sT
+ae
+ae
 ae
 ae
 ae
@@ -123746,37 +124253,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
@@ -123888,37 +124395,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
@@ -124030,37 +124537,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
@@ -124172,37 +124679,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
@@ -124314,37 +124821,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
+Gz
+Xr
 AD
-rh
-rh
-Sy
-Sl
+AD
+ZE
+Fe
 XE
 XE
 ET
 ET
-zK
+sT
+ae
+ae
 ae
 ae
 ae
@@ -124456,37 +124963,37 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-zK
-ET
-ET
+sT
+As
+As
+As
 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
-HW
+Xn
+FJ
+YY
+Zw
 XE
 XE
-ET
-ET
-ET
-zK
+As
+As
+As
+sT
+ae
+ae
 ae
 ae
 ae
@@ -124598,37 +125105,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
@@ -124740,11 +125247,8 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-zK
+sT
+ET
 ET
 ET
 ET
@@ -124754,14 +125258,15 @@ XE
 XE
 zw
 XE
-Sl
-zw
-Fe
 Fe
 zw
-Sl
+VR
+VR
+VR
+zw
+Fe
 XE
-pv
+Xy
 XE
 XE
 ET
@@ -124770,7 +125275,9 @@ ET
 ET
 ET
 ET
-zK
+sT
+ae
+ae
 ae
 ae
 ae
@@ -124882,37 +125389,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
@@ -125024,37 +125531,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
@@ -125178,10 +125685,11 @@ Nq
 Nq
 Nq
 Yx
-Nq
-Nq
-Nq
-Nq
+VL
+VY
+WA
+VY
+WC
 Yx
 Nq
 Nq
@@ -125202,7 +125710,6 @@ ae
 ae
 ae
 ae
-ae
 ap
 ap
 ap
@@ -125321,7 +125828,8 @@ Nq
 Nq
 wd
 dZ
-TY
+Vv
+Vv
 Vv
 dZ
 dZ
@@ -125344,7 +125852,6 @@ ae
 ae
 ae
 ae
-ae
 ap
 ap
 ap
@@ -125464,8 +125971,9 @@ QY
 TI
 Rr
 SV
+WB
 SV
-Rr
+WE
 TI
 QY
 SH
@@ -125486,7 +125994,6 @@ ae
 ae
 ae
 ae
-ae
 ap
 ap
 ap
@@ -125604,10 +126111,11 @@ TI
 TI
 TI
 dZ
+YE
 Ru
 Ru
 Ru
-Ru
+Zi
 dZ
 dZ
 dZ
@@ -125617,8 +126125,7 @@ dZ
 dZ
 dZ
 VI
-ae
-ae
+VI
 ae
 ae
 ae
@@ -125746,21 +126253,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
@@ -125891,22 +126398,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
@@ -126033,18 +126540,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
@@ -126175,22 +126682,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
@@ -126316,7 +126823,9 @@ VU
 Vu
 Ru
 Ru
-Zi
+Ru
+Ru
+Ru
 VI
 VI
 VI
@@ -126325,11 +126834,9 @@ VI
 VI
 VI
 VI
-Yl
+Yy
 VI
-Xi
-ae
-ae
+Om
 ae
 ae
 ae
@@ -126456,22 +126963,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
@@ -126601,19 +127108,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
@@ -126743,19 +127250,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
@@ -126882,22 +127389,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
@@ -127024,22 +127531,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
@@ -127169,19 +127676,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
@@ -127311,19 +127818,19 @@ Vu
 Ru
 Ru
 Ru
-WB
-VR
-We
-Wo
-Wz
+Ru
+Ru
+Wk
+WL
+XM
+YC
+WH
 VQ
 VQ
 VQ
-ZE
+VQ
+HW
 VM
-Xi
-ae
-ae
 ae
 ae
 ae
@@ -127452,23 +127959,23 @@ VP
 Vu
 Ru
 Ru
-Zi
-WB
-VR
+Ru
+Ru
+Ru
 Wk
-Wu
-Wz
+WL
+XS
+YD
+WH
 VQ
 VQ
 VQ
-WZ
+VQ
+Pq
 VM
 ae
 ae
 ae
-ae
-ae
-ae
 ap
 ap
 ap
@@ -127592,25 +128099,25 @@ Vs
 VP
 Ut
 Vu
+YE
 Ru
 Ru
 Ru
-VK
+Ru
+Wc
 VQ
-Wd
-Wd
-VQ
-VZ
-VZ
+ZC
+ZC
 VQ
 Xa
+Xa
+VQ
+VQ
+Qo
 VM
 ae
 ae
 ae
-ae
-ae
-ae
 ap
 ap
 ap
@@ -127737,22 +128244,22 @@ Vu
 Ru
 Ru
 Ru
-VL
+Ru
+Ru
+Wd
 VQ
 VQ
 VQ
-VR
-WA
-WI
-Wz
+WL
+Hv
 Xb
+WH
+VQ
+Ya
 VM
 ae
 ae
 ae
-ae
-ae
-ae
 ap
 ap
 ap
@@ -127879,22 +128386,22 @@ Vu
 Ru
 Ru
 Ru
-WB
+Ru
+Ru
+Wk
 VQ
 VQ
 VQ
-VR
-WF
 WL
-Wz
+ws
 Xc
+WH
+VQ
+ZF
 VM
 ae
 ae
 ae
-ae
-ae
-ae
 ap
 ap
 ap
@@ -128018,25 +128525,25 @@ Ut
 Ut
 VU
 Vu
-YE
+Ru
+Ru
+Ru
 Ru
 Ru
 VM
-VY
-ZC
+Xk
+XX
 VQ
 VQ
-Wd
-Wd
 ZC
-Xd
+ZC
+XX
+VQ
+Xv
 VM
 ae
 ae
 ae
-ae
-ae
-ae
 ap
 ap
 ap
@@ -128160,9 +128667,11 @@ Vr
 Ut
 VU
 Vu
+YE
 Ru
 Ru
 Ru
+Zi
 VM
 VM
 VM
@@ -128179,8 +128688,6 @@ ae
 ae
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -128305,19 +128812,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
@@ -128447,24 +128954,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
@@ -128588,25 +129095,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
@@ -128731,24 +129238,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
@@ -128873,19 +129380,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
@@ -129012,27 +129519,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
@@ -129154,18 +129661,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
@@ -129173,8 +129682,6 @@ Vd
 Vd
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -129299,24 +129806,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
@@ -129441,24 +129948,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
@@ -129583,24 +130090,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
@@ -129724,7 +130231,9 @@ Ut
 Vu
 Ru
 Ru
-Zi
+Ru
+Ru
+Ru
 Vd
 Vd
 Vd
@@ -129732,7 +130241,7 @@ Vd
 Vd
 Vd
 Vd
-YF
+IX
 WS
 WS
 WS
@@ -129741,8 +130250,6 @@ WS
 Vd
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -129864,17 +130371,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
@@ -129883,8 +130392,6 @@ WS
 Vd
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -130009,24 +130516,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
@@ -130151,24 +130658,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
@@ -130293,24 +130800,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
@@ -130435,6 +130942,8 @@ Vg
 Wq
 Ws
 Ws
+Ws
+Ws
 Vg
 Vg
 Vg
@@ -130451,8 +130960,6 @@ WS
 Vd
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -130577,24 +131084,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
@@ -130720,6 +131227,8 @@ Wp
 Vg
 Wp
 Vg
+Wp
+Vg
 Vg
 Vg
 Vd
@@ -130735,8 +131244,6 @@ Vd
 Vd
 ae
 ae
-ae
-ae
 ap
 ap
 ap
@@ -130862,8 +131369,8 @@ Wj
 Vg
 Wj
 Vg
-ae
-ae
+Wj
+Vg
 ae
 ae
 ae
@@ -131004,8 +131511,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 496fbe0dc6..3b5e916f3d 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -3522,13 +3522,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{
@@ -3648,6 +3642,17 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+<<<<<<< HEAD
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1;
+	icon_state = "map-scrubbers"
+	},
+=======
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 /turf/simulated/floor/tiled,
 /area/rnd/hardstorage)
 "afQ" = (
@@ -11593,20 +11598,35 @@
 /turf/simulated/wall,
 /area/tether/surfacebase/tram)
 "atz" = (
+<<<<<<< HEAD
 /obj/machinery/door/blast/regular,
 /turf/simulated/wall,
-/area/tether/surfacebase/tram)
-"atA" = (
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 8
 	},
-/obj/structure/railing{
+/obj/machinery/light{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
+=======
+/obj/effect/floor_decal/techfloor/orange{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+/area/tether/surfacebase/tram)
+"atA" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/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{
@@ -11871,15 +11891,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" = (
@@ -12433,7 +12455,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" = (
@@ -12489,6 +12510,17 @@
 /obj/effect/floor_decal/steeldecal/steel_decals4{
 	dir = 1
 	},
+<<<<<<< HEAD
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9;
+	pixel_y = 0
+	},
+=======
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 /turf/simulated/floor/tiled,
 /area/hallway/lower/first_west)
 "avc" = (
@@ -12930,14 +12962,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" = (
@@ -18295,6 +18332,7 @@
 	dir = 4;
 	pixel_x = -30
 	},
+/obj/structure/flora/pottedplant/stoutbush,
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
 "aEc" = (
@@ -18616,19 +18654,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
 	},
@@ -18637,6 +18679,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" = (
@@ -19141,25 +19186,39 @@
 /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{
+/obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
-/obj/structure/bed/chair/wood,
+/obj/structure/table/woodentable,
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
 "aFH" = (
+<<<<<<< HEAD
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
 /obj/structure/cable/green{
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/obj/structure/cable/orange{
+=======
+/obj/structure/cable/orange{
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/structure/bed/chair/wood{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
 "aFI" = (
@@ -19349,18 +19408,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)
@@ -19722,20 +19781,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" = (
@@ -19743,11 +19793,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{
@@ -20834,16 +20885,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" = (
@@ -21297,19 +21351,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
@@ -33493,6 +33550,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";
@@ -34131,6 +34192,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";
@@ -34513,6 +34581,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;
@@ -35133,6 +35213,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,
@@ -37462,14 +37545,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)
 >>>>>>> 7c76d267c9... Merge pull request #9645 from SweetBlueSylveon/The-Clime-Offices
 "xdV" = (
@@ -53849,7 +53931,7 @@ atx
 aEb
 auB
 aFE
-aFU
+auB
 aLK
 act
 aDu
@@ -53991,8 +54073,8 @@ atx
 afY
 auB
 aFF
-aFV
-aGz
+auB
+auB
 aCO
 aHH
 aIu
@@ -54133,12 +54215,12 @@ atx
 aEc
 aEN
 aFG
-aFV
+aFW
 aGA
 aCO
 aHI
 aIy
-aJp
+aJW
 aJW
 aJW
 aLk
@@ -54260,7 +54342,7 @@ aah
 atx
 atY
 auB
-auU
+auV
 avC
 auB
 awR
@@ -54274,15 +54356,15 @@ aCT
 aDw
 auB
 aEO
-auU
+lsh
 aFW
 auB
 aCO
-aCS
+jCv
 aIz
-aJq
 aJV
 aDu
+aDu
 aLl
 aJn
 aCO
@@ -54402,7 +54484,7 @@ aah
 atx
 atZ
 auC
-auV
+auC
 avD
 awj
 awj
@@ -54423,7 +54505,7 @@ aCO
 aHJ
 aHJ
 aHJ
-aHJ
+aCO
 aHJ
 aHJ
 aHJ
@@ -54544,6 +54626,7 @@ aah
 atx
 auB
 auB
+auU
 auB
 auB
 auB
@@ -54557,10 +54640,13 @@ auB
 auB
 auB
 auB
+auU
 auB
 auB
 auB
-aGC
+auB
+auB
+atW
 atx
 aad
 aad
@@ -54572,10 +54658,6 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
 aah
 aah
 aah
@@ -54678,6 +54760,7 @@ lry
 lry
 aah
 aah
+<<<<<<< HEAD
 aah
 aah
 aah
@@ -54709,6 +54792,71 @@ atx
 atx
 atx
 aty
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aty
+atx
+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
+=======
+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
+aad
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aad
 aad
 aad
@@ -54820,6 +54968,7 @@ aah
 aah
 aah
 aah
+<<<<<<< HEAD
 aah
 aah
 aah
@@ -54851,6 +55000,71 @@ auc
 auc
 auD
 atz
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+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
+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
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aad
 aad
 aad
@@ -54962,6 +55176,7 @@ aah
 aah
 aah
 aah
+<<<<<<< HEAD
 aah
 aah
 aah
@@ -54993,6 +55208,33 @@ aud
 aud
 aud
 atz
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+auD
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+auD
 aad
 aad
 aad
@@ -55045,6 +55287,159 @@ aad
 aad
 aad
 aad
+=======
+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
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aad
+aad
+aad
+aad
+aad
+aad
+<<<<<<< HEAD
+aad
+aad
+aad
+aad
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aad
+aad
+aad
+aad
+aaa
+"}
+(121,1,1) = {"
+aaa
+=======
+aaa
+"}
+(121,1,1) = {"
+aaa
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+<<<<<<< HEAD
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
 aad
 aad
 aad
@@ -55135,11 +55530,80 @@ aud
 aud
 aud
 atz
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aah
+aah
+auD
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+wXW
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+auD
 aad
 aad
 aad
 aad
 aad
+=======
+aah
+aah
+auD
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aJq
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+auD
+aad
+aad
+aad
+aad
+aad
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aad
 aad
 aad
 aad
@@ -55246,6 +55710,7 @@ aad
 aad
 aad
 aad
+<<<<<<< HEAD
 aad
 aad
 aad
@@ -55277,11 +55742,76 @@ atB
 atB
 atB
 atz
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+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
 aad
 aad
 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
+aud
+aud
+aud
+aud
+auD
+aad
+aad
+aad
+aad
+aad
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aad
 aad
 aad
 aad
@@ -55369,25 +55899,7 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+<<<<<<< HEAD
 aad
 aad
 aad
@@ -55419,6 +55931,35 @@ aud
 aud
 aud
 atz
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+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
+=======
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aad
 aad
 aad
@@ -55438,6 +55979,51 @@ aad
 aad
 aad
 aad
+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
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
+aad
 aad
 aad
 aad
@@ -55560,7 +56146,17 @@ aud
 aud
 aud
 aud
+<<<<<<< HEAD
 atz
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+auD
+=======
+aud
+aud
+aud
+aud
+auD
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aad
 aad
 aad
@@ -55623,10 +56219,26 @@ aaa
 (125,1,1) = {"
 aaa
 aad
+<<<<<<< HEAD
 aad
 aad
 aad
 aad
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aad
+aad
+aad
+aad
+aaa
+"}
+(125,1,1) = {"
+aaa
+=======
+aaa
+"}
+(125,1,1) = {"
+aaa
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aad
 aad
 aad
@@ -55702,7 +56314,17 @@ aud
 aud
 aud
 aud
+<<<<<<< HEAD
 atz
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+auD
+=======
+aud
+aud
+aud
+aud
+auD
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aad
 aad
 aad
@@ -55765,10 +56387,26 @@ aaa
 (126,1,1) = {"
 aaa
 aad
+<<<<<<< HEAD
 aad
 aad
 aad
 aad
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aad
+aad
+aad
+aad
+aaa
+"}
+(126,1,1) = {"
+aaa
+=======
+aaa
+"}
+(126,1,1) = {"
+aaa
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aad
 aad
 aad
@@ -55844,7 +56482,17 @@ aud
 aud
 aud
 aud
+<<<<<<< HEAD
 atz
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+auD
+=======
+aud
+aud
+aud
+aud
+auD
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aad
 aad
 aad
@@ -55907,10 +56555,26 @@ aaa
 (127,1,1) = {"
 aaa
 aad
+<<<<<<< HEAD
 aad
 aad
 aad
 aad
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aad
+aad
+aad
+aad
+aaa
+"}
+(127,1,1) = {"
+aaa
+=======
+aaa
+"}
+(127,1,1) = {"
+aaa
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aad
 aad
 aad
@@ -55986,12 +56650,28 @@ aud
 aud
 aud
 aud
+<<<<<<< HEAD
 atz
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+auD
 aad
 aad
 aad
 aad
 aad
+=======
+aud
+aud
+aud
+aud
+auD
+aad
+aad
+aad
+aad
+aad
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aad
 aad
 aad
 aad
@@ -56128,7 +56808,17 @@ aud
 aud
 aud
 aud
+<<<<<<< HEAD
 atz
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+auD
+=======
+aud
+aud
+aud
+aud
+auD
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aad
 aad
 aad
@@ -56191,6 +56881,26 @@ aaa
 (129,1,1) = {"
 aaa
 aad
+<<<<<<< HEAD
+aad
+aad
+aad
+aad
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aad
+aad
+aad
+aad
+aaa
+"}
+(129,1,1) = {"
+aaa
+=======
+aaa
+"}
+(129,1,1) = {"
+aaa
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aad
 aad
 aad
@@ -56241,10 +56951,7 @@ aad
 aad
 aad
 aad
-aad
-aad
-aad
-aad
+<<<<<<< HEAD
 atz
 aud
 aud
@@ -56271,11 +56978,76 @@ aud
 aud
 aud
 atz
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+auD
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+aud
+auD
 aad
 aad
 aad
 aad
 aad
+=======
+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
+aad
+aad
+aad
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aad
 aad
 aad
 aad
@@ -56382,6 +57154,7 @@ aad
 aad
 aad
 aad
+<<<<<<< HEAD
 aad
 aad
 aad
@@ -56413,6 +57186,65 @@ atB
 atB
 atB
 atz
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+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
+aud
+auD
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aad
 aad
 aad
@@ -56475,10 +57307,26 @@ aaa
 (131,1,1) = {"
 aaa
 aad
+<<<<<<< HEAD
 aad
 aad
 aad
 aad
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aad
+aad
+aad
+aad
+aaa
+"}
+(131,1,1) = {"
+aaa
+=======
+aaa
+"}
+(131,1,1) = {"
+aaa
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aad
 aad
 aad
@@ -56554,12 +57402,28 @@ aud
 aud
 aud
 aud
+<<<<<<< HEAD
 atz
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+auD
 aad
 aad
 aad
 aad
 aad
+=======
+aud
+aud
+aud
+aud
+auD
+aad
+aad
+aad
+aad
+aad
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aad
 aad
 aad
 aad
@@ -56674,6 +57538,20 @@ aad
 atz
 atC
 atC
+atC
+atC
+aua
+atC
+atC
+<<<<<<< HEAD
+auf
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aue
+=======
+atC
+atC
+aue
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aua
 atC
 atC
@@ -56681,22 +57559,32 @@ atC
 aua
 atC
 atC
+atC
+aua
+<<<<<<< HEAD
+atC
 auf
-aua
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 atC
-atC
-aua
+aue
+=======
+aue
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 atC
 atC
 atC
 aua
 atC
-auf
-atC
-aua
-atC
 atC
+<<<<<<< HEAD
 atz
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+auD
+=======
+atC
+atC
+auD
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aad
 aad
 aad
@@ -56759,10 +57647,26 @@ aaa
 (133,1,1) = {"
 aaa
 aad
+<<<<<<< HEAD
 aad
 aad
 aad
 aad
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aad
+aad
+aad
+aad
+aaa
+"}
+(133,1,1) = {"
+aaa
+=======
+aaa
+"}
+(133,1,1) = {"
+aaa
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aad
 aad
 aad
@@ -56838,6 +57742,10 @@ atx
 atx
 atx
 atx
+atx
+atx
+atx
+atx
 aty
 aad
 aad
@@ -56896,6 +57804,16 @@ aad
 aad
 aad
 aad
+<<<<<<< HEAD
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aad
+aad
+aad
+aad
+aad
+=======
+aad
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aaa
 "}
 (134,1,1) = {"
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index ab3e5a35b1..07059ea912 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -52304,6 +52304,7 @@ aeG
 abn
 abn
 abn
+<<<<<<< HEAD
 aeG
 aeG
 aeG
@@ -52311,6 +52312,29 @@ aeG
 aeG
 aeG
 aeG
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+aab
+aab
+=======
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+aeG
+aab
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aab
 aab
 aab
@@ -52447,12 +52471,38 @@ aeG
 aeG
 abn
 abn
+<<<<<<< HEAD
 aeG
 aeG
 aeG
 aeG
 aeG
 aeG
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+aab
+aab
+aab
+=======
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+aeG
+aeG
+aab
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aab
 aab
 aab
@@ -52591,6 +52641,7 @@ aeG
 abn
 abn
 abn
+<<<<<<< HEAD
 aeG
 aeG
 aeG
@@ -52609,6 +52660,39 @@ aab
 aab
 aab
 aab
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+aab
+aab
+aab
+=======
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+aeG
+aeG
+aeG
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aab
 aab
 aab
@@ -52733,10 +52817,62 @@ aeG
 aeG
 aeG
 abn
+<<<<<<< HEAD
 aeG
 aeG
 aeG
 aeG
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+aab
+aab
+aab
+aab
+=======
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+aeG
+aeG
+aeG
+aab
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aab
 aab
 aab
@@ -52875,10 +53011,52 @@ aeG
 aeG
 abn
 abn
+<<<<<<< HEAD
 aeG
 aeG
 aeG
 aeG
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+aab
+aab
+aab
+aab
+=======
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+aeG
+aeG
+aeG
+aab
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aab
 aab
 aab
@@ -53020,11 +53198,29 @@ abn
 abn
 abn
 aeG
+<<<<<<< HEAD
 aeG
 aab
 aab
 aab
 aab
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+abn
+abn
+abn
+aab
+aab
+aab
+aab
+=======
+abn
+abn
+abn
+aeG
+aeG
+aeG
+aeG
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aab
 aab
 aab
@@ -53157,6 +53353,7 @@ aeG
 aeG
 aeG
 aeG
+<<<<<<< HEAD
 aeG
 aeG
 abn
@@ -53167,6 +53364,17 @@ aab
 aab
 aab
 aab
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aab
+aab
+aab
+aab
+=======
+aeG
+aeG
+aeG
+aeG
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aab
 aab
 aab
@@ -53300,6 +53508,7 @@ aeG
 aeG
 aeG
 aeG
+<<<<<<< HEAD
 aeG
 aeG
 aeG
@@ -53309,6 +53518,17 @@ aab
 aab
 aab
 aab
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aab
+aab
+aab
+aab
+=======
+aeG
+aeG
+aeG
+aeG
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aab
 aab
 aab
@@ -53442,6 +53662,7 @@ aeG
 aeG
 aeG
 aeG
+<<<<<<< HEAD
 aeG
 aeG
 aeG
@@ -53451,6 +53672,17 @@ aab
 aab
 aab
 aab
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aab
+aab
+aab
+aab
+=======
+aeG
+aeG
+aeG
+aeG
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aab
 aab
 aab
@@ -53584,6 +53816,7 @@ aeG
 aeG
 aeG
 aeG
+<<<<<<< HEAD
 aeG
 aeG
 aeG
@@ -53593,6 +53826,17 @@ aab
 aab
 aab
 aab
+||||||| parent of 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
+aab
+aab
+aab
+aab
+=======
+aeG
+aeG
+aeG
+aeG
+>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
 aab
 aab
 aab
@@ -53731,10 +53975,10 @@ aeG
 aeG
 aeG
 aeG
-aab
-aab
-aab
-aab
+aeG
+aeG
+aeG
+aeG
 aab
 aab
 aab
@@ -53873,10 +54117,10 @@ aeG
 aeG
 aeG
 aeG
-aab
-aab
-aab
-aab
+aeG
+aeG
+aeG
+aeG
 aab
 aab
 aab