diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 3e9fd970306..20ccd4ed260 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -241,7 +241,11 @@
 			G.check_nuke_disks()
 
 		spawn(0)
-			if(loc) loc.Entered(src)
+			if(loc)
+				var/turf/T = loc
+				loc.Entered(src)
+				if(!T.is_hole)
+					fall_impact(text2num(pickweight(list("1" = 60, "2" = 30, "3" = 10))))
 
 //by default, transition randomly to another zlevel
 /atom/movable/proc/get_transit_zlevel()
diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm
index a5dbc13d017..47172ad62db 100644
--- a/code/modules/shuttles/shuttle.dm
+++ b/code/modules/shuttles/shuttle.dm
@@ -231,6 +231,8 @@
 			if(SW.outside_window)
 				var/turf/target_turf = get_turf(SW)
 				target_turf.ChangeTurf(destination.base_turf)
+		for(var/obj/effect/energy_field/ef in sub_area)
+			qdel(ef)
 
 	// Remove all powernets that were affected, and rebuild them.
 	var/list/cables = list()
diff --git a/html/changelogs/Ferner-200824-bugfix_shuttlefixes2.yml b/html/changelogs/Ferner-200824-bugfix_shuttlefixes2.yml
new file mode 100644
index 00000000000..1e79702b00d
--- /dev/null
+++ b/html/changelogs/Ferner-200824-bugfix_shuttlefixes2.yml
@@ -0,0 +1,7 @@
+author: Ferner
+delete-after: True
+changes: 
+  - bugfix: "Fixed players sometimes spawning with ashy feet."
+  - bugfix: "Fixed a few lighting issues and things related to shuttles."
+  - bugfix: "Landing back on the asteroid after falling into space now makes you take fall damage again, watch your step out there."
+
diff --git a/icons/turf/shuttles_unique/merc_shuttle.dmi b/icons/turf/shuttles_unique/merc_shuttle.dmi
index a6ba57da83c..9c6f8f9b955 100644
Binary files a/icons/turf/shuttles_unique/merc_shuttle.dmi and b/icons/turf/shuttles_unique/merc_shuttle.dmi differ
diff --git a/maps/_common/areas/special.dm b/maps/_common/areas/special.dm
index aeb6eb8ccf0..4ed87c6b7f3 100644
--- a/maps/_common/areas/special.dm
+++ b/maps/_common/areas/special.dm
@@ -21,6 +21,10 @@
 	name = "Centcom Preparatory Wing"
 	ambience = AMBIENCE_ARRIVALS
 
+/area/centcom/start
+	name = "New Player Spawn"
+	dynamic_lighting = 0
+
 /area/centcom/evac
 	name = "Centcom Emergency Shuttle"
 
diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm
index e1e4c495a6f..cc2c17b9025 100644
--- a/maps/aurora/aurora-1_centcomm.dmm
+++ b/maps/aurora/aurora-1_centcomm.dmm
@@ -2830,6 +2830,8 @@
 "amC" = (
 /obj/structure/bed/padded,
 /obj/effect/decal/cleanable/dirt,
+/obj/item/bedsheet/random,
+/obj/structure/curtain/open/bed,
 /turf/simulated/floor/carpet/art,
 /area/shuttle/skipjack)
 "amG" = (
@@ -3380,8 +3382,15 @@
 	dir = 5
 	},
 /obj/structure/table/steel,
-/obj/machinery/recharger,
 /obj/effect/decal/cleanable/dirt,
+/obj/item/grenade/flashbang{
+	pixel_x = -4;
+	pixel_y = 4
+	},
+/obj/item/grenade/empgrenade{
+	pixel_x = 7;
+	pixel_y = 6
+	},
 /turf/simulated/floor/tiled,
 /area/shuttle/skipjack)
 "apH" = (
@@ -3391,9 +3400,20 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
-/obj/item/card/emag,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table/steel,
+/obj/machinery/recharger{
+	pixel_x = 10;
+	pixel_y = 10
+	},
+/obj/item/card/emag{
+	pixel_x = -9;
+	pixel_y = 9
+	},
+/obj/item/grenade/spawnergrenade/manhacks{
+	pixel_x = -15;
+	pixel_y = 1
+	},
 /turf/simulated/floor/tiled,
 /area/shuttle/skipjack)
 "apI" = (
@@ -3514,6 +3534,7 @@
 /area/shuttle/skipjack)
 "aqj" = (
 /obj/structure/bed/padded,
+/obj/item/bedsheet/random,
 /turf/simulated/floor/carpet,
 /area/shuttle/skipjack)
 "aqn" = (
@@ -3530,6 +3551,7 @@
 	dir = 4
 	},
 /obj/structure/bed/padded,
+/obj/item/bedsheet/random,
 /turf/simulated/floor/carpet,
 /area/shuttle/skipjack)
 "aqq" = (
@@ -6572,9 +6594,11 @@
 	},
 /area/centcom/control)
 "azn" = (
-/turf/simulated/wall/shuttle/unique/mercenary{
-	icon_state = "12,17"
+/obj/structure/shuttle_part/mercenary{
+	icon_state = "12,17";
+	opacity = 1
 	},
+/turf/space/dynamic,
 /area/shuttle/mercenary)
 "azo" = (
 /obj/structure/window/reinforced,
@@ -9849,20 +9873,6 @@
 	},
 /area/centcom/checkpoint/aft)
 "aHi" = (
-/obj/structure/table/rack,
-/obj/item/grenade/spawnergrenade/manhacks,
-/obj/item/grenade/flashbang,
-/obj/item/grenade/empgrenade,
-/obj/effect/floor_decal/corner/red{
-	dir = 5
-	},
-/obj/effect/floor_decal/corner/red{
-	dir = 10
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled,
-/area/shuttle/skipjack)
-"aHj" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 5
 	},
@@ -9880,6 +9890,29 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled,
 /area/shuttle/skipjack)
+"aHj" = (
+/obj/effect/floor_decal/corner/red{
+	dir = 5
+	},
+/obj/effect/floor_decal/corner/red{
+	dir = 10
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table/steel,
+/obj/item/rig/eva/equipped{
+	pixel_x = -13;
+	pixel_y = 7
+	},
+/obj/item/rig/hazard/equipped/pirate{
+	pixel_x = 2;
+	pixel_y = 2
+	},
+/obj/item/rig/industrial/equipped{
+	pixel_x = -8;
+	pixel_y = -2
+	},
+/turf/simulated/floor/tiled,
+/area/shuttle/skipjack)
 "aHk" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 5
@@ -9889,7 +9922,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bucket/wood,
+/obj/structure/bed/chair/shuttle,
 /turf/simulated/floor/tiled,
 /area/shuttle/skipjack)
 "aHl" = (
@@ -10144,7 +10177,6 @@
 	dir = 10
 	},
 /obj/effect/decal/cleanable/blood/oil,
-/obj/structure/table/rack,
 /obj/item/clothing/suit/space/void/atmos,
 /obj/item/clothing/head/helmet/space/void/atmos,
 /obj/item/clothing/head/helmet/space/void/mining,
@@ -10154,6 +10186,7 @@
 /obj/item/clothing/shoes/magboots,
 /obj/item/clothing/shoes/magboots,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/table/steel,
 /turf/simulated/floor/tiled,
 /area/shuttle/skipjack)
 "aHP" = (
@@ -10430,7 +10463,7 @@
 	name = "Secure Holding";
 	req_access = list(1)
 	},
