diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index b0f513e41d..aed08f5d8d 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -127842,8 +127842,7 @@
 	icon_state = "airlock_control_standby";
 	id = "chapelgun";
 	name = "Mass Driver Controller";
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /turf/open/floor/plasteel/dark,
 /area/chapel/office)
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 386ab45c6b..e900a4597c 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -24138,8 +24138,7 @@
 	dir = 8
 	},
 /obj/machinery/keycard_auth{
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /turf/open/floor/plasteel,
 /area/quartermaster/qm)
diff --git a/_maps/shuttles/arrival_box.dmm b/_maps/shuttles/arrival_box.dmm
index 4c63ce80b4..07644e5291 100644
--- a/_maps/shuttles/arrival_box.dmm
+++ b/_maps/shuttles/arrival_box.dmm
@@ -9,6 +9,7 @@
 /obj/machinery/door/airlock/titanium{
 	name = "Arrivals Shuttle Airlock"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/arrival)
 "d" = (
@@ -150,17 +151,21 @@
 	},
 /turf/open/floor/plating/airless,
 /area/shuttle/arrival)
+"B" = (
+/obj/machinery/porta_turret/centcom_shuttle,
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/arrival)
 "S" = (
 /turf/open/floor/mineral/titanium,
 /area/shuttle/arrival)
 
 (1,1,1) = {"
 a
-b
+B
 o
 d
 d
-b
+B
 a
 "}
 (2,1,1) = {"
diff --git a/_maps/shuttles/arrival_delta.dmm b/_maps/shuttles/arrival_delta.dmm
index 4f883436a6..62e30ef335 100644
--- a/_maps/shuttles/arrival_delta.dmm
+++ b/_maps/shuttles/arrival_delta.dmm
@@ -165,6 +165,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plasteel/white,
 /area/shuttle/arrival)
 "o" = (
@@ -449,6 +450,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/shuttle/arrival)
+"T" = (
+/obj/machinery/porta_turret/centcom_shuttle,
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/arrival)
 "U" = (
 /obj/machinery/computer{
 	dir = 1;
@@ -480,7 +485,7 @@
 
 (1,1,1) = {"
 a
-d
+T
 f
 g
 n
@@ -632,7 +637,7 @@ a
 "}
 (9,1,1) = {"
 a
-d
+T
 f
 g
 n
diff --git a/_maps/shuttles/arrival_omega.dmm b/_maps/shuttles/arrival_omega.dmm
index c4eeecbecf..f580149163 100644
--- a/_maps/shuttles/arrival_omega.dmm
+++ b/_maps/shuttles/arrival_omega.dmm
@@ -87,6 +87,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/arrival)
 "k" = (
diff --git a/_maps/shuttles/arrival_pubby.dmm b/_maps/shuttles/arrival_pubby.dmm
index c8e6427add..9932e9f3e8 100644
--- a/_maps/shuttles/arrival_pubby.dmm
+++ b/_maps/shuttles/arrival_pubby.dmm
@@ -9,6 +9,7 @@
 /obj/machinery/door/airlock/titanium{
 	name = "Arrivals Shuttle Airlock"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/arrival)
 "d" = (
@@ -139,16 +140,20 @@
 	},
 /turf/open/floor/plating/airless,
 /area/shuttle/arrival)
+"w" = (
+/obj/machinery/porta_turret/centcom_shuttle,
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/arrival)
 "C" = (
 /turf/open/floor/mineral/titanium,
 /area/shuttle/arrival)
 
 (1,1,1) = {"
 a
-b
+w
 m
 m
-b
+w
 a
 "}
 (2,1,1) = {"
diff --git a/_maps/shuttles/emergency_airless.dmm b/_maps/shuttles/emergency_airless.dmm
index b69a11ee7b..ac34c10387 100644
--- a/_maps/shuttles/emergency_airless.dmm
+++ b/_maps/shuttles/emergency_airless.dmm
@@ -28,7 +28,7 @@
 /turf/closed/wall,
 /area/shuttle/escape)
 "f" = (
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating,
 /area/shuttle/escape)
 "g" = (
 /obj/docking_port/mobile/emergency/shuttle_build{
@@ -39,32 +39,38 @@
 	preferred_direction = 2;
 	width = 30
 	},
-/turf/open/floor/plating/airless,
+/turf/closed/wall,
+/area/shuttle/escape)
+"h" = (
+/obj/machinery/computer/emergency_shuttle{
+	dir = 1
+	},
+/turf/open/floor/plating,
 /area/shuttle/escape)
 
 (1,1,1) = {"
 a
 c
 e
-f
-f
-f
-f
-f
-f
-f
-f
+e
+e
+e
+e
+e
+e
+e
+e
 g
-f
-f
-f
-f
-f
-f
-f
-f
-f
-f
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
 e
 e
 a
@@ -128,7 +134,7 @@ f
 f
 f
 f
-f
+e
 a
 a
 a
@@ -192,8 +198,8 @@ f
 f
 e
 e
-f
-f
+e
+e
 e
 e
 "}
@@ -257,7 +263,7 @@ f
 f
 f
 f
-f
+e
 "}
 (8,1,1) = {"
 c
@@ -288,7 +294,7 @@ f
 f
 f
 f
-f
+e
 "}
 (9,1,1) = {"
 b
@@ -318,8 +324,8 @@ f
 f
 f
 f
-f
-f
+h
+e
 "}
 (10,1,1) = {"
 b
@@ -350,7 +356,7 @@ f
 f
 f
 f
-f
+e
 "}
 (11,1,1) = {"
 c
@@ -381,7 +387,7 @@ f
 f
 f
 f
-f
+e
 "}
 (12,1,1) = {"
 b
@@ -412,7 +418,7 @@ f
 f
 f
 f
-f
+e
 "}
 (13,1,1) = {"
 b
@@ -471,8 +477,8 @@ f
 f
 e
 e
-f
-f
+e
+e
 e
 e
 "}
@@ -531,7 +537,7 @@ f
 f
 f
 f
-f
+e
 a
 a
 a
@@ -573,25 +579,25 @@ a
 a
 c
 e
-f
-f
-f
-f
-f
-f
-f
-f
-f
-f
-f
-f
-f
-f
-f
-f
-f
-f
-f
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
 e
 e
 a
diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm
index 7687241791..1d76177190 100644
--- a/_maps/shuttles/emergency_asteroid.dmm
+++ b/_maps/shuttles/emergency_asteroid.dmm
@@ -2,6 +2,13 @@
 "aa" = (
 /turf/template_noop,
 /area/template_noop)
+"ab" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/escape)
 "ac" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/escape)
@@ -16,17 +23,7 @@
 	},
 /turf/open/floor/mineral/titanium/yellow,
 /area/shuttle/escape)
-"ah" = (
-/obj/effect/spawner/structure/window/shuttle,
-/turf/open/floor/plating,
-/area/shuttle/escape)
-"ai" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock"
-	},
-/turf/open/floor/mineral/titanium,
-/area/shuttle/escape)
-"aj" = (
+"af" = (
 /obj/machinery/door/airlock/titanium{
 	name = "Emergency Shuttle Airlock"
 	},
@@ -37,8 +34,13 @@
 	name = "Asteroid emergency shuttle";
 	width = 28
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
+"ah" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/escape)
 "al" = (
 /obj/machinery/door/airlock/titanium{
 	name = "Emergency Shuttle Airlock";
@@ -618,7 +620,7 @@ aa
 aa
 "}
 (12,1,1) = {"
-ai
+ab
 at
 at
 at
@@ -708,7 +710,7 @@ aa
 aa
 "}
 (18,1,1) = {"
-aj
+af
 at
 at
 at
diff --git a/_maps/shuttles/emergency_backup.dmm b/_maps/shuttles/emergency_backup.dmm
index 6b59c17ec1..d7aedbb2f5 100644
--- a/_maps/shuttles/emergency_backup.dmm
+++ b/_maps/shuttles/emergency_backup.dmm
@@ -5,9 +5,10 @@
 	},
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape/backup)
-"c" = (
+"b" = (
 /obj/machinery/door/airlock/titanium,
 /obj/docking_port/mobile/emergency/backup,
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape/backup)
 "f" = (
@@ -55,7 +56,7 @@
 (1,1,1) = {"
 m
 m
-c
+b
 m
 m
 m
diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm
index 544e8891a4..084789bb90 100644
--- a/_maps/shuttles/emergency_bar.dmm
+++ b/_maps/shuttles/emergency_bar.dmm
@@ -10,15 +10,8 @@
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "ad" = (
-/obj/structure/table,
-/obj/machinery/chem_dispenser/drinks/beer{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/space/basic,
 /area/shuttle/escape)
 "ae" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
@@ -45,19 +38,14 @@
 	pixel_x = -4;
 	pixel_y = 6
 	},
+/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/storage/box/drinkingglasses,
 /turf/open/floor/carpet,
 /area/shuttle/escape)
 "aj" = (
-/obj/structure/table,
-/obj/machinery/chem_dispenser/drinks{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/shuttle/escape)
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/template_noop)
 "ak" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_y = 30
@@ -89,11 +77,8 @@
 /turf/open/floor/carpet,
 /area/shuttle/escape)
 "ap" = (
-/obj/machinery/computer/security{
-	dir = 8
-	},
-/turf/open/floor/carpet,
-/area/shuttle/escape)
+/turf/closed/wall/mineral/titanium,
+/area/template_noop)
 "aq" = (
 /obj/machinery/computer/crew{
 	dir = 4
@@ -122,17 +107,53 @@
 	pixel_x = 6;
 	pixel_y = -24
 	},
-/obj/structure/table/wood/poker,
-/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
 /obj/machinery/light,
 /turf/open/floor/carpet,
 /area/shuttle/escape)
 "au" = (
-/obj/machinery/computer/communications{
-	dir = 8
+/obj/structure/table,
+/obj/item/storage/backpack/duffelbag/med/surgery,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/escape)
+"av" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Airlock";
+	req_access_txt = "2"
 	},
-/turf/open/floor/carpet,
+/obj/structure/fans/tiny,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"aw" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/docking_port/mobile/emergency{
+	name = "The Emergency Escape Bar"
+	},
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"ax" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"ay" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel/freezer,
 /area/shuttle/escape)
 "az" = (
 /obj/machinery/door/airlock/public/glass{
@@ -145,6 +166,12 @@
 /obj/machinery/status_display/evac,
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/escape)
+"aB" = (
+/obj/machinery/computer/security{
+	dir = 8
+	},
+/turf/open/floor/carpet,
+/area/shuttle/escape)
 "aC" = (
 /obj/structure/chair/comfy/shuttle,
 /turf/open/floor/mineral/plastitanium/red/brig,
@@ -183,10 +210,10 @@
 /turf/open/floor/plasteel/grimy,
 /area/shuttle/escape)
 "aG" = (
-/obj/structure/chair/stool{
-	can_buckle = 1
+/obj/machinery/computer/communications{
+	dir = 8
 	},
-/turf/open/floor/plasteel/grimy,
+/turf/open/floor/carpet,
 /area/shuttle/escape)
 "aH" = (
 /obj/machinery/flasher{
@@ -220,11 +247,10 @@
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
 "aK" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock";
-	req_access_txt = "2"
+/obj/structure/chair/stool{
+	can_buckle = 1
 	},
-/turf/open/floor/mineral/plastitanium/red/brig,
+/turf/open/floor/plasteel/grimy,
 /area/shuttle/escape)
 "aL" = (
 /obj/structure/extinguisher_cabinet{
@@ -267,6 +293,12 @@
 	},
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
+"aQ" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/plasteel/grimy,
+/area/shuttle/escape)
 "aR" = (
 /obj/structure/table/wood/bar{
 	boot_dir = 8
@@ -278,6 +310,15 @@
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
 "aS" = (
+/obj/structure/table/wood/bar,
+/obj/item/instrument/guitar,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"aT" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 27
 	},
@@ -290,19 +331,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
-"aT" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock"
-	},
-/obj/docking_port/mobile/emergency{
-	name = "The Emergency Escape Bar"
-	},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/shuttle/escape)
 "aU" = (
 /obj/effect/turf_decal/tile/bar,
 /obj/effect/turf_decal/tile/bar{
@@ -311,6 +339,17 @@
 /mob/living/simple_animal/hostile/alien/maid/barmaid,
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
+"aV" = (
+/obj/structure/table,
+/obj/machinery/chem_dispenser/drinks/beer{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
 "aW" = (
 /obj/structure/chair/wood/normal,
 /turf/open/floor/plasteel/grimy,
@@ -341,6 +380,17 @@
 /obj/effect/spawner/lootdrop/gambling,
 /turf/open/floor/plasteel/grimy,
 /area/shuttle/escape)
+"bb" = (
+/obj/structure/table,
+/obj/machinery/chem_dispenser/drinks{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
 "bc" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -369,10 +419,29 @@
 	},
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
-"bg" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock"
+"bf" = (
+/obj/structure/table,
+/obj/item/storage/box/drinkingglasses,
+/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/storage/fancy/cigarettes/cigars/havana,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
 	},
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"bg" = (
+/obj/item/twohanded/required/kirbyplants{
+	icon_state = "plant-10"
+	},
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"bh" = (
+/obj/machinery/vending/cigarette,
 /obj/effect/turf_decal/tile/bar,
 /obj/effect/turf_decal/tile/bar{
 	dir = 1
@@ -382,13 +451,24 @@
 "bi" = (
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
+"bj" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plasteel/freezer,
+/area/shuttle/escape)
 "bk" = (
-/obj/machinery/vending/cigarette,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
+/obj/machinery/sleeper{
+	dir = 8
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/escape)
+"bl" = (
+/obj/machinery/sleeper{
+	dir = 8
+	},
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "bm" = (
 /obj/machinery/door/airlock{
@@ -402,10 +482,13 @@
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/escape)
 "bo" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock"
+/obj/structure/table,
+/obj/item/storage/firstaid/fire,
+/obj/item/storage/firstaid/brute{
+	pixel_x = 4;
+	pixel_y = 4
 	},
-/turf/open/floor/plasteel/freezer,
+/turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "bp" = (
 /turf/open/floor/plasteel/freezer,
@@ -417,10 +500,8 @@
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "br" = (
-/obj/machinery/sleeper{
-	dir = 8
-	},
-/turf/open/floor/mineral/titanium,
+/obj/machinery/computer/card,
+/turf/open/floor/carpet,
 /area/shuttle/escape)
 "bs" = (
 /obj/machinery/door/airlock{
@@ -465,15 +546,12 @@
 	},
 /turf/open/floor/plasteel/freezer,
 /area/shuttle/escape)
-"bz" = (
-/obj/structure/table,
-/obj/item/circular_saw,
-/obj/item/hemostat,
-/obj/item/retractor,
-/obj/item/scalpel,
-/obj/item/surgicaldrill,
-/obj/item/cautery,
-/turf/open/floor/mineral/titanium,
+"bA" = (
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/bar,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "bC" = (
 /obj/structure/window/reinforced{
@@ -486,10 +564,6 @@
 /obj/structure/shuttle/engine/propulsion,
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
-"bF" = (
-/obj/effect/spawner/structure/window/shuttle,
-/turf/open/floor/plasteel/freezer,
-/area/shuttle/escape)
 "bG" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -505,15 +579,6 @@
 "bH" = (
 /turf/open/floor/plasteel/grimy,
 /area/shuttle/escape)
-"bI" = (
-/obj/structure/table/wood/bar,
-/obj/item/instrument/guitar,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/shuttle/escape)
 "bJ" = (
 /obj/structure/table/wood/bar,
 /obj/item/storage/fancy/donut_box,
@@ -535,17 +600,6 @@
 	},
 /turf/open/floor/plasteel/grimy,
 /area/shuttle/escape)
-"bN" = (
-/obj/structure/table,
-/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/storage/fancy/cigarettes/cigars/havana,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/shuttle/escape)
 "bO" = (
 /obj/structure/table/wood/bar,
 /obj/item/folder/red,
@@ -584,25 +638,6 @@
 	},
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
-"bT" = (
-/obj/item/twohanded/required/kirbyplants{
-	icon_state = "plant-10"
-	},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/shuttle/escape)
-"bU" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/fire,
-/obj/item/storage/firstaid/brute{
-	pixel_x = 4;
-	pixel_y = 4
-	},
-/turf/open/floor/mineral/titanium,
-/area/shuttle/escape)
 "bV" = (
 /obj/structure/table/wood/bar{
 	boot_dir = 8
@@ -616,12 +651,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
-"bW" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/plasteel/grimy,
-/area/shuttle/escape)
 "bX" = (
 /obj/machinery/light{
 	dir = 8
@@ -658,15 +687,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
-"cb" = (
-/obj/machinery/sleeper{
-	dir = 8
-	},
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/mineral/titanium,
-/area/shuttle/escape)
 
 (1,1,1) = {"
 aa
@@ -676,17 +696,17 @@ aa
 ab
 ab
 ab
-aK
+av
 ab
-aT
+aw
 ab
 ac
 ac
 ac
 ab
-bg
+ax
 ab
-bo
+ay
 ab
 ab
 ab
@@ -703,11 +723,11 @@ aH
 aL
 ab
 bY
-bH
-aZ
-bc
-aZ
-bH
+bA
+bA
+bA
+bA
+bA
 bZ
 ab
 bp
@@ -727,11 +747,11 @@ aI
 aM
 ab
 aE
-aW
-ba
-bL
-bO
-bQ
+bH
+aZ
+bc
+aZ
+bH
 bR
 ab
 bp
@@ -752,9 +772,9 @@ aM
 ab
 aE
 aW
-bJ
-bM
-bP
+ba
+bL
+bO
 bQ
 aE
 ab
@@ -775,11 +795,11 @@ aJ
 ac
 ae
 aE
-bH
-bK
-bH
-bK
-bH
+aW
+bJ
+bM
+bP
+bQ
 aE
 aA
 bp
@@ -799,11 +819,11 @@ aE
 aE
 bX
 aE
-aE
-aE
-aE
-aE
-aE
+bH
+bK
+bH
+bK
+bH
 aE
 bm
 bp
@@ -814,10 +834,34 @@ bE
 "}
 (7,1,1) = {"
 ac
-ag
+br
 an
 an
 az
+bA
+bA
+bA
+bA
+bA
+bA
+bA
+bA
+bA
+bA
+bA
+ae
+ae
+ab
+ab
+bC
+bE
+"}
+(8,1,1) = {"
+ad
+ag
+an
+an
+ab
 aE
 aE
 aN
@@ -830,13 +874,13 @@ aN
 aE
 ca
 ae
-ab
-ab
-ab
+bw
+bi
+au
 bC
 bE
 "}
-(8,1,1) = {"
+(9,1,1) = {"
 ac
 ai
 ao
@@ -855,16 +899,16 @@ aN
 aE
 bn
 bi
-bw
-bz
+bi
+bi
 bC
 bE
 "}
-(9,1,1) = {"
-ab
-ae
+(10,1,1) = {"
 ap
-au
+ae
+aB
+aG
 ab
 aF
 bH
@@ -884,51 +928,51 @@ bS
 bC
 bE
 "}
-(10,1,1) = {"
-aa
-ab
-ab
-ab
-ab
-aG
-bW
-bI
-aS
-ad
-aY
-aj
-bN
-be
-bT
-bk
-bF
-br
-cb
-bU
-ab
-ab
-"}
 (11,1,1) = {"
 aa
+ap
+ap
+ap
+ab
+aK
+aQ
+aS
+aT
+aV
+aY
+bb
+bf
+be
+bg
+bh
+bj
+bk
+bl
+bo
+ab
+ap
+"}
+(12,1,1) = {"
 aa
 aa
 aa
-ab
-ac
-ab
-ac
-ab
-ab
-ab
-ac
-ac
-ac
-ab
-ab
-ab
-ac
-ab
-ac
-ab
+aa
+ap
+aj
+ap
+aj
+ap
+ap
+ap
+aj
+aj
+aj
+ap
+ap
+ap
+aj
+ap
+aj
+ap
 aa
 "}
diff --git a/_maps/shuttles/emergency_birdboat.dmm b/_maps/shuttles/emergency_birdboat.dmm
index 940d655f43..43a6a85bf7 100644
--- a/_maps/shuttles/emergency_birdboat.dmm
+++ b/_maps/shuttles/emergency_birdboat.dmm
@@ -112,6 +112,11 @@
 /obj/machinery/light,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
+"w" = (
+/obj/machinery/door/airlock/titanium,
+/obj/structure/fans/tiny,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/escape)
 "x" = (
 /obj/structure/table,
 /obj/machinery/recharger{
@@ -197,6 +202,7 @@
 	width = 14;
 	name = "Birdboat emergency escape shuttle"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "L" = (
@@ -574,7 +580,7 @@ p
 u
 b
 b
-G
+w
 K
 b
 b
diff --git a/_maps/shuttles/emergency_box.dmm b/_maps/shuttles/emergency_box.dmm
index 19c1bf7720..d65da0b3f3 100644
--- a/_maps/shuttles/emergency_box.dmm
+++ b/_maps/shuttles/emergency_box.dmm
@@ -2,6 +2,14 @@
 "aa" = (
 /turf/template_noop,
 /area/template_noop)
+"ab" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Airlock";
+	req_access_txt = "2"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
 "ac" = (
 /obj/effect/spawner/structure/window/shuttle,
 /turf/open/floor/plating,
@@ -37,6 +45,23 @@
 /obj/item/storage/firstaid/fire,
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
+"aj" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/docking_port/mobile/emergency{
+	name = "Box emergency shuttle"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"ak" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/escape)
 "al" = (
 /obj/machinery/computer/atmos_alert{
 	dir = 4
@@ -171,13 +196,6 @@
 	},
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
-"aI" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock";
-	req_access_txt = "2"
-	},
-/turf/open/floor/mineral/plastitanium/red/brig,
-/area/shuttle/escape)
 "aJ" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 1
@@ -192,15 +210,6 @@
 /obj/structure/table,
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
-"aP" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock"
-	},
-/obj/docking_port/mobile/emergency{
-	name = "Box emergency shuttle"
-	},
-/turf/open/floor/plating,
-/area/shuttle/escape)
 "aQ" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -5;
@@ -235,12 +244,6 @@
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
-"aV" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock"
-	},
-/turf/open/floor/plating,
-/area/shuttle/escape)
 "aW" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -30
@@ -375,17 +378,17 @@ aa
 ad
 ad
 ad
-aI
+ab
 ad
-aP
+aj
 ad
 ac
 ac
 ac
 ad
-aV
+ak
 ad
-aV
+ak
 ad
 ad
 ad
diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm
index 47ad888f11..aa9ae0cc39 100644
--- a/_maps/shuttles/emergency_cere.dmm
+++ b/_maps/shuttles/emergency_cere.dmm
@@ -507,6 +507,35 @@
 /obj/item/book/manual/wiki/security_space_law,
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
+"aW" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Emergency Shuttle Airlock";
+	req_access_txt = "2"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"aX" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/docking_port/mobile/emergency{
+	dheight = 0;
+	dwidth = 15;
+	height = 20;
+	name = "Cere emergency shuttle";
+	width = 42
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"aY" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/escape)
 "aZ" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -639,13 +668,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
-"bv" = (
-/obj/machinery/door/airlock/shuttle{
-	name = "Emergency Shuttle Airlock";
-	req_access_txt = "2"
-	},
-/turf/open/floor/plating,
-/area/shuttle/escape)
 "bw" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 1
@@ -696,19 +718,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
-"bE" = (
-/obj/machinery/door/airlock/shuttle{
-	name = "Emergency Shuttle Airlock"
-	},
-/obj/docking_port/mobile/emergency{
-	dheight = 0;
-	dwidth = 15;
-	height = 20;
-	name = "Cere emergency shuttle";
-	width = 42
-	},
-/turf/open/floor/plating,
-/area/shuttle/escape)
 "bF" = (
 /obj/structure/closet/crate/bin,
 /obj/effect/turf_decal/tile/neutral{
@@ -936,12 +945,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
-"bY" = (
-/obj/machinery/door/airlock/shuttle{
-	name = "Emergency Shuttle Airlock"
-	},
-/turf/open/floor/plating,
-/area/shuttle/escape)
 "bZ" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -28
@@ -1762,17 +1765,17 @@ ab
 ab
 ab
 ab
-bv
+aW
 ab
-bE
+aX
 ab
 aa
 aa
 aa
 ab
-bY
+aY
 ab
-bY
+aY
 ab
 aa
 aa
diff --git a/_maps/shuttles/emergency_clown.dmm b/_maps/shuttles/emergency_clown.dmm
index d2329af155..2c5388a0e5 100644
--- a/_maps/shuttles/emergency_clown.dmm
+++ b/_maps/shuttles/emergency_clown.dmm
@@ -117,6 +117,23 @@
 	},
 /turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
+"aw" = (
+/obj/machinery/door/airlock/bananium{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/docking_port/mobile/emergency{
+	name = "Snappop(tm)!"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"ax" = (
+/obj/machinery/door/airlock/bananium{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/escape)
 "ay" = (
 /obj/structure/table,
 /obj/item/storage/firstaid/fire,
@@ -137,6 +154,8 @@
 /obj/machinery/door/airlock/bananium/glass{
 	name = "Emergency Shuttle Greentext"
 	},
+/obj/structure/fans/tiny,
+/obj/structure/barricade/wooden/crude,
 /turf/open/floor/bluespace,
 /area/shuttle/escape)
 "aC" = (
@@ -170,15 +189,6 @@
 /obj/item/toy/sword,
 /turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
-"aI" = (
-/obj/machinery/door/airlock/bananium{
-	name = "Emergency Shuttle Airlock"
-	},
-/obj/docking_port/mobile/emergency{
-	name = "Snappop(tm)!"
-	},
-/turf/open/floor/plating,
-/area/shuttle/escape)
 "aJ" = (
 /obj/item/toy/snappop/phoenix,
 /obj/machinery/light/small{
@@ -233,12 +243,6 @@
 	},
 /turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
-"aQ" = (
-/obj/machinery/door/airlock/bananium{
-	name = "Emergency Shuttle Airlock"
-	},
-/turf/open/floor/plating,
-/area/shuttle/escape)
 "aR" = (
 /obj/item/toy/snappop/phoenix,
 /obj/machinery/light/small,
@@ -354,15 +358,15 @@ ab
 ab
 ab
 ab
-aI
+aw
 ab
 ac
 ac
 ac
 ab
-aQ
+ax
 ab
-aQ
+ax
 ab
 ab
 ab
diff --git a/_maps/shuttles/emergency_cramped.dmm b/_maps/shuttles/emergency_cramped.dmm
index 863b5bd088..08ac96bf69 100644
--- a/_maps/shuttles/emergency_cramped.dmm
+++ b/_maps/shuttles/emergency_cramped.dmm
@@ -11,6 +11,7 @@
 	name = "Emergency Shuttle Airlock";
 	req_access_txt = "2"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "d" = (
@@ -64,6 +65,7 @@
 	name = "Secure Transport Vessel 5";
 	width = 14
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "l" = (
@@ -97,6 +99,7 @@
 /obj/machinery/door/airlock/titanium{
 	name = "Emergency Shuttle Airlock"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "r" = (
diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm
index 471232a295..8047130689 100644
--- a/_maps/shuttles/emergency_delta.dmm
+++ b/_maps/shuttles/emergency_delta.dmm
@@ -490,6 +490,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "aP" = (
@@ -562,6 +563,7 @@
 	preferred_direction = 2;
 	port_direction = 4
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "aX" = (
@@ -796,6 +798,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "bw" = (
diff --git a/_maps/shuttles/emergency_discoinferno.dmm b/_maps/shuttles/emergency_discoinferno.dmm
index 025a7cf743..e142208e12 100644
--- a/_maps/shuttles/emergency_discoinferno.dmm
+++ b/_maps/shuttles/emergency_discoinferno.dmm
@@ -83,6 +83,7 @@
 /obj/machinery/door/airlock/gold{
 	req_access_txt = "19"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/mineral/gold,
 /area/shuttle/escape)
 "q" = (
@@ -110,6 +111,7 @@
 	heat_proof = 1;
 	resistance_flags = 2
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/mineral/plasma,
 /area/shuttle/escape)
 "v" = (
@@ -118,6 +120,7 @@
 /area/shuttle/escape)
 "w" = (
 /obj/machinery/door/airlock/gold,
+/obj/structure/fans/tiny,
 /turf/open/floor/wood,
 /area/shuttle/escape)
 "x" = (
@@ -220,6 +223,11 @@
 "O" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/shuttle/escape)
+"P" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel/elevatorshaft,
+/area/shuttle/escape)
 
 (1,1,1) = {"
 a
@@ -262,7 +270,7 @@ r
 r
 r
 q
-c
+P
 x
 C
 I
@@ -274,7 +282,7 @@ b
 b
 h
 m
-c
+P
 r
 r
 r
@@ -286,7 +294,7 @@ r
 r
 r
 r
-c
+P
 x
 D
 D
@@ -298,7 +306,7 @@ c
 d
 i
 i
-c
+P
 r
 r
 r
@@ -310,7 +318,7 @@ j
 r
 r
 r
-c
+P
 x
 x
 x
@@ -322,7 +330,7 @@ c
 e
 j
 j
-c
+P
 r
 r
 s
@@ -334,7 +342,7 @@ j
 s
 r
 r
-c
+P
 y
 E
 y
@@ -346,7 +354,7 @@ c
 f
 j
 n
-c
+P
 r
 j
 j
@@ -358,7 +366,7 @@ t
 j
 j
 r
-c
+P
 z
 F
 J
@@ -382,7 +390,7 @@ j
 s
 r
 r
-c
+P
 y
 G
 y
@@ -394,7 +402,7 @@ c
 g
 k
 k
-c
+P
 r
 r
 r
@@ -406,7 +414,7 @@ j
 r
 r
 r
-c
+P
 x
 x
 x
@@ -418,7 +426,7 @@ b
 b
 l
 o
-c
+P
 r
 r
 r
@@ -430,7 +438,7 @@ r
 r
 r
 r
-c
+P
 A
 x
 K
@@ -454,7 +462,7 @@ r
 r
 r
 q
-c
+P
 B
 H
 L
diff --git a/_maps/shuttles/emergency_gorilla.dmm b/_maps/shuttles/emergency_gorilla.dmm
new file mode 100644
index 0000000000..34e8216a00
--- /dev/null
+++ b/_maps/shuttles/emergency_gorilla.dmm
@@ -0,0 +1,630 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/turf/template_noop,
+/area/template_noop)
+"ab" = (
+/turf/closed/wall/rust,
+/area/shuttle/escape)
+"ac" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plasteel/elevatorshaft,
+/area/shuttle/escape)
+"ad" = (
+/turf/closed/wall,
+/area/shuttle/escape)
+"ae" = (
+/turf/open/floor/holofloor/wood,
+/area/shuttle/escape)
+"af" = (
+/obj/machinery/computer/emergency_shuttle,
+/turf/open/floor/holofloor/wood,
+/area/shuttle/escape)
+"ag" = (
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/holofloor/wood,
+/area/shuttle/escape)
+"ah" = (
+/obj/machinery/computer/atmos_alert{
+	dir = 4
+	},
+/turf/open/floor/holofloor/wood,
+/area/shuttle/escape)
+"ai" = (
+/obj/structure/chair/office/dark,
+/turf/open/floor/holofloor/wood,
+/area/shuttle/escape)
+"aj" = (
+/obj/structure/chair/comfy/brown{
+	dir = 1
+	},
+/turf/open/floor/holofloor/wood,
+/area/shuttle/escape)
+"ak" = (
+/obj/item/chair,
+/turf/open/floor/holofloor/wood,
+/area/shuttle/escape)
+"al" = (
+/obj/machinery/computer/security{
+	dir = 8
+	},
+/turf/open/floor/holofloor/wood,
+/area/shuttle/escape)
+"am" = (
+/obj/machinery/computer/crew{
+	dir = 4
+	},
+/turf/open/floor/holofloor/wood,
+/area/shuttle/escape)
+"an" = (
+/obj/machinery/light,
+/turf/open/floor/holofloor/wood,
+/area/shuttle/escape)
+"ao" = (
+/obj/machinery/computer/communications{
+	dir = 8
+	},
+/turf/open/floor/holofloor/wood,
+/area/shuttle/escape)
+"ap" = (
+/obj/machinery/status_display/evac,
+/turf/closed/wall/rust,
+/area/shuttle/escape)
+"aq" = (
+/obj/machinery/door/airlock/gold{
+	req_access_txt = "19"
+	},
+/turf/open/floor/holofloor/wood,
+/area/shuttle/escape)
+"ar" = (
+/obj/structure/urinal{
+	pixel_y = 31
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"as" = (
+/obj/structure/chair/comfy/shuttle,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"at" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"au" = (
+/obj/machinery/deepfryer,
+/turf/open/floor/plasteel/shuttle,
+/area/shuttle/escape)
+"av" = (
+/turf/open/floor/plasteel/shuttle,
+/area/shuttle/escape)
+"aw" = (
+/obj/structure/closet/crate/freezer/blood,
+/turf/open/floor/plasteel/freezer,
+/area/shuttle/escape)
+"ax" = (
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"ay" = (
+/obj/machinery/flasher{
+	id = "shuttle_flasher";
+	pixel_x = -24;
+	pixel_y = 6
+	},
+/obj/machinery/button/flasher{
+	id = "shuttle_flasher";
+	pixel_x = -24;
+	pixel_y = -6
+	},
+/obj/machinery/light/small{
+	brightness = 3;
+	dir = 8
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"az" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"aA" = (
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"aB" = (
+/obj/machinery/door/airlock/security/glass{
+	name = "Emergency Shuttle Brig";
+	req_access_txt = "2"
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/escape)
+"aC" = (
+/turf/open/floor/plasteel/freezer,
+/area/shuttle/escape)
+"aD" = (
+/obj/structure/closet,
+/turf/open/floor/plasteel/freezer,
+/area/shuttle/escape)
+"aE" = (
+/obj/machinery/door/airlock/security/glass{
+	name = "Emergency Shuttle Airlock";
+	req_access_txt = "2"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"aF" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"aG" = (
+/obj/effect/decal/cleanable/blood/splatter,
+/turf/open/floor/plasteel/freezer,
+/area/shuttle/escape)
+"aH" = (
+/obj/structure/noticeboard,
+/turf/closed/wall/rust,
+/area/shuttle/escape)
+"aI" = (
+/obj/docking_port/mobile/emergency{
+	height = 15;
+	name = "Box emergency shuttle"
+	},
+/obj/machinery/door/airlock/security/glass{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"aJ" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -5;
+	pixel_y = 30
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"aK" = (
+/obj/structure/closet/crate/trashcart,
+/turf/open/floor/plasteel/shuttle,
+/area/shuttle/escape)
+"aL" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/shuttle,
+/area/shuttle/escape)
+"aM" = (
+/obj/structure/reagent_dispensers/keg/mead,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"aN" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"aO" = (
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/plasteel/shuttle,
+/area/shuttle/escape)
+"aP" = (
+/obj/structure/fluff/broken_flooring,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"aQ" = (
+/obj/structure/closet/crate/freezer,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"aR" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/open/floor/plasteel/shuttle,
+/area/shuttle/escape)
+"aS" = (
+/obj/effect/decal/cleanable/vomit/old,
+/turf/open/floor/plasteel/shuttle,
+/area/shuttle/escape)
+"aT" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/open/floor/plasteel/shuttle,
+/area/shuttle/escape)
+"aU" = (
+/obj/machinery/door/airlock/security/glass{
+	name = "Emergency Shuttle Airlock"
+	},
+/turf/open/floor/plasteel/freezer,
+/area/shuttle/escape)
+"aV" = (
+/obj/effect/decal/cleanable/blood/innards,
+/turf/open/floor/plasteel/freezer,
+/area/shuttle/escape)
+"aW" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"aX" = (
+/obj/structure/closet/crate/freezer/surplus_limbs,
+/turf/open/floor/plasteel/freezer,
+/area/shuttle/escape)
+"aY" = (
+/obj/effect/decal/cleanable/oil,
+/turf/open/floor/plasteel/freezer,
+/area/shuttle/escape)
+"aZ" = (
+/obj/structure/closet/crate/freezer,
+/turf/open/floor/plasteel/freezer,
+/area/shuttle/escape)
+"ba" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/machinery/light/small{
+	brightness = 3;
+	dir = 8
+	},
+/turf/open/floor/plasteel/shuttle,
+/area/shuttle/escape)
+"bb" = (
+/obj/machinery/door/airlock/security/glass{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"bc" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_y = -30
+	},
+/turf/open/floor/plasteel/shuttle,
+/area/shuttle/escape)
+"bd" = (
+/obj/structure/closet/toolcloset,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"be" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/structure/chair/sofa/right,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"bf" = (
+/obj/structure/chair/sofa,
+/mob/living/simple_animal/hostile/gorilla,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"bg" = (
+/obj/structure/chair/sofa,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"bh" = (
+/obj/structure/chair/sofa,
+/mob/living/simple_animal/hostile/gorilla,
+/turf/open/floor/plasteel/shuttle,
+/area/shuttle/escape)
+"bi" = (
+/obj/structure/chair/sofa/left,
+/mob/living/simple_animal/hostile/gorilla,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"bj" = (
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"bk" = (
+/obj/machinery/door/airlock/security/glass{
+	name = "Emergency Shuttle Brig";
+	req_access_txt = "2"
+	},
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"bl" = (
+/mob/living/simple_animal/hostile/gorilla,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"bm" = (
+/obj/effect/decal/cleanable/blood/gibs/limb,
+/mob/living/simple_animal/hostile/gorilla,
+/turf/open/floor/plasteel/shuttle,
+/area/shuttle/escape)
+"bn" = (
+/obj/structure/reagent_dispensers/keg/semen,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"bo" = (
+/obj/structure/closet/crate/freezer/surplus_limbs,
+/turf/open/floor/plasteel/shuttle,
+/area/shuttle/escape)
+"bp" = (
+/obj/structure/closet/crate/freezer/surplus_limbs,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"bq" = (
+/mob/living/simple_animal/hostile/gorilla,
+/turf/open/floor/plasteel/shuttle,
+/area/shuttle/escape)
+"br" = (
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/plasteel/shuttle,
+/area/shuttle/escape)
+"bs" = (
+/obj/structure/shuttle/engine/heater,
+/obj/structure/window/plasma/reinforced{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/escape)
+"bt" = (
+/turf/template_noop,
+/area/space)
+"bu" = (
+/obj/structure/shuttle/engine/propulsion,
+/turf/open/floor/plating/airless,
+/area/shuttle/escape)
+
+(1,1,1) = {"
+aa
+aa
+aa
+aa
+ab
+ab
+ab
+aE
+ab
+aI
+ab
+at
+at
+at
+ab
+bb
+ab
+bb
+ab
+ad
+ad
+bt
+"}
+(2,1,1) = {"
+aa
+ad
+ab
+ad
+ab
+ar
+ay
+aA
+aH
+ax
+aN
+aR
+aW
+aR
+ba
+av
+ad
+ax
+ax
+bo
+ab
+ab
+"}
+(3,1,1) = {"
+ab
+ab
+ah
+am
+ap
+as
+az
+aF
+ab
+aJ
+av
+aS
+av
+ax
+av
+bc
+ab
+bd
+bj
+bp
+bs
+bu
+"}
+(4,1,1) = {"
+ac
+ae
+ai
+ae
+ab
+as
+aA
+aF
+ad
+aK
+av
+aP
+av
+av
+ax
+ab
+ad
+ab
+bk
+ab
+bs
+bu
+"}
+(5,1,1) = {"
+ac
+ae
+ae
+ak
+ab
+at
+aB
+at
+ab
+aL
+av
+aT
+aT
+aT
+aT
+ac
+ac
+be
+aN
+bl
+bs
+bu
+"}
+(6,1,1) = {"
+ac
+af
+aj
+an
+ad
+au
+av
+av
+av
+av
+aO
+ab
+ab
+ad
+ab
+ad
+ad
+bf
+bl
+bq
+bs
+bu
+"}
+(7,1,1) = {"
+ac
+ae
+ae
+ae
+aq
+av
+ax
+av
+av
+aM
+aP
+aU
+aC
+aX
+aD
+ad
+ad
+bg
+bm
+bn
+bs
+bu
+"}
+(8,1,1) = {"
+ac
+ag
+ak
+ae
+ab
+ab
+ad
+ad
+ab
+ad
+ab
+ab
+aC
+aY
+aX
+ad
+ad
+bh
+aP
+bq
+bs
+bu
+"}
+(9,1,1) = {"
+ab
+ad
+al
+ao
+ab
+aw
+aC
+ax
+aG
+aC
+aD
+aC
+ax
+aZ
+ax
+ac
+ac
+bg
+bl
+br
+bs
+bu
+"}
+(10,1,1) = {"
+aa
+ad
+ab
+ad
+ab
+ax
+aD
+aG
+aD
+aC
+aQ
+aV
+aC
+aX
+aD
+ad
+ab
+bi
+bn
+bl
+ab
+ab
+"}
+(11,1,1) = {"
+aa
+aa
+aa
+aa
+ab
+ab
+ad
+ab
+ab
+ad
+ab
+ad
+ab
+ad
+ad
+ab
+ad
+ab
+ab
+ad
+ad
+aa
+"}
diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm
index 1fd515fb76..6942a6797d 100644
--- a/_maps/shuttles/emergency_luxury.dmm
+++ b/_maps/shuttles/emergency_luxury.dmm
@@ -3,20 +3,16 @@
 /turf/template_noop,
 /area/template_noop)
 "ab" = (
-/turf/closed/indestructible/riveted/uranium,
+/obj/structure/table/wood/fancy,
+/obj/item/toy/cards/deck,
+/turf/open/floor/carpet/red,
 /area/shuttle/escape/luxury)
 "ac" = (
-/obj/machinery/door/airlock/external,
-/turf/open/floor/wood{
-	icon_state = "wood-broken2"
-	},
+/turf/closed/wall/mineral/gold,
 /area/shuttle/escape/luxury)
 "ad" = (
 /obj/machinery/door/airlock/gold,
-/obj/effect/forcefield/luxury_shuttle{
-	name = "Ticket Booth"
-	},
-/turf/open/floor/mineral/gold,
+/turf/open/floor/carpet/red,
 /area/shuttle/escape/luxury)
 "ae" = (
 /obj/docking_port/mobile/emergency{
@@ -27,70 +23,65 @@
 	width = 25
 	},
 /obj/machinery/door/airlock/gold,
-/obj/effect/forcefield/luxury_shuttle{
-	name = "Ticket Booth"
-	},
-/turf/open/floor/mineral/gold,
+/turf/open/floor/carpet/red,
 /area/shuttle/escape/luxury)
 "af" = (
-/turf/open/floor/wood{
-	icon_state = "wood-broken3"
-	},
+/turf/open/floor/carpet/red,
 /area/shuttle/escape/luxury)
 "ag" = (
-/turf/open/floor/wood,
+/obj/machinery/light{
+	dir = 4;
+	light_range = 8
+	},
+/turf/open/floor/carpet/red,
 /area/shuttle/escape/luxury)
 "ah" = (
-/turf/open/floor/wood{
-	icon_state = "wood-broken"
-	},
+/turf/open/floor/plasteel/white,
 /area/shuttle/escape/luxury)
 "ai" = (
-/turf/open/floor/wood{
-	icon_state = "wood-broken5"
+/obj/structure/chair/comfy{
+	dir = 8
 	},
+/turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape/luxury)
 "aj" = (
-/turf/open/floor/mineral/gold,
+/obj/machinery/door/airlock/gold{
+	req_access_txt = "2"
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape/luxury)
 "ak" = (
-/obj/item/twohanded/required/kirbyplants{
-	icon_state = "plant-10"
-	},
-/turf/open/floor/mineral/gold,
-/area/shuttle/escape/luxury)
-"al" = (
-/obj/structure/mirror{
-	pixel_y = 32
-	},
-/turf/open/floor/mineral/gold,
-/area/shuttle/escape/luxury)
-"am" = (
-/turf/open/floor/wood{
-	icon_state = "wood-broken7"
-	},
-/area/shuttle/escape/luxury)
-"an" = (
-/obj/machinery/light/small,
-/turf/open/floor/wood{
-	icon_state = "wood-broken2"
-	},
-/area/shuttle/escape/luxury)
-"ao" = (
-/obj/machinery/light/small,
-/turf/open/floor/wood{
-	icon_state = "wood-broken6"
-	},
-/area/shuttle/escape/luxury)
-"ap" = (
-/obj/structure/toilet{
+/obj/structure/chair/comfy{
 	dir = 4
 	},
-/turf/open/floor/mineral/gold,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape/luxury)
+"al" = (
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape/luxury)
+"am" = (
+/turf/open/floor/carpet/royalblue,
+/area/shuttle/escape/luxury)
+"an" = (
+/turf/open/floor/carpet/royalblack,
+/area/shuttle/escape/luxury)
+"ao" = (
+/obj/structure/chair/comfy,
+/turf/open/floor/carpet/royalblack,
+/area/shuttle/escape/luxury)
+"ap" = (
+/obj/machinery/light{
+	dir = 4;
+	light_range = 8
+	},
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aq" = (
-/obj/machinery/door/airlock/gold,
-/turf/open/floor/mineral/gold,
+/obj/machinery/light{
+	dir = 4;
+	light_range = 8
+	},
+/turf/open/floor/plasteel/white,
 /area/shuttle/escape/luxury)
 "ar" = (
 /obj/structure/shuttle/engine/propulsion{
@@ -108,647 +99,761 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/escape/luxury)
 "at" = (
-/turf/open/floor/carpet,
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/food/snacks/meatballspaghetti,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "au" = (
-/obj/structure/chair/comfy,
-/turf/open/floor/carpet,
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/food/snacks/notasandwich,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "av" = (
-/obj/structure/chair/comfy{
-	dir = 4
-	},
-/turf/open/floor/mineral/gold,
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/food/snacks/pastatomato,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aw" = (
-/obj/machinery/computer/communications{
-	dir = 8
-	},
-/turf/open/floor/mineral/gold,
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/food/snacks/kebab/tofu,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "ax" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/meatballspaghetti,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/honkdae,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "ay" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/notasandwich,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/enchiladas,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "az" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/pastatomato,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/candiedapple,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aA" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/kebab/tofu,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/burger/baconburger,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aB" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/honkdae,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/benedict,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aC" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/enchiladas,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/cakeslice/chocolate,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aD" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/candiedapple,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/chowmein,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aE" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/burger/baconburger,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/dulcedebatataslice,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aF" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/benedict,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/salad/validsalad,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aG" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/cakeslice/chocolate,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/carneburrito,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aH" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/chowmein,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/chawanmushi,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aI" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/dulcedebatataslice,
-/turf/open/floor/carpet,
+/obj/structure/mirror{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel/white,
 /area/shuttle/escape/luxury)
 "aJ" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/salad/validsalad,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/melonfruitbowl,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aK" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/carneburrito,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/khachapuri,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aL" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/chawanmushi,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/grilledcheese,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aM" = (
-/obj/machinery/computer/emergency_shuttle{
-	dir = 8
-	},
-/turf/open/floor/mineral/gold,
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aN" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/melonfruitbowl,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/honeybun,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aO" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/khachapuri,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/eggplantparm,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aP" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/grilledcheese,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/copypasta,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aQ" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/bearsteak,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aR" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/honeybun,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/boiledspaghetti,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aS" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/eggplantparm,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/cherrycupcake,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aT" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/copypasta,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/customizable/pizza,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aU" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/bearsteak,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/hotdog,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aV" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/boiledspaghetti,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/pie/grapetart,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aW" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/cherrycupcake,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/burger/superbite,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aX" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/customizable/pizza,
-/turf/open/floor/carpet,
+/obj/item/reagent_containers/food/snacks/cakeslice/slimecake,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
 "aY" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/hotdog,
-/turf/open/floor/carpet,
+/obj/structure/chair/comfy{
+	dir = 4
+	},
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape/luxury)
 "aZ" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/pie/grapetart,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"ba" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/burger/superbite,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"bb" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/cakeslice/slimecake,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"bc" = (
-/obj/machinery/computer/station_alert{
+/obj/machinery/computer/communications{
 	dir = 8
 	},
-/turf/open/floor/mineral/gold,
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape/luxury)
-"bd" = (
+"ba" = (
 /obj/structure/chair/comfy{
 	dir = 1
 	},
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/royalblack,
 /area/shuttle/escape/luxury)
-"be" = (
-/obj/machinery/computer/crew{
+"bb" = (
+/obj/machinery/computer/emergency_shuttle{
 	dir = 8
 	},
-/turf/open/floor/mineral/gold,
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape/luxury)
-"bf" = (
+"bc" = (
 /obj/machinery/sleeper{
 	dir = 4
 	},
-/turf/open/floor/mineral/gold,
+/turf/open/floor/carpet/red,
+/area/shuttle/escape/luxury)
+"bd" = (
+/obj/machinery/computer/station_alert{
+	dir = 8
+	},
+/turf/open/floor/carpet/royalblue,
+/area/shuttle/escape/luxury)
+"be" = (
+/turf/open/floor/wood,
+/area/shuttle/escape/luxury)
+"bf" = (
+/obj/machinery/computer/crew{
+	dir = 8
+	},
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape/luxury)
 "bg" = (
 /obj/item/twohanded/required/kirbyplants{
-	icon_state = "plant-21";
-	pixel_x = -3;
-	pixel_y = 3
+	icon_state = "plant-10"
 	},
-/turf/open/floor/mineral/gold,
+/turf/open/floor/carpet/red,
 /area/shuttle/escape/luxury)
 "bh" = (
 /turf/open/floor/plating/beach/coastline_b,
 /area/shuttle/escape/luxury)
 "bi" = (
-/obj/machinery/light,
-/turf/open/floor/mineral/gold,
+/obj/machinery/door/airlock/gold/glass{
+	req_access_txt = "19"
+	},
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape/luxury)
 "bj" = (
-/obj/machinery/light{
-	dir = 8
+/obj/item/twohanded/required/kirbyplants{
+	icon_state = "plant-21";
+	pixel_x = -3;
+	pixel_y = 3
 	},
-/turf/open/floor/mineral/gold,
+/turf/open/floor/wood,
 /area/shuttle/escape/luxury)
 "bk" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/mineral/gold,
-/area/shuttle/escape/luxury)
-"bl" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-10"
 	},
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/mineral/gold,
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape/luxury)
-"bp" = (
+"bl" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
 	pixel_x = -3;
 	pixel_y = 3
 	},
 /obj/machinery/light,
-/turf/open/floor/mineral/gold,
+/turf/open/floor/wood,
+/area/shuttle/escape/luxury)
+"bm" = (
+/obj/structure/chair/comfy,
+/turf/open/floor/carpet/red,
+/area/shuttle/escape/luxury)
+"bn" = (
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/food/drinks/bottle/wine,
+/turf/open/floor/carpet/red,
+/area/shuttle/escape/luxury)
+"bo" = (
+/obj/structure/chair/comfy{
+	dir = 1
+	},
+/turf/open/floor/carpet/red,
+/area/shuttle/escape/luxury)
+"bp" = (
+/obj/item/toy/cards/deck/cas/black,
+/obj/structure/table/wood/fancy,
+/turf/open/floor/carpet/red,
+/area/shuttle/escape/luxury)
+"bq" = (
+/obj/structure/table/wood/fancy,
+/obj/item/toy/cards/deck/cas,
+/turf/open/floor/carpet/red,
+/area/shuttle/escape/luxury)
+"br" = (
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/turf/open/floor/carpet/red,
+/area/shuttle/escape/luxury)
+"bs" = (
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/food/drinks/bottle/grappa,
+/turf/open/floor/carpet/red,
+/area/shuttle/escape/luxury)
+"bt" = (
+/obj/structure/table/optable,
+/turf/open/floor/carpet/red,
+/area/shuttle/escape/luxury)
+"bu" = (
+/obj/machinery/door/airlock/gold/glass,
+/turf/open/floor/carpet/red,
+/area/shuttle/escape/luxury)
+"bv" = (
+/obj/structure/table/plasmaglass,
+/obj/item/storage/firstaid/brute,
+/obj/item/storage/firstaid/fire,
+/obj/item/storage/firstaid/toxin,
+/turf/open/floor/carpet/red,
+/area/shuttle/escape/luxury)
+"bw" = (
+/obj/structure/table/plasmaglass,
+/obj/item/storage/backpack/duffelbag/med/surgery,
+/turf/open/floor/carpet/red,
+/area/shuttle/escape/luxury)
+"bx" = (
+/obj/machinery/door/airlock/gold,
+/turf/open/floor/plasteel/white,
+/area/shuttle/escape/luxury)
+"by" = (
+/obj/structure/toilet{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/shuttle/escape/luxury)
+"bz" = (
+/obj/machinery/shower{
+	pixel_y = 19
+	},
+/turf/open/floor/plasteel/white,
+/area/shuttle/escape/luxury)
+"bA" = (
+/obj/structure/bed,
+/turf/open/floor/wood,
+/area/shuttle/escape/luxury)
+"bC" = (
+/obj/machinery/vending/coffee,
+/turf/open/floor/carpet/red,
+/area/shuttle/escape/luxury)
+"bD" = (
+/obj/machinery/vending/boozeomat/all_access,
+/turf/open/floor/carpet/red,
+/area/shuttle/escape/luxury)
+"bE" = (
+/obj/machinery/light{
+	dir = 1;
+	light_range = 8
+	},
+/turf/open/floor/carpet/red,
+/area/shuttle/escape/luxury)
+"bF" = (
+/obj/machinery/light{
+	dir = 4;
+	light_range = 8
+	},
+/obj/item/twohanded/required/kirbyplants{
+	icon_state = "plant-10"
+	},
+/turf/open/floor/carpet/red,
+/area/shuttle/escape/luxury)
+"bG" = (
+/obj/machinery/light{
+	light_range = 8
+	},
+/turf/open/floor/plating/beach/coastline_b,
+/area/shuttle/escape/luxury)
+"bH" = (
+/obj/machinery/light{
+	dir = 1;
+	light_range = 8
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape/luxury)
+"bI" = (
+/obj/machinery/light{
+	light_range = 8
+	},
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape/luxury)
 
 (1,1,1) = {"
-aa
-ab
-ab
-ab
-ab
+ac
+ac
+ac
+ac
+ac
 ar
 ar
 ar
 ar
-ab
-ab
-ab
-ab
+ac
+ac
+ac
+ac
 aa
 "}
 (2,1,1) = {"
-ab
-ab
-am
-ab
-ab
+ac
+bz
+ah
+by
+ac
 as
 as
 as
 as
-ab
-bf
-bf
-ab
-ab
+ac
+bc
+bc
+ac
+ac
 "}
 (3,1,1) = {"
-ab
+ac
+aI
+ah
+aq
+ac
+ac
+ac
+ac
+ac
+ac
 af
-ag
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-ab
-ab
+af
+bv
+ac
 "}
 (4,1,1) = {"
-ab
-ag
+ac
+ac
+bx
+ac
+ac
 an
-ab
-bl
-aj
-aj
-aj
-aj
-bj
-aj
-aj
-ak
-ab
+an
+an
+an
+bu
+af
+af
+bt
+ac
 "}
 (5,1,1) = {"
-ab
-ag
-ag
-ab
-aj
-at
-at
-at
-at
-aj
-aj
-aj
-aj
-ab
-"}
-(6,1,1) = {"
-ab
-ag
-ag
-ab
-aj
-au
-ax
-aN
-bd
-aj
-aj
-bg
-bp
-ab
-"}
-(7,1,1) = {"
-ab
-ah
-ag
-ab
-aj
-au
-ay
-aO
-bd
-aj
-aj
-bh
-bh
-ab
-"}
-(8,1,1) = {"
-ab
-ag
-ag
-ab
-aj
-au
-az
-aP
-bd
-aj
-aj
-bh
-bh
-ab
-"}
-(9,1,1) = {"
-ab
-ag
-ag
-ab
-aj
-au
-aA
-aQ
-bd
-aj
-aj
-bh
-bh
-ab
-"}
-(10,1,1) = {"
-ab
-ai
-ao
-ab
-aj
-au
-aB
-aR
-bd
-aj
-aj
-bh
-bh
-ab
-"}
-(11,1,1) = {"
-ab
-ag
-ag
-ab
-aj
-au
-aC
-aS
-bd
-aj
-aj
-bh
-bh
-ab
-"}
-(12,1,1) = {"
 ac
+af
+af
+af
+bg
+ao
+at
+aJ
+ba
+bu
 ag
 af
-ab
-aj
-au
-aD
-aT
-bd
-aj
-aj
-bh
-bh
-ab
+bw
+ac
 "}
-(13,1,1) = {"
-ab
-ab
-ab
-ab
-aj
-au
-aE
-aU
-bd
-aj
-aj
-bh
-bh
-ab
-"}
-(14,1,1) = {"
-ad
-aj
-aj
-bj
-aj
-au
-aF
-aV
-bd
-aj
-aj
-bh
-bh
-ab
-"}
-(15,1,1) = {"
-ab
-aj
-aj
-aj
-aj
-au
-aG
-aW
-bd
-aj
-aj
-bh
-bh
-ab
-"}
-(16,1,1) = {"
-ab
-aj
-aj
-aj
-aj
-au
-aH
-aX
-bd
-aj
-aj
-bh
-bh
-ab
-"}
-(17,1,1) = {"
-ab
-aj
-aj
-aj
-aj
-au
-aI
-aY
-bd
-aj
-aj
-bh
-bh
-ab
-"}
-(18,1,1) = {"
-ab
-aj
-aj
-aj
-aj
-au
-aJ
-aZ
-bd
-aj
-aj
-bh
-bh
-ab
-"}
-(19,1,1) = {"
-ab
-aj
-aj
-aj
-aj
+(6,1,1) = {"
+ac
+bE
+af
+af
+af
+ao
 au
 aK
 ba
-bd
-aj
-aj
+ac
+ac
+ac
+ac
+ac
+"}
+(7,1,1) = {"
+ac
+af
+af
+af
+af
+ao
+av
+aL
+ba
+af
+be
+bj
+bj
+ac
+"}
+(8,1,1) = {"
+ac
+bm
+bn
+bo
+af
+ao
+aw
+aM
+ba
+af
+be
 bh
 bh
+ac
+"}
+(9,1,1) = {"
+ac
+bm
 ab
+bo
+af
+ao
+ax
+aN
+ba
+af
+bA
+bh
+bh
+ac
+"}
+(10,1,1) = {"
+ac
+bm
+br
+bo
+af
+ao
+ay
+aO
+ba
+af
+bA
+bh
+bh
+ac
+"}
+(11,1,1) = {"
+ac
+bE
+af
+af
+af
+ao
+az
+aP
+ba
+af
+bA
+bh
+bG
+ac
+"}
+(12,1,1) = {"
+ad
+af
+af
+af
+af
+ao
+aA
+aQ
+ba
+af
+bA
+bh
+bh
+ac
+"}
+(13,1,1) = {"
+ac
+bg
+af
+af
+af
+ao
+aB
+aR
+ba
+af
+bA
+bh
+bh
+ac
+"}
+(14,1,1) = {"
+ad
+af
+af
+af
+af
+ao
+aC
+aS
+ba
+af
+bA
+bh
+bh
+ac
+"}
+(15,1,1) = {"
+ac
+bE
+af
+af
+af
+ao
+aD
+aT
+ba
+af
+bA
+bh
+bG
+ac
+"}
+(16,1,1) = {"
+ac
+bm
+bs
+bo
+af
+ao
+aE
+aU
+ba
+af
+bA
+bh
+bh
+ac
+"}
+(17,1,1) = {"
+ac
+bm
+bp
+bo
+af
+ao
+aF
+aV
+ba
+af
+bA
+bh
+bh
+ac
+"}
+(18,1,1) = {"
+ac
+bm
+bq
+bo
+af
+ao
+aG
+aW
+ba
+af
+bA
+bh
+bh
+ac
+"}
+(19,1,1) = {"
+ac
+bE
+af
+af
+af
+ao
+aH
+aX
+ba
+af
+be
+bh
+bh
+ac
 "}
 (20,1,1) = {"
 ae
-aj
-aj
-bk
-aj
-au
-aL
-bb
-bd
-aj
-aj
-bg
-bp
-ab
+af
+af
+af
+bF
+an
+an
+ap
+an
+af
+be
+bj
+bl
+ac
 "}
 (21,1,1) = {"
-ab
-ab
-ab
-ab
-aj
-at
-at
-at
-at
-aj
-aj
-aj
-aj
-ab
+ac
+ac
+ac
+ac
+ac
+af
+af
+ac
+ac
+ac
+ac
+ac
+ac
+ac
 "}
 (22,1,1) = {"
-ab
+aj
+al
 ak
-ap
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
+ak
+ac
+af
+af
+bi
+am
+am
+am
+am
+am
+ac
 "}
 (23,1,1) = {"
-ab
-aj
-bi
-ab
-aj
-av
-av
-av
-av
-aj
-aj
-aj
-aj
-ab
-"}
-(24,1,1) = {"
-ab
+ac
+bH
+al
 al
 aj
-aq
+af
+af
+ac
+aY
+aY
+aY
+aY
+bI
+ac
+"}
+(24,1,1) = {"
+ac
+ai
+ai
+ai
+ac
+bC
+bD
+ac
+aZ
+bb
+bd
+bf
 bk
-aw
-aM
-bc
-be
-bk
-aj
-aj
-ak
-ab
+ac
 "}
 (25,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
 "}
diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm
index 0a357d2308..b9f99c5c1f 100644
--- a/_maps/shuttles/emergency_meta.dmm
+++ b/_maps/shuttles/emergency_meta.dmm
@@ -2,6 +2,13 @@
 "aa" = (
 /turf/template_noop,
 /area/template_noop)
+"ab" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/escape)
 "ac" = (
 /obj/effect/spawner/structure/window/shuttle,
 /turf/open/floor/plating,
@@ -9,17 +16,7 @@
 "ad" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/escape)
-"af" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock"
-	},
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/escape)
-"ag" = (
-/obj/structure/sign/warning/nosmoking,
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/escape)
-"ah" = (
+"ae" = (
 /obj/machinery/door/airlock/titanium{
 	name = "Emergency Shuttle Airlock"
 	},
@@ -30,8 +27,21 @@
 	name = "Meta emergency shuttle";
 	width = 25
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
+"af" = (
+/obj/machinery/door/airlock/external{
+	name = "Emergency Recovery Airlock"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"ag" = (
+/obj/structure/sign/warning/nosmoking,
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/escape)
 "al" = (
 /obj/structure/table,
 /obj/item/phone{
@@ -939,7 +949,7 @@ be
 cc
 be
 be
-bf
+af
 "}
 (6,1,1) = {"
 ac
@@ -955,7 +965,7 @@ bf
 bT
 be
 be
-bf
+af
 "}
 (7,1,1) = {"
 ac
@@ -1038,7 +1048,7 @@ bF
 ac
 "}
 (12,1,1) = {"
-af
+ab
 LY
 LY
 aE
@@ -1070,7 +1080,7 @@ ad
 ad
 "}
 (14,1,1) = {"
-af
+ab
 LY
 LY
 aE
@@ -1166,7 +1176,7 @@ bM
 ad
 "}
 (20,1,1) = {"
-ah
+ae
 LY
 LY
 aE
@@ -1198,7 +1208,7 @@ bO
 ac
 "}
 (22,1,1) = {"
-af
+ab
 LY
 LY
 LY
diff --git a/_maps/shuttles/emergency_mini.dmm b/_maps/shuttles/emergency_mini.dmm
index 1be681e5b3..5e1157062a 100644
--- a/_maps/shuttles/emergency_mini.dmm
+++ b/_maps/shuttles/emergency_mini.dmm
@@ -113,6 +113,21 @@
 /obj/machinery/door/airlock/titanium{
 	name = "Emergency Shuttle Airlock"
 	},
+/obj/structure/fans/tiny,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/escape)
+"v" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/docking_port/mobile/emergency{
+	dir = 8;
+	dwidth = 8;
+	height = 9;
+	name = "Mini emergency shuttle";
+	width = 21
+	},
+/obj/structure/fans/tiny,
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
 "x" = (
@@ -145,19 +160,6 @@
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
-"B" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock"
-	},
-/obj/docking_port/mobile/emergency{
-	dir = 8;
-	dwidth = 8;
-	height = 9;
-	name = "Mini emergency shuttle";
-	width = 21
-	},
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/escape)
 "D" = (
 /obj/structure/table,
 /obj/item/storage/firstaid/fire,
@@ -453,7 +455,7 @@ b
 n
 b
 b
-B
+v
 b
 b
 b
diff --git a/_maps/shuttles/emergency_narnar.dmm b/_maps/shuttles/emergency_narnar.dmm
index 80046340e8..8adbd6f392 100644
--- a/_maps/shuttles/emergency_narnar.dmm
+++ b/_maps/shuttles/emergency_narnar.dmm
@@ -6,7 +6,8 @@
 /turf/closed/wall/mineral/cult,
 /area/shuttle/escape)
 "c" = (
-/obj/effect/forcefield/cult,
+/obj/machinery/door/airlock/cult/friendly,
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "d" = (
@@ -125,6 +126,10 @@
 /area/shuttle/escape)
 "x" = (
 /obj/machinery/door/airlock/cult/friendly,
+/obj/docking_port/mobile/emergency{
+	name = "shuttle 667"
+	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "y" = (
@@ -156,13 +161,6 @@
 /obj/effect/decal/remains/human,
 /turf/open/floor/plasteel/cult,
 /area/shuttle/escape)
-"E" = (
-/obj/machinery/door/airlock/cult/friendly,
-/obj/docking_port/mobile/emergency{
-	name = "shuttle 667"
-	},
-/turf/open/floor/plating,
-/area/shuttle/escape)
 "F" = (
 /obj/effect/decal/cleanable/blood/gibs/down,
 /turf/open/floor/plasteel/cult,
@@ -262,6 +260,10 @@
 /obj/structure/shuttle/engine/propulsion,
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
+"W" = (
+/obj/effect/spawner/structure/window/plastitanium,
+/turf/open/floor/plating,
+/area/shuttle/escape)
 
 (1,1,1) = {"
 a
@@ -271,17 +273,17 @@ a
 b
 b
 b
-x
-b
-E
-b
-c
-c
 c
 b
 x
 b
-x
+W
+W
+W
+b
+c
+b
+c
 b
 b
 b
@@ -336,7 +338,7 @@ U
 V
 "}
 (4,1,1) = {"
-c
+W
 d
 i
 n
@@ -360,7 +362,7 @@ U
 V
 "}
 (5,1,1) = {"
-c
+W
 e
 j
 o
@@ -384,7 +386,7 @@ U
 V
 "}
 (6,1,1) = {"
-c
+W
 f
 j
 j
@@ -408,7 +410,7 @@ U
 V
 "}
 (7,1,1) = {"
-c
+W
 e
 j
 j
@@ -424,7 +426,7 @@ j
 j
 K
 L
-c
+W
 t
 j
 t
@@ -432,7 +434,7 @@ U
 V
 "}
 (8,1,1) = {"
-c
+W
 g
 k
 k
@@ -472,7 +474,7 @@ A
 j
 j
 j
-c
+W
 j
 j
 j
@@ -496,7 +498,7 @@ j
 j
 j
 M
-c
+W
 P
 Q
 P
@@ -509,21 +511,21 @@ a
 a
 a
 b
-c
+W
 b
-c
+W
 b
 b
 b
-c
-c
-c
+W
+W
+W
 b
 b
 b
-c
+W
 b
-c
+W
 b
 a
 "}
diff --git a/_maps/shuttles/emergency_omega.dmm b/_maps/shuttles/emergency_omega.dmm
index 1601c97020..3e9074683a 100644
--- a/_maps/shuttles/emergency_omega.dmm
+++ b/_maps/shuttles/emergency_omega.dmm
@@ -185,6 +185,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "ar" = (
@@ -287,6 +288,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "az" = (
@@ -509,6 +511,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "aQ" = (
diff --git a/_maps/shuttles/emergency_pubby.dmm b/_maps/shuttles/emergency_pubby.dmm
index dc58ecf201..cc0f640c42 100644
--- a/_maps/shuttles/emergency_pubby.dmm
+++ b/_maps/shuttles/emergency_pubby.dmm
@@ -58,6 +58,29 @@
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
+"am" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"an" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/docking_port/mobile/emergency{
+	dir = 8;
+	dwidth = 27;
+	height = 8;
+	name = "PubbyStation emergency shuttle";
+	port_direction = 4;
+	preferred_direction = 1;
+	width = 46
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/escape)
 "ap" = (
 /obj/structure/chair/comfy,
 /obj/machinery/computer/security/telescreen/entertainment{
@@ -133,12 +156,6 @@
 "ax" = (
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
-"ay" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock"
-	},
-/turf/open/floor/plating,
-/area/shuttle/escape)
 "az" = (
 /obj/structure/chair/comfy{
 	dir = 1
@@ -675,21 +692,6 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/escape)
-"bL" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock"
-	},
-/obj/docking_port/mobile/emergency{
-	dir = 8;
-	dwidth = 27;
-	height = 8;
-	name = "PubbyStation emergency shuttle";
-	port_direction = 4;
-	preferred_direction = 1;
-	width = 46
-	},
-/turf/open/floor/plating,
-/area/shuttle/escape)
 "bO" = (
 /obj/machinery/door/airlock/public/glass{
 	name = "Cockpit";
@@ -1071,17 +1073,17 @@ ab
 ab
 ab
 ab
-ay
+am
 ab
-ay
+am
 ab
 ab
 aa
 ab
 ab
-bL
+an
 ab
-ay
+am
 ab
 ac
 ab
diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm
index 294b2e8c40..90c2ee86d1 100644
--- a/_maps/shuttles/emergency_raven.dmm
+++ b/_maps/shuttles/emergency_raven.dmm
@@ -427,6 +427,22 @@
 "aW" = (
 /turf/open/floor/mineral/plastitanium/red,
 /area/shuttle/escape)
+"aX" = (
+/obj/machinery/door/airlock/hatch,
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"aY" = (
+/obj/docking_port/mobile/emergency{
+	dwidth = 14;
+	height = 18;
+	name = "CentCom Raven Battlecruiser";
+	width = 32
+	},
+/obj/machinery/door/airlock/hatch,
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/escape)
 "aZ" = (
 /obj/effect/turf_decal/tile/green,
 /obj/effect/turf_decal/tile/green{
@@ -761,16 +777,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/shuttle/escape)
-"bE" = (
-/obj/docking_port/mobile/emergency{
-	dwidth = 14;
-	height = 18;
-	name = "CentCom Raven Battlecruiser";
-	width = 32
-	},
-/obj/machinery/door/airlock/hatch,
-/turf/open/floor/plating,
-/area/shuttle/escape)
 "bF" = (
 /obj/effect/turf_decal/tile/green{
 	dir = 1
@@ -1331,10 +1337,6 @@
 "eP" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/shuttle/escape)
-"UQ" = (
-/obj/machinery/door/airlock/hatch,
-/turf/open/floor/plating,
-/area/shuttle/escape)
 
 (1,1,1) = {"
 aa
@@ -1349,17 +1351,17 @@ bJ
 cs
 bJ
 bJ
-UQ
+aX
 cs
-bE
+aY
 bJ
 bJ
 cs
 ad
 aa
-UQ
+aX
 bJ
-UQ
+aX
 cs
 bJ
 cs
@@ -1893,7 +1895,7 @@ bJ
 bJ
 bJ
 cs
-cs
+en
 ad
 ad
 ad
@@ -1909,7 +1911,7 @@ ab
 bJ
 bJ
 cs
-cs
+en
 ad
 ad
 ad
diff --git a/_maps/shuttles/emergency_russiafightpit.dmm b/_maps/shuttles/emergency_russiafightpit.dmm
index abc40aa523..65fc7e30a2 100644
--- a/_maps/shuttles/emergency_russiafightpit.dmm
+++ b/_maps/shuttles/emergency_russiafightpit.dmm
@@ -235,6 +235,7 @@
 	name = "Emergency Shuttle Airlock";
 	req_access_txt = "2"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "aP" = (
@@ -282,6 +283,7 @@
 /obj/machinery/door/airlock/security/glass{
 	name = "Emergency Shuttle Airlock"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "aX" = (
@@ -375,7 +377,9 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/shuttle/escape)
 "bk" = (
-/obj/structure/kitchenspike,
+/obj/machinery/light/small{
+	dir = 4
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
 "bl" = (
@@ -420,6 +424,7 @@
 /obj/machinery/door/airlock/security/glass{
 	name = "Emergency Shuttle Airlock"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "bs" = (
@@ -460,13 +465,10 @@
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "bz" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 27
-	},
-/turf/open/floor/plating,
+/turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
 "bA" = (
-/obj/structure/closet/emcloset,
+/obj/machinery/sleeper,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
@@ -487,17 +489,12 @@
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
 "bD" = (
-/obj/machinery/sleeper{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
+/obj/structure/closet/emcloset,
+/turf/open/floor/mineral/plastitanium/red,
 /area/shuttle/escape)
 "bE" = (
-/obj/machinery/sleeper{
-	dir = 4
-	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/sleeper,
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
 "bF" = (
@@ -567,13 +564,6 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
-"bP" = (
-/obj/structure/kitchenspike,
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/escape)
 "bQ" = (
 /obj/machinery/light,
 /turf/open/floor/mineral/plastitanium/red,
@@ -584,6 +574,56 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/escape)
+"bS" = (
+/obj/structure/kitchenspike,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"bT" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 27
+	},
+/obj/structure/kitchenspike,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"bU" = (
+/obj/machinery/vending/sovietsoda,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/escape)
+"ca" = (
+/obj/structure/shuttle/engine/heater,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"cb" = (
+/obj/structure/shuttle/engine/propulsion,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"cd" = (
+/obj/structure/closet/emcloset,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"ce" = (
+/obj/structure/table/optable,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"cf" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/obj/item/storage/backpack/duffelbag/med/surgery,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"cg" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+	brightness = 3;
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
 
 (1,1,1) = {"
 aa
@@ -712,7 +752,7 @@ aj
 ao
 ad
 aw
-ax
+aR
 ax
 aR
 ax
@@ -721,9 +761,9 @@ ax
 aR
 ax
 bj
-ax
+aR
 ab
-by
+bS
 bx
 bI
 bK
@@ -736,6 +776,30 @@ ak
 ak
 at
 ax
+aR
+ax
+ax
+ax
+aR
+aR
+aR
+aR
+aR
+ax
+ab
+bT
+bx
+bI
+ca
+cb
+"}
+(8,1,1) = {"
+ac
+ag
+ak
+ap
+ab
+ax
 aJ
 aJ
 aJ
@@ -745,30 +809,6 @@ ax
 bc
 bc
 bc
-ax
-ab
-bz
-bx
-bI
-bK
-bL
-"}
-(8,1,1) = {"
-ac
-ag
-ak
-ap
-ab
-ay
-ay
-ay
-aS
-aY
-bf
-ax
-ax
-ax
-ax
 bQ
 bv
 ad
@@ -783,6 +823,30 @@ af
 al
 aq
 au
+ay
+ay
+ay
+aS
+aY
+bf
+ax
+ax
+ax
+ax
+ax
+ad
+bA
+cg
+ce
+bK
+bL
+"}
+(10,1,1) = {"
+ac
+bU
+ak
+aq
+au
 az
 aK
 aQ
@@ -792,16 +856,16 @@ ax
 ax
 bl
 ax
-ax
+bD
 ax
 ad
-bA
 bE
-bA
+bB
+bJ
 bK
 bL
 "}
-(10,1,1) = {"
+(11,1,1) = {"
 ac
 ah
 ak
@@ -821,16 +885,16 @@ ax
 ac
 bB
 bB
-bJ
+cf
 bK
 bL
 "}
-(11,1,1) = {"
+(12,1,1) = {"
 ad
 ab
 am
 ar
-au
+ac
 aB
 aA
 aA
@@ -849,12 +913,12 @@ bB
 bK
 bL
 "}
-(12,1,1) = {"
+(13,1,1) = {"
 aa
 ad
 ab
 ad
-as
+bv
 aC
 aK
 bM
@@ -869,11 +933,11 @@ ax
 ac
 bB
 bB
-bD
+bF
 ad
 ad
 "}
-(13,1,1) = {"
+(14,1,1) = {"
 aa
 aa
 aa
@@ -892,41 +956,41 @@ ax
 ax
 ad
 bC
-bF
+cd
 ad
 ad
 aa
 "}
-(14,1,1) = {"
-aa
-aa
-aa
-aa
-ab
-aE
-aN
-aN
-aV
-aD
-bi
-bk
-bk
-bk
-bP
-bt
-ab
-bD
-ab
-ad
-aa
-aa
-"}
 (15,1,1) = {"
 aa
 aa
 aa
 aa
 ad
+aE
+aN
+aN
+aV
+aD
+bi
+bz
+bz
+bz
+bk
+bt
+ab
+cd
+ab
+ad
+aa
+aa
+"}
+(16,1,1) = {"
+aa
+aa
+aa
+aa
+aa
 aD
 aE
 aE
diff --git a/_maps/shuttles/emergency_scrapheap.dmm b/_maps/shuttles/emergency_scrapheap.dmm
index 226dee7d9d..4bd8f07c8e 100644
--- a/_maps/shuttles/emergency_scrapheap.dmm
+++ b/_maps/shuttles/emergency_scrapheap.dmm
@@ -106,6 +106,7 @@
 	name = "Emergency Shuttle Airlock";
 	req_access_txt = "2"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "at" = (
@@ -174,6 +175,7 @@
 	name = "Emergency Shuttle Airlock";
 	req_access_txt = "2"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "aD" = (
@@ -227,6 +229,7 @@
 /obj/docking_port/mobile/emergency{
 	name = "Scrapheap Challenge"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "aL" = (
@@ -309,6 +312,7 @@
 /obj/machinery/door/airlock/titanium{
 	name = "Emergency Shuttle Airlock"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "ba" = (
diff --git a/_maps/shuttles/emergency_supermatter.dmm b/_maps/shuttles/emergency_supermatter.dmm
index fcdbf48a3d..71f791fad0 100644
--- a/_maps/shuttles/emergency_supermatter.dmm
+++ b/_maps/shuttles/emergency_supermatter.dmm
@@ -2,6 +2,13 @@
 "aa" = (
 /turf/template_noop,
 /area/template_noop)
+"ab" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/escape)
 "ac" = (
 /obj/structure/sign/warning/radiation,
 /turf/closed/wall/mineral/titanium,
@@ -13,6 +20,16 @@
 "ae" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/escape)
+"af" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/docking_port/mobile/emergency{
+	name = "Hyperfractal Gigashuttle"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/escape)
 "ag" = (
 /obj/structure/closet/radiation{
 	anchored = 1
@@ -33,6 +50,14 @@
 	},
 /turf/open/floor/mineral/titanium/yellow,
 /area/shuttle/escape)
+"ak" = (
+/obj/machinery/door/airlock/external{
+	name = "Emergency Launch Catwalk";
+	req_access_txt = "10;13"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/escape)
 "al" = (
 /obj/machinery/shower{
 	dir = 8
@@ -101,12 +126,6 @@
 "ax" = (
 /turf/closed/wall/mineral/titanium/interior,
 /area/shuttle/escape)
-"aA" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock"
-	},
-/turf/open/floor/plating,
-/area/shuttle/escape)
 "aB" = (
 /obj/machinery/power/supermatter_crystal/shard/hugbox/fakecrystal,
 /turf/open/floor/plating,
@@ -125,26 +144,10 @@
 /obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/mineral/titanium/yellow,
 /area/shuttle/escape)
-"aF" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock"
-	},
-/obj/docking_port/mobile/emergency{
-	name = "Hyperfractal Gigashuttle"
-	},
-/turf/open/floor/plating,
-/area/shuttle/escape)
 "aI" = (
 /obj/structure/sign/warning/radiation,
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/escape)
-"aL" = (
-/obj/machinery/door/airlock/external{
-	name = "Emergency Launch Catwalk";
-	req_access_txt = "10;13"
-	},
-/turf/open/floor/plating,
-/area/shuttle/escape)
 "aM" = (
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
@@ -348,9 +351,9 @@ aa
 aa
 aa
 aw
-aA
+ab
 ac
-aF
+af
 aw
 aa
 aa
@@ -472,7 +475,7 @@ aB
 bf
 at
 at
-aL
+ak
 aM
 aM
 hD
@@ -588,9 +591,9 @@ aa
 aa
 aa
 aw
-aA
+ab
 ac
-aA
+ab
 aw
 aa
 aa
diff --git a/_maps/shuttles/emergency_syndicate.dmm b/_maps/shuttles/emergency_syndicate.dmm
index 6e76bbc5f6..8fa48c465f 100644
--- a/_maps/shuttles/emergency_syndicate.dmm
+++ b/_maps/shuttles/emergency_syndicate.dmm
@@ -116,7 +116,6 @@
 	id = "shuttleshutters";
 	name = "Bridge Blast Shutters";
 	pixel_x = -26;
-	pixel_y = 0;
 	req_access_txt = "19"
 	},
 /obj/effect/turf_decal/tile/neutral{
@@ -199,8 +198,7 @@
 /obj/item/radio/intercom{
 	dir = 4;
 	name = "Station Intercom (General)";
-	pixel_x = 27;
-	pixel_y = 0
+	pixel_x = 27
 	},
 /turf/open/floor/plasteel/dark,
 /area/shuttle/escape)
@@ -309,8 +307,7 @@
 /obj/item/radio/intercom{
 	dir = 4;
 	name = "Station Intercom (General)";
-	pixel_x = -27;
-	pixel_y = 0
+	pixel_x = -27
 	},
 /turf/open/floor/plasteel/dark,
 /area/shuttle/escape)
@@ -408,7 +405,6 @@
 	id = "smindicate";
 	name = "external door control";
 	pixel_x = 26;
-	pixel_y = 0;
 	req_access_txt = "150"
 	},
 /obj/structure/fans/tiny,
@@ -420,8 +416,7 @@
 /obj/item/radio/intercom{
 	dir = 4;
 	name = "Station Intercom (General)";
-	pixel_x = 27;
-	pixel_y = 0
+	pixel_x = 27
 	},
 /turf/open/floor/plasteel/dark,
 /area/shuttle/escape)
@@ -878,6 +873,7 @@
 /area/shuttle/escape)
 "bz" = (
 /obj/machinery/door/airlock/hatch,
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "bA" = (
@@ -991,6 +987,7 @@
 /obj/docking_port/mobile/emergency{
 	name = "Syndicate Battlecruiser"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "bL" = (
@@ -1064,10 +1061,7 @@
 /area/shuttle/escape)
 "bR" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/box/drinkingglasses{
-	pixel_x = 0;
-	pixel_y = 0
-	},
+/obj/item/storage/box/drinkingglasses,
 /obj/item/storage/box/drinkingglasses{
 	pixel_x = -3;
 	pixel_y = 3
@@ -1499,8 +1493,7 @@
 /obj/item/radio/intercom{
 	dir = 4;
 	name = "Station Intercom (General)";
-	pixel_x = 27;
-	pixel_y = 0
+	pixel_x = 27
 	},
 /turf/open/floor/plasteel/dark,
 /area/shuttle/escape)
@@ -1606,8 +1599,7 @@
 /obj/item/radio/intercom{
 	dir = 4;
 	name = "Station Intercom (General)";
-	pixel_x = 27;
-	pixel_y = 0
+	pixel_x = 27
 	},
 /turf/open/floor/plasteel/dark,
 /area/shuttle/escape)
@@ -1634,10 +1626,7 @@
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/obj/item/storage/toolbox/emergency{
-	pixel_x = 0;
-	pixel_y = 0
-	},
+/obj/item/storage/toolbox/emergency,
 /obj/item/storage/toolbox/syndicate{
 	pixel_x = -3;
 	pixel_y = 3
diff --git a/_maps/shuttles/emergency_wabbajack.dmm b/_maps/shuttles/emergency_wabbajack.dmm
index c2707b19e9..6d77068054 100644
--- a/_maps/shuttles/emergency_wabbajack.dmm
+++ b/_maps/shuttles/emergency_wabbajack.dmm
@@ -119,12 +119,7 @@
 /area/shuttle/escape)
 "ar" = (
 /obj/structure/table,
-/obj/item/storage/firstaid/fire,
-/obj/item/storage/firstaid/regular{
-	pixel_x = 2;
-	pixel_y = 3
-	},
-/obj/item/crowbar,
+/obj/item/storage/toolbox/mechanical,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "as" = (
@@ -166,6 +161,7 @@
 	name = "Emergency Shuttle Airlock";
 	req_access_txt = "2"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "ay" = (
@@ -206,11 +202,24 @@
 /obj/docking_port/mobile/emergency{
 	name = "NT Lepton Violet"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
+"aE" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/sleeper{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/escape)
 "aF" = (
-/obj/machinery/door/window/eastleft,
-/turf/open/floor/mineral/titanium,
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
 /area/shuttle/escape)
 "aG" = (
 /obj/structure/extinguisher_cabinet{
@@ -244,52 +253,28 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
 "aK" = (
-/obj/machinery/sleeper{
-	dir = 4
+/obj/structure/table,
+/obj/item/storage/firstaid/regular{
+	pixel_x = 2;
+	pixel_y = 3
 	},
+/obj/item/storage/firstaid/fire,
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
 "aL" = (
-/obj/structure/table/reinforced,
-/turf/open/floor/mineral/titanium,
-/area/shuttle/escape)
-"aM" = (
-/obj/machinery/chem_dispenser,
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/mineral/titanium/white,
-/area/shuttle/escape)
-"aN" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/storage/firstaid/regular{
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/obj/item/wrench/medical,
-/turf/open/floor/mineral/titanium/white,
-/area/shuttle/escape)
-"aO" = (
-/turf/open/floor/plating,
-/area/shuttle/escape)
-"aP" = (
-/obj/structure/chair/office/light{
+/obj/machinery/sleeper{
 	dir = 8
 	},
-/turf/open/floor/mineral/titanium,
-/area/shuttle/escape)
-"aQ" = (
-/obj/machinery/chem_heater,
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
-"aR" = (
-/obj/machinery/chem_master,
-/turf/open/floor/mineral/titanium/white,
-/area/shuttle/escape)
-"aS" = (
-/obj/machinery/door/window/eastright,
-/turf/open/floor/mineral/titanium,
+"aM" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
 "aT" = (
 /obj/structure/table/glass,
@@ -304,12 +289,6 @@
 /obj/machinery/door/airlock/public/glass,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
-"aV" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock"
-	},
-/turf/open/floor/plating,
-/area/shuttle/escape)
 "aW" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -523,15 +502,6 @@
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
-"Ec" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/open/floor/mineral/titanium/white,
-/area/shuttle/escape)
 "MK" = (
 /obj/structure/chair/comfy/shuttle,
 /turf/open/floor/mineral/titanium/blue,
@@ -553,9 +523,9 @@ as
 as
 as
 ab
-aV
+aF
 ab
-aV
+aF
 ab
 ab
 ab
@@ -644,9 +614,9 @@ ab
 ab
 ab
 aq
-aK
-aN
-aK
+aM
+aM
+aM
 aq
 ab
 ji
@@ -673,10 +643,10 @@ aq
 aq
 bn
 aH
-ab
-ab
-ab
-ab
+as
+as
+as
+as
 be
 bf
 bg
@@ -691,11 +661,11 @@ ao
 au
 az
 ab
-aF
-Ec
 aq
-Ec
-aS
+aJ
+aJ
+aJ
+aq
 as
 aI
 aI
@@ -716,9 +686,9 @@ av
 aA
 ab
 aq
-aL
-aO
-aL
+aM
+aM
+aM
 aq
 aU
 aq
@@ -741,7 +711,7 @@ aq
 aC
 aq
 aq
-aP
+aq
 aq
 aq
 as
@@ -764,9 +734,9 @@ aw
 aw
 ab
 aG
-aM
-aQ
-aR
+aE
+aK
+aL
 aT
 as
 MK
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index e6147297df..e6d80bedb5 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -177,8 +177,8 @@
 /datum/map_template/shuttle/emergency/airless
 	suffix = "airless"
 	name = "Build your own shuttle kit"
-	description = "Save money by building your own shuttle! The chassis will dock upon purchase, but launch will have to be authorized as usual via shuttle call. Interior and atmosphere not included."
-	admin_notes = "No brig, no medical facilities, no air."
+	description = "Save money by building your own shuttle! The chassis will dock upon purchase, but launch will have to be authorized as usual via shuttle call. Interior and lighting not included."
+	admin_notes = "No brig, no medical facilities, just an empty box."
 	credit_cost = -7500
 
 /datum/map_template/shuttle/emergency/airless/prerequisites_met()
@@ -222,9 +222,9 @@
 /datum/map_template/shuttle/emergency/luxury
 	suffix = "luxury"
 	name = "Luxury Shuttle"
-	description = "A luxurious golden shuttle complete with an indoor swimming pool. Each crewmember wishing to board must bring 500 credits, payable in cash and mineral coin."
-	admin_notes = "Due to the limited space for non paying crew, this shuttle may cause a riot."
-	credit_cost = 10000
+	description = "A luxurious golden shuttle complete with an indoor swimming pool. Entry is free, so long as you can afford the initial cost."
+	admin_notes = "Fancy, and very roomy!"
+	credit_cost = 17500
 
 /datum/map_template/shuttle/emergency/discoinferno
 	suffix = "discoinferno"
@@ -300,7 +300,7 @@
 	suffix = "syndicate"
 	name = "Syndicate GM Battlecruiser"
 	credit_cost = 20000
-	description = "Manufactured by the Gorlex Marauders, this cruiser has been specially designed with high occupancy in mind, while remaining robust in combat situations. Features a fully stocked EVA storage, armory, medbay, and bar!"
+	description = "(Emag only) Manufactured by the Gorlex Marauders, this cruiser has been specially designed with high occupancy in mind, while remaining robust in combat situations. Features a fully stocked EVA storage, armory, medbay, and bar!"
 	admin_notes = "An emag exclusive, stocked with syndicate equipment and turrets that will target any simplemob."
 
 /datum/map_template/shuttle/emergency/syndicate/prerequisites_met()
@@ -333,7 +333,7 @@
 /datum/map_template/shuttle/emergency/supermatter
 	suffix = "supermatter"
 	name = "Hyperfractal Gigashuttle"
-	description = "\"I dunno, this seems kinda needlessly complicated.\"\n\
+	description = "(Emag only) \"I dunno, this seems kinda needlessly complicated.\"\n\
 	\"This shuttle has very a very high safety record, according to CentCom Officer Cadet Yins.\"\n\
 	\"Are you sure?\"\n\
 	\"Yes, it has a safety record of N-A-N, which is apparently larger than 100%.\""
@@ -341,7 +341,12 @@
 	Outside of admin intervention, it cannot explode. \
 	It does, however, still dust anything on contact, emits high levels of radiation, and induce hallucinations in anyone looking at it without protective goggles. \
 	Emitters spawn powered on, expect admin notices, they are harmless."
-	credit_cost = 100000
+	credit_cost = 15000
+
+/datum/map_template/shuttle/emergency/supermatter/prerequisites_met()
+	if("emagged" in SSshuttle.shuttle_purchase_requirements_met)
+		return TRUE
+	return FALSE
 
 /datum/map_template/shuttle/emergency/imfedupwiththisworld
 	suffix = "imfedupwiththisworld"
@@ -372,6 +377,12 @@
 	description = "On the smaller size with a modern design, this shuttle is for the crew who like the cosier things, while still being able to stretch their legs."
 	credit_cost = 1000
 
+/datum/map_template/shuttle/emergency/gorilla
+	suffix = "gorilla"
+	name = "Gorilla Cargo Freighter"
+	description = "A rustic, barely excuseable shuttle transporting important cargo. Not for crew who are about to go ape."
+	credit_cost = 2000
+
 /datum/map_template/shuttle/ferry/base
 	suffix = "base"
 	name = "transport ferry"