-/turf/simulated/floor/shuttle/black,
+/turf/simulated/floor/shuttle/dark_blue,
 /area/shuttle/escape)
 "aIE" = (
 /obj/structure/shuttle_part/raider{
@@ -10493,7 +10526,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/ramp{
+/turf/simulated/floor/tiled/ramp/bottom{
 	dir = 4
 	},
 /area/shuttle/skipjack)
@@ -10501,6 +10534,9 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/skipjack)
 "aIM" = (
@@ -10577,10 +10613,14 @@
 /turf/simulated/floor/tiled/dark,
 /area/centcom/spawning)
 "aIV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/lattice/catwalk/indoor/grate,
 /obj/machinery/door/airlock/hatch{
 	req_access = list(150)
 	},
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/skipjack)
 "aIW" = (
@@ -10908,6 +10948,10 @@
 	dir = 10
 	},
 /obj/effect/decal/cleanable/blood,
+/obj/item/reagent_containers/glass/bucket/wood{
+	pixel_x = -19;
+	pixel_y = 6
+	},
 /turf/simulated/floor/tiled,
 /area/shuttle/skipjack)
 "aJL" = (
@@ -10928,19 +10972,15 @@
 	},
 /area/shuttle/skipjack)
 "aJN" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/window/northleft{
 	name = "infirmary?";
 	req_one_access = list(150)
 	},
-/obj/effect/floor_decal/corner/green{
-	dir = 10
-	},
-/obj/effect/floor_decal/corner/green{
-	dir = 5
-	},
 /obj/structure/curtain/open/shower,
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/spline/fancy{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/freezer,
 /area/shuttle/skipjack)
 "aJO" = (
 /turf/simulated/wall/shuttle/unique/raider{
@@ -11450,7 +11490,12 @@
 /area/shuttle/skipjack)
 "aLp" = (
 /obj/structure/table/steel,
-/obj/item/deck/cards,
+/obj/item/deck/cards{
+	pixel_y = -16
+	},
+/obj/item/reagent_containers/food/drinks/bottle/rum{
+	pixel_y = 7
+	},
 /turf/simulated/floor/carpet,
 /area/shuttle/skipjack)
 "aLq" = (
@@ -11867,7 +11912,9 @@
 	req_access = list(13)
 	},
 /turf/unsimulated/floor,
-/area/centcom/spawning)
+/area/centcom/spawning{
+	name = "NTCC Odin Prepatory Wing"
+	})
 "aMO" = (
 /obj/structure/window/reinforced/holowindow{
 	dir = 4
@@ -11915,7 +11962,9 @@
 "aNb" = (
 /obj/machinery/megavendor,
 /turf/unsimulated/floor,
-/area/centcom/spawning)
+/area/centcom/spawning{
+	name = "NTCC Odin Prepatory Wing"
+	})
 "aNc" = (
 /obj/machinery/camera/network/crescent{
 	c_tag = "Crescent Departures";
@@ -11952,20 +12001,13 @@
 	store_mobs = 0
 	},
 /obj/item/reagent_containers/blood/ripped,
-/obj/effect/floor_decal/corner/green{
-	dir = 10
-	},
-/obj/effect/floor_decal/corner/green{
-	dir = 5
-	},
 /obj/item/reagent_containers/blood/OMinus{
 	name = "soon-to-expire blood pack"
 	},
 /obj/item/reagent_containers/blood/OMinus{
 	name = "soon-to-expire blood pack"
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/freezer,
 /area/shuttle/skipjack)
 "aNh" = (
 /obj/machinery/optable,
@@ -11997,16 +12039,10 @@
 /obj/random/medical,
 /obj/random/medical,
 /obj/random/medical,
-/obj/effect/floor_decal/corner/green{
-	dir = 10
-	},
 /obj/item/reagent_containers/glass/bottle/bicaridine,
 /obj/item/reagent_containers/glass/bottle/dermaline,
-/obj/effect/floor_decal/corner/green{
-	dir = 5
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled,
+/obj/item/reagent_containers/glass/bottle/thetamycin,
+/turf/simulated/floor/tiled/freezer,
 /area/shuttle/skipjack)
 "aNi" = (
 /turf/simulated/wall/shuttle/unique/raider{
@@ -12099,11 +12135,11 @@
 /turf/simulated/floor/plating,
 /area/shuttle/skipjack)
 "aNy" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 10
-	},
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/skipjack)
 "aNz" = (
@@ -12338,32 +12374,10 @@
 	},
 /area/centcom/spawning)
 "aOo" = (
-/obj/structure/table/steel,
-/obj/effect/floor_decal/corner/red/full,
-/obj/effect/floor_decal/corner/red{
-	dir = 5
-	},
-/obj/effect/floor_decal/corner/red{
-	dir = 10
-	},
-/obj/item/rig/industrial/equipped,
-/obj/item/rig/eva/equipped{
-	pixel_x = 13
-	},
-/turf/simulated/floor/tiled,
-/area/shuttle/skipjack)
-"aOp" = (
 /obj/item/gun/energy/rifle/ionrifle,
 /obj/item/material/harpoon,
-/obj/item/clothing/suit/space/void/merc,
-/obj/item/clothing/head/helmet/space/void/merc,
-/obj/item/clothing/head/helmet/space/void/engineering,
-/obj/item/clothing/suit/space/void/engineering,
-/obj/item/tank/oxygen,
 /obj/item/tank/oxygen,
 /obj/item/clothing/shoes/magboots,
-/obj/item/clothing/shoes/magboots,
-/obj/item/rig/hazard/equipped/pirate,
 /obj/effect/floor_decal/corner/red{
 	dir = 5
 	},
@@ -12372,6 +12386,24 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table/steel,
+/obj/item/clothing/suit/space/void/merc,
+/obj/item/clothing/head/helmet/space/void/merc,
+/turf/simulated/floor/tiled,
+/area/shuttle/skipjack)
+"aOp" = (
+/obj/item/gun/energy/rifle/ionrifle,
+/obj/item/tank/oxygen,
+/obj/item/clothing/shoes/magboots,
+/obj/effect/floor_decal/corner/red{
+	dir = 5
+	},
+/obj/effect/floor_decal/corner/red{
+	dir = 10
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table/steel,
+/obj/item/clothing/suit/space/void/engineering,
+/obj/item/clothing/head/helmet/space/void/engineering,
 /turf/simulated/floor/tiled,
 /area/shuttle/skipjack)
 "aOq" = (
@@ -12380,6 +12412,7 @@
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/plating,
 /area/shuttle/skipjack)
 "aOr" = (
@@ -12393,16 +12426,10 @@
 /obj/machinery/iv_drip{
 	pixel_x = -3
 	},
-/obj/effect/floor_decal/corner/green{
-	dir = 10
-	},
-/obj/effect/floor_decal/corner/green{
-	dir = 5
-	},
 /obj/machinery/shower{
 	dir = 8
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/freezer,
 /area/shuttle/skipjack)
 "aOz" = (
 /obj/effect/floor_decal/industrial/warning,
@@ -13029,9 +13056,6 @@
 	},
 /turf/unsimulated/floor,
 /area/centcom/spawning)
-"aRd" = (
-/turf/unsimulated/wall/riveted,
-/area/antag/wizard)
 "aRi" = (
 /obj/structure/table/glass{
 	name = "reinforced glass table";
@@ -14525,9 +14549,6 @@
 	},
 /turf/unsimulated/floor/plating,
 /area/shuttle/escape)
-"aXj" = (
-/turf/unsimulated/floor/plating,
-/area/shuttle/escape)
 "aXl" = (
 /obj/structure/dueling_table/no_collide/above_layer{
 	icon_state = "top_right"
@@ -15157,34 +15178,15 @@
 /turf/space/transit/south,
 /area/template_noop)
 "bln" = (
-/obj/structure/table/standard,
-/obj/item/reagent_containers/food/drinks/waterbottle{
-	pixel_x = -6;
-	pixel_y = 7
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle{
-	pixel_x = 1;
-	pixel_y = 7
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle{
-	pixel_x = 8;
-	pixel_y = 7
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle{
-	pixel_x = -6;
-	pixel_y = 7
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle{
-	pixel_x = 1;
-	pixel_y = 7
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle{
-	pixel_x = 8;
-	pixel_y = 7
-	},
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
+/obj/structure/undies_wardrobe{
+	anchored = 1;
+	icon = 'icons/obj/storage.dmi';
+	icon_state = "dropcrate-grey";
+	name = "underwear crate"
+	},
 /turf/unsimulated/floor{
 	icon_state = "new_reinforced"
 	},
@@ -15262,20 +15264,13 @@
 "brB" = (
 /obj/structure/table/standard,
 /obj/item/storage/box/fancy/tray,
-/obj/effect/floor_decal/corner/green{
-	dir = 10
-	},
-/obj/effect/floor_decal/corner/green{
-	dir = 5
-	},
 /obj/machinery/light/small,
-/obj/effect/decal/cleanable/dirt,
 /obj/structure/toilet{
 	dir = 4;
 	layer = 2.6;
 	pixel_y = 1
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/freezer,
 /area/shuttle/skipjack)
 "brN" = (
 /obj/structure/diona/vines,
@@ -15744,9 +15739,11 @@
 	},
 /area/centcom/legion)
 "bRJ" = (
-/turf/simulated/wall/shuttle/unique/mercenary{
-	icon_state = "4,16"
+/obj/structure/shuttle_part/mercenary{
+	icon_state = "4,16";
+	opacity = 1
 	},
+/turf/space/dynamic,
 /area/shuttle/mercenary)
 "bSa" = (
 /obj/structure/sign/pharmacy,
@@ -15870,10 +15867,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/skipjack)
 "bXB" = (
-/obj/machinery/computer/teleporter,
-/turf/unsimulated/floor{
-	icon_state = "new_reinforced"
-	},
+/turf/space,
 /area/antag/ninja)
 "bXO" = (
 /obj/structure/table/wood,
@@ -15911,6 +15905,12 @@
 	name = "Skipjack"
 	},
 /area/shuttle/skipjack)
+"cbf" = (
+/obj/machinery/teleport/hub,
+/turf/unsimulated/floor{
+	icon_state = "new_reinforced"
+	},
+/area/antag/ninja)
 "cbz" = (
 /obj/item/storage/bag/money{
 	layer = 2.99;
@@ -16022,13 +16022,21 @@
 	},
 /area/shuttle/syndicate_elite)
 "ceT" = (
-/turf/simulated/wall/shuttle/unique/mercenary{
-	icon_state = "12,16"
+/obj/structure/shuttle_part/mercenary{
+	icon_state = "12,16";
+	opacity = 1
 	},
+/turf/space/dynamic,
 /area/shuttle/mercenary)
 "cfo" = (
-/turf/simulated/floor/tiled/dark,
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/lattice/catwalk/indoor/grate,
+/turf/simulated/floor/plating,
 /area/shuttle/skipjack)
+"cfL" = (
+/turf/unsimulated/wall/riveted,
+/area/centcom/start)
 "cgd" = (
 /obj/structure/shuttle_part/transfer{
 	desc = "A large, bloated shuttle designed for automated passenger transport.";
@@ -16039,8 +16047,20 @@
 /turf/unsimulated/floor/plating,
 /area/shuttle/escape)
 "chb" = (
-/obj/structure/closet/crate/freezer/rations,
-/turf/simulated/floor/tiled/dark,
+/obj/item/hoist_kit,
+/obj/item/ladder_mobile{
+	pixel_y = 6
+	},
+/obj/structure/closet{
+	icon_closed = "toolcloset";
+	icon_opened = "toolclosetopen";
+	icon_state = "toolcloset"
+	},
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/item/pickaxe/jackhammer,
+/obj/item/pickaxe/jackhammer,
+/obj/item/pickaxe/jackhammer,
+/turf/simulated/floor/plating,
 /area/shuttle/skipjack)
 "chj" = (
 /obj/effect/floor_decal/industrial/warning{
@@ -16074,6 +16094,14 @@
 	},
 /turf/unsimulated/floor,
 /area/antag/mercenary)
+"cie" = (
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/skipjack)
 "ciV" = (
 /turf/simulated/wall/elevator,
 /area/centcom/spawning)
@@ -16164,13 +16192,13 @@
 /turf/unsimulated/wall/darkshuttlewall,
 /area/centcom/legion)
 "coK" = (
-/obj/structure/bed/chair/shuttle{
-	dir = 1
-	},
 /obj/structure/closet/walllocker/emerglocker/south{
 	pixel_y = -27;
 	spawnitems = list(/obj/item/tank/emergency_oxygen/double,/obj/item/clothing/mask/breath)
 	},
+/obj/structure/bed/chair/shuttle{
+	dir = 4
+	},
 /turf/simulated/floor/shuttle/black,
 /area/shuttle/distress)
 "cpq" = (
@@ -16410,9 +16438,6 @@
 /area/shuttle/administration)
 "cCo" = (
 /obj/structure/table/rack,
-/obj/item/pickaxe/jackhammer,
-/obj/item/pickaxe/jackhammer,
-/obj/item/pickaxe/jackhammer,
 /obj/item/device/suit_cooling_unit,
 /obj/item/device/suit_cooling_unit,
 /obj/structure/lattice/catwalk/indoor/grate,
@@ -16420,7 +16445,9 @@
 /area/shuttle/skipjack)
 "cCB" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/undies_wardrobe,
+/obj/structure/undies_wardrobe{
+	anchored = 1
+	},
 /turf/unsimulated/floor{
 	icon_state = "steel_dirty"
 	},
@@ -16816,6 +16843,12 @@
 	},
 /turf/simulated/floor/carpet,
 /area/centcom/shared_dream)
+"cRP" = (
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/turf/simulated/floor/plating,
+/area/shuttle/skipjack)
 "cSw" = (
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 6
@@ -17047,14 +17080,14 @@
 /turf/space/dynamic,
 /area/antag/raider)
 "dby" = (
-/obj/machinery/light/small{
-	brightness_color = "#DA0205";
-	brightness_power = 1;
-	name = "adjusted light fixture"
+/obj/structure/reagent_dispensers/fueltank,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 5
 	},
-/obj/structure/table/rack,
-/obj/item/storage/box/drinkingglasses,
-/turf/simulated/floor/tiled/dark,
+/obj/item/clothing/head/welding,
+/obj/item/weldingtool,
+/obj/structure/lattice/catwalk/indoor/grate,
+/turf/simulated/floor/plating,
 /area/shuttle/skipjack)
 "dbL" = (
 /obj/structure/window/reinforced/crescent{
@@ -17143,8 +17176,12 @@
 	},
 /area/antag/raider)
 "dff" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor/tiled/dark,
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/atmospherics/pipe/tank/air{
+	dir = 8;
+	layer = 3.5
+	},
+/turf/simulated/floor/plating,
 /area/shuttle/skipjack)
 "dft" = (
 /obj/machinery/vending/engivend,
@@ -17579,6 +17616,7 @@
 	layer = 2.8;
 	name = "Pod D"
 	},
+/obj/effect/floor_decal/industrial/loading,
 /turf/unsimulated/floor{
 	icon_state = "new_reinforced"
 	},
@@ -18638,6 +18676,9 @@
 	},
 /turf/space/dynamic,
 /area/shuttle/skipjack)
+"euT" = (
+/turf/simulated/floor/holofloor/space,
+/area/centcom/start)
 "evt" = (
 /obj/structure/bed/chair/office/hover{
 	can_buckle = 0;
@@ -19369,13 +19410,13 @@
 /turf/space/dynamic,
 /area/shuttle/mercenary)
 "fgy" = (
-/obj/structure/table/standard,
 /obj/item/storage/toolbox/syndicate{
 	pixel_y = -11
 	},
 /obj/item/storage/toolbox/syndicate{
 	pixel_y = 5
 	},
+/obj/structure/table/standard,
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
@@ -19656,6 +19697,13 @@
 /obj/item/clothing/mask/offworlder,
 /turf/unsimulated/floor/plating,
 /area/antag/raider)
+"fvg" = (
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 10
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/skipjack)
 "fvm" = (
 /obj/structure/table/reinforced,
 /obj/effect/floor_decal/corner/paleblue/diagonal{
@@ -20292,7 +20340,12 @@
 /turf/unsimulated/wall/riveted,
 /area/centcom/living)
 "gaS" = (
-/obj/structure/undies_wardrobe,
+/obj/structure/table/rack,
+/obj/item/storage/secure/briefcase,
+/obj/item/storage/briefcase/aluminium,
+/obj/item/device/camera,
+/obj/item/device/taperecorder,
+/obj/item/device/megaphone,
 /turf/unsimulated/floor{
 	icon_state = "new_reinforced"
 	},
@@ -20807,6 +20860,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/mercenary)
+"gvP" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/freezer/rations,
+/obj/item/storage/box/drinkingglasses,
+/turf/simulated/floor/tiled/dark,
+/area/shuttle/skipjack)
 "gws" = (
 /obj/structure/shuttle_part/mercenary{
 	icon_state = "0,9"
@@ -21085,7 +21144,8 @@
 /area/centcom/legion/hangar5)
 "gCr" = (
 /turf/unsimulated/wall/riveted{
-	opacity = 0
+	opacity = 0;
+	permit_ao = 0
 	},
 /area/antag/wizard)
 "gDh" = (
@@ -21807,13 +21867,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/merchant_station/warehouse)
-"hnF" = (
-/obj/structure/bed/chair/office/bridge,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/escape)
 "hnG" = (
 /obj/machinery/recharge_station,
 /obj/machinery/light/small{
@@ -22005,9 +22058,6 @@
 /area/antag/mercenary)
 "hyR" = (
 /obj/structure/bed/chair/office/bridge,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
 /turf/simulated/floor/shuttle/dark_blue,
 /area/shuttle/escape)
 "hyU" = (
@@ -23137,6 +23187,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/merchant_station)
+"ioX" = (
+/obj/structure/shuttle_part/merchant{
+	density = 0;
+	icon_state = "0,2"
+	},
+/turf/space/dynamic,
+/area/shuttle/merchant)
 "ipu" = (
 /obj/effect/floor_decal/corner_wide/paleblue/diagonal{
 	dir = 8;
@@ -23690,10 +23747,10 @@
 /turf/unsimulated/floor,
 /area/centcom/spawning)
 "iKK" = (
-/obj/effect/decal/fake_object/light_source/invisible,
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
 	},
+/obj/effect/decal/fake_object/light_source/invisible,
 /turf/unsimulated/floor{
 	icon_state = "new_reinforced"
 	},
@@ -24125,6 +24182,12 @@
 	icon_state = "dark2"
 	},
 /area/antag/mercenary)
+"jbP" = (
+/obj/machinery/computer/teleporter,
+/turf/unsimulated/floor{
+	icon_state = "new_reinforced"
+	},
+/area/antag/ninja)
 "jcc" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -25575,7 +25638,7 @@
 	},
 /area/supply/dock)
 "kxv" = (
-/obj/machinery/teleport/hub,
+/obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/unsimulated/floor{
 	icon_state = "new_reinforced"
 	},
@@ -26113,6 +26176,7 @@
 	layer = 2.8;
 	name = "Pod C"
 	},
+/obj/effect/floor_decal/industrial/loading,
 /turf/unsimulated/floor{
 	icon_state = "new_reinforced"
 	},
@@ -26160,6 +26224,12 @@
 	},
 /turf/unsimulated/floor,
 /area/antag/mercenary)
+"kYI" = (
+/obj/machinery/teleport/station,
+/turf/unsimulated/floor{
+	icon_state = "new_reinforced"
+	},
+/area/antag/ninja)
 "kYR" = (
 /obj/effect/step_trigger/thrower/shuttle/northeast,
 /turf/space/transit/south,
@@ -27382,6 +27452,14 @@
 	icon_state = "new_reinforced"
 	},
 /area/antag/mercenary)
+"mbe" = (
+/obj/effect/landmark{
+	name = "start"
+	},
+/turf/simulated/floor/holofloor/space,
+/area/centcom/start{
+	name = "Romanovich Cloud, Tau Ceti"
+	})
 "mbj" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/unsimulated/floor/plating,
@@ -27740,6 +27818,9 @@
 	layer = 2.8;
 	name = "Pod A"
 	},
+/obj/effect/floor_decal/industrial/loading{
+	dir = 1
+	},
 /turf/unsimulated/floor{
 	icon_state = "new_reinforced"
 	},
@@ -29252,9 +29333,11 @@
 	},
 /area/centcom/legion)
 "nDv" = (
-/turf/simulated/wall/shuttle/unique/mercenary{
-	icon_state = "4,17"
+/obj/structure/shuttle_part/mercenary{
+	icon_state = "4,17";
+	opacity = 1
 	},
+/turf/space/dynamic,
 /area/shuttle/mercenary)
 "nDL" = (
 /obj/effect/floor_decal/industrial/warning{
@@ -30068,6 +30151,17 @@
 	},
 /turf/unsimulated/floor/plating,
 /area/shuttle/legion)
+"olC" = (
+/obj/effect/floor_decal/corner/red{
+	dir = 5
+	},
+/obj/effect/floor_decal/corner/red{
+	dir = 10
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/bed/chair/shuttle,
+/turf/simulated/floor/tiled,
+/area/shuttle/skipjack)
 "omw" = (
 /obj/structure/shuttle_part/transfer{
 	desc = "A large, bloated shuttle designed for automated passenger transport.";
@@ -31030,6 +31124,9 @@
 	layer = 2.8;
 	name = "Pod B"
 	},
+/obj/effect/floor_decal/industrial/loading{
+	dir = 1
+	},
 /turf/unsimulated/floor{
 	icon_state = "new_reinforced"
 	},
@@ -31886,7 +31983,7 @@
 	pixel_y = -20
 	},
 /obj/structure/bed/chair/shuttle{
-	dir = 1
+	dir = 4
 	},
 /turf/simulated/floor/shuttle/black,
 /area/shuttle/distress)
@@ -31923,10 +32020,10 @@
 	},
 /area/centcom/legion)
 "qcb" = (
-/obj/effect/decal/fake_object/light_source/invisible,
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 1
 	},
+/obj/effect/decal/fake_object/light_source/invisible,
 /turf/unsimulated/floor{
 	icon_state = "new_reinforced"
 	},
@@ -32732,6 +32829,9 @@
 	pixel_x = 4;
 	pixel_y = 7
 	},
+/obj/item/reagent_containers/glass/bottle/thetamycin{
+	pixel_x = 9
+	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/mercenary)
 "qRm" = (
@@ -33288,6 +33388,13 @@
 	dynamic_lighting = 1
 	},
 /area/shuttle/merchant)
+"rrF" = (
+/obj/structure/shuttle_part/merchant{
+	density = 0;
+	icon_state = "0,6"
+	},
+/turf/space/dynamic,
+/area/shuttle/merchant)
 "rrS" = (
 /turf/simulated/wall/shuttle/unique/distress{
 	icon_state = "2,0"
@@ -33956,11 +34063,13 @@
 /turf/simulated/floor/plating,
 /area/shuttle/burglar)
 "rZy" = (
-/obj/structure/undies_wardrobe,
 /obj/machinery/light{
 	dir = 1;
 	icon_state = "tube1"
 	},
+/obj/structure/undies_wardrobe{
+	anchored = 1
+	},
 /turf/unsimulated/floor{
 	icon_state = "wood_light"
 	},
@@ -34384,6 +34493,15 @@
 	icon_state = "6,5"
 	},
 /area/shuttle/mercenary)
+"suT" = (
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 6;
+	icon_state = "intact"
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/skipjack)
 "svr" = (
 /obj/structure/bed/chair/comfy/brown{
 	can_buckle = 0;
@@ -34602,7 +34720,7 @@
 /area/centcom/legion/hangar5)
 "sEk" = (
 /obj/structure/bed/chair/shuttle{
-	dir = 1
+	dir = 4
 	},
 /turf/simulated/floor/shuttle/black,
 /area/shuttle/distress)
@@ -35889,7 +36007,7 @@
 	dir = 8
 	},
 /obj/structure/bed/chair/shuttle{
-	dir = 1
+	dir = 4
 	},
 /turf/simulated/floor/shuttle/black,
 /area/shuttle/distress)
@@ -35929,7 +36047,7 @@
 	},
 /area/antag/mercenary)
 "tRe" = (
-/obj/machinery/teleport/station,
+/obj/effect/decal/fake_object/light_source/invisible,
 /turf/unsimulated/floor{
 	icon_state = "new_reinforced"
 	},
@@ -36075,7 +36193,8 @@
 	icon = 'icons/obj/doors/Doorext.dmi';
 	icon_state = "door_locked";
 	name = "external airlock";
-	opacity = 0
+	opacity = 0;
+	permit_ao = 0
 	},
 /area/antag/raider)
 "tYm" = (
@@ -36284,6 +36403,7 @@
 /area/antag/burglar)
 "ugF" = (
 /obj/structure/shuttle_part/mercenary{
+	density = 0;
 	icon_state = "1,13"
 	},
 /turf/space/dynamic,
@@ -36331,7 +36451,7 @@
 /turf/unsimulated/floor/plating,
 /area/centcom/legion)
 "ujT" = (
-/obj/effect/decal/fake_object/light_source/invisible,
+/obj/structure/table/standard,
 /turf/unsimulated/floor{
 	icon_state = "new_reinforced"
 	},
@@ -36795,6 +36915,7 @@
 /area/centcom/ferry)
 "uHL" = (
 /obj/structure/shuttle_part/mercenary{
+	density = 0;
 	icon_state = "15,13"
 	},
 /turf/space/dynamic,
@@ -37110,12 +37231,22 @@
 	icon_state = "wood"
 	},
 /area/antag/burglar)
+"uUa" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/door/airlock/hatch{
+	req_access = list(150)
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/skipjack)
 "uUx" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/unsimulated/wall/fakepdoor{
 	icon_state = "shutter1";
 	name = "shutter";
-	opacity = 0
+	opacity = 0;
+	permit_ao = 0
 	},
 /area/antag/raider)
 "uUQ" = (
@@ -37190,9 +37321,11 @@
 	},
 /area/centcom/legion/hangar5)
 "uXF" = (
-/turf/simulated/wall/shuttle/unique/mercenary{
-	icon_state = "1,12"
+/obj/structure/shuttle_part/mercenary{
+	icon_state = "1,12";
+	opacity = 1
 	},
+/turf/space/dynamic,
 /area/shuttle/mercenary)
 "uXQ" = (
 /obj/structure/shuttle_part/tcfl{
@@ -39065,7 +39198,42 @@
 /turf/space/dynamic,
 /area/shuttle/mercenary)
 "wvP" = (
-/turf/template_noop,
+/obj/item/paper_bin{
+	pixel_x = 7;
+	pixel_y = -3
+	},
+/obj/item/pen/multi{
+	pixel_x = 7;
+	pixel_y = -1
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = 7;
+	pixel_y = 16
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = 1;
+	pixel_y = 16
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = -5;
+	pixel_y = 16
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = 7;
+	pixel_y = 16
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = 1;
+	pixel_y = 16
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle{
+	pixel_x = -5;
+	pixel_y = 16
+	},
+/obj/structure/table/standard,
+/turf/unsimulated/floor{
+	icon_state = "new_reinforced"
+	},
 /area/antag/ninja)
 "wwm" = (
 /obj/structure/table/rack,
@@ -39084,6 +39252,16 @@
 	},
 /turf/unsimulated/floor,
 /area/centcom/legion)
+"wxL" = (
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/binary/passive_gate{
+	name = "shuttle airlock pressure regulator";
+	target_pressure = 200;
+	unlocked = 1
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/skipjack)
 "wxU" = (
 /obj/structure/window/shuttle/unique/mercenary/small{
 	icon_state = "2,12";
@@ -40559,11 +40737,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/mercenary)
 "xNH" = (
+/obj/item/device/suit_cooling_unit,
+/obj/item/device/suit_cooling_unit,
+/obj/item/rig_module/cooling_unit,
+/obj/item/rig_module/cooling_unit,
 /obj/structure/table/standard,
-/obj/item/device/suit_cooling_unit,
-/obj/item/device/suit_cooling_unit,
-/obj/item/rig_module/cooling_unit,
-/obj/item/rig_module/cooling_unit,
 /turf/unsimulated/floor{
 	icon_state = "new_reinforced"
 	},
@@ -46035,11 +46213,11 @@ ifL
 aaM
 jdm
 jXF
-aaM
+rrF
 meB
 niY
 omL
-aaM
+ioX
 qoj
 rhD
 akG
@@ -48669,7 +48847,7 @@ iwf
 gCr
 yhJ
 yhJ
-aRd
+gCr
 ahV
 ahV
 ahV
@@ -48926,8 +49104,8 @@ qIj
 wIF
 cyJ
 cuH
-aRd
-aRd
+gCr
+gCr
 ahV
 ahV
 ahV
@@ -49184,7 +49362,7 @@ qIj
 qIj
 qIj
 pLd
-aRd
+gCr
 ahV
 ahV
 ahV
@@ -49698,7 +49876,7 @@ qIj
 qIj
 qIj
 ghL
-aRd
+gCr
 ahV
 ahV
 ahV
@@ -49954,8 +50132,8 @@ qIj
 ohI
 hqT
 knI
-aRd
-aRd
+gCr
+gCr
 ahV
 ahV
 ahV
@@ -50211,7 +50389,7 @@ pKH
 gCr
 yhJ
 yhJ
-aRd
+gCr
 ahV
 ahV
 ahV
@@ -52561,10 +52739,10 @@ dfV
 dfV
 dfV
 dfV
-dfV
-dfV
-wvP
-wvP
+aaM
+aaM
+aaM
+aaM
 aaM
 aaM
 aaM
@@ -52818,6 +52996,7 @@ sFP
 nkc
 nkc
 nkc
+bXB
 nkc
 nkc
 nkc
@@ -52825,7 +53004,6 @@ nkc
 aaM
 aaM
 aaM
-aaM
 aQS
 pBV
 aaM
@@ -53075,6 +53253,7 @@ sFP
 nkc
 nkc
 nkc
+bXB
 nkc
 nkc
 nkc
@@ -53082,7 +53261,6 @@ nkc
 aaM
 aaM
 aaM
-aaM
 aQS
 pBV
 aaM
@@ -53332,6 +53510,7 @@ sSa
 eew
 nkc
 nkc
+bXB
 nkc
 nkc
 nkc
@@ -53339,7 +53518,6 @@ nkc
 aaM
 aaM
 aaM
-aaM
 aQS
 pBV
 aaM
@@ -53591,12 +53769,12 @@ uie
 uie
 uie
 uie
+uie
 eew
 nkc
 aaM
 aaM
 aaM
-aaM
 aQS
 pBV
 aaM
@@ -53848,12 +54026,12 @@ vRS
 vRS
 fgy
 xNH
+gaS
 sFP
 nkc
 aaM
 aaM
 aaM
-aaM
 aQS
 pBV
 aaM
@@ -54105,12 +54283,12 @@ ajm
 jZc
 qcb
 ioz
+kxv
 lKv
 eew
 aaM
 aaM
 aaM
-aaM
 aQS
 pBV
 aaM
@@ -54362,12 +54540,12 @@ jCS
 ioz
 ioz
 ioz
-bXB
+ioz
+jbP
 sFP
 aaM
 aaM
 aaM
-aaM
 aQS
 pBV
 aaM
@@ -54618,13 +54796,13 @@ aVh
 jCS
 gCf
 ioz
-ujT
+ioz
 tRe
+kYI
 sFP
 aaM
 aaM
 aaM
-aaM
 aQS
 pBV
 aaM
@@ -54873,15 +55051,15 @@ vRS
 sSa
 eew
 jCS
-gaS
 ioz
 ioz
-kxv
+ioz
+ioz
+cbf
 sFP
 aaM
 aaM
 aaM
-aaM
 aQS
 pBV
 aaM
@@ -55133,12 +55311,12 @@ peq
 uDT
 iKK
 ioz
+ujT
 dac
 qTD
 aaM
 aaM
 aaM
-aaM
 aQS
 pBV
 aaM
@@ -55390,12 +55568,12 @@ vRS
 vRS
 bln
 jbp
+wvP
 sFP
 nkc
 aaM
 aaM
 aaM
-aaM
 aQS
 pBV
 aaM
@@ -55647,12 +55825,12 @@ thB
 thB
 thB
 thB
+thB
 qTD
 nkc
 aaM
 aaM
 aaM
-aaM
 aQS
 pBV
 aaM
@@ -55902,6 +56080,7 @@ hAO
 qTD
 nkc
 nkc
+bXB
 nkc
 nkc
 nkc
@@ -55909,7 +56088,6 @@ nkc
 aaM
 aaM
 aaM
-aaM
 aQS
 pBV
 aaM
@@ -56159,6 +56337,7 @@ sFP
 nkc
 nkc
 nkc
+bXB
 nkc
 nkc
 nkc
@@ -56166,7 +56345,6 @@ nkc
 aaM
 aaM
 aaM
-aaM
 aQS
 pBV
 aaM
@@ -56416,6 +56594,7 @@ sFP
 nkc
 nkc
 nkc
+bXB
 nkc
 nkc
 nkc
@@ -56423,7 +56602,6 @@ nkc
 aaM
 aaM
 aaM
-aaM
 aQS
 pBV
 aaM
@@ -56673,10 +56851,10 @@ dfV
 dfV
 dfV
 dfV
-dfV
-dfV
-wvP
-wvP
+aaM
+aaM
+aaM
+aaM
 aaM
 aaM
 aaM
@@ -56930,8 +57108,8 @@ dfV
 ahV
 ahV
 ahV
-ahV
-ahV
+aaM
+aaM
 aaM
 aaM
 aaM
@@ -60017,7 +60195,7 @@ aIK
 aJk
 aMn
 aOd
-aMn
+gvP
 bWB
 cQv
 dVC
@@ -61041,11 +61219,11 @@ apF
 aoz
 aGn
 aHk
-aFR
-aFR
-aFR
+suT
+cRP
+cRP
 aOq
-aNe
+uUa
 cfo
 dby
 dXR
@@ -61298,7 +61476,7 @@ apG
 aoz
 aGt
 aHl
-aFR
+cie
 aJM
 aNf
 aOr
@@ -61554,8 +61732,8 @@ aoA
 apH
 aDR
 aGu
-aJL
-aFR
+olC
+cie
 aJN
 aNg
 brB
@@ -62069,7 +62247,7 @@ apJ
 aEu
 aGw
 aIh
-aFR
+cie
 aKq
 aNi
 aOE
@@ -62583,8 +62761,8 @@ apM
 aEH
 aGy
 aIj
-aFP
-aFR
+fvg
+wxL
 aNy
 aPk
 bfN
@@ -67682,23 +67860,23 @@ aaM
 aaM
 aaM
 aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+cfL
+cfL
+cfL
+cfL
+cfL
+cfL
+cfL
+cfL
+cfL
+cfL
+cfL
+cfL
+cfL
+cfL
+cfL
+cfL
+cfL
 aaM
 aaM
 aaM
@@ -67939,23 +68117,23 @@ aaM
 aaM
 aaM
 aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+cfL
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+cfL
 aaM
 aaM
 aaM
@@ -68196,23 +68374,23 @@ aaM
 aaM
 aaM
 aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+cfL
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+cfL
 aaM
 aaM
 aaM
@@ -68453,23 +68631,23 @@ aaM
 aaM
 aaM
 aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+cfL
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+cfL
 aaM
 aaM
 aaM
@@ -68710,23 +68888,23 @@ aaM
 aaM
 aaM
 aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+cfL
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+cfL
 aaM
 aaM
 aaM
@@ -68968,22 +69146,22 @@ aCq
 aCq
 aCq
 aCq
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+cfL
 aaM
 aaM
 aaM
@@ -69225,22 +69403,22 @@ aJP
 aJP
 aKQ
 aCq
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+cfL
 aaM
 aaM
 aaM
@@ -69482,22 +69660,22 @@ aGI
 aGI
 aKR
 aCq
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+cfL
 aaM
 aaM
 aaM
@@ -69739,22 +69917,22 @@ aJQ
 aJQ
 aKS
 aCq
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+mbe
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+cfL
 aaM
 aaM
 aaM
@@ -69996,22 +70174,22 @@ aJP
 aJP
 aKQ
 aCq
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+cfL
 aaM
 aaM
 aaM
@@ -70253,22 +70431,22 @@ aGI
 aGI
 aKR
 aCq
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+cfL
 aaM
 aaM
 aaM
@@ -70510,22 +70688,22 @@ aJQ
 aJQ
 aKS
 aCq
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+cfL
 aaM
 aaM
 aaM
@@ -70767,22 +70945,22 @@ aDb
 aDb
 aDb
 aCq
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+cfL
 aaM
 aaM
 aaM
@@ -71024,22 +71202,22 @@ aJS
 aJS
 aKT
 aCq
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+cfL
 aaM
 aaM
 aaM
@@ -71281,22 +71459,22 @@ aGI
 aGI
 aKU
 aCq
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+cfL
 aaM
 aaM
 aaM
@@ -71538,22 +71716,22 @@ aJT
 aJT
 aKV
 aCq
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+euT
+cfL
 aaM
 aaM
 aaM
@@ -83609,7 +83787,7 @@ aWv
 aWW
 hHX
 aXg
-aXj
+wne
 wne
 wzE
 aJH
@@ -84123,7 +84301,7 @@ aWp
 aWX
 hgr
 hOe
-aXj
+wne
 wne
 wzE
 aJH
@@ -84876,7 +85054,7 @@ wne
 aDK
 sgv
 sYx
-hnF
+hyR
 aWu
 aVH
 kYV
diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm
index 214e0ebd46b..9141a508231 100644
--- a/maps/aurora/aurora-5_interstitial.dmm
+++ b/maps/aurora/aurora-5_interstitial.dmm
@@ -12312,6 +12312,7 @@
 	tag = "icon-warning_dust (SOUTHWEST)"
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/splatter,
 /turf/simulated/floor/airless{
 	icon_state = "asteroidplating"
 	},
@@ -12428,16 +12429,6 @@
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
 /area/security/forensics_office)
-"UQ" = (
-/obj/effect/floor_decal/industrial/warning/dust{
-	dir = 9
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/splatter,
-/turf/simulated/floor/airless{
-	icon_state = "asteroidplating"
-	},
-/area/mine/unexplored)
 "UR" = (
 /obj/structure/sign/nosmoking_2{
 	pixel_y = 32
@@ -12652,16 +12643,6 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/maintenance/medbay_interstitial)
-"Wr" = (
-/obj/effect/floor_decal/industrial/warning/dust{
-	dir = 5
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/splatter,
-/turf/simulated/floor/airless{
-	icon_state = "asteroidplating"
-	},
-/area/mine/unexplored)
 "Wu" = (
 /obj/structure/track{
 	icon_state = "track3"
@@ -43708,7 +43689,7 @@ xy
 Iv
 Iv
 UK
-UQ
+md
 Ny
 UA
 ab
@@ -44222,7 +44203,7 @@ xy
 Iv
 Iv
 UK
-Wr
+me
 wc
 ab
 ab
@@ -46523,8 +46504,8 @@ YS
 Sk
 YS
 YS
-aa
-aa
+mo
+mo
 UK
 vd
 nm
@@ -46779,9 +46760,9 @@ mo
 YS
 Ei
 YS
-aa
-aa
-aa
+mo
+mo
+mo
 UK
 nr
 CN
@@ -47036,9 +47017,9 @@ mo
 YS
 Ei
 YS
-aa
-aa
-aa
+mo
+mo
+mo
 UK
 FF
 qT
@@ -47293,9 +47274,9 @@ aa
 YS
 Ei
 YS
-aa
-aa
-aa
+mo
+mo
+mo
 UK
 YX
 oX
@@ -47550,9 +47531,9 @@ aa
 YS
 Ei
 YS
-aa
-aa
-aa
+mo
+mo
+mo
 UK
 PB
 Tu
@@ -47807,9 +47788,9 @@ aa
 YS
 Ei
 YS
-aa
-aa
-aa
+mo
+mo
+mo
 UK
 UK
 UK
@@ -48064,10 +48045,10 @@ aa
 YS
 Ei
 YS
-aa
-aa
-aa
-aa
+mo
+mo
+mo
+mo
 mo
 mo
 mo
@@ -48321,7 +48302,7 @@ aa
 YS
 Ei
 YS
-aa
+mo
 aa
 aa
 aa
@@ -48329,10 +48310,10 @@ aa
 aa
 aa
 mo
-aa
-aa
-aa
-aa
+mo
+mo
+mo
+mo
 mo
 ab
 ab
diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm
index 63694adfbdf..6b10e0bee23 100644
--- a/maps/aurora/aurora-6_surface.dmm
+++ b/maps/aurora/aurora-6_surface.dmm
@@ -256,7 +256,7 @@
 /area/maintenance/foresolar)
 "az" = (
 /obj/effect/shuttle_landmark/arrival/dock,
-/turf/unsimulated/chasm_mask,
+/turf/unsimulated/floor/asteroid/ash,
 /area/mine/explored)
 "aA" = (
 /obj/structure/grille,
@@ -900,7 +900,7 @@
 /area/tcommsat/computer)
 "bH" = (
 /obj/effect/shuttle_landmark/merc/dock,
-/turf/unsimulated/chasm_mask,
+/turf/unsimulated/floor/asteroid/ash,
 /area/mine/explored)
 "bI" = (
 /obj/machinery/power/port_gen/pacman,
@@ -1041,7 +1041,7 @@
 /area/hallway/secondary/entry/dock)
 "bU" = (
 /obj/effect/shuttle_landmark/merc_elite/green,
-/turf/unsimulated/chasm_mask,
+/turf/unsimulated/floor/asteroid/ash,
 /area/mine/explored)
 "bV" = (
 /obj/structure/window/reinforced{
@@ -1137,7 +1137,7 @@
 /area/maintenance/cargo/surface)
 "ce" = (
 /obj/effect/shuttle_landmark/admin/green,
-/turf/unsimulated/chasm_mask,
+/turf/unsimulated/floor/asteroid/ash,
 /area/mine/explored)
 "cf" = (
 /obj/structure/table/standard,
@@ -1606,7 +1606,7 @@
 /area/turret_protected/tcomsat)
 "de" = (
 /obj/effect/shuttle_landmark/burglar/surface,
-/turf/unsimulated/chasm_mask,
+/turf/unsimulated/floor/asteroid/ash,
 /area/mine/explored)
 "df" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -2158,7 +2158,7 @@
 /area/tcommsat/computer)
 "ec" = (
 /obj/effect/shuttle_landmark/ccia/dock,
-/turf/unsimulated/chasm_mask,
+/turf/unsimulated/floor/asteroid/ash,
 /area/mine/explored)
 "ed" = (
 /obj/structure/cable/green{
@@ -2429,6 +2429,14 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/entry/port)
+"eA" = (
+/obj/effect/floor_decal/industrial/warning/dust/corner{
+	dir = 1
+	},
+/turf/simulated/floor/airless{
+	icon_state = "asteroidplating"
+	},
+/area/mine/explored)
 "eB" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced{
@@ -2443,7 +2451,7 @@
 /area/hallway/secondary/entry/port)
 "eC" = (
 /obj/effect/shuttle_landmark/merchant/dock,
-/turf/unsimulated/chasm_mask,
+/turf/unsimulated/floor/asteroid/ash,
 /area/mine/explored)
 "eD" = (
 /obj/structure/grille,
@@ -5738,7 +5746,7 @@
 /area/bridge/levela/research_dock)
 "kG" = (
 /obj/effect/shuttle_landmark/ert/dock,
-/turf/unsimulated/chasm_mask,
+/turf/unsimulated/floor/asteroid/ash,
 /area/mine/explored)
 "kH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
@@ -6546,11 +6554,11 @@
 /area/maintenance/store)
 "me" = (
 /obj/effect/shuttle_landmark/supply/dock,
-/turf/unsimulated/floor/asteroid/ash,
+/turf/simulated/floor/airless/ceiling,
 /area/mine/explored)
 "mf" = (
 /obj/effect/shuttle_landmark/emergency/dock,
-/turf/unsimulated/chasm_mask,
+/turf/unsimulated/floor/asteroid/ash,
 /area/mine/explored)
 "mg" = (
 /obj/structure/closet,
@@ -7269,7 +7277,7 @@
 /area/hallway/secondary/entry/fore)
 "nx" = (
 /obj/effect/shuttle_landmark/merc_elite/merchant,
-/turf/unsimulated/chasm_mask,
+/turf/unsimulated/floor/asteroid/ash,
 /area/mine/explored)
 "ny" = (
 /obj/item/cell,
@@ -7412,6 +7420,9 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/entry/emergency)
+"nL" = (
+/turf/simulated/floor/airless/ceiling,
+/area/mine/explored)
 "nM" = (
 /obj/random/junk,
 /turf/unsimulated/chasm_mask,
@@ -9552,7 +9563,7 @@
 /area/shuttle/research)
 "rM" = (
 /obj/effect/shuttle_landmark/admin/command,
-/turf/unsimulated/chasm_mask,
+/turf/unsimulated/floor/asteroid/ash,
 /area/mine/explored)
 "rN" = (
 /obj/structure/table/standard,
@@ -10704,7 +10715,7 @@
 /area/shuttle/research)
 "uh" = (
 /obj/effect/shuttle_landmark/merc_elite/yellow,
-/turf/unsimulated/chasm_mask,
+/turf/unsimulated/floor/asteroid/ash,
 /area/mine/explored)
 "ui" = (
 /obj/machinery/door/firedoor,
@@ -13096,7 +13107,7 @@
 "yN" = (
 /obj/effect/shuttle_landmark/burglar/blue,
 /obj/effect/shuttle_landmark/distress/blue,
-/turf/unsimulated/chasm_mask,
+/turf/unsimulated/floor/asteroid/ash,
 /area/mine/explored)
 "yO" = (
 /obj/structure/window/reinforced{
@@ -13512,9 +13523,6 @@
 /turf/simulated/floor/plating,
 /area/maintenance/store)
 "zB" = (
-/obj/effect/floor_decal/industrial/warning/dust/corner{
-	dir = 4
-	},
 /turf/simulated/floor/airless{
 	icon_state = "asteroidplating"
 	},
@@ -18424,7 +18432,7 @@
 /area/hallway/secondary/entry/emergency)
 "In" = (
 /obj/effect/floor_decal/industrial/warning/dust/corner{
-	dir = 1
+	dir = 4
 	},
 /turf/simulated/floor/airless{
 	icon_state = "asteroidplating"
@@ -18865,7 +18873,7 @@
 /area/maintenance/portsolar)
 "Jc" = (
 /obj/effect/shuttle_landmark/skipjack/surface,
-/turf/unsimulated/chasm_mask,
+/turf/unsimulated/floor/asteroid/ash,
 /area/mine/explored)
 "Je" = (
 /obj/effect/floor_decal/corner/red,
@@ -21389,7 +21397,7 @@
 /area/hallway/secondary/entry/emergency)
 "Oh" = (
 /obj/effect/shuttle_landmark/distress/green,
-/turf/unsimulated/chasm_mask,
+/turf/unsimulated/floor/asteroid/ash,
 /area/mine/explored)
 "Oi" = (
 /obj/machinery/atmospherics/binary/pump/on{
@@ -23503,7 +23511,7 @@
 /area/tcommsat/entrance)
 "Sv" = (
 /obj/effect/shuttle_landmark/merc_elite/command,
-/turf/unsimulated/chasm_mask,
+/turf/unsimulated/floor/asteroid/ash,
 /area/mine/explored)
 "Sw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -24328,7 +24336,7 @@
 /area/crew_quarters/fitness)
 "TW" = (
 /obj/effect/shuttle_landmark/legion/merchant,
-/turf/unsimulated/chasm_mask,
+/turf/unsimulated/floor/asteroid/ash,
 /area/mine/explored)
 "TX" = (
 /turf/simulated/floor/plating,
@@ -47635,8 +47643,8 @@ ZZ
 ZZ
 ZZ
 ZZ
-zB
-aa
+ZZ
+In
 aa
 aa
 aa
@@ -47881,19 +47889,19 @@ aw
 Uy
 aw
 Yx
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-Xp
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
 zB
+Pr
 aa
 aa
 aa
@@ -48138,18 +48146,18 @@ aw
 Uy
 aw
 Yx
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
 Pr
 aa
 aa
@@ -48395,18 +48403,18 @@ aw
 Uy
 aw
 Yx
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
 Pr
 aa
 aa
@@ -48652,18 +48660,18 @@ aw
 Uy
 aw
 Yx
-aw
-aw
-aw
-aw
-aw
+nL
+nL
+nL
+nL
+nL
 me
-aw
-aw
-aw
-aw
-aw
-aw
+nL
+nL
+nL
+nL
+nL
+nL
 Pr
 aw
 aw
@@ -48909,18 +48917,18 @@ aw
 Uy
 aw
 Yx
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
 Pr
 aw
 aw
@@ -49166,18 +49174,18 @@ Is
 Uy
 aw
 Yx
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
 AX
 aw
 aw
@@ -49423,19 +49431,19 @@ aw
 Uy
 aw
 Yx
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-If
-In
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+nL
+zB
+Pr
 aa
 aa
 aa
@@ -49691,8 +49699,8 @@ Gz
 EN
 Zi
 Zi
-In
-aa
+Zi
+eA
 aa
 ag
 ag
@@ -49961,8 +49969,8 @@ ag
 ag
 aa
 aa
-aw
-aw
+aa
+aa
 aa
 aa
 aa
@@ -50218,18 +50226,18 @@ ag
 ag
 aa
 aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aw
+aw
 aw
 aw
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 aa
 aa
 aa
@@ -50475,18 +50483,18 @@ ag
 ag
 aa
 aa
+aa
+aa
+aa
+aa
+aa
+aw
+aw
+aw
+aw
+aw
 aw
 aw
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 aa
 aa
 aa
@@ -50732,18 +50740,18 @@ ag
 ag
 aa
 aa
+aa
+aa
+aa
+aa
+aa
+aw
+aw
+aw
 aw
 aw
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 Jc
-aa
+aw
 aa
 aa
 aa
@@ -50989,18 +50997,18 @@ ag
 ag
 aa
 aa
+aa
+aa
+aa
+aa
+aa
+aw
+aw
+aw
+aw
+aw
 aw
 aw
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 aa
 aa
 aa
@@ -51246,18 +51254,18 @@ ag
 aa
 aa
 aa
+aa
+aa
+aa
+aa
+aa
+aw
+aw
+aw
+aw
+aw
 aw
 aw
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 aa
 aa
 aa
@@ -51503,17 +51511,17 @@ ag
 aa
 aa
 aa
+aa
+aa
+aa
+aa
+aa
+aw
+aw
+aw
+aw
 aw
 aw
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 aa
 aa
 aa
@@ -51761,16 +51769,16 @@ aa
 aa
 aa
 aw
+aa
+aa
+aa
+aw
+aw
+aw
+aw
+aw
+aw
 aw
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 aa
 aa
 aa
@@ -52018,16 +52026,16 @@ aa
 aa
 aa
 aw
+aa
+aa
+aa
+aw
+aw
+aw
+aw
+aw
+aw
 aw
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 aa
 aa
 aa
@@ -52275,16 +52283,16 @@ aa
 aa
 aa
 aw
+aa
+aa
+aa
+aw
+aw
+aw
+aw
+aw
+aw
 aw
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 aa
 aa
 aa
@@ -52532,16 +52540,16 @@ aa
 aa
 aa
 aw
+aa
+aa
+aa
+aw
+aw
+aw
+aw
+aw
+aw
 aw
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 aa
 aa
 aa
@@ -52789,16 +52797,16 @@ aa
 aa
 aw
 aw
+aa
+aa
+aa
+aw
+aw
+aw
+aw
+aw
+aw
 aw
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 aa
 aa
 aa
@@ -53047,15 +53055,15 @@ aa
 aw
 aw
 aw
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
 aa
 aa
 aa
@@ -53304,15 +53312,15 @@ aw
 aw
 aw
 aw
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
 aa
 aa
 aa
@@ -53562,14 +53570,14 @@ aw
 aw
 UA
 UA
+aw
+aw
+aw
+aw
+aw
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+aw
+aw
 aa
 aa
 aa
@@ -53819,11 +53827,11 @@ aw
 UA
 UA
 UA
-aa
-aa
-aa
-aa
-aa
+aw
+aw
+aw
+aw
+aw
 aa
 aa
 aa
@@ -54075,12 +54083,12 @@ aw
 aw
 UA
 UA
-aa
-aa
-aa
-aa
-aa
-aa
+aw
+aw
+aw
+aw
+aw
+aw
 aa
 aa
 aa
@@ -54327,15 +54335,15 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
 aa
 aa
 aa
@@ -54586,13 +54594,13 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+aw
+aw
+aw
+aw
+aw
+aw
+aw
 aa
 aa
 aa
@@ -68931,7 +68939,7 @@ aw
 aw
 aw
 aw
-aa
+aw
 Sv
 aa
 aa