diff --git a/_maps/shuttles/emergency/emergency_asteroid.dmm b/_maps/shuttles/emergency/emergency_asteroid.dmm
index e3bb8df900f06..b6de68951f0e1 100644
--- a/_maps/shuttles/emergency/emergency_asteroid.dmm
+++ b/_maps/shuttles/emergency/emergency_asteroid.dmm
@@ -15,21 +15,31 @@
 /obj/structure/shuttle/engine/heater{
 	dir = 8
 	},
+/obj/effect/spawner/structure/window/shuttle,
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
 "ap" = (
 /obj/structure/ore_box,
-/turf/open/floor/mineral/titanium/yellow,
+/turf/open/floor/iron/dark,
 /area/shuttle/escape)
 "aq" = (
-/turf/open/floor/mineral/titanium/yellow,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 6
+	},
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "ar" = (
 /obj/machinery/recharge_station,
-/turf/open/floor/mineral/titanium/yellow,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 5
+	},
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "at" = (
-/turf/open/floor/mineral/titanium,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 10
+	},
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "av" = (
 /obj/structure/chair/fancy/shuttle{
@@ -44,161 +54,193 @@
 /obj/structure/chair/fancy/shuttle{
 	dir = 8
 	},
+/obj/machinery/camera/directional/east,
+/obj/machinery/status_display/evac/directional/east,
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "az" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/escape)
-"aB" = (
-/turf/closed/wall/mineral/titanium/interior,
-/area/shuttle/escape)
 "aE" = (
 /obj/structure/chair/fancy/shuttle{
 	dir = 4
 	},
-/obj/item/radio/intercom{
-	dir = 8;
-	name = "Station Intercom (General)";
-	pixel_x = -28
-	},
+/obj/item/radio/intercom/directional/west,
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "aF" = (
 /obj/machinery/suit_storage_unit,
-/turf/open/floor/mineral/titanium/yellow,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 9
+	},
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "aH" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_y = 30
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 9
 	},
-/turf/open/floor/mineral/titanium,
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "aI" = (
-/obj/structure/closet,
-/turf/open/floor/mineral/titanium/blue,
+/obj/structure/closet/firecloset,
+/obj/effect/turf_decal/bot,
+/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/obj/machinery/light,
+/turf/open/floor/iron/edge{
+	dir = 1
+	},
 /area/shuttle/escape)
 "aJ" = (
-/obj/structure/table,
-/obj/item/extinguisher,
-/obj/item/crowbar,
-/turf/open/floor/mineral/titanium/blue,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/bot,
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/iron/edge,
 /area/shuttle/escape)
 "aK" = (
 /obj/structure/chair/fancy/shuttle,
-/turf/open/floor/mineral/titanium/blue,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 1
+	},
+/turf/open/floor/iron/edge,
 /area/shuttle/escape)
 "aL" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/fire,
-/obj/item/storage/firstaid/regular{
-	pixel_x = 2;
-	pixel_y = 3
+/obj/machinery/camera/directional/south,
+/obj/structure/chair/fancy/shuttle{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/iron/edge{
+	dir = 1
 	},
-/turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
 "aM" = (
+/obj/effect/turf_decal/bot,
 /obj/structure/closet/emcloset,
-/obj/item/radio/intercom{
-	name = "Station Intercom (General)";
-	pixel_y = 23
+/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 1
+	},
+/obj/machinery/light{
+	dir = 1
 	},
-/turf/open/floor/mineral/titanium/blue,
+/turf/open/floor/iron/edge,
 /area/shuttle/escape)
 "aN" = (
-/obj/structure/bed/roller,
-/turf/open/floor/mineral/titanium/blue,
+/obj/structure/closet/emcloset,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 6
+	},
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "aQ" = (
 /obj/structure/bed,
+/obj/machinery/newscaster/directional/east,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/item/book/manual/wiki/security_space_law{
+	pixel_x = -4;
+	pixel_y = 4
+	},
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "aR" = (
-/obj/machinery/computer/station_alert{
+/obj/machinery/computer/crew{
 	dir = 4
 	},
-/turf/open/floor/mineral/titanium/blue,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "aS" = (
-/turf/open/floor/mineral/titanium/blue,
+/turf/open/floor/circuit/green{
+	luminosity = 2
+	},
 /area/shuttle/escape)
 "aT" = (
-/obj/structure/chair/office/light{
-	name = "Chief Engineer"
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/machinery/light{
+	dir = 1
 	},
-/turf/open/floor/mineral/titanium/blue,
+/obj/structure/chair/fancy/corp,
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "aU" = (
-/obj/structure/chair/office/light{
-	name = "Captain"
-	},
-/obj/machinery/light{
+/obj/effect/turf_decal/siding/thinplating_new/dark{
 	dir = 1
 	},
-/turf/open/floor/mineral/titanium/blue,
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/structure/chair/fancy/corp,
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "aV" = (
-/obj/structure/chair/office/light{
-	name = "Head of Security"
+/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 1
 	},
-/turf/open/floor/mineral/titanium/blue,
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/structure/chair/fancy/corp,
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "aW" = (
-/obj/item/radio/intercom{
-	name = "Station Intercom (General)";
-	pixel_y = 23
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 5
 	},
-/turf/open/floor/mineral/titanium,
-/area/shuttle/escape)
-"aX" = (
-/obj/machinery/status_display/ai,
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/escape)
-"aY" = (
-/obj/structure/chair/fancy/shuttle{
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
 	dir = 8
 	},
-/turf/open/floor/mineral/titanium/blue,
+/obj/machinery/status_display/ai/directional/east,
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "aZ" = (
 /obj/structure/chair/fancy/shuttle{
 	dir = 1
 	},
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/escape)
-"ba" = (
-/obj/structure/chair/fancy/shuttle{
-	dir = 4
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/turf/open/floor/iron/edge{
+	dir = 1
 	},
-/turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
 "bb" = (
-/obj/machinery/computer/security{
-	dir = 4
-	},
+/obj/item/kirbyplants/random,
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "bc" = (
 /obj/structure/table,
 /obj/item/paper_bin{
-	pixel_x = -1;
-	pixel_y = 6
+	pixel_y = 4
 	},
-/turf/open/floor/mineral/titanium,
+/obj/item/pen,
+/obj/item/folder/blue{
+	pixel_y = 4
+	},
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "bd" = (
 /obj/machinery/computer/emergency_shuttle,
-/turf/open/floor/mineral/titanium,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "be" = (
 /obj/structure/table,
-/obj/item/folder/blue,
-/obj/item/pen,
 /obj/machinery/recharger,
-/turf/open/floor/mineral/titanium,
+/obj/item/storage/fancy/donut_box,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "bf" = (
-/obj/machinery/ai_slipper,
-/turf/open/floor/mineral/titanium,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 4
+	},
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "bi" = (
 /obj/machinery/status_display/evac,
@@ -208,101 +250,128 @@
 /obj/machinery/computer/communications{
 	dir = 4
 	},
-/turf/open/floor/mineral/titanium/blue,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "bk" = (
-/obj/structure/chair/office/light{
-	dir = 1;
-	name = "Research Director"
+/obj/machinery/camera/directional/south,
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 1
 	},
-/turf/open/floor/mineral/titanium/blue,
+/obj/machinery/newscaster/directional/south,
+/obj/machinery/light,
+/obj/structure/chair/fancy/corp{
+	dir = 1
+	},
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "bl" = (
-/obj/structure/chair/office/light{
-	dir = 1;
-	name = "Head of Personnel"
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 1
 	},
-/turf/open/floor/mineral/titanium/blue,
+/obj/structure/chair/fancy/corp{
+	dir = 1
+	},
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "bm" = (
-/obj/structure/chair/office/light{
-	dir = 1;
-	name = "Chief Medical Officer"
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 1
 	},
-/turf/open/floor/mineral/titanium/blue,
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/structure/chair/fancy/corp{
+	dir = 1
+	},
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "bn" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_y = -30
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 6
+	},
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+	dir = 1
 	},
-/turf/open/floor/mineral/titanium,
+/obj/machinery/status_display/evac/directional/east,
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "bp" = (
 /obj/machinery/computer/crew{
 	dir = 4
 	},
-/turf/open/floor/mineral/titanium/white,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 9
+	},
+/turf/open/floor/iron/white,
 /area/shuttle/escape)
 "bs" = (
 /obj/structure/bed,
+/obj/machinery/light/small,
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
 "bt" = (
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = -12;
-	pixel_y = 2
-	},
-/obj/structure/mirror{
-	pixel_x = -30
+/obj/structure/closet/emcloset,
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/effect/turf_decal/trimline/neutral/filled/end{
+	dir = 8
 	},
-/turf/open/floor/mineral/titanium/white,
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "bv" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/escape)
-"bw" = (
-/obj/structure/chair/fancy/shuttle{
+/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/obj/item/kirbyplants/random,
+/obj/machinery/light,
+/turf/open/floor/iron/edge{
 	dir = 1
 	},
-/obj/item/radio/intercom{
-	name = "Station Intercom (General)";
-	pixel_y = -29
-	},
-/turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
-"bx" = (
+"bw" = (
 /obj/structure/chair/fancy/shuttle{
 	dir = 1
 	},
-/obj/structure/extinguisher_cabinet{
-	pixel_y = -30
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/obj/machinery/newscaster/directional/south,
+/turf/open/floor/iron/edge{
+	dir = 1
 	},
-/turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
 "by" = (
-/obj/structure/table,
-/obj/item/extinguisher,
-/obj/item/crowbar,
-/obj/machinery/recharger,
-/turf/open/floor/mineral/titanium/blue,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "bz" = (
 /obj/machinery/stasis,
-/turf/open/floor/mineral/titanium/white,
+/obj/machinery/camera/directional/east,
+/obj/machinery/status_display/evac/directional/east,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 8
+	},
 /area/shuttle/escape)
 "bC" = (
-/obj/item/radio/intercom{
-	dir = 8;
-	name = "Station Intercom (General)";
-	pixel_x = -28
+/obj/item/radio/intercom/directional/west,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 8
+	},
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 4
 	},
-/turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
 "bD" = (
 /obj/structure/closet/secure_closet/medical2,
-/turf/open/floor/mineral/titanium/white,
+/obj/machinery/newscaster/directional/east,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 4
+	},
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 8
+	},
 /area/shuttle/escape)
 "bE" = (
 /obj/structure/toilet{
@@ -311,53 +380,145 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
+/obj/machinery/newscaster/directional/west,
+/obj/item/radio/intercom/directional/east,
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
 "bF" = (
 /obj/structure/table,
-/obj/item/retractor,
 /obj/item/hemostat,
 /obj/item/scalpel,
-/obj/item/surgicaldrill,
-/turf/open/floor/mineral/titanium/white,
+/obj/item/cautery{
+	pixel_x = 4
+	},
+/obj/item/clothing/gloves/color/latex,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 10
+	},
+/turf/open/floor/iron/white,
 /area/shuttle/escape)
 "bG" = (
 /obj/structure/table/optable,
-/turf/open/floor/mineral/titanium/white,
+/obj/item/surgical_drapes,
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 1
+	},
 /area/shuttle/escape)
 "bH" = (
+/obj/item/storage/firstaid/regular{
+	pixel_x = 2;
+	pixel_y = 5
+	},
+/obj/item/storage/firstaid/fire{
+	pixel_y = 2
+	},
 /obj/structure/table,
-/obj/item/circular_saw,
-/obj/item/cautery{
-	pixel_x = 4
+/obj/item/storage/firstaid/brute{
+	pixel_x = -2;
+	pixel_y = -1
 	},
-/obj/item/surgical_drapes,
-/turf/open/floor/mineral/titanium/white,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 6
+	},
+/turf/open/floor/iron/white,
 /area/shuttle/escape)
 "bJ" = (
 /obj/machinery/light,
-/turf/open/floor/mineral/titanium/yellow,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 10
+	},
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "bK" = (
 /obj/structure/chair/fancy/shuttle,
-/obj/machinery/light{
+/obj/machinery/camera/directional/north,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
 	dir = 1
 	},
-/turf/open/floor/mineral/titanium/blue,
+/turf/open/floor/iron/edge,
 /area/shuttle/escape)
 "bM" = (
 /obj/machinery/light,
+/obj/structure/reagent_dispensers/peppertank/directional/south,
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "bN" = (
-/obj/machinery/light{
+/obj/structure/mirror/directional/north{
+	pixel_y = 32
+	},
+/obj/structure/sink{
+	dir = 1;
+	pixel_y = 24
+	},
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
 	dir = 1
 	},
-/turf/open/floor/mineral/titanium/white,
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "bP" = (
-/obj/machinery/light,
-/turf/open/floor/mineral/titanium/blue,
+/obj/structure/chair/fancy/shuttle{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/obj/machinery/status_display/ai/directional/south,
+/turf/open/floor/iron/edge{
+	dir = 1
+	},
+/area/shuttle/escape)
+"cl" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 1
+	},
+/turf/open/floor/iron/white/smooth_edge,
+/area/shuttle/escape)
+"cB" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 4
+	},
+/obj/effect/turf_decal/box,
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
+"dD" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"fh" = (
+/obj/machinery/vending/wallmed,
+/turf/closed/wall/mineral/titanium/interior,
+/area/shuttle/escape)
+"iU" = (
+/obj/structure/closet/firecloset,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 5
+	},
+/turf/open/floor/iron/edge,
+/area/shuttle/escape)
+"iZ" = (
+/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 1
+	},
+/obj/item/kirbyplants/random,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/iron/edge,
 /area/shuttle/escape)
 "jj" = (
 /obj/machinery/door/airlock/titanium{
@@ -367,41 +528,182 @@
 /obj/structure/fans/tiny,
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
-"qg" = (
-/obj/structure/window/shuttle,
-/obj/structure/grille,
-/turf/open/floor/mineral/titanium/blue,
+"lL" = (
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white/smooth_large,
+/area/shuttle/escape)
+"mB" = (
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "qO" = (
-/obj/structure/window/shuttle,
-/obj/structure/grille,
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/firedoor/window,
 /turf/open/floor/plating,
 /area/shuttle/escape)
-"rp" = (
-/obj/machinery/door/airlock/medical/glass{
-	name = "Escape Shuttle Infirmary";
-	req_access_txt = "5"
+"sV" = (
+/obj/structure/toilet{
+	dir = 1
 	},
-/obj/machinery/door/firedoor,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/item/radio/intercom/directional/west,
+/obj/machinery/newscaster/directional/east,
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
+"ta" = (
+/obj/machinery/computer/security{
+	dir = 8
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"uc" = (
+/obj/machinery/status_display/evac,
+/turf/closed/wall/mineral/titanium/interior,
+/area/shuttle/escape)
+"uM" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white/smooth_large,
+/area/shuttle/escape)
+"uQ" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 8
+	},
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
+/area/shuttle/escape)
+"ve" = (
+/obj/structure/closet,
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 8
+	},
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
+/area/shuttle/escape)
+"xr" = (
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 5
+	},
+/turf/open/floor/iron/white,
+/area/shuttle/escape)
 "xE" = (
 /obj/machinery/door/airlock/titanium{
 	name = "Emergency Shuttle Airlock"
 	},
 /obj/structure/fans/tiny,
-/turf/open/floor/mineral/titanium/yellow,
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron/white,
+/area/shuttle/escape)
+"yg" = (
+/obj/effect/turf_decal/trimline/neutral/filled/warning{
+	dir = 4
+	},
+/turf/open/floor/iron/edge{
+	dir = 8
+	},
+/area/shuttle/escape)
+"yT" = (
+/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/trimline/yellow/filled/line,
+/turf/open/floor/iron/edge{
+	dir = 1
+	},
+/area/shuttle/escape)
+"Ca" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/edge{
+	dir = 1
+	},
+/area/shuttle/escape)
+"Cf" = (
+/obj/structure/mirror/directional/north{
+	pixel_y = 32
+	},
+/obj/structure/sink{
+	dir = 1;
+	pixel_y = 24
+	},
+/obj/effect/turf_decal/trimline/neutral/filled/end{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"CC" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 4
+	},
+/turf/open/floor/iron/edge{
+	dir = 8
+	},
+/area/shuttle/escape)
+"Dx" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/bot,
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/iron/edge,
+/area/shuttle/escape)
+"El" = (
+/obj/machinery/door/airlock{
+	name = "Emergency Restroom"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"Em" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 10
+	},
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+	dir = 4
+	},
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "ED" = (
 /obj/machinery/door/airlock/mining{
 	name = "Emergency Shuttle Storage"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/mineral/titanium/yellow,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"Fk" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 9
+	},
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner,
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "Gw" = (
 /obj/machinery/door/firedoor,
-/turf/open/floor/mineral/titanium,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"Gy" = (
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+	dir = 1
+	},
+/turf/open/floor/iron/edge,
+/area/shuttle/escape)
+"IQ" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
+/turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "Jx" = (
 /turf/open/floor/mineral/titanium/white,
@@ -412,28 +714,64 @@
 	req_access_txt = "2"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/mineral/plastitanium/red/brig,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"Lj" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/edge,
 /area/shuttle/escape)
-"JM" = (
-/obj/machinery/vending/wallmed{
-	name = "Emergency NanoMed";
-	use_power = 0
+"LA" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 8
+	},
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 4
 	},
-/turf/closed/wall/mineral/titanium,
 /area/shuttle/escape)
-"QG" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock"
+"Mo" = (
+/obj/effect/turf_decal/trimline/neutral/filled/warning{
+	dir = 8
 	},
-/obj/structure/fans/tiny,
-/turf/open/floor/mineral/titanium,
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
+/area/shuttle/escape)
+"NA" = (
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+	dir = 8
+	},
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 4
+	},
+/area/shuttle/escape)
+"Oc" = (
+/obj/structure/chair/fancy/shuttle{
+	dir = 8
+	},
+/obj/machinery/newscaster/directional/east,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"OP" = (
+/obj/machinery/recharger,
+/obj/structure/table,
+/obj/item/restraints/handcuffs{
+	pixel_y = 3
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "RT" = (
 /obj/machinery/door/airlock{
-	name = "Emergency Shuttle Restroom"
+	name = "Unit 2"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/mineral/titanium/white,
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "RU" = (
 /obj/machinery/door/airlock/titanium{
@@ -447,26 +785,94 @@
 	width = 28
 	},
 /obj/structure/fans/tiny,
-/turf/open/floor/mineral/titanium,
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron/white,
+/area/shuttle/escape)
+"TP" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 4
+	},
+/obj/item/kirbyplants/random,
+/turf/open/floor/iron/edge{
+	dir = 8
+	},
+/area/shuttle/escape)
+"Vz" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "VO" = (
 /obj/effect/spawner/structure/window/shuttle,
 /turf/open/floor/plating,
 /area/shuttle/escape)
+"Wg" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 8
+	},
+/obj/structure/sign/nanotrasen{
+	pixel_x = -32
+	},
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
+/area/shuttle/escape)
+"WD" = (
+/obj/machinery/status_display/evac/directional/east,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 4
+	},
+/turf/open/floor/iron/edge{
+	dir = 8
+	},
+/area/shuttle/escape)
+"XM" = (
+/obj/machinery/iv_drip,
+/obj/structure/bed/roller,
+/obj/machinery/vending/wallmed/directional/east,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 4
+	},
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 8
+	},
+/area/shuttle/escape)
+"Ym" = (
+/obj/machinery/door/airlock{
+	name = "Unit 1"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron,
+/area/shuttle/escape)
 "YJ" = (
-/obj/machinery/door/airlock/command/glass{
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/obj/machinery/door/airlock/command{
 	name = "Emergency Shuttle Cockpit";
 	req_access_txt = "19"
 	},
-/obj/machinery/door/firedoor,
-/turf/open/floor/mineral/titanium,
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "Zz" = (
 /obj/machinery/door/airlock/medical/glass{
 	name = "Escape Shuttle Infirmary"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/mineral/titanium/white,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"ZD" = (
+/obj/machinery/light/small,
+/obj/machinery/status_display/evac/directional/south,
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 1
+	},
+/turf/open/floor/iron,
 /area/shuttle/escape)
 
 (1,1,1) = {"
@@ -477,7 +883,7 @@ am
 ac
 qO
 qO
-qg
+qO
 ac
 am
 ac
@@ -505,9 +911,9 @@ an
 ac
 ac
 ac
-at
-at
-at
+Fk
+cB
+Em
 ac
 ac
 ac
@@ -518,21 +924,21 @@ ac
 ac
 ac
 az
-aF
+ap
 ac
 aT
 bc
 bk
 ac
 bt
-az
+ac
 ac
 ac
 "}
 (5,1,1) = {"
 qO
-ap
-aq
+aF
+ve
 bJ
 ac
 aU
@@ -546,15 +952,15 @@ qO
 "}
 (6,1,1) = {"
 xE
-aq
-aq
-aq
+Gy
+by
+yT
 ac
 aV
 be
 bm
 ac
-Jx
+ZD
 ac
 ac
 ac
@@ -562,16 +968,16 @@ ac
 (7,1,1) = {"
 qO
 ar
-aq
+WD
 aq
 ac
 aW
 bf
 bn
 ac
-Jx
-RT
-bE
+Cf
+Ym
+sV
 qO
 "}
 (8,1,1) = {"
@@ -580,12 +986,12 @@ ac
 ac
 ED
 ac
-aX
+ac
 YJ
-bi
-az
-RT
-az
+ac
+ac
+El
+ac
 ac
 ac
 "}
@@ -594,11 +1000,11 @@ aa
 ac
 ac
 aH
-at
-at
-at
-at
-at
+Wg
+uQ
+Mo
+uQ
+Wg
 at
 ac
 ac
@@ -608,57 +1014,57 @@ aa
 aa
 aa
 ac
-aI
-at
-aY
-aY
-aY
-at
+iZ
+Vz
+Vz
+Vz
+Vz
+Vz
 bv
 ac
 aa
 aa
 "}
 (11,1,1) = {"
-VO
-VO
-aB
+qO
+qO
+az
 aJ
-at
+Vz
 aZ
-VO
+uc
 aK
-at
+Vz
 aL
 ac
 aa
 aa
 "}
 (12,1,1) = {"
-QG
-at
+xE
+Vz
 Gw
-at
-at
+Vz
+Vz
 aZ
 VO
 aK
-at
+Vz
 bP
 ac
 aa
 aa
 "}
 (13,1,1) = {"
-VO
-VO
-aB
-bK
-at
+qO
+qO
+az
+aK
+Vz
 aZ
 VO
 aK
-at
+Vz
 bw
 ac
 aa
@@ -669,11 +1075,11 @@ aa
 aa
 qO
 aK
-at
+Vz
 aZ
-VO
+fh
 aK
-at
+Vz
 aZ
 qO
 aa
@@ -683,13 +1089,13 @@ aa
 aa
 aa
 qO
-aK
-at
-at
-at
-at
-at
-aZ
+Lj
+Vz
+Vz
+dD
+Vz
+Vz
+Ca
 qO
 aa
 aa
@@ -699,57 +1105,57 @@ aa
 aa
 qO
 aK
-at
+Vz
 aZ
-VO
+uc
 aK
-at
+Vz
 aZ
 qO
 aa
 aa
 "}
 (17,1,1) = {"
-VO
-VO
-aB
+qO
+qO
+az
 bK
-at
+Vz
 aZ
 VO
 aK
-at
-bx
+Vz
+aZ
 ac
 aa
 aa
 "}
 (18,1,1) = {"
 RU
-at
+Vz
 Gw
-at
-at
+Vz
+Vz
 aZ
 VO
 aK
-at
+Vz
 bP
 ac
 aa
 aa
 "}
 (19,1,1) = {"
-VO
-VO
-aB
-aL
-at
+qO
+qO
+az
+Dx
+Vz
 aZ
-VO
+fh
 aK
-at
-by
+Vz
+bw
 ac
 aa
 aa
@@ -759,11 +1165,11 @@ aa
 aa
 ac
 aM
-at
-ba
-ba
-ba
-at
+Vz
+Vz
+Vz
+Vz
+Vz
 aI
 ac
 aa
@@ -773,12 +1179,12 @@ aa
 aa
 ac
 ac
-aN
-at
-at
-at
-at
-at
+iU
+yg
+CC
+TP
+CC
+yg
 aN
 ac
 ac
@@ -801,15 +1207,15 @@ ac
 "}
 (23,1,1) = {"
 ac
-av
+OP
 aE
 av
 aw
 bb
 ac
 bp
-Jx
-Jx
+NA
+LA
 bC
 bF
 ac
@@ -818,27 +1224,27 @@ ac
 jj
 aw
 aw
+IQ
 aw
-aw
-aw
-qO
-Jx
-Jx
-Jx
-Jx
+bM
+ac
+cl
+lL
+uM
+lL
 bG
 qO
 "}
 (25,1,1) = {"
 ac
+ta
+Oc
 ax
-ax
-ax
+mB
 aw
-bM
 ac
-bN
-Jx
+xr
+XM
 bz
 bD
 bH
@@ -849,12 +1255,12 @@ ac
 ac
 ac
 ac
-qO
+ac
 JJ
 ac
-rp
-qO
-JM
+Zz
+ac
+ac
 ac
 ac
 ac
@@ -866,7 +1272,7 @@ ac
 ac
 aQ
 aw
-qO
+ac
 Jx
 bs
 ac
diff --git a/_maps/shuttles/emergency/emergency_bar.dmm b/_maps/shuttles/emergency/emergency_bar.dmm
index 872d81fee2707..b1720b49d0f1c 100644
--- a/_maps/shuttles/emergency/emergency_bar.dmm
+++ b/_maps/shuttles/emergency/emergency_bar.dmm
@@ -15,17 +15,27 @@
 "af" = (
 /obj/structure/table/wood,
 /obj/item/flashlight/lamp/green,
-/turf/open/floor/carpet,
+/obj/machinery/newscaster/directional/west,
+/obj/effect/turf_decal/siding/dark{
+	dir = 9
+	},
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape)
 "ag" = (
 /obj/structure/chair/fancy/comfy{
 	dir = 1
 	},
-/turf/open/floor/carpet,
+/obj/effect/turf_decal/siding/dark{
+	dir = 1
+	},
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape)
 "ah" = (
 /obj/machinery/computer/emergency_shuttle,
-/turf/open/floor/carpet,
+/obj/effect/turf_decal/siding/dark{
+	dir = 1
+	},
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape)
 "ai" = (
 /obj/structure/table/wood,
@@ -34,87 +44,91 @@
 	pixel_x = -4;
 	pixel_y = 6
 	},
-/turf/open/floor/carpet,
-/area/shuttle/escape)
-"ak" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_y = 30
-	},
-/obj/machinery/light/small{
-	dir = 1
+/obj/effect/turf_decal/siding/dark{
+	dir = 5
 	},
-/turf/open/floor/iron/freezer,
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape)
 "al" = (
 /obj/machinery/computer/atmos_alert{
 	dir = 4
 	},
-/turf/open/floor/carpet,
+/obj/machinery/status_display/evac/directional/west,
+/obj/effect/turf_decal/siding/dark{
+	dir = 9
+	},
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape)
 "am" = (
 /obj/structure/chair/fancy/comfy{
 	dir = 8
 	},
-/turf/open/floor/carpet,
+/obj/effect/turf_decal/siding/dark/corner{
+	dir = 1
+	},
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape)
 "an" = (
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape)
 "ao" = (
 /obj/structure/chair/fancy/comfy{
 	dir = 4
 	},
-/turf/open/floor/carpet,
+/obj/effect/turf_decal/siding/dark/corner{
+	dir = 4
+	},
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape)
 "ap" = (
 /obj/machinery/computer/security{
 	dir = 8
 	},
-/turf/open/floor/carpet,
+/obj/machinery/status_display/ai/directional/east,
+/obj/effect/turf_decal/siding/dark{
+	dir = 5
+	},
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape)
 "aq" = (
 /obj/machinery/computer/crew{
 	dir = 4
 	},
-/turf/open/floor/carpet,
+/obj/effect/turf_decal/siding/dark{
+	dir = 10
+	},
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape)
 "ar" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_y = -30
-	},
 /obj/structure/chair/fancy/comfy{
 	dir = 8
 	},
-/turf/open/floor/carpet,
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape)
 "as" = (
-/obj/item/radio/intercom{
-	name = "Station Intercom (General)";
-	pixel_y = -29
-	},
-/turf/open/floor/carpet,
+/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape)
 "at" = (
-/obj/machinery/button/flasher{
-	id = "cockpit_flasher";
-	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,
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape)
 "au" = (
 /obj/machinery/computer/communications{
 	dir = 8
 	},
-/turf/open/floor/carpet,
-/area/shuttle/escape)
-"aA" = (
-/obj/machinery/status_display/evac,
-/turf/closed/wall/mineral/titanium,
+/obj/machinery/camera/directional/east,
+/obj/effect/turf_decal/siding/dark{
+	dir = 6
+	},
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape)
 "aC" = (
 /obj/structure/chair/fancy/shuttle,
@@ -124,38 +138,35 @@
 /obj/structure/musician/piano{
 	icon_state = "piano"
 	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/obj/structure/sign/nanotrasen{
+	pixel_y = 32
+	},
 /turf/open/floor/carpet/grimy,
 /area/shuttle/escape)
 "aG" = (
-/obj/structure/chair/stool/directional/west{
-	can_buckle = 1
+/obj/structure/chair/stool{
+	desc = "Apply butt, this one has a belt.";
+	can_buckle = 1;
+	dir = 8
 	},
 /turf/open/floor/carpet/grimy,
 /area/shuttle/escape)
 "aH" = (
-/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
 	},
+/obj/structure/reagent_dispensers/peppertank/directional/west,
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "aI" = (
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "aL" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_y = -30
-	},
+/obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "aM" = (
@@ -166,11 +177,16 @@
 /area/shuttle/escape)
 "aW" = (
 /obj/structure/chair/wood/normal,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
 /turf/open/floor/carpet/grimy,
 /area/shuttle/escape)
 "aY" = (
 /obj/machinery/vending/boozeomat,
-/turf/closed/wall/mineral/titanium,
+/obj/machinery/status_display/evac/directional/east,
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "aZ" = (
 /obj/structure/chair/wood/normal{
@@ -192,19 +208,23 @@
 /turf/open/floor/carpet/grimy,
 /area/shuttle/escape)
 "bi" = (
-/turf/open/floor/mineral/titanium,
-/area/shuttle/escape)
-"bn" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/structure/sign/departments/medbay/alt,
-/turf/closed/wall/mineral/titanium,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
+/turf/open/floor/iron/white/smooth_large,
 /area/shuttle/escape)
 "bp" = (
+/obj/effect/decal/cleanable/oil,
+/obj/structure/extinguisher_cabinet/directional/north,
 /turf/open/floor/iron/freezer,
 /area/shuttle/escape)
 "br" = (
-/obj/machinery/stasis,
-/turf/open/floor/mineral/titanium,
+/obj/machinery/iv_drip,
+/obj/structure/bed/roller,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 5
+	},
+/turf/open/floor/iron/white,
 /area/shuttle/escape)
 "bw" = (
 /obj/structure/table/optable,
@@ -213,50 +233,48 @@
 	brightness = 3;
 	dir = 8
 	},
-/turf/open/floor/mineral/titanium,
-/area/shuttle/escape)
-"bx" = (
-/obj/structure/toilet{
-	dir = 4
+/obj/machinery/camera/directional/west,
+/obj/machinery/newscaster/directional/west,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 8
 	},
-/obj/machinery/light/small{
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/white/smooth_edge{
 	dir = 4
 	},
-/turf/open/floor/iron/freezer,
 /area/shuttle/escape)
-"by" = (
+"bx" = (
 /obj/machinery/recharge_station,
 /obj/machinery/light/small{
 	dir = 4
 	},
+/obj/item/radio/intercom/directional/west,
+/obj/machinery/newscaster/directional/east,
 /turf/open/floor/iron/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,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 10
+	},
+/turf/open/floor/iron/white,
 /area/shuttle/escape)
 "bC" = (
-/obj/structure/window/reinforced{
-	dir = 1
-	},
 /obj/structure/shuttle/engine/heater,
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/firedoor/window,
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
 "bE" = (
 /obj/structure/shuttle/engine/propulsion,
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
-"bF" = (
-/obj/effect/spawner/structure/window/shuttle,
-/turf/open/floor/iron/freezer,
-/area/shuttle/escape)
 "bH" = (
+/obj/machinery/status_display/evac/directional/west,
+/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/carpet/grimy,
 /area/shuttle/escape)
 "bJ" = (
@@ -268,6 +286,9 @@
 /obj/structure/chair/wood/normal{
 	dir = 8
 	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
 /turf/open/floor/carpet/grimy,
 /area/shuttle/escape)
 "bL" = (
@@ -297,6 +318,7 @@
 /obj/structure/chair/wood/normal{
 	dir = 1
 	},
+/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/carpet/grimy,
 /area/shuttle/escape)
 "bS" = (
@@ -306,7 +328,10 @@
 	pixel_x = 4;
 	pixel_y = 4
 	},
-/turf/open/floor/mineral/titanium,
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 1
+	},
 /area/shuttle/escape)
 "bU" = (
 /obj/structure/table,
@@ -315,12 +340,17 @@
 	pixel_x = 4;
 	pixel_y = 4
 	},
-/turf/open/floor/mineral/titanium,
+/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 6
+	},
+/turf/open/floor/iron/white,
 /area/shuttle/escape)
 "bW" = (
 /obj/machinery/light/small{
 	dir = 4
 	},
+/obj/machinery/status_display/ai/directional/east,
 /turf/open/floor/carpet/grimy,
 /area/shuttle/escape)
 "cb" = (
@@ -328,7 +358,21 @@
 	dir = 4
 	},
 /obj/machinery/stasis,
-/turf/open/floor/mineral/titanium,
+/obj/machinery/status_display/evac/directional/east,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 8
+	},
+/area/shuttle/escape)
+"cS" = (
+/obj/machinery/status_display/evac/directional/west,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/open/floor/carpet/grimy,
 /area/shuttle/escape)
 "ek" = (
 /obj/structure/table,
@@ -338,12 +382,33 @@
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/shuttle/escape)
+"ft" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
+/turf/open/floor/carpet/grimy,
+/area/shuttle/escape)
+"gl" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
+	},
+/turf/open/floor/carpet/grimy,
+/area/shuttle/escape)
+"gr" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/turf/open/floor/carpet/grimy,
+/area/shuttle/escape)
 "hb" = (
 /obj/machinery/door/airlock{
-	name = "Unit B"
+	name = "Unit 1"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/iron/freezer,
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "hk" = (
 /obj/structure/table/wood/bar{
@@ -353,12 +418,25 @@
 	group_name = "bar staff on the Emergency Escape Bar"
 	},
 /obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "hI" = (
-/obj/structure/chair/stool/bar/directional/west,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
+/obj/structure/chair/stool/bar{
+	dir = 4;
+	can_buckle = 1;
+	desc = "The apex of the bar experience, this one comes with a belt."
+	},
+/turf/open/floor/wood,
+/area/shuttle/escape)
+"hM" = (
+/obj/structure/chair/fancy/shuttle{
+	dir = 1
+	},
+/obj/machinery/status_display/ai/directional/south,
+/turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "hS" = (
 /obj/structure/table,
@@ -368,24 +446,32 @@
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/shuttle/escape)
+"jv" = (
+/obj/machinery/status_display/evac/directional/north,
+/obj/machinery/light/small,
+/turf/open/floor/iron/freezer,
+/area/shuttle/escape)
 "kj" = (
 /obj/machinery/vending/cigarette,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
+/turf/open/floor/wood,
 /area/shuttle/escape)
 "kK" = (
 /obj/machinery/door/airlock/titanium{
 	name = "Emergency Shuttle Airlock"
 	},
 /obj/structure/fans/tiny,
-/turf/open/floor/iron/freezer,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/turf/open/floor/iron/white,
 /area/shuttle/escape)
 "kS" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_y = -30
-	},
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
+/turf/open/floor/wood,
+/area/shuttle/escape)
+"mB" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape)
 "oh" = (
 /obj/item/kirbyplants{
@@ -393,8 +479,7 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
+/turf/open/floor/wood,
 /area/shuttle/escape)
 "ox" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -404,42 +489,54 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
-/area/shuttle/escape)
-"qm" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock"
-	},
-/obj/structure/fans/tiny,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
+/turf/open/floor/wood,
 /area/shuttle/escape)
 "rb" = (
 /obj/machinery/door/airlock{
 	name = "Unit 2"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/iron/freezer,
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"rp" = (
+/obj/machinery/camera/directional/south,
+/turf/open/floor/wood,
 /area/shuttle/escape)
 "rs" = (
 /mob/living/simple_animal/hostile/alien/maid/barmaid,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/shuttle/escape)
+"tB" = (
+/obj/machinery/vending/wallmed/directional/west,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 9
+	},
+/turf/open/floor/iron/white,
+/area/shuttle/escape)
+"tV" = (
+/obj/structure/table/wood/bar{
+	boot_dir = 8
+	},
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/obj/item/radio/intercom,
+/turf/open/floor/iron,
+/area/shuttle/escape)
 "up" = (
 /obj/structure/table/wood/bar{
 	boot_dir = 10
 	},
 /obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
+	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "wI" = (
-/obj/machinery/flasher{
-	id = "cockpit_flasher";
-	pixel_x = 6;
-	pixel_y = 24
-	},
 /obj/item/kirbyplants{
 	icon_state = "plant-21";
 	pixel_x = -3;
@@ -448,34 +545,71 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
+/turf/open/floor/wood,
 /area/shuttle/escape)
 "xh" = (
 /obj/item/kirbyplants{
 	icon_state = "plant-10"
 	},
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
+/obj/machinery/status_display/evac/directional/east,
+/turf/open/floor/wood,
 /area/shuttle/escape)
 "ys" = (
 /obj/structure/table/wood/bar{
 	boot_dir = 9
 	},
 /obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
+	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "zE" = (
 /obj/machinery/light,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
+/obj/machinery/newscaster/directional/south,
+/turf/open/floor/wood,
+/area/shuttle/escape)
+"zZ" = (
+/obj/structure/chair/fancy/shuttle,
+/obj/machinery/camera/directional/west,
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"As" = (
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/wood,
 /area/shuttle/escape)
 "AX" = (
 /obj/structure/chair/stool/bar{
+	dir = 1;
 	can_buckle = 1;
-	name = "buckleable bar stool"
+	desc = "The apex of the bar experience, this one comes with a belt."
+	},
+/turf/open/floor/wood,
+/area/shuttle/escape)
+"Cv" = (
+/obj/machinery/flasher{
+	id = "cockpit_flasher";
+	pixel_x = -25;
+	pixel_y = 25
+	},
+/turf/open/floor/wood,
+/area/shuttle/escape)
+"DY" = (
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+	dir = 1
+	},
+/turf/open/floor/iron/white/smooth_edge,
+/area/shuttle/escape)
+"Fm" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
 	},
+/turf/open/floor/carpet/grimy,
+/area/shuttle/escape)
+"Fy" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
+/mob/living/simple_animal/drone/snowflake/bardrone,
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "FR" = (
@@ -483,7 +617,8 @@
 	name = "Medbay"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/mineral/titanium,
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "Ge" = (
 /obj/structure/table,
@@ -491,26 +626,56 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/machinery/camera/directional/east,
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/newscaster/directional/east,
 /turf/open/floor/iron,
 /area/shuttle/escape)
+"Gr" = (
+/obj/machinery/button/flasher{
+	id = "cockpit_flasher";
+	pixel_x = -25;
+	pixel_y = -25
+	},
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/carpet/royalblue,
+/area/shuttle/escape)
+"GA" = (
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/iron/freezer,
+/area/shuttle/escape)
 "GY" = (
 /obj/machinery/door/airlock/public/glass{
 	name = "Emergency Shuttle Cockpit";
 	req_access_txt = "19"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/carpet,
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "JC" = (
 /obj/structure/table/wood/bar,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
+"JI" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
 "Lq" = (
 /obj/structure/table/wood/bar{
 	boot_dir = 8
 	},
 /obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "LQ" = (
@@ -519,7 +684,18 @@
 	req_access_txt = "2"
 	},
 /obj/structure/fans/tiny,
-/turf/open/floor/mineral/plastitanium/red/brig,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/turf/open/floor/iron/white,
+/area/shuttle/escape)
+"NU" = (
+/obj/structure/chair/fancy/comfy{
+	dir = 4
+	},
+/obj/machinery/firealarm/directional/south,
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/carpet/royalblue,
 /area/shuttle/escape)
 "Py" = (
 /obj/machinery/door/airlock/titanium{
@@ -529,8 +705,20 @@
 	name = "The Emergency Escape Bar"
 	},
 /obj/structure/fans/tiny,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/turf/open/floor/iron/white,
+/area/shuttle/escape)
+"PN" = (
+/obj/structure/mirror/directional/north{
+	pixel_y = 32
+	},
+/obj/structure/sink{
+	dir = 1;
+	pixel_y = 24
+	},
+/turf/open/floor/iron/freezer,
 /area/shuttle/escape)
 "Qu" = (
 /obj/structure/extinguisher_cabinet{
@@ -547,7 +735,8 @@
 	name = "Unisex Restrooms"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/iron/freezer,
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "Rk" = (
 /obj/machinery/door/airlock/public/glass{
@@ -555,47 +744,70 @@
 	req_access_txt = "2"
 	},
 /obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
+"Rl" = (
+/obj/structure/chair/fancy/shuttle,
+/obj/machinery/status_display/evac/directional/north,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"Sq" = (
+/obj/structure/sign/departments/medbay/alt{
+	pixel_y = -32
+	},
+/turf/open/floor/wood,
+/area/shuttle/escape)
 "Vx" = (
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
+/turf/open/floor/wood,
+/area/shuttle/escape)
+"Xg" = (
+/obj/structure/toilet{
+	dir = 4
+	},
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/newscaster/directional/east,
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/iron/freezer,
 /area/shuttle/escape)
 "Xz" = (
 /obj/machinery/light/small,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
-/area/shuttle/escape)
-"Yn" = (
-/obj/machinery/vending/wallmed{
-	name = "Emergency NanoMed";
-	use_power = 0
-	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/wood,
 /area/shuttle/escape)
 "YJ" = (
 /obj/machinery/door/airlock{
-	name = "Unit 1"
+	name = "Unit B"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/iron/freezer,
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "Zm" = (
 /obj/structure/table/wood/bar,
 /obj/item/instrument/guitar,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
+"Zp" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/firedoor/window,
+/turf/open/floor/plating,
+/area/shuttle/escape)
 "Zq" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/mob/living/simple_animal/drone/snowflake/bardrone,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "Zw" = (
@@ -603,6 +815,7 @@
 	boot_dir = 2
 	},
 /obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/iron,
 /area/shuttle/escape)
 
@@ -618,11 +831,11 @@ LQ
 ab
 Py
 ab
-ac
-ac
-ac
+Zp
+Zp
+Zp
 ab
-qm
+kK
 ab
 kK
 ab
@@ -636,12 +849,12 @@ ab
 ab
 ab
 ab
-aC
+zZ
 aH
 aL
 ab
 oF
-bH
+cS
 aZ
 bc
 aZ
@@ -660,11 +873,11 @@ ae
 al
 aq
 ab
-aC
-aI
-aM
+Rl
+JI
+hM
 ab
-ox
+kS
 aW
 ba
 bL
@@ -672,14 +885,14 @@ bO
 bQ
 kS
 ab
-bp
+PN
 ab
 ab
 bC
 bE
 "}
 (4,1,1) = {"
-ac
+Zp
 af
 am
 ar
@@ -688,22 +901,22 @@ aC
 aI
 aM
 ab
-ox
+As
 aW
 bJ
 bM
 bP
 bQ
-ox
+rp
 ab
-ak
+PN
 rb
-bx
+Xg
 bC
 bE
 "}
 (5,1,1) = {"
-ac
+Zp
 ag
 an
 as
@@ -712,52 +925,52 @@ ac
 Rk
 ac
 ae
-ox
-bH
+kS
+gl
 bK
-bH
+ft
 bK
-bH
-ox
-aA
-bp
+gr
+kS
+ab
+jv
 ab
 ab
 bC
 bE
 "}
 (6,1,1) = {"
-ac
+Zp
 ah
 an
 at
 ab
 wI
-ox
-ox
+kS
+kS
 Vx
-ox
-ox
-ox
-ox
-ox
-ox
-ox
+kS
+kS
+kS
+kS
+kS
+kS
+kS
 QE
-bp
+GA
 hb
-by
+Xg
 bC
 bE
 "}
 (7,1,1) = {"
-ac
+Zp
 ag
-an
-an
+mB
+Gr
 GY
-ox
-ox
+Cv
+kS
 hI
 hI
 hI
@@ -765,9 +978,9 @@ hI
 hI
 hI
 hI
-ox
+kS
 zE
-Yn
+ae
 ab
 ab
 ab
@@ -775,24 +988,24 @@ bC
 bE
 "}
 (8,1,1) = {"
-ac
+Zp
 ai
 ao
-ao
-aA
+NU
+ab
 oh
-ox
+kS
 ys
-Lq
+tV
 hk
 Lq
 Lq
 Lq
 up
 AX
-ox
-bn
-bi
+Sq
+ab
+tB
 bw
 bz
 bC
@@ -805,18 +1018,18 @@ ap
 au
 ab
 aF
-bH
+Fm
 JC
 ox
 rs
 Zq
-ox
+Fy
 ox
 Zw
-ox
-ox
+kS
+kS
 FR
-bi
+DY
 bi
 bS
 bC
@@ -839,7 +1052,7 @@ hS
 Zw
 xh
 kj
-bF
+Zp
 br
 cb
 bU
@@ -852,21 +1065,21 @@ aa
 aa
 aa
 ab
-ac
+Zp
 ab
-ac
+Zp
 ab
 ab
 ab
-ac
-ac
-ac
+Zp
+Zp
+Zp
 ab
 ab
 ab
-ac
+Zp
 ab
-ac
+Zp
 ab
 aa
 "}
diff --git a/_maps/shuttles/emergency/emergency_birdboat.dmm b/_maps/shuttles/emergency/emergency_birdboat.dmm
index 7307074e8a6f7..cc2dc3d035c09 100644
--- a/_maps/shuttles/emergency/emergency_birdboat.dmm
+++ b/_maps/shuttles/emergency/emergency_birdboat.dmm
@@ -6,25 +6,30 @@
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/escape)
 "ad" = (
-/obj/structure/table,
-/obj/item/scalpel,
-/obj/item/retractor{
-	pixel_y = 5
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/structure/closet,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 1
 	},
-/obj/item/hemostat,
-/turf/open/floor/mineral/titanium/white,
+/turf/open/floor/iron/edge,
 /area/shuttle/escape)
 "ae" = (
-/obj/structure/table,
-/obj/item/cautery,
-/obj/item/surgicaldrill,
-/obj/item/circular_saw{
-	pixel_y = 9
+/obj/structure/closet,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 1
 	},
-/turf/open/floor/mineral/titanium/white,
+/turf/open/floor/iron/edge,
 /area/shuttle/escape)
 "af" = (
-/turf/open/floor/mineral/titanium/white,
+/obj/machinery/vending/wallmed/directional/south,
+/obj/machinery/computer/operating{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/machinery/light,
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 1
+	},
 /area/shuttle/escape)
 "ag" = (
 /obj/structure/shuttle/engine/propulsion/right{
@@ -35,40 +40,13 @@
 "ah" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/escape)
-"ai" = (
-/obj/machinery/computer/emergency_shuttle,
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/escape)
-"aj" = (
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/escape)
-"ak" = (
-/obj/item/kirbyplants{
-	icon_state = "plant-22"
-	},
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/escape)
 "al" = (
 /obj/structure/chair/fancy/shuttle,
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
-"am" = (
-/obj/structure/chair/fancy/shuttle,
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/mineral/plastitanium/red/brig,
-/area/shuttle/escape)
 "an" = (
-/obj/structure/table/optable,
-/obj/item/surgical_drapes,
-/turf/open/floor/mineral/titanium/white,
-/area/shuttle/escape)
-"ao" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/mineral/titanium/white,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "ap" = (
 /obj/structure/shuttle/engine/propulsion{
@@ -77,16 +55,19 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
 "aq" = (
-/obj/machinery/computer/communications{
+/obj/machinery/computer/crew,
+/obj/item/radio/intercom/directional/west,
+/obj/machinery/newscaster/directional/north,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
 	dir = 4
 	},
-/turf/open/floor/mineral/titanium/blue,
+/turf/open/floor/iron/dark/side,
 /area/shuttle/escape)
 "ar" = (
-/obj/structure/chair/fancy/shuttle{
+/obj/structure/chair/fancy/corp{
 	dir = 8
 	},
-/turf/open/floor/mineral/titanium,
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "at" = (
 /turf/open/floor/mineral/plastitanium/red/brig,
@@ -98,61 +79,54 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
 "av" = (
-/obj/machinery/light,
-/turf/open/floor/mineral/titanium,
-/area/shuttle/escape)
-"aw" = (
-/obj/machinery/vending/wallmed{
-	name = "Emergency NanoMed";
-	use_power = 0
+/obj/machinery/computer/communications{
+	dir = 1
 	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/shuttle/escape)
-"ax" = (
-/obj/structure/table,
-/obj/machinery/recharger{
-	active_power_usage = 0;
-	idle_power_usage = 0;
-	pixel_y = 4;
-	use_power = 0
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+	alpha = 180;
+	dir = 8
+	},
+/turf/open/floor/iron/dark/side{
+	dir = 1
 	},
-/turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
-"ay" = (
-/obj/structure/table,
-/obj/item/storage/box/handcuffs,
-/turf/open/floor/mineral/plastitanium/red/brig,
+"aw" = (
+/obj/structure/closet/crate/bin,
+/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 10
+	},
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "aB" = (
 /obj/item/kirbyplants{
 	icon_state = "plant-21"
 	},
-/turf/open/floor/mineral/titanium,
+/obj/effect/turf_decal/siding/thinplating_new,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "aC" = (
-/turf/open/floor/mineral/titanium,
-/area/shuttle/escape)
-"aD" = (
-/turf/open/floor/mineral/plastitanium,
+/obj/effect/turf_decal/siding/thinplating_new{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "aE" = (
 /obj/structure/chair/fancy/shuttle{
 	dir = 4
 	},
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/escape)
-"aF" = (
-/obj/structure/table,
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/mineral/plastitanium,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/iron/techmaint,
 /area/shuttle/escape)
 "aH" = (
 /obj/structure/chair/fancy/shuttle{
 	dir = 8
 	},
-/turf/open/floor/mineral/plastitanium,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/iron/techmaint,
 /area/shuttle/escape)
 "aI" = (
 /obj/structure/table,
@@ -161,147 +135,805 @@
 	pixel_x = 4;
 	pixel_y = 7
 	},
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/escape)
-"aJ" = (
-/obj/machinery/light/small,
-/turf/open/floor/mineral/titanium,
+/turf/open/floor/iron/techmaint,
 /area/shuttle/escape)
 "aL" = (
 /obj/structure/table,
-/turf/open/floor/mineral/plastitanium,
+/turf/open/floor/iron/techmaint,
 /area/shuttle/escape)
 "aM" = (
 /obj/structure/table,
 /obj/item/food/chocolatebar,
-/turf/open/floor/mineral/plastitanium,
+/turf/open/floor/iron/techmaint,
 /area/shuttle/escape)
 "aN" = (
 /obj/structure/chair/fancy/shuttle{
 	dir = 1
 	},
 /obj/structure/window/reinforced,
-/turf/open/floor/mineral/plastitanium,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/iron/techmaint,
+/area/shuttle/escape)
+"aP" = (
+/obj/structure/chair/fancy/shuttle,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/iron/techmaint,
 /area/shuttle/escape)
-"aO" = (
+"aR" = (
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 5
+	},
+/turf/open/floor/iron/white,
+/area/shuttle/escape)
+"aS" = (
 /obj/structure/chair/fancy/shuttle{
 	dir = 1
 	},
-/obj/structure/window/reinforced,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/iron/techmaint,
+/area/shuttle/escape)
+"aT" = (
+/obj/machinery/light,
+/obj/structure/chair/fancy/shuttle{
+	dir = 1
+	},
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/machinery/camera/directional/south,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/iron/techmaint,
+/area/shuttle/escape)
+"aU" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 4
+	},
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 8
+	},
+/area/shuttle/escape)
+"aV" = (
+/obj/machinery/vending/cigarette,
+/obj/effect/turf_decal/bot,
+/obj/machinery/newscaster/directional/south,
+/obj/effect/turf_decal/siding/thinplating_new{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"aX" = (
+/obj/machinery/stasis,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/machinery/camera/directional/south,
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 1
+	},
+/area/shuttle/escape)
+"aY" = (
+/obj/structure/table/optable,
+/obj/item/clothing/gloves/color/latex,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 6
+	},
+/turf/open/floor/iron/white,
+/area/shuttle/escape)
+"bS" = (
+/obj/structure/chair/fancy/shuttle,
+/obj/structure/sign/nanotrasen{
+	pixel_y = 32
+	},
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/iron/techmaint,
+/area/shuttle/escape)
+"cM" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 1
+	},
 /obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/iron/edge,
+/area/shuttle/escape)
+"do" = (
+/obj/effect/turf_decal/siding/thinplating_new,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"dy" = (
+/obj/effect/turf_decal/siding/thinplating_new,
+/obj/effect/turf_decal/siding/thinplating_new/corner{
 	dir = 4
 	},
-/turf/open/floor/mineral/plastitanium,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
-"aP" = (
+"eF" = (
+/obj/effect/turf_decal/trimline/neutral/filled/warning{
+	dir = 1
+	},
+/turf/open/floor/iron/edge,
+/area/shuttle/escape)
+"gr" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+	dir = 8
+	},
+/obj/structure/chair/fancy/corp{
+	dir = 4
+	},
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
+"ho" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/closeup,
+/obj/machinery/door/airlock/security/glass{
+	name = "Emergency Shuttle Brig";
+	req_access_txt = "2"
+	},
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"hK" = (
+/obj/machinery/vending/sustenance,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"im" = (
+/obj/machinery/computer/secure_data{
+	dir = 4
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"ip" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
+/obj/effect/turf_decal/siding/thinplating_new/corner,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"iH" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 1;
+	pixel_y = -16
+	},
+/obj/effect/turf_decal/box/corners{
+	pixel_y = -16;
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"jz" = (
+/obj/machinery/iv_drip,
+/obj/structure/bed/roller,
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/turf/open/floor/iron/edge{
+	dir = 1
+	},
+/area/shuttle/escape)
+"jD" = (
+/obj/machinery/button/flasher{
+	id = "cockpit_flasher";
+	pixel_x = 25;
+	pixel_y = -25
+	},
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 8
+	},
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
+"jP" = (
+/mob/living/simple_animal/bot/medbot{
+	name = "\improper emergency medibot";
+	pixel_x = -3;
+	pixel_y = 2
+	},
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 4
+	},
+/turf/open/floor/iron/edge{
+	dir = 8
+	},
+/area/shuttle/escape)
+"kh" = (
+/obj/effect/turf_decal/trimline/neutral/filled/warning{
+	dir = 8
+	},
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
+/area/shuttle/escape)
+"li" = (
+/obj/structure/table,
+/obj/item/hemostat,
+/obj/item/scalpel,
+/obj/item/cautery,
+/obj/item/surgical_drapes,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 10
+	},
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/iron/white,
+/area/shuttle/escape)
+"lO" = (
+/obj/effect/turf_decal/trimline/neutral/filled/warning{
+	dir = 4
+	},
+/turf/open/floor/iron/edge{
+	dir = 8
+	},
+/area/shuttle/escape)
+"lX" = (
+/obj/effect/turf_decal/siding/thinplating_new{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"mk" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 10
+	},
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"mB" = (
+/obj/effect/turf_decal/siding/thinplating_new,
+/obj/effect/turf_decal/siding/thinplating_new/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"mM" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 5
+	},
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"oq" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 1
+	},
+/obj/structure/chair/fancy/corp,
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
+"ow" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 8
+	},
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
+/area/shuttle/escape)
+"oZ" = (
+/obj/structure/chair/fancy/shuttle{
+	dir = 1
+	},
+/obj/structure/window/reinforced,
+/obj/machinery/newscaster/directional/east,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/iron/techmaint,
+/area/shuttle/escape)
+"pl" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+	dir = 8
+	},
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
+"ru" = (
+/obj/machinery/firealarm/directional/east,
+/obj/machinery/camera/directional/east,
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
+"rE" = (
 /obj/structure/chair/fancy/shuttle,
 /obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/effect/turf_decal/bot_white,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/iron/techmaint,
+/area/shuttle/escape)
+"st" = (
+/obj/effect/turf_decal/trimline/neutral/filled/warning,
+/turf/open/floor/iron/edge{
+	dir = 1
+	},
+/area/shuttle/escape)
+"sR" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 6
+	},
+/obj/machinery/newscaster/directional/south,
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"ta" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating_new{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"tw" = (
+/obj/effect/turf_decal/siding/thinplating_new/corner,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"uy" = (
+/obj/structure/chair/fancy/shuttle,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/iron/techmaint,
+/area/shuttle/escape)
+"uP" = (
+/obj/machinery/holopad{
+	pixel_x = 16
+	},
+/obj/effect/turf_decal/box/corners{
 	dir = 1;
-	pixel_y = 2
+	pixel_x = 16
+	},
+/obj/effect/turf_decal/box/corners{
+	pixel_x = 16;
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white/smooth_large,
+/area/shuttle/escape)
+"vj" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"vv" = (
+/obj/structure/chair/fancy/shuttle,
+/obj/machinery/camera/directional/north,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/iron/techmaint,
+/area/shuttle/escape)
+"vW" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 8
+	},
+/obj/structure/chair/fancy/corp{
+	dir = 4
+	},
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
+"wJ" = (
+/obj/machinery/holopad{
+	pixel_y = 16
+	},
+/obj/effect/turf_decal/box/corners{
+	pixel_y = 16
+	},
+/obj/effect/turf_decal/box/corners{
+	pixel_y = 16;
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"xz" = (
+/obj/machinery/door/airlock/public/glass{
+	name = "Emergency Shuttle"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"xQ" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 8
+	},
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/firedoor/window,
+/turf/open/floor/plating/airless,
+/area/shuttle/escape)
+"xV" = (
+/obj/structure/chair/fancy/shuttle{
+	dir = 1
+	},
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/machinery/newscaster/directional/south,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"zf" = (
+/obj/structure/table,
+/obj/machinery/recharger,
+/obj/item/storage/fancy/donut_box,
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
+"zs" = (
+/obj/item/kirbyplants{
+	icon_state = "plant-21"
+	},
+/obj/item/radio/intercom/directional/west,
+/obj/effect/turf_decal/siding/thinplating_new{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"zG" = (
+/obj/effect/turf_decal/siding/thinplating_new{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating_new,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"AT" = (
+/obj/structure/chair/fancy/shuttle,
+/obj/machinery/camera/directional/east,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"Bm" = (
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+	dir = 1
+	},
+/turf/open/floor/iron/white/smooth_edge,
+/area/shuttle/escape)
+"DU" = (
+/obj/structure/closet/firecloset,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 9
+	},
+/obj/machinery/camera/directional/north,
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"Eg" = (
+/obj/structure/closet/emcloset,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 1
+	},
+/turf/open/floor/iron/edge,
+/area/shuttle/escape)
+"Em" = (
+/obj/effect/turf_decal/siding/thinplating_new{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"EQ" = (
+/obj/structure/chair/fancy/shuttle{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"Fg" = (
+/obj/structure/chair/fancy/shuttle,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"FV" = (
+/obj/effect/turf_decal/trimline/yellow/filled/warning,
+/turf/open/floor/iron/edge{
+	dir = 1
+	},
+/area/shuttle/escape)
+"GP" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"Hl" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/closeup,
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Cargo"
+	},
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"Hx" = (
+/obj/effect/turf_decal/siding/thinplating_new/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"Hy" = (
+/obj/machinery/computer/crew{
+	dir = 4
+	},
+/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 9
+	},
+/turf/open/floor/iron/white,
+/area/shuttle/escape)
+"HU" = (
+/obj/item/radio/intercom/directional/east,
+/obj/effect/turf_decal/siding/thinplating_new,
+/obj/effect/turf_decal/siding/thinplating_new{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"II" = (
+/obj/effect/turf_decal/siding/thinplating_new,
+/obj/effect/turf_decal/siding/thinplating_new{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"Jj" = (
+/obj/effect/turf_decal/siding/thinplating_new/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"Ke" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/item/folder/blue,
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
+"Ki" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+	dir = 1
+	},
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
+"Kr" = (
+/obj/structure/table,
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/item/bikehorn/rubberducky{
+	pixel_y = 6;
+	pixel_x = 4
+	},
+/obj/item/origami/paperboat,
+/turf/open/floor/iron/techmaint,
+/area/shuttle/escape)
+"KB" = (
+/obj/machinery/flasher{
+	id = "cockpit_flasher";
+	pixel_x = 25;
+	pixel_y = 25
+	},
+/obj/effect/turf_decal/siding/thinplating_new{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"KP" = (
+/obj/structure/closet/crate/bin,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/siding/thinplating_new/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"Lz" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 6
+	},
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"Mg" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/docking_port/mobile/emergency{
+	dir = 8;
+	dwidth = 6;
+	height = 18;
+	name = "Birdboat emergency escape shuttle";
+	port_direction = 4;
+	width = 14
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/iron/white,
+/area/shuttle/escape)
+"Ml" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/closeup,
+/obj/machinery/door/airlock/public/glass{
+	name = "Emergency Shuttle Infirmary"
+	},
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"MM" = (
+/obj/item/kirbyplants{
+	icon_state = "plant-22"
+	},
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
+"MN" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/firedoor/window,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"Nj" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 1
+	},
+/turf/open/floor/iron/white/smooth_edge,
+/area/shuttle/escape)
+"Nl" = (
+/obj/machinery/light{
+	dir = 4
 	},
-/turf/open/floor/mineral/plastitanium,
+/obj/structure/reagent_dispensers/peppertank/directional/east,
+/turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
-"aQ" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_x = -27
+"Ok" = (
+/obj/structure/table,
+/obj/machinery/recharger{
+	active_power_usage = 0;
+	idle_power_usage = 0;
+	pixel_y = 4;
+	use_power = 0
 	},
-/turf/open/floor/mineral/titanium/white,
-/area/shuttle/escape)
-"aR" = (
-/obj/structure/table/glass,
-/obj/item/storage/firstaid/fire{
-	pixel_x = 5;
-	pixel_y = 5
+/obj/item/restraints/handcuffs{
+	pixel_y = 3
 	},
-/obj/item/storage/firstaid/toxin,
-/turf/open/floor/mineral/titanium/white,
+/turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
-"aS" = (
-/obj/structure/chair/fancy/shuttle{
-	dir = 1
+"OU" = (
+/obj/machinery/computer/security{
+	dir = 4
 	},
-/turf/open/floor/mineral/plastitanium,
+/turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
-"aT" = (
-/obj/structure/chair/fancy/shuttle{
+"PJ" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/obj/machinery/light,
+/turf/open/floor/iron/edge{
 	dir = 1
 	},
-/obj/machinery/light,
-/turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
-"aU" = (
-/obj/structure/table/glass,
-/obj/item/storage/firstaid/brute{
+"QI" = (
+/obj/item/storage/firstaid/fire{
 	pixel_x = 5;
 	pixel_y = 5
 	},
 /obj/item/storage/firstaid/brute,
-/obj/machinery/light{
+/obj/structure/table,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 8
+	},
+/turf/open/floor/iron/white/smooth_edge{
 	dir = 4
 	},
-/turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
-"aV" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_y = -32
+"Re" = (
+/obj/machinery/light{
+	dir = 4
 	},
-/turf/open/floor/mineral/titanium,
-/area/shuttle/escape)
-"aW" = (
-/obj/structure/chair/fancy/shuttle,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/escape)
-"aX" = (
-/obj/machinery/stasis,
-/turf/open/floor/mineral/titanium/white,
-/area/shuttle/escape)
-"aY" = (
-/obj/structure/table/glass,
-/obj/item/defibrillator/loaded,
-/turf/open/floor/mineral/titanium/white,
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/structure/chair/fancy/corp{
+	dir = 8
+	},
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
-"xJ" = (
+"RD" = (
 /obj/machinery/door/airlock/command/glass{
-	name = "bridge Door";
+	name = "Emergency Shuttle Cockpit";
 	req_access_txt = "19"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/mineral/titanium,
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron,
 /area/shuttle/escape)
-"Hy" = (
-/obj/machinery/door/airlock/public/glass,
+"SF" = (
 /obj/machinery/door/firedoor,
-/turf/open/floor/mineral/titanium/white,
-/area/shuttle/escape)
-"Mg" = (
-/obj/machinery/door/airlock/titanium,
-/obj/docking_port/mobile/emergency{
-	dir = 8;
-	dwidth = 6;
-	height = 18;
-	name = "Birdboat emergency escape shuttle";
-	port_direction = 4;
-	width = 14
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
 	},
-/obj/machinery/door/firedoor,
-/turf/open/floor/mineral/titanium,
+/obj/machinery/door/airlock/public/glass{
+	name = "Emergency Shuttle"
+	},
+/turf/open/floor/iron,
 /area/shuttle/escape)
-"MN" = (
-/obj/effect/spawner/structure/window/shuttle,
-/turf/open/floor/plating,
+"SQ" = (
+/obj/effect/turf_decal/box/corners{
+	pixel_x = -16
+	},
+/obj/effect/turf_decal/box/corners{
+	pixel_x = -16;
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white/smooth_large,
 /area/shuttle/escape)
 "Ti" = (
-/obj/machinery/door/airlock/titanium,
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Airlock"
+	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/mineral/titanium,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/iron/white,
 /area/shuttle/escape)
-"Wn" = (
-/obj/machinery/door/airlock/security/glass{
-	name = "security Airlock";
-	req_access_txt = "63"
+"UE" = (
+/obj/machinery/computer/emergency_shuttle{
+	dir = 1
 	},
-/obj/machinery/door/firedoor,
-/turf/open/floor/mineral/plastitanium/red/brig,
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+	alpha = 180;
+	dir = 8
+	},
+/turf/open/floor/iron/dark/side{
+	dir = 1
+	},
+/area/shuttle/escape)
+"Yo" = (
+/obj/structure/closet/crate,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 9
+	},
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"YS" = (
+/obj/effect/turf_decal/siding/thinplating_new,
+/obj/effect/turf_decal/siding/thinplating_new/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"YT" = (
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/escape)
+"YX" = (
+/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/trimline/yellow/filled/line,
+/obj/machinery/light/small,
+/turf/open/floor/iron/edge{
+	dir = 1
+	},
+/area/shuttle/escape)
+"ZR" = (
+/obj/structure/closet/crate/medical,
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/o2{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/storage/firstaid/toxin{
+	pixel_x = -4;
+	pixel_y = 3
+	},
+/obj/item/healthanalyzer{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/lazarus_injector,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 5
+	},
+/turf/open/floor/iron,
 /area/shuttle/escape)
 
 (1,1,1) = {"
@@ -310,13 +942,13 @@ aa
 ab
 ab
 MN
-ab
-MN
 MN
+ab
 MN
 MN
 MN
 ab
+ab
 aa
 aa
 "}
@@ -325,13 +957,13 @@ aa
 ab
 ah
 aq
-ak
-MN
-aB
-aH
-aH
-aH
-aB
+oq
+UE
+ab
+bS
+aL
+aS
+zs
 ah
 ab
 aa
@@ -339,15 +971,15 @@ aa
 (3,1,1) = {"
 aa
 ab
-ai
-ar
-aC
-xJ
-aC
-aC
-aC
-aC
-aC
+gr
+vW
+Ki
+av
+MN
+uy
+aL
+aS
+zG
 aS
 ab
 aa
@@ -355,205 +987,205 @@ aa
 (4,1,1) = {"
 aa
 MN
-aj
-aC
-av
-ab
-aD
-aD
-aL
+zf
+Ke
+pl
+jD
+RD
+KB
 aC
 aC
+YS
 aS
-ab
+MN
 aa
 "}
 (5,1,1) = {"
 aa
 MN
-aj
-aC
-aV
-ab
-aE
-aE
-aM
-aC
-aC
+ar
+Re
+ru
+MM
+ab
+ta
+Em
+Hx
+do
 aS
-ab
+MN
 aa
 "}
 (6,1,1) = {"
-aa
 ab
-ak
-aC
-ak
 ab
-aF
-aI
-aL
-aC
-aC
+ab
+ab
+ab
+MN
+ah
+aE
+aM
+lX
+mB
 aT
 ah
 ab
 "}
 (7,1,1) = {"
-aa
-ab
 ab
-xJ
-MN
+Ok
+im
+OU
 ab
-aC
-aC
-aC
-aC
-aC
-aC
 aB
+Kr
+aL
+aI
+lX
+GP
+aC
+hK
 ab
 "}
 (8,1,1) = {"
-aa
 ab
-al
+Fg
 at
 at
 MN
-aB
-aC
-aC
+KP
 aC
 aC
 aC
+Jj
+tw
+Em
 aV
 ab
 "}
 (9,1,1) = {"
-aa
-ab
+MN
 al
+vj
 at
-at
-Wn
-aC
-aC
-aN
-aP
-aC
-aC
-aW
+ho
+Em
+Hx
+ip
+Em
+Em
+dy
+aE
+aE
 MN
 "}
 (10,1,1) = {"
-aa
-ab
-am
-at
+MN
+al
 at
+EQ
 MN
-aC
-aC
+uy
+lX
+do
 aN
 aP
-aC
-aC
-aW
+II
+aL
+aL
 MN
 "}
 (11,1,1) = {"
-aa
-ab
-al
-at
-ax
-ab
-aC
-aC
-aN
-aP
-aC
-aC
-aW
+MN
+AT
+Nl
+xV
+ab
+vv
+lX
+do
+oZ
+rE
+HU
+aH
+aH
 MN
 "}
 (12,1,1) = {"
-aa
 ab
-al
-at
-ay
 ab
-aC
-aC
-aO
-aP
-aC
-aC
-aB
 ab
-"}
-(13,1,1) = {"
 ab
 ab
 ab
+SF
+xz
 ab
 ab
-ah
-aC
-aC
-aw
 ab
-Hy
 MN
 ab
 ab
 "}
+(13,1,1) = {"
+ab
+Yo
+ow
+mk
+ab
+DU
+kh
+kh
+aw
+ab
+Hy
+QI
+li
+ab
+"}
 (14,1,1) = {"
 ab
 ad
 an
-af
-af
-Hy
-aC
-aC
-Hy
-aQ
-af
-af
+YX
+ab
+Eg
+GP
+GP
+jz
+MN
+Nj
+uP
 aX
 ab
 "}
 (15,1,1) = {"
 ab
 ae
-af
-af
-af
-Hy
-aC
-aC
-Hy
-af
-af
-af
+an
+FV
+Hl
+eF
+iH
+wJ
+st
+Ml
+Bm
+SQ
 af
 ab
 "}
 (16,1,1) = {"
 ab
-af
-ao
-af
-ab
-ab
-Ti
-Ti
+ZR
+jP
+sR
 ab
+cM
+GP
+GP
+PJ
 ab
 aR
 aU
@@ -562,18 +1194,18 @@ ab
 "}
 (17,1,1) = {"
 ab
+xQ
+xQ
+xQ
 ab
+mM
+lO
+lO
+Lz
 ab
-ab
-ab
-ab
-aC
-aJ
-ab
-ab
-ab
-ab
-ab
+xQ
+xQ
+xQ
 ab
 "}
 (18,1,1) = {"
@@ -581,12 +1213,12 @@ ab
 ag
 ap
 au
-ab
+YT
 ab
 Ti
 Mg
 ab
-ab
+YT
 ag
 ap
 au
diff --git a/_maps/shuttles/emergency/emergency_box.dmm b/_maps/shuttles/emergency/emergency_box.dmm
index 4905f73d54616..4e2846ce75543 100644
--- a/_maps/shuttles/emergency/emergency_box.dmm
+++ b/_maps/shuttles/emergency/emergency_box.dmm
@@ -12,7 +12,8 @@
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 8
 	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "ag" = (
 /turf/open/floor/iron,
@@ -25,7 +26,12 @@
 /obj/effect/turf_decal/siding/thinplating_new/corner{
 	dir = 4
 	},
-/turf/open/floor/iron,
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/machinery/vending/wallmed/directional/north,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "ai" = (
 /obj/structure/chair/fancy/shuttle{
@@ -41,9 +47,6 @@
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 4
 	},
-/obj/machinery/light{
-	dir = 8
-	},
 /turf/open/floor/iron/tech/grid,
 /area/shuttle/escape)
 "am" = (
@@ -54,86 +57,9 @@
 /turf/open/floor/iron/techmaint,
 /area/shuttle/escape)
 "an" = (
-/obj/item/clothing/suit/hazardvest{
-	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
-	name = "emergency lifejacket"
-	},
-/obj/item/clothing/suit/hazardvest{
-	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
-	name = "emergency lifejacket"
-	},
-/obj/item/clothing/suit/hazardvest{
-	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
-	name = "emergency lifejacket"
-	},
-/obj/item/clothing/suit/hazardvest{
-	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
-	name = "emergency lifejacket"
-	},
-/obj/item/clothing/suit/hazardvest{
-	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
-	name = "emergency lifejacket"
-	},
-/obj/item/tank/internals/emergency_oxygen{
-	pixel_x = 3
-	},
-/obj/item/tank/internals/emergency_oxygen{
-	pixel_x = 3
-	},
-/obj/item/tank/internals/emergency_oxygen{
-	pixel_x = 3
-	},
-/obj/item/tank/internals/emergency_oxygen{
-	pixel_x = 3
-	},
-/obj/item/tank/internals/emergency_oxygen{
-	pixel_x = 3
-	},
-/obj/item/clothing/mask/breath{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/item/clothing/mask/breath{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/item/clothing/mask/breath{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/item/clothing/mask/breath{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/item/clothing/mask/breath{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/item/clothing/head/utility/hardhat/orange{
-	name = "protective hat";
-	pixel_y = 9
-	},
-/obj/item/clothing/head/utility/hardhat/orange{
-	name = "protective hat";
-	pixel_y = 9
-	},
-/obj/item/clothing/head/utility/hardhat/orange{
-	name = "protective hat";
-	pixel_y = 9
-	},
-/obj/item/clothing/head/utility/hardhat/orange{
-	name = "protective hat";
-	pixel_y = 9
-	},
-/obj/item/clothing/head/utility/hardhat/orange{
-	name = "protective hat";
-	pixel_y = 9
-	},
-/obj/structure/closet/crate{
-	name = "lifejackets"
-	},
-/obj/effect/turf_decal/bot_white,
-/turf/open/floor/iron,
+/obj/machinery/newscaster/directional/east,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "ao" = (
 /obj/structure/chair/fancy/shuttle,
@@ -147,57 +73,39 @@
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 8
 	},
-/obj/machinery/light{
-	dir = 4
-	},
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/tech/grid,
 /area/shuttle/escape)
 "aq" = (
-/obj/effect/turf_decal/guideline/guideline_edge/blue{
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/turf/open/floor/iron/white/smooth_edge{
 	dir = 1
 	},
-/turf/open/floor/iron/white,
 /area/shuttle/escape)
 "ar" = (
 /obj/machinery/computer/emergency_shuttle,
 /obj/effect/turf_decal/siding/thinplating_new,
-/obj/machinery/status_display/evac/directional/north,
 /turf/open/floor/iron/tech/grid,
 /area/shuttle/escape)
 "as" = (
-/obj/effect/turf_decal/guideline/guideline_edge_alt/blue{
-	dir = 8
-	},
-/obj/effect/turf_decal/guideline/guideline_half_edge/blue{
-	dir = 10
-	},
-/obj/effect/turf_decal/guideline/guideline_half_edge/blue{
+/obj/machinery/computer/operating{
 	dir = 4
 	},
-/obj/machinery/computer/operating{
-	dir = 1
+/obj/item/radio/intercom/directional/west,
+/obj/machinery/camera/directional/west,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 10
 	},
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/white/textured,
+/turf/open/floor/iron/white,
 /area/shuttle/escape)
 "at" = (
 /obj/structure/chair/fancy/shuttle{
 	dir = 8
 	},
-/obj/structure/extinguisher_cabinet{
-	pixel_y = -30
-	},
 /obj/effect/turf_decal/bot_white,
+/obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/iron/techmaint,
 /area/shuttle/escape)
-"au" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_x = -5;
-	pixel_y = 30
-	},
-/obj/effect/turf_decal/siding/thinplating_new,
-/turf/open/floor/iron,
-/area/shuttle/escape)
 "az" = (
 /obj/machinery/status_display/evac,
 /turf/closed/wall/mineral/titanium,
@@ -209,14 +117,11 @@
 "aB" = (
 /obj/machinery/stasis,
 /obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/guideline/guideline_edge_alt/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/guideline/guideline_half_edge/blue{
-	dir = 6
+/obj/machinery/newscaster/directional/north,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 5
 	},
-/obj/item/defibrillator/loaded,
-/turf/open/floor/iron/white/textured,
+/turf/open/floor/iron/white,
 /area/shuttle/escape)
 "aC" = (
 /obj/effect/turf_decal/siding/thinplating_new{
@@ -225,7 +130,8 @@
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 4
 	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "aD" = (
 /obj/machinery/recharger,
@@ -247,6 +153,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/structure/reagent_dispensers/peppertank/directional/west,
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "aG" = (
@@ -256,13 +163,15 @@
 /obj/structure/chair/fancy/shuttle{
 	dir = 1
 	},
+/obj/machinery/newscaster/directional/south,
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "aK" = (
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 1
 	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "aM" = (
 /obj/structure/table,
@@ -273,14 +182,16 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/siding/thinplating_new/corner,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "aR" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 27
 	},
 /obj/effect/turf_decal/siding/thinplating_new,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "aS" = (
 /obj/structure/chair/fancy/shuttle{
@@ -303,46 +214,38 @@
 /turf/open/floor/iron/techmaint,
 /area/shuttle/escape)
 "aW" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_y = -30
-	},
 /obj/effect/turf_decal/siding/thinplating_new/corner{
 	dir = 4
 	},
 /obj/effect/turf_decal/siding/thinplating_new/corner{
 	dir = 1
 	},
-/turf/open/floor/iron,
+/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "bb" = (
-/turf/open/floor/mineral/titanium/yellow,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "bc" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 27
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 5
 	},
-/turf/open/floor/mineral/titanium/yellow,
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "bd" = (
 /obj/machinery/stasis,
 /obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/guideline/guideline_edge_alt/blue,
-/obj/effect/turf_decal/guideline/guideline_half_edge/blue{
-	dir = 9
-	},
-/obj/effect/turf_decal/guideline/guideline_half_edge/blue{
-	dir = 1
+/obj/machinery/vending/wallmed/directional/south,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 6
 	},
-/turf/open/floor/iron/white/textured,
+/turf/open/floor/iron/white,
 /area/shuttle/escape)
 "be" = (
 /obj/structure/table,
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 27
-	},
-/obj/effect/turf_decal/guideline/guideline_edge/blue{
-	dir = 8
-	},
 /obj/item/storage/firstaid/regular{
 	pixel_x = -10;
 	pixel_y = 7
@@ -355,28 +258,35 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/open/floor/iron/white/textured,
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 4
+	},
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 8
+	},
 /area/shuttle/escape)
 "bf" = (
 /obj/structure/closet,
-/turf/open/floor/mineral/titanium/yellow,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 10
+	},
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "bg" = (
 /obj/structure/closet/crate,
-/turf/open/floor/mineral/titanium/yellow,
-/area/shuttle/escape)
-"bi" = (
-/obj/structure/window/reinforced{
+/obj/effect/turf_decal/trimline/yellow/filled/line,
+/turf/open/floor/iron/edge{
 	dir = 1
 	},
+/area/shuttle/escape)
+"bi" = (
 /obj/structure/shuttle/engine/heater,
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/firedoor/window,
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
 "bj" = (
-/obj/machinery/vending/wallmed{
-	name = "Emergency NanoMed";
-	use_power = 0
-	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/escape)
 "bk" = (
@@ -390,24 +300,29 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/open/floor/iron,
+/obj/item/radio/intercom/directional/east,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "bm" = (
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 4
 	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "bn" = (
 /obj/effect/turf_decal/siding/thinplating_new,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "bo" = (
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 1
 	},
-/obj/machinery/light,
-/turf/open/floor/iron,
+/obj/machinery/newscaster/directional/south,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "bp" = (
 /obj/machinery/light,
@@ -417,34 +332,55 @@
 /obj/effect/turf_decal/siding/thinplating_new/corner{
 	dir = 1
 	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "bq" = (
 /obj/machinery/light/small{
 	brightness = 3;
 	dir = 8
 	},
-/turf/open/floor/mineral/titanium/yellow,
+/obj/machinery/newscaster/directional/west,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 8
+	},
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
 /area/shuttle/escape)
 "br" = (
 /obj/machinery/light/small{
 	dir = 4
 	},
-/turf/open/floor/mineral/titanium/yellow,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 4
+	},
+/turf/open/floor/iron/edge{
+	dir = 8
+	},
 /area/shuttle/escape)
 "bs" = (
 /obj/structure/table/optable,
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/effect/turf_decal/guideline/guideline_edge/blue{
+/obj/machinery/status_display/evac/directional/west,
+/obj/item/clothing/gloves/color/latex,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/white/smooth_edge{
 	dir = 4
 	},
-/obj/item/storage/backpack/duffelbag/med/surgery{
-	pixel_y = 7
+/area/shuttle/escape)
+"cF" = (
+/obj/effect/turf_decal/box/corners{
+	pixel_y = 16;
+	dir = 8;
+	pixel_x = 16
 	},
-/obj/item/surgical_drapes,
-/turf/open/floor/iron/white/textured,
+/turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "ds" = (
 /obj/structure/extinguisher_cabinet{
@@ -454,9 +390,9 @@
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 1
 	},
-/obj/machinery/light,
 /obj/effect/turf_decal/bot_white,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "ef" = (
 /obj/structure/table,
@@ -478,11 +414,53 @@
 /obj/effect/turf_decal/siding/thinplating_new/corner{
 	dir = 1
 	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "ga" = (
-/obj/effect/turf_decal/tile/blue/diagonal_centre,
-/turf/open/floor/iron/white,
+/obj/machinery/holopad{
+	pixel_x = 16
+	},
+/obj/effect/turf_decal/box/corners{
+	dir = 1;
+	pixel_x = 16
+	},
+/obj/effect/turf_decal/box/corners{
+	pixel_x = 16;
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white/smooth_large,
+/area/shuttle/escape)
+"ij" = (
+/obj/machinery/holopad{
+	pixel_x = 16;
+	pixel_y = -16
+	},
+/obj/effect/turf_decal/box/corners{
+	dir = 1;
+	pixel_x = 16;
+	pixel_y = -16
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"iS" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 9
+	},
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"jw" = (
+/obj/effect/turf_decal/siding/thinplating_new{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating_new{
+	dir = 4
+	},
+/obj/machinery/holopad,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/box,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "jX" = (
 /obj/machinery/computer/atmos_alert{
@@ -491,20 +469,48 @@
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 4
 	},
+/obj/machinery/status_display/evac/directional/west,
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/open/floor/iron/tech/grid,
 /area/shuttle/escape)
+"lc" = (
+/obj/structure/chair/fancy/shuttle{
+	dir = 4
+	},
+/obj/effect/turf_decal/bot_white,
+/obj/machinery/newscaster/directional/south,
+/turf/open/floor/iron/techmaint,
+/area/shuttle/escape)
+"lm" = (
+/obj/structure/chair/fancy/shuttle,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
 "mA" = (
 /obj/machinery/door/airlock/titanium{
 	name = "Emergency Shuttle Airlock"
 	},
 /obj/structure/fans/tiny,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/turf/open/floor/iron/white,
 /area/shuttle/escape)
 "mU" = (
 /obj/effect/turf_decal/siding/thinplating_new,
 /obj/effect/turf_decal/siding/thinplating_new/corner{
 	dir = 4
 	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"nN" = (
+/obj/structure/closet/crate,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 6
+	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "qi" = (
@@ -515,13 +521,16 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/machinery/status_display/evac/directional/west,
+/obj/machinery/camera/directional/west,
 /turf/open/floor/iron/techmaint,
 /area/shuttle/escape)
 "qO" = (
+/obj/machinery/camera/directional/south,
 /obj/machinery/button/flasher{
 	id = "cockpit_flasher";
 	pixel_x = 6;
-	pixel_y = -24
+	pixel_y = -25
 	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
@@ -533,27 +542,154 @@
 /obj/effect/turf_decal/siding/thinplating_new,
 /turf/open/floor/iron/techmaint,
 /area/shuttle/escape)
+"uh" = (
+/obj/structure/chair/fancy/shuttle{
+	dir = 4
+	},
+/obj/effect/turf_decal/bot_white,
+/obj/machinery/status_display/ai/directional/west,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/iron/techmaint,
+/area/shuttle/escape)
+"vj" = (
+/obj/structure/chair/fancy/shuttle{
+	dir = 8
+	},
+/obj/effect/turf_decal/bot_white,
+/obj/machinery/status_display/evac/directional/east,
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/camera/directional/east,
+/turf/open/floor/iron/techmaint,
+/area/shuttle/escape)
 "wq" = (
-/obj/item/radio/intercom{
-	name = "Station Intercom (General)";
-	pixel_y = -29
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"wF" = (
+/obj/effect/turf_decal/box/corners{
+	pixel_x = -16
 	},
+/obj/effect/turf_decal/box/corners{
+	pixel_x = -16;
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white/smooth_large,
+/area/shuttle/escape)
+"wG" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 4;
+	pixel_x = -16;
+	pixel_y = -16
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"yh" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "yM" = (
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/structure/closet/crate{
+	name = "lifejackets"
+	},
+/obj/effect/turf_decal/bot_white,
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 4
 	},
-/obj/effect/turf_decal/bot_white,
-/obj/structure/tank_dispenser/oxygen,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "Ao" = (
 /obj/effect/turf_decal/siding/thinplating_new,
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 1
 	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"Bo" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "BN" = (
 /obj/machinery/computer/security{
@@ -562,14 +698,27 @@
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 8
 	},
+/obj/machinery/status_display/evac/directional/east,
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/open/floor/iron/tech/grid,
 /area/shuttle/escape)
+"Ck" = (
+/obj/effect/turf_decal/siding/thinplating_new{
+	dir = 1
+	},
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
 "Dd" = (
 /obj/machinery/door/airlock/titanium{
 	name = "Emergency Shuttle Cargo"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/mineral/titanium/yellow,
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "FC" = (
 /obj/structure/chair/fancy/shuttle,
@@ -582,11 +731,23 @@
 	req_access_txt = "2"
 	},
 /obj/structure/fans/tiny,
-/turf/open/floor/mineral/plastitanium/red/brig,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/turf/open/floor/iron/white,
+/area/shuttle/escape)
+"GK" = (
+/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 1
+	},
+/turf/open/floor/iron/edge,
 /area/shuttle/escape)
 "HD" = (
-/obj/effect/turf_decal/guideline/guideline_edge/blue,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 1
+	},
+/turf/open/floor/iron/white/smooth_edge,
 /area/shuttle/escape)
 "IL" = (
 /obj/machinery/door/firedoor,
@@ -594,16 +755,19 @@
 	name = "Cockpit";
 	req_access_txt = "19"
 	},
+/obj/effect/turf_decal/stripes/closeup,
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "JT" = (
+/obj/structure/extinguisher_cabinet/directional/south,
 /obj/structure/chair/fancy/shuttle{
-	dir = 8
+	dir = 1
 	},
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "JW" = (
 /obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/firedoor/window,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "Km" = (
@@ -614,7 +778,10 @@
 	name = "Box emergency shuttle"
 	},
 /obj/structure/fans/tiny,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/turf/open/floor/iron/white,
 /area/shuttle/escape)
 "KS" = (
 /obj/structure/chair/fancy/shuttle{
@@ -624,6 +791,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/machinery/status_display/ai/directional/east,
 /turf/open/floor/iron/techmaint,
 /area/shuttle/escape)
 "Lm" = (
@@ -631,14 +799,17 @@
 	name = "Emergency Shuttle Infirmary"
 	},
 /obj/machinery/door/firedoor,
-/obj/effect/turf_decal/guideline/guideline_edge/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/guideline/guideline_edge/blue{
-	dir = 8
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"Lr" = (
+/obj/machinery/flasher{
+	id = "cockpit_flasher";
+	pixel_x = -25;
+	pixel_y = 25
 	},
-/obj/effect/turf_decal/caution/stand_clear,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "Np" = (
 /obj/item/storage/firstaid/regular{
@@ -652,32 +823,29 @@
 /turf/open/floor/iron/tech/grid,
 /area/shuttle/escape)
 "Nq" = (
-/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/structure/chair/fancy/shuttle{
 	dir = 4
 	},
+/obj/machinery/camera/directional/west,
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
-"Pt" = (
-/obj/effect/turf_decal/caution{
-	dir = 4
-	},
-/obj/effect/turf_decal/guideline/guideline_tri/blue{
-	dir = 8
+"Od" = (
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+	dir = 1
 	},
-/obj/effect/turf_decal/guideline/guideline_tri/blue{
+/turf/open/floor/iron/edge,
+/area/shuttle/escape)
+"OC" = (
+/obj/effect/turf_decal/siding/thinplating_new,
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"Pt" = (
+/obj/effect/turf_decal/trimline/blue/filled/warning{
 	dir = 1
 	},
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/white/smooth_edge,
 /area/shuttle/escape)
 "PC" = (
 /obj/effect/turf_decal/siding/thinplating_new/corner{
@@ -686,18 +854,8 @@
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 1
 	},
-/turf/open/floor/iron,
-/area/shuttle/escape)
-"RE" = (
-/obj/structure/chair/fancy/shuttle{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/effect/turf_decal/siding/thinplating_new,
-/obj/effect/turf_decal/bot_white,
-/turf/open/floor/iron/techmaint,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "TU" = (
 /obj/effect/turf_decal/siding/thinplating_new/corner{
@@ -706,14 +864,16 @@
 /obj/effect/turf_decal/siding/thinplating_new/corner{
 	dir = 1
 	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "UI" = (
 /obj/machinery/door/airlock/security/glass{
 	name = "Brig";
 	req_access_txt = "2"
 	},
-/turf/open/floor/mineral/plastitanium/red/brig,
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "US" = (
 /obj/machinery/door/firedoor,
@@ -721,22 +881,38 @@
 	name = "Brig";
 	req_access_txt = "2"
 	},
-/turf/open/floor/mineral/plastitanium/red/brig,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "Vh" = (
 /obj/structure/table,
 /obj/machinery/status_display/evac/directional/north,
 /turf/open/floor/iron/techmaint,
 /area/shuttle/escape)
-"XC" = (
-/obj/effect/turf_decal/guideline/guideline_edge_alt/blue{
+"VE" = (
+/obj/effect/turf_decal/box/corners{
+	pixel_x = -16;
+	pixel_y = 16
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"VF" = (
+/obj/structure/closet,
+/obj/effect/turf_decal/trimline/yellow/filled/line,
+/turf/open/floor/iron/edge{
 	dir = 1
 	},
-/obj/effect/turf_decal/guideline/guideline_half_edge/blue{
-	dir = 5
+/area/shuttle/escape)
+"XC" = (
+/obj/structure/table,
+/obj/item/storage/backpack/duffelbag/med/surgery{
+	pixel_y = 7
+	},
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 9
 	},
-/obj/effect/turf_decal/guideline/guideline_half_edge/blue,
-/obj/effect/turf_decal/box,
 /turf/open/floor/iron/white,
 /area/shuttle/escape)
 
@@ -781,10 +957,10 @@ qi
 ai
 ai
 ai
-ai
+uh
 bo
 ad
-bb
+iS
 bq
 bf
 ad
@@ -797,8 +973,8 @@ jX
 al
 ad
 FC
-aG
-aG
+ij
+cF
 aG
 UI
 aQ
@@ -809,9 +985,9 @@ aC
 aC
 aW
 ad
+GK
 bb
-bb
-bf
+VF
 bi
 bk
 "}
@@ -822,11 +998,11 @@ am
 at
 ad
 aA
-aG
-aG
+wG
+VE
 aJ
 ad
-au
+bn
 aS
 aS
 aS
@@ -834,7 +1010,7 @@ aS
 aS
 aK
 Dd
-bb
+Od
 bb
 bg
 bi
@@ -846,32 +1022,32 @@ tF
 ag
 wq
 ad
-aA
-JT
+lm
+aG
 aG
 JT
 ad
-bn
+OC
 aT
 aT
 aT
 aT
 aT
-aK
+Ck
 ad
 bc
 br
-bg
+nN
 bi
 bk
 "}
 (6,1,1) = {"
-ad
+JW
 ar
-ag
+yh
 qO
 ad
-JW
+ad
 JW
 US
 JW
@@ -879,7 +1055,7 @@ bj
 ah
 aC
 aC
-aC
+jw
 aC
 aC
 bp
@@ -896,8 +1072,8 @@ tF
 ag
 ag
 IL
-ag
-ag
+Lr
+Bo
 bn
 ao
 aM
@@ -919,7 +1095,7 @@ bk
 JW
 Np
 ai
-ai
+lc
 ad
 yM
 bm
@@ -927,7 +1103,7 @@ mU
 ao
 aM
 Ao
-RE
+aT
 aT
 aT
 aT
@@ -960,7 +1136,7 @@ aC
 TU
 JW
 HD
-ga
+wF
 aq
 bi
 bk
@@ -974,16 +1150,16 @@ ad
 aM
 aE
 bl
-ag
+Bo
 an
 aR
 KS
 am
 am
 am
-am
+vj
 ds
-JW
+ad
 aB
 be
 bd
diff --git a/_maps/shuttles/emergency/emergency_delta.dmm b/_maps/shuttles/emergency/emergency_delta.dmm
index c67ec5cea34cf..de3aa740a6542 100644
--- a/_maps/shuttles/emergency/emergency_delta.dmm
+++ b/_maps/shuttles/emergency/emergency_delta.dmm
@@ -15,13 +15,15 @@
 /turf/closed/wall/mineral/plastitanium,
 /area/shuttle/escape)
 "ad" = (
-/obj/structure/window/reinforced,
 /obj/structure/shuttle/engine/heater{
 	dir = 1
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/structure/window/reinforced/survival_pod{
+	dir = 1
+	},
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
 "ae" = (
@@ -30,90 +32,28 @@
 "af" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/escape)
-"ag" = (
-/obj/structure/window/shuttle,
-/obj/structure/grille,
-/turf/open/floor/plating,
-/area/shuttle/escape)
 "ah" = (
-/obj/item/clothing/suit/hazardvest{
-	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
-	name = "emergency lifejacket"
-	},
-/obj/item/clothing/suit/hazardvest{
-	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
-	name = "emergency lifejacket"
-	},
-/obj/item/clothing/suit/hazardvest{
-	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
-	name = "emergency lifejacket"
-	},
-/obj/item/clothing/suit/hazardvest{
-	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
-	name = "emergency lifejacket"
-	},
-/obj/item/clothing/suit/hazardvest{
-	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
-	name = "emergency lifejacket"
-	},
-/obj/item/tank/internals/emergency_oxygen{
-	pixel_x = 3
-	},
-/obj/item/tank/internals/emergency_oxygen{
-	pixel_x = 3
-	},
-/obj/item/tank/internals/emergency_oxygen{
-	pixel_x = 3
-	},
-/obj/item/tank/internals/emergency_oxygen{
-	pixel_x = 3
-	},
-/obj/item/tank/internals/emergency_oxygen{
-	pixel_x = 3
-	},
-/obj/item/clothing/mask/breath{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/item/clothing/mask/breath{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/item/clothing/mask/breath{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/item/clothing/mask/breath{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/item/clothing/mask/breath{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/item/clothing/head/utility/hardhat/orange{
-	name = "protective hat";
-	pixel_y = 9
-	},
-/obj/item/clothing/head/utility/hardhat/orange{
-	name = "protective hat";
-	pixel_y = 9
-	},
-/obj/item/clothing/head/utility/hardhat/orange{
-	name = "protective hat";
-	pixel_y = 9
+/obj/structure/chair/fancy/shuttle,
+/obj/effect/turf_decal/bot,
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"ap" = (
+/obj/structure/flora/ausbushes/grassybush,
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/flora/ausbushes/brflowers,
+/obj/structure/flora/ausbushes/leafybush,
+/obj/structure/window/reinforced{
+	dir = 1;
+	pixel_y = 1
 	},
-/obj/item/clothing/head/utility/hardhat/orange{
-	name = "protective hat";
-	pixel_y = 9
+/obj/structure/window/reinforced{
+	dir = 8
 	},
-/obj/item/clothing/head/utility/hardhat/orange{
-	name = "protective hat";
-	pixel_y = 9
+/obj/structure/window/reinforced{
+	dir = 4
 	},
-/obj/structure/closet/crate/internals,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/turf/open/floor/grass,
 /area/shuttle/escape)
 "aq" = (
 /obj/machinery/status_display/evac,
@@ -124,23 +64,47 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 8
+	},
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
 /area/shuttle/escape)
 "aw" = (
 /obj/structure/chair/fancy/shuttle{
 	dir = 8
 	},
 /obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 4
+	},
+/turf/open/floor/iron/edge{
+	dir = 8
+	},
 /area/shuttle/escape)
 "ax" = (
 /obj/structure/flora/ausbushes/grassybush,
 /obj/structure/flora/ausbushes/lavendergrass,
 /obj/structure/flora/ausbushes/brflowers,
 /obj/structure/flora/ausbushes/leafybush,
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/window/reinforced,
 /turf/open/floor/grass,
 /area/shuttle/escape)
+"az" = (
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+	dir = 8
+	},
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 4
+	},
+/area/shuttle/escape)
 "aC" = (
 /obj/machinery/status_display/ai,
 /turf/closed/wall/mineral/titanium/nodiagonal,
@@ -150,26 +114,35 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/escape)
 "aE" = (
-/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 10
+	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "aH" = (
 /obj/structure/chair/fancy/shuttle{
 	dir = 4
 	},
-/obj/item/radio/intercom{
-	name = "Station Intercom";
-	pixel_x = -26
-	},
 /obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 8
+	},
+/obj/machinery/camera/directional/west,
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
 /area/shuttle/escape)
 "aI" = (
 /obj/structure/flora/ausbushes/grassybush,
 /obj/structure/flora/ausbushes/lavendergrass,
 /obj/structure/flora/ausbushes/ywflowers,
 /obj/structure/flora/ausbushes/genericbush,
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
 /turf/open/floor/grass,
 /area/shuttle/escape)
 "aK" = (
@@ -189,22 +162,34 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 8
+	},
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
 /area/shuttle/escape)
 "aX" = (
 /obj/structure/flora/ausbushes/grassybush,
 /obj/structure/flora/ausbushes/lavendergrass,
 /obj/structure/flora/ausbushes/ppflowers,
 /obj/structure/flora/ausbushes/sunnybush,
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/window/reinforced,
 /turf/open/floor/grass,
 /area/shuttle/escape)
 "aY" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_x = -26
-	},
 /obj/machinery/shieldgen,
 /obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 9
+	},
+/obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "aZ" = (
@@ -224,28 +209,34 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 5
+	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "ba" = (
 /obj/structure/reagent_dispensers/fueltank,
-/obj/item/radio/intercom{
-	name = "Station Intercom";
-	pixel_x = -26
-	},
 /obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 8
+	},
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
 /area/shuttle/escape)
 "bb" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "bc" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "bd" = (
 /obj/structure/closet/crate/medical,
@@ -269,32 +260,50 @@
 	pixel_x = -3;
 	pixel_y = 2
 	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 4
+	},
+/turf/open/floor/iron/edge{
+	dir = 8
+	},
 /area/shuttle/escape)
 "be" = (
 /obj/structure/flora/ausbushes/grassybush,
 /obj/structure/flora/ausbushes/lavendergrass,
 /obj/structure/flora/ausbushes/ywflowers,
 /obj/structure/flora/ausbushes/fernybush,
-/obj/structure/window/shuttle,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
 /turf/open/floor/grass,
 /area/shuttle/escape)
 "bf" = (
 /obj/structure/reagent_dispensers/watertank,
 /obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 8
+	},
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
 /area/shuttle/escape)
 "bg" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "bh" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "bi" = (
 /obj/structure/closet/crate{
@@ -314,7 +323,12 @@
 /obj/item/wrench,
 /obj/item/radio,
 /obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 4
+	},
+/turf/open/floor/iron/edge{
+	dir = 8
+	},
 /area/shuttle/escape)
 "bj" = (
 /obj/machinery/vending/wallmed{
@@ -333,19 +347,26 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 8
+	},
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
 /area/shuttle/escape)
 "bm" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "bn" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "bq" = (
 /obj/structure/table,
@@ -354,18 +375,28 @@
 /obj/item/pen,
 /obj/item/hand_labeler_refill,
 /obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 10
+	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "br" = (
 /obj/machinery/recharge_station,
 /obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/filled/line,
+/obj/machinery/status_display/evac/directional/south,
+/turf/open/floor/iron/edge{
+	dir = 1
+	},
 /area/shuttle/escape)
 "bs" = (
 /obj/structure/table,
 /obj/machinery/cell_charger,
 /obj/item/stock_parts/cell/high,
 /obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 6
+	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "bw" = (
@@ -389,8 +420,8 @@
 	pixel_x = -26;
 	pixel_y = 24
 	},
-/obj/effect/turf_decal/tile/red{
-	dir = 1
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+	dir = 9
 	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
@@ -398,16 +429,33 @@
 /obj/item/kirbyplants{
 	icon_state = "plant-21"
 	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+	dir = 5
+	},
+/obj/structure/sign/nanotrasen{
+	pixel_x = 32
 	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "bB" = (
-/obj/structure/table,
-/obj/item/clipboard,
-/obj/item/toy/figure/ninja,
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
 /obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/components/unary/tank/air,
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "bC" = (
@@ -415,57 +463,57 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/iron,
 /area/shuttle/escape)
-"bD" = (
-/obj/structure/chair/fancy/shuttle,
-/obj/machinery/status_display/evac{
-	pixel_y = 32
-	},
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
-/area/shuttle/escape)
 "bE" = (
 /obj/structure/chair/fancy/shuttle{
 	dir = 4
 	},
+/obj/structure/reagent_dispensers/peppertank/directional/west,
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "bF" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 1
+/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+	dir = 8
+	},
+/turf/open/floor/iron/edge{
+	dir = 4
 	},
-/turf/open/floor/iron,
 /area/shuttle/escape)
 "bG" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 26
-	},
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/neutral{
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
 	dir = 4
 	},
-/turf/open/floor/iron,
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/iron/edge{
+	dir = 8
+	},
 /area/shuttle/escape)
 "bH" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 5
+	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "bI" = (
-/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+	dir = 6
+	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "bK" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 10
 	},
-/turf/open/floor/iron,
+/turf/open/floor/catwalk_floor/iron,
 /area/shuttle/escape)
 "bL" = (
 /obj/machinery/door/airlock/external{
 	name = "Emergency Recovery Airlock"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
 	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
@@ -492,36 +540,43 @@
 "bP" = (
 /obj/structure/table/reinforced,
 /obj/machinery/recharger,
-/obj/effect/turf_decal/tile/red{
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
 	dir = 8
 	},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
 /area/shuttle/escape)
 "bQ" = (
 /obj/structure/fireaxecabinet{
 	pixel_x = 32
 	},
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+	dir = 4
+	},
+/obj/machinery/camera/directional/east,
+/turf/open/floor/iron/edge{
+	dir = 8
+	},
 /area/shuttle/escape)
 "bR" = (
 /obj/machinery/door/airlock/external{
 	name = "Emergency Recovery Airlock"
 	},
-/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/closeup,
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "bS" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 5
 	},
-/turf/open/floor/iron,
+/turf/open/floor/catwalk_floor/iron,
 /area/shuttle/escape)
 "bT" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 9
 	},
-/turf/open/floor/iron,
+/turf/open/floor/catwalk_floor/iron,
 /area/shuttle/escape)
 "bU" = (
 /obj/structure/chair/fancy/shuttle{
@@ -532,18 +587,17 @@
 "bV" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/box/zipties,
-/obj/item/radio/intercom{
-	name = "Station Intercom";
-	pixel_y = -26
-	},
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "bW" = (
 /obj/structure/table/reinforced,
 /obj/item/paper_bin,
 /obj/item/pen,
-/obj/effect/turf_decal/tile/red{
-	dir = 8
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+	dir = 10
+	},
+/obj/structure/sign/nanotrasen{
+	pixel_x = -32
 	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
@@ -553,10 +607,10 @@
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "co" = (
-/obj/effect/turf_decal/tile/blue/half/contrasted{
-	dir = 8
+/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
+/turf/open/floor/iron/edge{
+	dir = 1
 	},
-/turf/open/floor/iron,
 /area/shuttle/escape)
 "cB" = (
 /obj/structure/chair/fancy/shuttle{
@@ -566,14 +620,29 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 4
+	},
+/obj/machinery/camera/directional/east,
+/turf/open/floor/iron/edge{
+	dir = 8
+	},
 /area/shuttle/escape)
 "cC" = (
 /obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+	dir = 4
+	},
+/turf/open/floor/iron/edge{
+	dir = 8
+	},
 /area/shuttle/escape)
 "cF" = (
 /obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/obj/machinery/status_display/evac/directional/south,
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "cG" = (
@@ -581,6 +650,7 @@
 	dir = 1
 	},
 /obj/machinery/light,
+/obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "cH" = (
@@ -588,48 +658,181 @@
 /obj/machinery/light/small,
 /turf/open/floor/iron,
 /area/shuttle/escape)
+"dg" = (
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/structure/closet/crate/internals,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 6
+	},
+/turf/open/floor/iron,
+/area/shuttle/escape)
 "dr" = (
 /obj/machinery/computer/communications{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/blue/half/contrasted{
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+	alpha = 180;
 	dir = 8
 	},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/side{
+	dir = 1
+	},
 /area/shuttle/escape)
 "dX" = (
 /obj/machinery/computer/operating,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
+/obj/effect/turf_decal/trimline/blue/filled/line{
 	dir = 1
 	},
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/white/smooth_edge,
 /area/shuttle/escape)
 "eY" = (
 /obj/machinery/door/airlock/medical/glass{
 	name = "Escape Shuttle Infirmary"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
 /obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
-"hB" = (
-/obj/effect/spawner/structure/window/shuttle,
-/turf/open/floor/plating,
+"gv" = (
+/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+	dir = 1
+	},
+/turf/open/floor/iron/edge,
+/area/shuttle/escape)
+"hv" = (
+/obj/effect/turf_decal/box/corners{
+	pixel_y = 16;
+	dir = 8;
+	pixel_x = 16
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"iy" = (
+/obj/effect/turf_decal/box/corners{
+	pixel_y = 16;
+	dir = 8;
+	pixel_x = 16
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"iz" = (
+/obj/structure/chair/fancy/shuttle,
+/obj/machinery/camera/directional/north,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"iG" = (
+/obj/effect/turf_decal/trimline/neutral/filled/warning{
+	dir = 8
+	},
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
 /area/shuttle/escape)
 "jP" = (
 /obj/structure/table/reinforced,
 /obj/machinery/cell_charger,
 /obj/item/stock_parts/cell/high,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/corner{
+	dir = 1
+	},
 /area/shuttle/escape)
 "kc" = (
-/obj/effect/turf_decal/tile/blue/half/contrasted{
+/turf/open/floor/iron/white/smooth_large,
+/area/shuttle/escape)
+"kS" = (
+/obj/structure/flora/ausbushes/grassybush,
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/flora/ausbushes/ppflowers,
+/obj/structure/flora/ausbushes/sunnybush,
+/obj/structure/window/reinforced{
 	dir = 8
 	},
-/turf/open/floor/iron/white,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	pixel_y = 1
+	},
+/turf/open/floor/grass,
 /area/shuttle/escape)
 "nv" = (
 /obj/machinery/computer/crew{
@@ -638,56 +841,86 @@
 /obj/effect/turf_decal/tile/blue/half/contrasted{
 	dir = 8
 	},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/side{
+	dir = 1
+	},
+/area/shuttle/escape)
+"nz" = (
+/obj/structure/chair/fancy/shuttle{
+	dir = 8
+	},
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 4
+	},
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/iron/edge{
+	dir = 8
+	},
 /area/shuttle/escape)
 "oq" = (
 /obj/structure/bed/roller,
 /obj/machinery/iv_drip,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
+/obj/effect/turf_decal/trimline/blue/filled/line{
 	dir = 8
 	},
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 4
+	},
 /area/shuttle/escape)
 "pa" = (
-/obj/item/radio/intercom{
-	name = "Station Intercom";
-	pixel_y = 58
-	},
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
-	dir = 8
+/obj/machinery/atmospherics/components/binary/dp_vent_pump{
+	dir = 4
 	},
-/turf/open/floor/iron,
+/turf/open/floor/catwalk_floor/iron,
 /area/shuttle/escape)
-"qL" = (
-/obj/item/radio/intercom{
-	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 58
+"pk" = (
+/obj/effect/turf_decal/tile/blue/anticorner,
+/obj/machinery/holopad{
+	pixel_x = 16;
+	pixel_y = -16
+	},
+/obj/effect/turf_decal/box/corners{
+	dir = 1;
+	pixel_x = 16;
+	pixel_y = -16
 	},
-/obj/effect/turf_decal/tile/blue/opposingcorners{
+/turf/open/floor/iron/white/smooth_corner{
 	dir = 1
 	},
-/turf/open/floor/iron/white,
+/area/shuttle/escape)
+"pw" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 1
+	},
+/turf/open/floor/iron/edge,
+/area/shuttle/escape)
+"qU" = (
+/obj/machinery/camera/directional/north,
+/obj/machinery/status_display/ai/directional/north,
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "rY" = (
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 4
 	},
-/turf/open/floor/iron,
+/turf/open/floor/catwalk_floor/iron,
 /area/shuttle/escape)
 "sc" = (
 /obj/structure/chair/office,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "sN" = (
 /obj/machinery/computer/security{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/red/anticorner/contrasted{
+/obj/effect/turf_decal/tile/red/half/contrasted{
 	dir = 1
 	},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/side{
+	dir = 4
+	},
 /area/shuttle/escape)
 "sU" = (
 /obj/item/kirbyplants{
@@ -698,32 +931,68 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 8
+	},
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "tw" = (
 /obj/machinery/computer/secure_data{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/red/anticorner/contrasted{
-	dir = 8
+/obj/effect/turf_decal/tile/red/half/contrasted{
+	dir = 1
+	},
+/turf/open/floor/iron/dark/side{
+	dir = 4
 	},
-/turf/open/floor/iron/dark,
 /area/shuttle/escape)
 "uc" = (
 /obj/structure/chair/office/light{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/blue/opposingcorners{
+/turf/open/floor/iron/white/smooth_large,
+/area/shuttle/escape)
+"ue" = (
+/obj/effect/turf_decal/tile/blue/anticorner{
 	dir = 1
 	},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/box/corners{
+	pixel_x = -16;
+	pixel_y = 16
+	},
+/turf/open/floor/iron/white/smooth_corner,
+/area/shuttle/escape)
+"uA" = (
+/obj/machinery/door/airlock/security/glass{
+	name = "Holding Area";
+	req_access_txt = "2"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"vi" = (
+/obj/effect/turf_decal/tile/blue/anticorner{
+	dir = 8
+	},
+/obj/effect/turf_decal/box/corners{
+	dir = 4;
+	pixel_x = -16;
+	pixel_y = -16
+	},
+/turf/open/floor/iron/white/smooth_corner{
+	dir = 4
+	},
 /area/shuttle/escape)
 "vm" = (
 /obj/machinery/stasis,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
-	dir = 1
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 10
 	},
+/obj/machinery/vending/wallmed/directional/south,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/iron/white,
 /area/shuttle/escape)
 "vA" = (
@@ -731,24 +1000,80 @@
 	dir = 8;
 	name = "emergency shower"
 	},
-/obj/effect/turf_decal/tile/blue/half/contrasted,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 4
+	},
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 8
+	},
 /area/shuttle/escape)
 "wW" = (
 /obj/structure/table/reinforced,
 /obj/machinery/recharger,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/side{
+	dir = 4
+	},
+/area/shuttle/escape)
+"xg" = (
+/obj/machinery/status_display/evac/directional/north,
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
+"xi" = (
+/obj/structure/flora/ausbushes/grassybush,
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/flora/ausbushes/brflowers,
+/obj/structure/flora/ausbushes/leafybush,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	pixel_y = 1
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/open/floor/grass,
+/area/shuttle/escape)
+"xn" = (
+/obj/machinery/recharge_station,
+/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/trimline/yellow/filled/line,
+/turf/open/floor/iron/edge{
+	dir = 1
+	},
+/area/shuttle/escape)
+"xB" = (
+/obj/structure/table,
+/obj/item/clipboard,
+/obj/item/toy/figure/ninja,
+/obj/effect/turf_decal/bot,
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"xX" = (
+/obj/machinery/holopad{
+	pixel_x = 16
+	},
+/obj/effect/turf_decal/box/corners{
+	dir = 1;
+	pixel_x = 16
+	},
+/obj/effect/turf_decal/box/corners{
+	pixel_x = 16;
+	dir = 8
+	},
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "zd" = (
 /obj/machinery/door/airlock/command{
 	name = "Emergency Recovery Airlock";
 	req_access_txt = "19"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
 /obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "zl" = (
@@ -760,62 +1085,129 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 4
+	},
+/turf/open/floor/iron/edge{
+	dir = 8
+	},
 /area/shuttle/escape)
 "zr" = (
 /obj/structure/table/reinforced,
 /obj/item/folder/red,
 /obj/item/restraints/handcuffs,
 /obj/item/assembly/flash/handheld,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/side{
+	dir = 1
+	},
+/area/shuttle/escape)
+"zu" = (
+/obj/effect/turf_decal/box/corners{
+	pixel_x = -16
+	},
+/obj/effect/turf_decal/box/corners{
+	pixel_x = -16;
+	dir = 4
+	},
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "zW" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"zZ" = (
+/obj/structure/chair/office{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 8
+	},
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
+"Ab" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/obj/machinery/newscaster/directional/south,
+/turf/open/floor/iron/edge{
+	dir = 1
+	},
 /area/shuttle/escape)
 "Af" = (
 /obj/structure/table/optable,
 /obj/item/surgical_drapes,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
+/obj/effect/turf_decal/trimline/blue/filled/line{
 	dir = 1
 	},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/white/smooth_edge,
 /area/shuttle/escape)
 "Ay" = (
 /obj/machinery/door/airlock/shuttle{
 	name = "Emergency Shuttle Airlock"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
 /obj/structure/fans/tiny,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
 /turf/open/floor/iron/white,
 /area/shuttle/escape)
 "AG" = (
 /obj/machinery/computer/med_data{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/blue/half/contrasted{
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 8
+	},
+/turf/open/floor/iron/white/smooth_edge{
 	dir = 4
 	},
-/turf/open/floor/iron/white,
 /area/shuttle/escape)
-"Cl" = (
-/obj/effect/turf_decal/tile/blue/half/contrasted{
+"AP" = (
+/obj/structure/flora/ausbushes/grassybush,
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/flora/ausbushes/brflowers,
+/obj/structure/flora/ausbushes/leafybush,
+/obj/structure/window/reinforced{
 	dir = 4
 	},
-/turf/open/floor/iron/white,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/open/floor/grass,
+/area/shuttle/escape)
+"AZ" = (
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+	dir = 1
+	},
+/turf/open/floor/iron/edge,
+/area/shuttle/escape)
+"CS" = (
+/obj/machinery/holopad{
+	pixel_x = 16;
+	pixel_y = -16
+	},
+/obj/effect/turf_decal/box/corners{
+	dir = 1;
+	pixel_x = 16;
+	pixel_y = -16
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "Dx" = (
 /obj/machinery/computer/station_alert{
 	dir = 8
 	},
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
-	dir = 4
+/obj/effect/turf_decal/tile/yellow/half/contrasted,
+/turf/open/floor/iron/dark/side{
+	dir = 8
 	},
-/turf/open/floor/iron/dark,
+/area/shuttle/escape)
+"DG" = (
+/obj/effect/turf_decal/box/corners{
+	pixel_x = -16;
+	pixel_y = 16
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "Ec" = (
 /obj/item/scalpel{
@@ -833,9 +1225,12 @@
 /obj/structure/table/reinforced,
 /obj/item/surgicaldrill,
 /obj/item/cautery,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
-	dir = 1
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 5
 	},
+/obj/machinery/camera/directional/north,
+/obj/machinery/status_display/evac/directional/east,
+/obj/machinery/newscaster/directional/north,
 /turf/open/floor/iron/white,
 /area/shuttle/escape)
 "Ej" = (
@@ -844,24 +1239,34 @@
 	req_access_txt = "2"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/mineral/plastitanium/red/brig,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "Eu" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/firstaid/regular,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "Ey" = (
 /obj/machinery/door/airlock/shuttle{
 	name = "Emergency Shuttle Cargo"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
 /obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
+"EJ" = (
+/obj/structure/chair/fancy/shuttle{
+	dir = 1
+	},
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
 "Gd" = (
 /obj/item/reagent_containers/glass/bottle/epinephrine{
 	pixel_x = 6
@@ -897,44 +1302,98 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/effect/turf_decal/tile/blue/opposingcorners{
-	dir = 1
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 8
+	},
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 4
 	},
-/turf/open/floor/iron/white,
 /area/shuttle/escape)
 "Gg" = (
 /obj/structure/chair/office{
 	dir = 8
 	},
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 10
+	},
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
+"GG" = (
+/obj/structure/chair/fancy/shuttle{
+	dir = 1
+	},
+/obj/machinery/newscaster/directional/south,
+/turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "Hh" = (
 /obj/machinery/door/airlock/command/glass{
 	name = "Cockpit";
 	req_access_txt = "19"
 	},
-/obj/effect/turf_decal/stripes/line,
 /obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/closeup,
 /turf/open/floor/iron,
 /area/shuttle/escape)
+"Ho" = (
+/obj/effect/turf_decal/trimline/neutral/filled/warning{
+	dir = 4
+	},
+/turf/open/floor/iron/edge{
+	dir = 8
+	},
+/area/shuttle/escape)
+"Hv" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"Hw" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 4;
+	pixel_x = -16;
+	pixel_y = -16
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"HH" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/turf/open/floor/iron/edge{
+	dir = 1
+	},
+/area/shuttle/escape)
 "IG" = (
 /obj/item/kirbyplants{
 	icon_state = "plant-21";
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
-	dir = 1
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 8
 	},
-/turf/open/floor/iron,
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
+/area/shuttle/escape)
+"JW" = (
+/obj/machinery/stasis,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 6
+	},
+/obj/item/radio/intercom/directional/east,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/white,
 /area/shuttle/escape)
 "Kr" = (
 /obj/structure/table/reinforced,
 /obj/item/paper_bin,
 /obj/item/pen,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
+/obj/machinery/newscaster/directional/south,
+/turf/open/floor/iron/dark/corner{
+	dir = 4
+	},
 /area/shuttle/escape)
 "Ky" = (
 /obj/effect/spawner/structure/window/shuttle,
@@ -946,24 +1405,207 @@
 	name = "Emergency Shuttle Airlock";
 	req_access_txt = "2"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
 /obj/structure/fans/tiny,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
 /turf/open/floor/iron/white,
 /area/shuttle/escape)
+"KN" = (
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/structure/closet/crate/internals,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 9
+	},
+/turf/open/floor/iron,
+/area/shuttle/escape)
 "LM" = (
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
-	dir = 4
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 1
+	},
+/turf/open/floor/iron/edge,
+/area/shuttle/escape)
+"Mb" = (
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/structure/closet/crate/internals,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 5
 	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
+"Mi" = (
+/obj/machinery/holopad{
+	pixel_x = 16
+	},
+/obj/effect/turf_decal/box/corners{
+	dir = 1;
+	pixel_x = 16
+	},
+/obj/effect/turf_decal/box/corners{
+	pixel_x = 16;
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
 "Ml" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
+/turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "Mo" = (
 /obj/item/kirbyplants{
@@ -974,94 +1616,247 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 8
+	},
+/obj/machinery/camera/directional/west,
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
+/area/shuttle/escape)
+"Mq" = (
+/obj/item/kirbyplants{
+	icon_state = "plant-21";
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 8
+	},
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
+/area/shuttle/escape)
+"MY" = (
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 11
+	},
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 4
+	},
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 8
+	},
+/area/shuttle/escape)
+"Np" = (
+/obj/item/storage/firstaid/toxin,
+/obj/item/storage/firstaid/o2{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 4
+	},
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 8
+	},
+/area/shuttle/escape)
+"OM" = (
+/obj/effect/turf_decal/tile/blue/anticorner{
+	dir = 4
+	},
+/obj/effect/turf_decal/box/corners{
+	pixel_y = 16;
+	dir = 8;
+	pixel_x = 16
+	},
+/turf/open/floor/iron/white/smooth_corner{
+	dir = 8
+	},
+/area/shuttle/escape)
+"Pe" = (
+/obj/structure/chair/office{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 6
+	},
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
+"Pm" = (
+/obj/item/storage/firstaid/fire,
+/obj/item/storage/firstaid/regular{
+	pixel_x = 2;
+	pixel_y = 3
+	},
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 4
+	},
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 8
+	},
+/area/shuttle/escape)
+"PN" = (
+/obj/structure/chair/fancy/shuttle,
+/obj/effect/turf_decal/bot,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"Qa" = (
+/obj/machinery/flasher{
+	id = "shuttleflash";
+	pixel_y = -26
+	},
+/obj/machinery/light,
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/turf/open/floor/iron/edge{
+	dir = 1
+	},
+/area/shuttle/escape)
+"Qc" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/mechanical,
+/turf/open/floor/iron/dark/side{
+	dir = 1
+	},
+/area/shuttle/escape)
+"Qw" = (
+/obj/structure/chair/office/light{
+	dir = 8
+	},
+/turf/open/floor/iron/white/smooth_large,
+/area/shuttle/escape)
+"QN" = (
+/obj/effect/turf_decal/box/corners{
+	pixel_x = -16;
+	pixel_y = 16
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"QW" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/fancy/donut_box,
+/turf/open/floor/iron/dark/side{
+	dir = 8
+	},
+/area/shuttle/escape)
+"Rn" = (
+/obj/machinery/computer/atmos_alert{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/yellow/half/contrasted,
+/turf/open/floor/iron/dark/side{
+	dir = 8
+	},
+/area/shuttle/escape)
+"RY" = (
+/obj/machinery/holopad{
+	pixel_x = 16;
+	pixel_y = -16
+	},
+/obj/effect/turf_decal/box/corners{
+	dir = 1;
+	pixel_x = 16;
+	pixel_y = -16
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/large,
+/area/shuttle/escape)
+"Ss" = (
+/obj/effect/turf_decal/trimline/blue/filled/warning,
+/turf/open/floor/iron/white/smooth_edge{
 	dir = 1
 	},
-/turf/open/floor/iron,
-/area/shuttle/escape)
-"MY" = (
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = 11
+/area/shuttle/escape)
+"TJ" = (
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
 	},
-/obj/effect/turf_decal/tile/blue/opposingcorners{
-	dir = 1
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
 	},
-/turf/open/floor/iron/white,
-/area/shuttle/escape)
-"Np" = (
-/obj/item/storage/firstaid/toxin,
-/obj/item/storage/firstaid/o2{
-	pixel_x = 3;
-	pixel_y = 3
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
 	},
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
-	dir = 4
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
 	},
-/turf/open/floor/iron/white,
-/area/shuttle/escape)
-"Pe" = (
-/obj/structure/chair/office{
-	dir = 4
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
 	},
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/shuttle/escape)
-"Pm" = (
-/obj/item/storage/firstaid/fire,
-/obj/item/storage/firstaid/regular{
-	pixel_x = 2;
-	pixel_y = 3
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
 	},
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/blue/half/contrasted,
-/turf/open/floor/iron/white,
-/area/shuttle/escape)
-"Qa" = (
-/obj/machinery/flasher{
-	id = "shuttleflash";
-	pixel_y = -26
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
 	},
-/obj/machinery/light,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
-	dir = 8
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
 	},
-/turf/open/floor/iron,
-/area/shuttle/escape)
-"Qc" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/mechanical,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/shuttle/escape)
-"Qw" = (
-/obj/structure/chair/office/light{
-	dir = 8
+/obj/item/clothing/head/utility/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
 	},
-/obj/effect/turf_decal/tile/blue/half/contrasted{
+/obj/structure/closet/crate/internals,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
 	dir = 4
 	},
-/turf/open/floor/iron/white,
-/area/shuttle/escape)
-"QW" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/fancy/donut_box,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/shuttle/escape)
-"Rn" = (
-/obj/machinery/computer/atmos_alert{
+/turf/open/floor/iron/edge{
 	dir = 8
 	},
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
-/turf/open/floor/iron/dark,
-/area/shuttle/escape)
-"Ss" = (
-/obj/effect/turf_decal/tile/blue/opposingcorners{
-	dir = 1
-	},
-/turf/open/floor/iron/white,
 /area/shuttle/escape)
 "TQ" = (
 /obj/machinery/door/airlock/shuttle{
@@ -1076,73 +1871,153 @@
 	width = 29
 	},
 /obj/structure/fans/tiny,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/turf/open/floor/iron/white,
 /area/shuttle/escape)
-"Vu" = (
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
+"TS" = (
+/obj/structure/chair/office{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 4
+	},
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
+"Ua" = (
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
 	dir = 8
 	},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
+/area/shuttle/escape)
+"Vu" = (
+/obj/effect/turf_decal/trimline/neutral/filled/warning,
+/turf/open/floor/iron/edge{
+	dir = 1
+	},
 /area/shuttle/escape)
 "VI" = (
 /obj/structure/bed/roller,
 /obj/machinery/iv_drip,
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 26
-	},
 /obj/machinery/light/small{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 4
+	},
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 8
+	},
 /area/shuttle/escape)
 "Wk" = (
 /obj/machinery/computer/emergency_shuttle{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+	alpha = 180;
 	dir = 8
 	},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/side{
+	dir = 1
+	},
 /area/shuttle/escape)
 "WL" = (
 /obj/structure/table/reinforced,
 /obj/item/folder/blue,
 /obj/item/pen,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
+"WV" = (
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+	dir = 1
+	},
+/turf/open/floor/catwalk_floor/iron,
+/area/shuttle/escape)
+"WW" = (
+/obj/item/kirbyplants{
+	icon_state = "plant-21";
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 8
+	},
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/iron/edge{
+	dir = 4
+	},
 /area/shuttle/escape)
 "Xq" = (
 /obj/machinery/computer/med_data{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+	dir = 8
+	},
+/turf/open/floor/iron/dark/side{
+	dir = 1
+	},
+/area/shuttle/escape)
+"Yf" = (
+/obj/item/kirbyplants{
+	icon_state = "plant-21";
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 4
+	},
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
+"Yn" = (
+/obj/effect/turf_decal/box/corners{
+	pixel_x = -16
+	},
+/obj/effect/turf_decal/box/corners{
+	pixel_x = -16;
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/iron/large,
 /area/shuttle/escape)
 "Yt" = (
 /obj/machinery/door/airlock/medical/glass{
 	name = "Escape Shuttle Infirmary"
 	},
-/obj/effect/turf_decal/stripes/line,
 /obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/closeup,
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "Zl" = (
 /obj/item/defibrillator/loaded,
 /obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
-	dir = 1
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 9
 	},
 /turf/open/floor/iron/white,
 /area/shuttle/escape)
-"ZB" = (
-/obj/item/radio/intercom{
-	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 58
+"ZZ" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 4;
+	pixel_x = -16;
+	pixel_y = -16
 	},
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
+/turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 
 (1,1,1) = {"
@@ -1180,15 +2055,15 @@ aa
 ab
 ad
 af
-ah
-Mo
+KN
+WW
 av
 av
 aH
-IG
-aE
+Mq
+iG
 aU
-aE
+iG
 IG
 av
 av
@@ -1199,7 +2074,7 @@ af
 bw
 bE
 bM
-bU
+GG
 af
 aa
 aa
@@ -1211,7 +2086,7 @@ aa
 ab
 ad
 Ky
-rY
+pw
 zW
 zW
 zW
@@ -1226,10 +2101,10 @@ zW
 zW
 zW
 Vu
-Ej
-bw
-bw
+uA
 bw
+CS
+hv
 bU
 Ky
 aa
@@ -1242,7 +2117,7 @@ aa
 ab
 ad
 Ky
-rY
+pw
 zW
 aw
 aw
@@ -1256,11 +2131,11 @@ aw
 aw
 aw
 zW
-Vu
+HH
 af
-bx
-bw
-bw
+iz
+ZZ
+DG
 cG
 af
 aa
@@ -1273,31 +2148,31 @@ aa
 ac
 ac
 af
-rY
+pw
 zW
-ax
-aC
+ap
+bj
 aI
-aK
+aC
 ax
 zW
-aX
+kS
 aK
 be
 aD
 aX
 zW
-Vu
-hB
+HH
+Ky
 bx
 bw
 bN
-bU
+EJ
 af
 af
-aT
-Ky
 af
+Ky
+aT
 af
 "}
 (6,1,1) = {"
@@ -1318,7 +2193,7 @@ av
 av
 av
 zW
-Vu
+Ab
 af
 by
 bw
@@ -1335,14 +2210,14 @@ af
 ab
 ad
 Ky
-rY
-zW
+pw
 zW
 zW
 zW
 zW
 zW
 zW
+Hv
 zW
 zW
 zW
@@ -1353,11 +2228,11 @@ Qa
 af
 af
 Ej
-hB
-aT
+Ky
+af
 af
 sU
-Gg
+zZ
 Gg
 zr
 Ky
@@ -1380,14 +2255,14 @@ aw
 aw
 aw
 zW
-Vu
-hB
+HH
+Ky
 bz
 bF
 bP
 bW
-aq
-Ml
+af
+xg
 Ml
 sc
 nv
@@ -1397,15 +2272,15 @@ Ky
 ab
 ad
 Ky
-rY
+pw
 zW
-ax
+xi
 aD
 aI
 aK
-ax
+AP
 zW
-aX
+kS
 aC
 be
 bj
@@ -1413,13 +2288,13 @@ aX
 zW
 Vu
 Hh
-rY
-zW
-zW
+gv
+RY
+iy
 co
 Hh
 Ml
-Ml
+xX
 Eu
 Xq
 Ky
@@ -1428,7 +2303,7 @@ Ky
 ab
 ad
 Ky
-rY
+pw
 zW
 av
 av
@@ -1444,13 +2319,13 @@ av
 zW
 Vu
 Hh
-rY
-zW
-zW
+gv
+Hw
+QN
 co
 Hh
 Ml
-Ml
+zu
 WL
 Wk
 Ky
@@ -1459,7 +2334,7 @@ Ky
 ac
 ac
 af
-rY
+pw
 zW
 zW
 zW
@@ -1473,15 +2348,15 @@ zW
 zW
 zW
 zW
-Vu
-hB
+HH
+Ky
 bA
 bG
 bQ
 bI
-aq
+af
+qU
 Ml
-ZB
 sc
 dr
 Ky
@@ -1490,29 +2365,29 @@ Ky
 ab
 ad
 Ky
-ah
+Mb
 zl
 aw
-aE
-aE
+Ho
+Ho
 aw
 aw
 cB
 aw
 aw
-aw
-aE
-aE
+nz
+Ho
+Ho
 zl
-ah
+dg
+af
 af
-aT
 af
 af
 zd
 af
-sU
-Pe
+Yf
+TS
 Pe
 Qc
 Ky
@@ -1523,10 +2398,10 @@ ad
 af
 af
 aq
-ag
+Ky
 eY
 eY
-ag
+Ky
 aP
 af
 af
@@ -1555,28 +2430,28 @@ af
 Zl
 Gd
 AG
-aE
-aE
+az
+az
 oq
 vm
 af
 aY
 ba
 bf
-aE
-aE
+Ua
+Ua
 bl
 bq
 af
-bC
+xB
 cF
 ae
 af
 af
 af
-aT
-Ky
 af
+Ky
+aT
 af
 "}
 (15,1,1) = {"
@@ -1586,21 +2461,21 @@ Ky
 dX
 uc
 Qw
-zW
-zW
+pk
+OM
 kc
 Ss
 Yt
-aE
+AZ
 bb
 bg
-bg
+Mi
 bg
 bm
 br
 af
-bD
-bI
+bC
+WV
 bS
 bZ
 af
@@ -1615,22 +2490,22 @@ ab
 ad
 Ky
 Af
-qL
-Cl
-zW
-zW
+kc
+kc
+vi
+ue
 kc
 Ss
 Yt
-aE
+AZ
 bc
 bh
-bh
+Yn
 bh
 bn
-br
+xn
 af
-bC
+PN
 pa
 rY
 bZ
@@ -1651,14 +2526,14 @@ Np
 Pm
 vA
 VI
-vm
+JW
 aP
 aZ
 bd
 bi
 cC
 cC
-ah
+TJ
 bs
 af
 ah
diff --git a/_maps/shuttles/emergency/emergency_meta.dmm b/_maps/shuttles/emergency/emergency_meta.dmm
index 2cd54480bb07b..998c2fb62672c 100644
--- a/_maps/shuttles/emergency/emergency_meta.dmm
+++ b/_maps/shuttles/emergency/emergency_meta.dmm
@@ -9,13 +9,10 @@
 "ad" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/escape)
-"ag" = (
-/obj/structure/sign/warning/nosmoking,
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/escape)
 "al" = (
 /obj/structure/table,
 /obj/item/storage/fancy/donut_box,
+/obj/machinery/newscaster/directional/west,
 /turf/open/floor/iron/dark/side{
 	dir = 4
 	},
@@ -54,6 +51,7 @@
 	},
 /obj/structure/closet/firecloset,
 /obj/effect/turf_decal/box,
+/obj/machinery/status_display/evac/directional/west,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
 "aq" = (
@@ -75,6 +73,14 @@
 /obj/machinery/holopad{
 	pixel_x = 16
 	},
+/obj/effect/turf_decal/box/corners{
+	dir = 1;
+	pixel_x = 16
+	},
+/obj/effect/turf_decal/box/corners{
+	pixel_x = 16;
+	dir = 8
+	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "at" = (
@@ -94,8 +100,8 @@
 /obj/structure/shuttle/engine/heater{
 	dir = 8
 	},
-/obj/structure/window/reinforced{
-	dir = 4
+/obj/structure/window/reinforced/survival_pod{
+	dir = 8
 	},
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
@@ -103,6 +109,10 @@
 /obj/machinery/computer/communications{
 	dir = 4
 	},
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+	alpha = 180;
+	dir = 1
+	},
 /turf/open/floor/iron/dark/side{
 	dir = 4
 	},
@@ -110,10 +120,6 @@
 "ax" = (
 /turf/open/floor/carpet/blue,
 /area/shuttle/escape)
-"az" = (
-/obj/machinery/status_display/evac,
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/escape)
 "aA" = (
 /obj/effect/turf_decal/box,
 /obj/structure/tank_dispenser/oxygen,
@@ -123,17 +129,17 @@
 /obj/machinery/computer/emergency_shuttle{
 	dir = 4
 	},
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+	alpha = 180;
+	dir = 1
+	},
 /turf/open/floor/iron/dark/side{
 	dir = 4
 	},
 /area/shuttle/escape)
 "aC" = (
 /obj/structure/table,
-/obj/item/folder/blue,
-/obj/structure/extinguisher_cabinet{
-	dir = 4;
-	pixel_y = -27
-	},
+/obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/iron/dark/side{
 	dir = 1
 	},
@@ -143,19 +149,51 @@
 /obj/structure/flora/ausbushes/lavendergrass,
 /obj/structure/flora/ausbushes/brflowers,
 /obj/structure/flora/ausbushes/leafybush,
-/obj/structure/window/shuttle,
-/turf/open/floor/grass,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 1;
+	pixel_y = 1
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/open/floor/grass/no_border,
 /area/shuttle/escape)
 "aF" = (
 /obj/machinery/computer/station_alert{
 	dir = 4
 	},
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+	alpha = 180;
+	dir = 1
+	},
 /turf/open/floor/iron/dark/side{
 	dir = 4
 	},
 /area/shuttle/escape)
 "aG" = (
-/obj/machinery/recharge_station,
+/obj/structure/rack,
+/obj/item/storage/toolbox/electrical{
+	pixel_x = -3;
+	pixel_y = 1
+	},
+/obj/item/storage/toolbox/mechanical{
+	pixel_y = -1
+	},
+/obj/item/storage/toolbox/emergency{
+	pixel_x = 3;
+	pixel_y = -5
+	},
+/obj/item/radio,
+/obj/item/flashlight/flare{
+	pixel_x = -6;
+	pixel_y = -2
+	},
+/obj/item/flashlight/flare{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/radio/intercom/directional/east,
 /obj/effect/turf_decal/delivery,
 /obj/machinery/light{
 	dir = 1
@@ -182,16 +220,6 @@
 	dir = 4
 	},
 /area/shuttle/escape)
-"aN" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/machinery/door/airlock/medical/glass{
-	name = "Escape Shuttle Infirmary"
-	},
-/turf/open/floor/iron/white,
-/area/shuttle/escape)
 "aO" = (
 /obj/structure/table,
 /obj/machinery/recharger{
@@ -209,18 +237,16 @@
 /area/shuttle/escape)
 "aR" = (
 /obj/machinery/holopad,
+/obj/effect/turf_decal/box,
 /turf/open/floor/carpet/blue,
 /area/shuttle/escape)
 "aS" = (
-/obj/item/radio/intercom{
-	name = "Station Intercom (General)";
-	pixel_y = -31
-	},
 /obj/structure/chair/fancy/shuttle{
 	dir = 1
 	},
 /obj/machinery/light,
 /obj/effect/turf_decal/bot,
+/obj/item/radio/intercom/directional/south,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "aT" = (
@@ -237,6 +263,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "be" = (
@@ -261,8 +288,7 @@
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "bj" = (
-/obj/item/defibrillator/loaded,
-/obj/structure/table,
+/obj/machinery/stasis,
 /obj/effect/turf_decal/bot,
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
@@ -274,13 +300,7 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
 "bl" = (
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/iron/white,
-/area/shuttle/escape)
-"bm" = (
-/obj/effect/turf_decal/siding/thinplating_new/light,
-/obj/structure/closet/crate/freezer/blood,
-/turf/open/floor/mineral/titanium/blue,
+/turf/open/floor/iron/white/smooth_large,
 /area/shuttle/escape)
 "bn" = (
 /obj/effect/turf_decal/delivery,
@@ -288,30 +308,11 @@
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "bo" = (
-/obj/structure/rack,
+/obj/machinery/recharge_station,
+/obj/effect/turf_decal/delivery,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
-/obj/item/storage/toolbox/electrical{
-	pixel_x = -3;
-	pixel_y = 1
-	},
-/obj/item/storage/toolbox/mechanical{
-	pixel_y = -1
-	},
-/obj/item/storage/toolbox/emergency{
-	pixel_x = 3;
-	pixel_y = -5
-	},
-/obj/item/radio,
-/obj/item/flashlight/flare{
-	pixel_x = -6;
-	pixel_y = -2
-	},
-/obj/item/flashlight/flare{
-	pixel_x = 3;
-	pixel_y = 3
-	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "bp" = (
@@ -329,22 +330,30 @@
 	},
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
-"bt" = (
-/obj/structure/reagent_dispensers/peppertank,
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/escape)
 "bu" = (
-/obj/machinery/stasis,
 /obj/effect/turf_decal/siding/thinplating_new/light,
-/obj/effect/turf_decal/box,
+/obj/structure/table,
+/obj/item/clothing/gloves/color/latex,
+/obj/item/cautery,
+/obj/item/hemostat{
+	pixel_x = -4
+	},
+/obj/item/scalpel{
+	pixel_y = 5
+	},
+/obj/item/surgical_drapes,
+/obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
 "bv" = (
-/obj/effect/turf_decal/tile/blue/opposingcorners,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
+/obj/effect/turf_decal/tile/blue/anticorner{
+	dir = 1
 	},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/box/corners{
+	pixel_x = -16;
+	pixel_y = 16
+	},
+/turf/open/floor/iron/white/smooth_corner,
 /area/shuttle/escape)
 "bw" = (
 /obj/item/cigbutt,
@@ -354,18 +363,21 @@
 "by" = (
 /obj/machinery/suit_storage_unit/standard_unit,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "bz" = (
-/obj/machinery/computer/crew{
-	dir = 4
+/obj/structure/sink{
+	dir = 8;
+	pixel_x = -12
 	},
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/white/smooth_large,
 /area/shuttle/escape)
 "bA" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "bD" = (
@@ -377,14 +389,11 @@
 	pixel_x = -4;
 	pixel_y = 2
 	},
-/obj/item/radio/intercom{
-	name = "Station Intercom (General)";
-	pixel_y = -31
-	},
 /obj/item/book/manual/wiki/security_space_law{
 	pixel_x = -4;
 	pixel_y = 4
 	},
+/obj/item/radio/intercom/directional/south,
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "bE" = (
@@ -412,29 +421,18 @@
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "bH" = (
-/obj/item/radio/intercom{
-	name = "Station Intercom (General)";
-	pixel_x = -27
-	},
 /obj/machinery/shower{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
 /obj/effect/turf_decal/bot,
+/obj/machinery/newscaster/directional/south,
 /turf/open/floor/noslip/blue,
 /area/shuttle/escape)
 "bI" = (
-/obj/effect/turf_decal/tile/blue/opposingcorners,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
 /obj/effect/turf_decal/arrows{
 	dir = 8
 	},
-/obj/structure/sink,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/white/smooth_large,
 /area/shuttle/escape)
 "bJ" = (
 /obj/structure/table,
@@ -483,6 +481,7 @@
 /obj/effect/turf_decal/siding/thinplating_new/light{
 	dir = 1
 	},
+/obj/machinery/status_display/evac/directional/south,
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
 "bL" = (
@@ -493,11 +492,14 @@
 /obj/effect/turf_decal/tile/blue/half/contrasted{
 	dir = 8
 	},
-/obj/structure/bed/roller,
-/obj/machinery/iv_drip,
 /obj/effect/turf_decal/siding/thinplating_new/light{
 	dir = 1
 	},
+/mob/living/simple_animal/bot/medbot{
+	name = "\improper emergency medibot";
+	pixel_x = -3;
+	pixel_y = 2
+	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
 "bN" = (
@@ -516,10 +518,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
-/obj/structure/extinguisher_cabinet{
-	dir = 4;
-	pixel_y = -27
-	},
+/obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "bP" = (
@@ -539,20 +538,17 @@
 	},
 /obj/item/lazarus_injector,
 /obj/effect/turf_decal/bot,
-/mob/living/simple_animal/bot/medbot{
-	name = "\improper emergency medibot";
-	pixel_x = -3;
-	pixel_y = 2
-	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "bQ" = (
 /obj/machinery/advanced_airlock_controller{
 	pixel_y = 24
 	},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 10
+	},
+/turf/open/floor/catwalk_floor/iron,
 /area/shuttle/escape)
 "bR" = (
 /obj/structure/table,
@@ -659,6 +655,10 @@
 "bY" = (
 /turf/open/floor/iron/dark/corner,
 /area/shuttle/escape)
+"bZ" = (
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
 "ca" = (
 /obj/machinery/space_heater,
 /obj/effect/turf_decal/bot,
@@ -678,6 +678,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/structure/reagent_dispensers/peppertank/directional/east,
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "cl" = (
@@ -685,6 +686,11 @@
 	pixel_x = 16;
 	pixel_y = -16
 	},
+/obj/effect/turf_decal/box/corners{
+	dir = 1;
+	pixel_x = 16;
+	pixel_y = -16
+	},
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "cO" = (
@@ -695,11 +701,21 @@
 /obj/effect/turf_decal/siding/thinplating_new/light{
 	dir = 8
 	},
-/obj/item/storage/backpack/duffelbag/med/surgery{
-	pixel_y = 7
+/obj/item/storage/firstaid/regular{
+	pixel_x = 2;
+	pixel_y = 3
 	},
+/obj/item/storage/firstaid/fire,
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
+"df" = (
+/obj/effect/turf_decal/box/corners{
+	pixel_y = 16;
+	dir = 8;
+	pixel_x = 16
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
 "dy" = (
 /obj/item/stack/medical/bruise_pack,
 /obj/item/stack/medical/ointment,
@@ -720,7 +736,8 @@
 	req_access_txt = "2"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/mineral/plastitanium/red/brig,
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "eB" = (
 /turf/open/floor/iron/dark/corner{
@@ -729,6 +746,7 @@
 /area/shuttle/escape)
 "fb" = (
 /obj/machinery/holopad,
+/obj/effect/turf_decal/box,
 /turf/open/floor/iron/dark,
 /area/shuttle/escape)
 "fi" = (
@@ -737,6 +755,7 @@
 	},
 /obj/machinery/light,
 /obj/effect/turf_decal/bot,
+/obj/machinery/newscaster/directional/south,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "fr" = (
@@ -744,6 +763,23 @@
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 9
 	},
+/turf/open/floor/catwalk_floor/iron,
+/area/shuttle/escape)
+"fx" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/closet/firecloset,
+/obj/effect/turf_decal/box,
+/obj/machinery/status_display/ai/directional/west,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/escape)
+"fH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/tank/air{
+	dir = 4
+	},
+/obj/effect/turf_decal/bot,
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "gU" = (
@@ -752,20 +788,56 @@
 	req_access_txt = "19"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/carpet/blue,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "hJ" = (
 /obj/machinery/light{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 6
-	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
 /turf/open/floor/iron,
 /area/shuttle/escape)
+"ig" = (
+/obj/machinery/camera/directional/east,
+/turf/open/floor/carpet/blue,
+/area/shuttle/escape)
+"ja" = (
+/obj/structure/chair/fancy/shuttle{
+	dir = 1
+	},
+/obj/effect/turf_decal/bot,
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/escape)
 "jb" = (
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/anticorner{
+	dir = 4
+	},
+/obj/effect/turf_decal/box/corners{
+	pixel_y = 16;
+	dir = 8;
+	pixel_x = 16
+	},
+/turf/open/floor/iron/white/smooth_corner{
+	dir = 8
+	},
+/area/shuttle/escape)
+"jg" = (
+/obj/structure/chair/fancy/shuttle{
+	dir = 4
+	},
+/obj/machinery/status_display/evac/directional/west,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"mg" = (
+/obj/structure/chair/fancy/shuttle,
+/obj/effect/turf_decal/bot,
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "mw" = (
 /obj/effect/turf_decal/siding/thinplating_new/dark,
@@ -778,6 +850,29 @@
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
+"nd" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 4;
+	pixel_x = -16;
+	pixel_y = -16
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"ph" = (
+/obj/structure/flora/ausbushes/grassybush,
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/flora/ausbushes/brflowers,
+/obj/structure/flora/ausbushes/leafybush,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	pixel_y = 1
+	},
+/turf/open/floor/grass/no_border,
+/area/shuttle/escape)
 "pq" = (
 /obj/machinery/door/airlock/command{
 	name = "Emergency Recovery Airlock";
@@ -785,6 +880,18 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"re" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/box/corners{
+	pixel_x = -16
+	},
+/obj/effect/turf_decal/box/corners{
+	pixel_x = -16;
+	dir = 4
+	},
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "rl" = (
@@ -792,19 +899,16 @@
 	name = "Emergency Shuttle Airlock"
 	},
 /obj/structure/fans/tiny,
+/obj/effect/turf_decal/stripes/closeup,
 /turf/open/floor/iron/white,
 /area/shuttle/escape)
 "rp" = (
-/obj/item/radio/intercom{
-	dir = 4;
-	name = "Station Intercom (General)";
-	pixel_y = 27
-	},
 /obj/structure/chair/fancy/shuttle,
 /obj/machinery/light{
 	dir = 1
 	},
 /obj/effect/turf_decal/bot,
+/obj/item/radio/intercom/directional/north,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "sb" = (
@@ -813,38 +917,95 @@
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
+"uw" = (
+/obj/structure/chair/fancy/shuttle{
+	dir = 1
+	},
+/obj/effect/turf_decal/bot,
+/obj/machinery/camera/directional/south,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/escape)
 "uD" = (
 /obj/structure/chair/fancy/shuttle,
 /obj/machinery/light{
 	dir = 1
 	},
 /obj/effect/turf_decal/bot,
+/obj/machinery/camera/directional/north,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "ve" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
+/obj/effect/turf_decal/tile/blue/anticorner,
 /obj/machinery/holopad{
 	pixel_x = 16;
 	pixel_y = -16
 	},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/box/corners{
+	dir = 1;
+	pixel_x = 16;
+	pixel_y = -16
+	},
+/turf/open/floor/iron/white/smooth_corner{
+	dir = 1
+	},
+/area/shuttle/escape)
+"wj" = (
+/obj/effect/turf_decal/tile/blue/anticorner{
+	dir = 8
+	},
+/obj/effect/turf_decal/box/corners{
+	dir = 4;
+	pixel_x = -16;
+	pixel_y = -16
+	},
+/turf/open/floor/iron/white/smooth_corner{
+	dir = 4
+	},
 /area/shuttle/escape)
 "wu" = (
 /obj/effect/turf_decal/siding/thinplating_new/light,
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
-"AT" = (
-/obj/structure/table,
-/obj/item/paper_bin{
-	pixel_x = -2;
-	pixel_y = 8
+"wY" = (
+/obj/machinery/status_display/evac/directional/east,
+/turf/open/floor/iron/dark/side{
+	dir = 1
+	},
+/area/shuttle/escape)
+"yj" = (
+/obj/structure/chair/fancy/shuttle{
+	dir = 8
 	},
-/obj/item/radio/intercom{
-	name = "Station Intercom (General)";
-	pixel_y = -31
+/obj/machinery/status_display/ai/directional/east,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"yL" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/catwalk_floor/iron,
+/area/shuttle/escape)
+"AF" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/radio/intercom/directional/north,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 10
 	},
+/turf/open/floor/iron,
+/area/shuttle/escape)
+"AG" = (
+/obj/structure/chair/fancy/shuttle{
+	dir = 4
+	},
+/obj/machinery/camera/directional/west,
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"AT" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/radio/intercom/directional/south,
+/obj/item/pen,
+/obj/item/folder/blue,
 /turf/open/floor/iron/dark/side{
 	dir = 1
 	},
@@ -862,35 +1023,34 @@
 /area/shuttle/escape)
 "BN" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/binary/dp_vent_pump,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+	dir = 8
+	},
+/turf/open/floor/catwalk_floor/iron,
 /area/shuttle/escape)
 "Ce" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 10
-	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/escape)
 "CQ" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump,
+/turf/open/floor/catwalk_floor/iron,
 /area/shuttle/escape)
 "DK" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/tank/air,
+/obj/structure/chair/fancy/shuttle{
+	dir = 4
+	},
+/obj/machinery/newscaster/directional/west,
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "Eg" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/regular{
-	pixel_x = 2;
-	pixel_y = 3
-	},
-/obj/item/storage/firstaid/fire,
 /obj/effect/turf_decal/siding/thinplating_new/light{
 	dir = 1
 	},
+/obj/machinery/computer/crew{
+	dir = 1
+	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
 "EG" = (
@@ -929,50 +1089,95 @@
 /obj/machinery/door/firedoor/window,
 /turf/open/floor/plating,
 /area/shuttle/escape)
+"Ls" = (
+/obj/structure/chair/fancy/shuttle{
+	dir = 1
+	},
+/obj/effect/turf_decal/bot,
+/obj/machinery/status_display/ai/directional/south,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/escape)
 "LY" = (
 /turf/open/floor/iron/dark/side{
 	dir = 4
 	},
 /area/shuttle/escape)
 "Ml" = (
-/obj/machinery/stasis,
-/obj/effect/turf_decal/box,
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/item/radio/intercom/directional/west,
+/obj/machinery/computer/operating{
+	dir = 4
+	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
+"MO" = (
+/obj/structure/flora/ausbushes/grassybush,
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/flora/ausbushes/brflowers,
+/obj/structure/flora/ausbushes/leafybush,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/window/reinforced,
+/turf/open/floor/grass/no_border,
+/area/shuttle/escape)
+"Ns" = (
+/obj/machinery/door/airlock/external{
+	name = "Emergency Recovery Airlock"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/shuttle/escape)
 "PE" = (
 /obj/machinery/door/airlock/medical/glass{
 	name = "Escape Shuttle Infirmary"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/iron/white,
-/area/shuttle/escape)
-"PV" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "Qj" = (
 /obj/machinery/computer/security,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+	dir = 4
+	},
 /turf/open/floor/iron/dark/side,
 /area/shuttle/escape)
-"Rb" = (
-/obj/structure/table/optable,
-/obj/item/surgical_drapes,
-/turf/open/floor/mineral/titanium/blue,
+"QP" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/item/kirbyplants{
+	icon_state = "plant-10"
+	},
+/obj/structure/sign/warning/nosmoking{
+	pixel_y = -32
+	},
+/turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
 "Rg" = (
 /obj/structure/table,
 /obj/item/storage/firstaid/regular,
+/obj/machinery/status_display/ai/directional/east,
 /turf/open/floor/iron/dark/side,
 /area/shuttle/escape)
 "Ro" = (
 /obj/structure/flora/ausbushes/grassybush,
 /obj/structure/flora/ausbushes/brflowers,
-/turf/open/floor/grass,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 1;
+	pixel_y = 1
+	},
+/turf/open/floor/grass/no_border,
 /area/shuttle/escape)
 "RM" = (
 /obj/effect/decal/cleanable/dirt,
@@ -986,10 +1191,23 @@
 /obj/machinery/door/airlock/medical/glass{
 	name = "Escape Shuttle Infirmary"
 	},
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
 /turf/open/floor/iron/white,
 /area/shuttle/escape)
+"SV" = (
+/obj/effect/turf_decal/box/corners{
+	pixel_x = -16;
+	pixel_y = 16
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
 "TI" = (
 /obj/machinery/computer/crew,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+	dir = 4
+	},
 /turf/open/floor/iron/dark/side,
 /area/shuttle/escape)
 "Ui" = (
@@ -1009,6 +1227,7 @@
 	width = 25
 	},
 /obj/structure/fans/tiny,
+/obj/effect/turf_decal/stripes/closeup,
 /turf/open/floor/iron/white,
 /area/shuttle/escape)
 "Vs" = (
@@ -1029,17 +1248,34 @@
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "Xm" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/closeup,
 /obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Cargo Bay Airlock"
+	name = "Emergency Shuttle Cargo"
 	},
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor,
 /turf/open/floor/iron,
 /area/shuttle/escape)
+"Xr" = (
+/obj/structure/flora/ausbushes/grassybush,
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/flora/ausbushes/brflowers,
+/obj/structure/flora/ausbushes/leafybush,
+/obj/structure/window/reinforced{
+	dir = 1;
+	pixel_y = 1
+	},
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/open/floor/grass/no_border,
+/area/shuttle/escape)
 "Yo" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 5
+	},
+/turf/open/floor/catwalk_floor/iron,
 /area/shuttle/escape)
 "Yp" = (
 /obj/item/kirbyplants{
@@ -1048,22 +1284,33 @@
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
 "YP" = (
-/obj/machinery/computer/operating{
-	dir = 8
-	},
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/iv_drip,
+/obj/machinery/camera/directional/north,
+/obj/structure/bed/roller,
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
+"Zo" = (
+/obj/structure/chair/fancy/shuttle{
+	dir = 4
+	},
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
 "ZP" = (
 /obj/structure/chair/fancy/shuttle,
 /obj/effect/turf_decal/bot,
-/turf/open/floor/carpet/grimy,
+/obj/structure/sign/warning/nosmoking{
+	pixel_y = 32
+	},
+/turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "ZQ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/suit_storage_unit/standard_unit,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/iron,
 /area/shuttle/escape)
 
@@ -1127,9 +1374,9 @@ aB
 aF
 aL
 aO
-aJ
-bd
-bd
+ad
+fH
+be
 RM
 bd
 DK
@@ -1145,7 +1392,7 @@ aq
 Bg
 AT
 ad
-be
+AF
 hJ
 BN
 CQ
@@ -1162,10 +1409,10 @@ ax
 mw
 aC
 ad
-bf
+Ns
 Ce
 bQ
-CQ
+yL
 fr
 bf
 "}
@@ -1173,11 +1420,11 @@ bf
 Li
 Rg
 ao
+bZ
 ax
-ax
-ax
+ig
 dE
-ar
+wY
 pq
 cb
 ad
@@ -1189,24 +1436,24 @@ Li
 (8,1,1) = {"
 ad
 ad
-az
+ad
 ad
 gU
 ad
-az
 ad
 ad
 ad
 ad
 ad
-az
+ad
+ad
 ad
 ad
 "}
 (9,1,1) = {"
 ad
 bX
-ap
+fx
 Yp
 cO
 Yp
@@ -1214,9 +1461,9 @@ ap
 bX
 ad
 bh
-bh
-bh
-bh
+AG
+Zo
+jg
 bD
 ad
 "}
@@ -1232,24 +1479,24 @@ cO
 ef
 bU
 cl
-bU
+df
 bU
 bE
 Li
 "}
 (11,1,1) = {"
 ad
-aT
+mg
 bV
 bN
 aE
 aT
 ar
 bN
-ac
+Li
 bi
-bU
-bU
+nd
+SV
 bU
 bF
 Li
@@ -1262,12 +1509,12 @@ bN
 aI
 aT
 ar
-bN
+Ls
 ad
 bs
 cd
 bs
-bs
+yj
 bG
 ad
 "}
@@ -1282,9 +1529,9 @@ ar
 aS
 ad
 ad
-bt
 ad
-az
+ad
+ad
 ad
 ad
 "}
@@ -1306,15 +1553,15 @@ bH
 ad
 "}
 (15,1,1) = {"
-ag
+ad
 ZP
 bV
 bN
-aE
+ph
 aT
 ar
 bN
-ac
+Li
 sb
 bk
 Vs
@@ -1332,8 +1579,8 @@ aP
 ar
 cO
 PE
-PV
-jb
+bl
+bl
 ve
 jb
 bJ
@@ -1344,14 +1591,14 @@ Li
 aT
 bV
 bN
-aE
+MO
 aT
 ar
 bN
-ac
+Li
 cW
 mV
-bl
+wj
 bv
 bK
 ad
@@ -1365,11 +1612,11 @@ bL
 aT
 ar
 bN
-ac
-Rb
+Li
+bj
 wu
-jb
-PV
+bl
+bl
 Eg
 ac
 "}
@@ -1378,14 +1625,14 @@ ad
 rp
 bV
 bN
-aE
+Ro
 aT
 ar
 fi
 ad
 YP
-bm
-bv
+wu
+bl
 bl
 bM
 ac
@@ -1394,15 +1641,15 @@ ac
 Vh
 cO
 bV
-aP
-aP
-aP
-ar
 bN
+aI
+aT
+ar
+uw
 ba
 ad
 ac
-aN
+Sy
 Sy
 ba
 ad
@@ -1412,11 +1659,11 @@ ad
 aT
 bV
 bN
-aE
+Xr
 aT
 ar
-bN
-aJ
+ja
+ad
 VU
 bo
 bA
@@ -1453,7 +1700,7 @@ LY
 Xm
 bp
 be
-be
+re
 be
 bP
 Li
@@ -1466,8 +1713,8 @@ aA
 at
 dy
 bW
-Kc
-ag
+QP
+ad
 aG
 bq
 Gk
diff --git a/_maps/shuttles/emergency/emergency_tiny.dmm b/_maps/shuttles/emergency/emergency_tiny.dmm
index 98fa24e0f6ac5..9bdc48160d4e6 100644
--- a/_maps/shuttles/emergency/emergency_tiny.dmm
+++ b/_maps/shuttles/emergency/emergency_tiny.dmm
@@ -6,6 +6,14 @@
 	},
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
+"aj" = (
+/obj/structure/window/shuttle,
+/obj/structure/flora/ausbushes/grassybush,
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/flora/ausbushes/palebush,
+/obj/machinery/door/firedoor/window,
+/turf/open/floor/grass/no_border,
+/area/shuttle/escape)
 "bm" = (
 /obj/structure/table/reinforced,
 /obj/item/clothing/head/utility/chefhat{
@@ -17,18 +25,8 @@
 "bV" = (
 /obj/structure/chair/fancy/shuttle,
 /obj/effect/turf_decal/bot,
-/obj/structure/extinguisher_cabinet{
-	pixel_x = -31;
-	pixel_y = -1
-	},
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
-"cc" = (
-/obj/effect/turf_decal/trimline/dark/corner{
-	dir = 1
-	},
-/turf/open/floor/mineral/titanium/white,
-/area/shuttle/escape)
 "ci" = (
 /obj/item/kirbyplants{
 	icon_state = "plant-21";
@@ -57,28 +55,23 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
-"dl" = (
-/obj/structure/sign/departments/security{
-	pixel_y = 32
-	},
-/obj/structure/table/reinforced,
-/obj/structure/extinguisher_cabinet{
-	pixel_x = -32;
-	pixel_y = 31
-	},
-/obj/item/flashlight/lamp/green{
-	pixel_x = -4;
-	pixel_y = 11
+"dI" = (
+/obj/structure/flora/ausbushes/grassybush,
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/flora/ausbushes/ywflowers,
+/obj/structure/flora/ausbushes/fernybush,
+/obj/structure/window/shuttle,
+/obj/machinery/door/firedoor/window,
+/turf/open/floor/grass/no_border,
+/area/shuttle/escape)
+"ec" = (
+/obj/machinery/light{
+	dir = 8
 	},
-/obj/item/toy/crayon/red,
-/obj/item/toy/crayon/blue{
-	pixel_x = 3
+/obj/machinery/camera/directional/west,
+/turf/open/floor/circuit/green{
+	luminosity = 2
 	},
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/escape)
-"dM" = (
-/obj/effect/spawner/structure/window/shuttle,
-/turf/open/floor/plating,
 /area/shuttle/escape)
 "gg" = (
 /obj/effect/turf_decal/trimline/dark/warning,
@@ -112,33 +105,12 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
-"iq" = (
-/obj/effect/turf_decal/tile/blue/opposingcorners{
-	dir = 1
-	},
-/obj/machinery/camera/directional/north,
-/turf/open/floor/iron/white,
-/area/shuttle/escape)
-"iw" = (
-/obj/structure/grille,
-/obj/effect/spawner/structure/window/shuttle,
-/obj/structure/curtain/directional{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/shuttle/escape)
-"jH" = (
-/obj/structure/sign/departments/medbay/alt,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/shuttle/escape)
-"jK" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/effect/turf_decal/caution/stand_clear{
-	dir = 4
+"in" = (
+/obj/machinery/door/airlock/security{
+	req_one_access_txt = "2;19"
 	},
-/turf/open/floor/mineral/plastitanium/red/brig,
+/obj/effect/turf_decal/stripes/closeup,
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "kF" = (
 /obj/structure/flora/ausbushes/grassybush,
@@ -159,52 +131,41 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
-"mb" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/airlock/medical/glass{
-	name = "Shuttle Infirmary"
-	},
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
+"mX" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/chair/fancy/shuttle{
 	dir = 1
 	},
-/turf/open/floor/iron/white,
-/area/shuttle/escape)
-"mi" = (
-/obj/structure/chair/fancy/shuttle,
-/obj/effect/turf_decal/bot,
-/obj/structure/extinguisher_cabinet{
+/obj/machinery/computer/security/telescreen/evac{
 	pixel_x = 32;
-	pixel_y = -1
-	},
-/obj/item/storage/pod{
-	pixel_x = 5;
-	pixel_y = 31
+	dir = 8
 	},
+/obj/item/radio/intercom/directional/south,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
-"mC" = (
-/obj/structure/window/shuttle,
-/obj/structure/flora/ausbushes/grassybush,
-/obj/structure/flora/ausbushes/lavendergrass,
-/obj/structure/flora/ausbushes/ywflowers,
-/turf/open/floor/grass/no_border,
-/area/shuttle/escape)
 "nL" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/escape)
-"oh" = (
-/obj/machinery/flasher{
-	id = "tinyflash";
-	pixel_y = 27
+"nQ" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"ou" = (
+/obj/effect/turf_decal/trimline/dark/warning{
+	dir = 4
 	},
-/obj/structure/chair/fancy/shuttle,
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
+/obj/effect/turf_decal/trimline/dark/corner{
+	dir = 8
 	},
-/obj/effect/turf_decal/bot,
-/obj/machinery/camera/directional/north,
-/turf/open/floor/mineral/plastitanium,
+/obj/structure/sign/departments/medbay/alt{
+	pixel_x = 32
+	},
+/obj/effect/turf_decal/box/corners{
+	pixel_x = -16;
+	pixel_y = 16
+	},
+/turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
 "pJ" = (
 /obj/effect/turf_decal/stripes/line{
@@ -218,16 +179,6 @@
 	},
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
-"qI" = (
-/obj/effect/turf_decal/stripes/closeup{
-	dir = 1
-	},
-/obj/machinery/door/airlock/command{
-	name = "Cockpit";
-	req_access_txt = "19"
-	},
-/turf/open/floor/mineral/plastitanium/red/brig,
-/area/shuttle/escape)
 "rc" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
@@ -260,19 +211,35 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
-"se" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/box/zipties{
-	pixel_y = 4
+"rZ" = (
+/obj/structure/sign/poster/official/state_laws{
+	pixel_y = -32
 	},
-/obj/machinery/recharger,
-/obj/structure/window/reinforced{
-	dir = 8
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/escape)
+"sf" = (
+/obj/machinery/shower{
+	name = "emergency shower";
+	pixel_y = 7
 	},
-/obj/item/storage/toolbox/mechanical{
-	pixel_y = -1
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
 	},
-/turf/open/floor/mineral/plastitanium,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/noslip/dark,
+/area/shuttle/escape)
+"sp" = (
+/obj/effect/turf_decal/trimline/dark/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/box/corners{
+	dir = 4;
+	pixel_x = -16;
+	pixel_y = -16
+	},
+/turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
 "sv" = (
 /obj/effect/turf_decal/trimline/dark/warning{
@@ -283,6 +250,19 @@
 	},
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
+"sT" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/firedoor/window,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"tn" = (
+/obj/machinery/button/flasher{
+	id = "cockpit_flasher";
+	pixel_x = 25;
+	pixel_y = -25
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
 "tQ" = (
 /obj/structure/chair/fancy/shuttle{
 	dir = 4
@@ -297,12 +277,6 @@
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/escape)
-"vN" = (
-/obj/structure/sign/poster/official/state_laws{
-	pixel_y = -32
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/escape)
 "wh" = (
 /obj/structure/chair/fancy/shuttle{
 	dir = 1
@@ -313,19 +287,12 @@
 "wR" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/escape)
-"xg" = (
-/obj/machinery/door/airlock/security{
-	req_access_txt = "2"
-	},
-/obj/effect/turf_decal/stripes/closeup{
-	dir = 1
-	},
-/obj/structure/fans/tiny,
-/obj/docking_port/mobile/emergency{
-	name = "Echo emergency shuttle";
-	width = 16
-	},
-/turf/open/floor/mineral/plastitanium/red/brig,
+"xa" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/structure/grille,
+/obj/structure/shuttle/engine/heater,
+/obj/machinery/door/firedoor/window,
+/turf/open/floor/plating,
 /area/shuttle/escape)
 "xB" = (
 /obj/structure/table,
@@ -360,15 +327,52 @@
 	},
 /turf/open/floor/iron/white,
 /area/shuttle/escape)
-"xQ" = (
+"xD" = (
 /obj/effect/spawner/structure/window/shuttle,
-/obj/structure/grille,
-/obj/structure/shuttle/engine/heater,
+/obj/machinery/door/firedoor/window,
+/obj/structure/curtain/directional{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "xX" = (
 /turf/template_noop,
 /area/shuttle/escape)
+"yf" = (
+/obj/structure/table/reinforced,
+/obj/item/restraints/handcuffs{
+	pixel_x = 4;
+	pixel_y = 7
+	},
+/obj/machinery/recharger,
+/obj/item/restraints/handcuffs{
+	pixel_y = 2
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/camera/directional/east,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"yG" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/structure/fans/tiny,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/turf/open/floor/iron/white,
+/area/shuttle/escape)
+"yV" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/stasis,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+	dir = 1
+	},
+/obj/machinery/defibrillator_mount/loaded/directional/east,
+/turf/open/floor/iron/white,
+/area/shuttle/escape)
 "zE" = (
 /obj/structure/chair/office/light,
 /obj/effect/turf_decal/tile/blue/opposingcorners{
@@ -376,13 +380,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/shuttle/escape)
-"zK" = (
-/obj/structure/window/shuttle,
-/obj/structure/flora/ausbushes/grassybush,
-/obj/structure/flora/ausbushes/lavendergrass,
-/obj/structure/flora/ausbushes/palebush,
-/turf/open/floor/grass/no_border,
-/area/shuttle/escape)
 "Ae" = (
 /obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/stripes/line{
@@ -394,28 +391,16 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
-"Aq" = (
-/obj/machinery/door/airlock/shuttle{
-	name = "Emergency Shuttle Airlock"
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
+"Au" = (
+/obj/structure/chair/fancy/shuttle,
+/obj/effect/turf_decal/bot,
+/obj/item/storage/pod{
+	pixel_x = 5;
+	pixel_y = 31
 	},
-/obj/structure/fans/tiny,
+/obj/structure/extinguisher_cabinet/directional/east,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
-"Bi" = (
-/obj/effect/turf_decal/trimline/dark/warning{
-	dir = 4
-	},
-/obj/effect/turf_decal/trimline/dark/corner{
-	dir = 8
-	},
-/turf/open/floor/mineral/titanium/white,
-/area/shuttle/escape)
 "BB" = (
 /obj/machinery/light,
 /obj/structure/chair/fancy/shuttle{
@@ -431,13 +416,33 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
-"Co" = (
-/obj/machinery/button/flasher{
-	id = "tinyflash";
-	pixel_x = 26;
-	pixel_y = -25
+"BP" = (
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+	dir = 1
 	},
-/turf/open/floor/mineral/plastitanium/red/brig,
+/obj/machinery/camera/directional/north,
+/turf/open/floor/iron/white,
+/area/shuttle/escape)
+"BW" = (
+/obj/structure/closet/emcloset,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/dark/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/dark/warning{
+	dir = 8
+	},
+/obj/item/lazarus_injector,
+/mob/living/simple_animal/bot/medbot{
+	name = "\improper emergency medibot";
+	pixel_x = -3;
+	pixel_y = 2
+	},
+/obj/structure/sign/poster/official/help_others{
+	pixel_y = -32
+	},
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
 "CU" = (
 /obj/effect/turf_decal/bot,
@@ -452,35 +457,69 @@
 	},
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
-"Ho" = (
-/obj/structure/table/reinforced,
-/obj/item/restraints/handcuffs{
-	pixel_x = 4;
-	pixel_y = 7
-	},
-/obj/machinery/recharger,
-/obj/item/restraints/handcuffs{
-	pixel_y = 2
+"ER" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
 	},
-/obj/machinery/light{
+/obj/effect/turf_decal/caution/stand_clear{
 	dir = 4
 	},
-/obj/machinery/camera/directional/east,
-/turf/open/floor/mineral/plastitanium/red/brig,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/escape)
+"Fb" = (
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+	dir = 1
+	},
+/turf/open/floor/iron/white,
 /area/shuttle/escape)
 "HD" = (
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
+"Ie" = (
+/obj/machinery/door/airlock/security{
+	req_access_txt = "2"
+	},
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/obj/structure/fans/tiny,
+/obj/docking_port/mobile/emergency{
+	name = "Echo emergency shuttle";
+	width = 16
+	},
+/turf/open/floor/iron/white,
+/area/shuttle/escape)
+"Ix" = (
+/obj/structure/sign/departments/security{
+	pixel_y = 32
+	},
+/obj/structure/table/reinforced,
+/obj/item/flashlight/lamp/green{
+	pixel_x = -4;
+	pixel_y = 11
+	},
+/obj/item/toy/crayon/red,
+/obj/item/toy/crayon/blue{
+	pixel_x = 3
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/escape)
 "Ju" = (
 /obj/machinery/computer/emergency_shuttle{
 	dir = 8
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
-"Kb" = (
-/obj/structure/grille,
-/obj/effect/spawner/structure/window/shuttle,
-/turf/open/floor/plating,
+"JM" = (
+/obj/effect/turf_decal/trimline/dark/warning{
+	dir = 8
+	},
+/obj/machinery/flasher{
+	id = "cockpit_flasher";
+	pixel_x = 25;
+	pixel_y = 25
+	},
+/turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
 "KD" = (
 /obj/effect/turf_decal/stripes/line{
@@ -502,47 +541,6 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
-"LR" = (
-/obj/effect/turf_decal/tile/blue/opposingcorners{
-	dir = 1
-	},
-/turf/open/floor/iron/white,
-/area/shuttle/escape)
-"Mi" = (
-/obj/structure/window/shuttle,
-/obj/structure/flora/ausbushes/grassybush,
-/obj/structure/flora/ausbushes/lavendergrass,
-/obj/structure/flora/ausbushes/brflowers,
-/turf/open/floor/grass/no_border,
-/area/shuttle/escape)
-"MJ" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/chair/fancy/shuttle{
-	dir = 1
-	},
-/obj/item/radio/intercom{
-	name = "Station Intercom";
-	pixel_x = 1;
-	pixel_y = -30
-	},
-/obj/machinery/computer/security/telescreen/evac{
-	pixel_x = 32;
-	pixel_y = -1
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/escape)
-"No" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/stasis,
-/obj/machinery/defibrillator_mount/loaded{
-	pixel_x = 31;
-	pixel_y = -1
-	},
-/obj/effect/turf_decal/tile/blue/opposingcorners{
-	dir = 1
-	},
-/turf/open/floor/iron/white,
-/area/shuttle/escape)
 "Ns" = (
 /obj/effect/turf_decal/bot,
 /obj/machinery/light{
@@ -556,6 +554,26 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
+"Nt" = (
+/obj/structure/window/shuttle,
+/obj/structure/flora/ausbushes/grassybush,
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/flora/ausbushes/ywflowers,
+/obj/machinery/door/firedoor/window,
+/turf/open/floor/grass/no_border,
+/area/shuttle/escape)
+"Nx" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/box/zipties{
+	pixel_y = 4
+	},
+/obj/machinery/recharger,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/item/storage/fancy/donut_box,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/escape)
 "NC" = (
 /obj/structure/flora/ausbushes/grassybush,
 /obj/structure/flora/ausbushes/lavendergrass,
@@ -587,15 +605,24 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
-"Pw" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/light{
-	dir = 8
+"Pv" = (
+/obj/effect/turf_decal/trimline/dark/warning,
+/obj/effect/turf_decal/box/corners{
+	pixel_y = 16;
+	dir = 8;
+	pixel_x = 16
 	},
-/obj/machinery/camera/directional/west,
-/turf/open/floor/circuit/green{
-	luminosity = 2
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/escape)
+"QG" = (
+/obj/machinery/door/airlock/medical/glass{
+	name = "Shuttle Infirmary"
 	},
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
+	},
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "QY" = (
 /obj/effect/turf_decal/stripes/line{
@@ -603,29 +630,36 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
-"TN" = (
-/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/trimline/dark/warning{
-	dir = 4
-	},
-/obj/effect/turf_decal/trimline/dark/warning{
-	dir = 8
-	},
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 32;
-	pixel_y = -1
+"RX" = (
+/obj/structure/window/shuttle,
+/obj/structure/flora/ausbushes/grassybush,
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/flora/ausbushes/brflowers,
+/obj/machinery/door/firedoor/window,
+/turf/open/floor/grass/no_border,
+/area/shuttle/escape)
+"Sm" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
 	},
-/obj/item/lazarus_injector,
-/mob/living/simple_animal/bot/medbot{
-	name = "\improper emergency medibot";
-	pixel_x = -3;
-	pixel_y = 2
+/obj/effect/turf_decal/bot,
+/obj/machinery/camera/directional/north,
+/obj/structure/closet/firecloset/full,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/escape)
+"TD" = (
+/obj/structure/reagent_dispensers/peppertank/directional/north,
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"TL" = (
+/obj/effect/turf_decal/stripes/closeup{
+	dir = 1
 	},
-/obj/structure/sign/poster/official/help_others{
-	pixel_y = -32
+/obj/machinery/door/airlock/command{
+	name = "Cockpit";
+	req_access_txt = "19"
 	},
-/turf/open/floor/mineral/titanium/white,
+/turf/open/floor/iron,
 /area/shuttle/escape)
 "Up" = (
 /obj/effect/spawner/structure/window/shuttle,
@@ -638,13 +672,6 @@
 "Vn" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/shuttle/escape)
-"Xn" = (
-/obj/machinery/door/airlock/security{
-	req_one_access_txt = "2;19"
-	},
-/obj/effect/turf_decal/stripes/closeup,
-/turf/open/floor/mineral/plastitanium/red/brig,
-/area/shuttle/escape)
 "Ys" = (
 /obj/structure/shuttle/engine/large,
 /obj/effect/turf_decal/stripes/line{
@@ -662,31 +689,36 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
-"ZY" = (
-/obj/machinery/shower{
-	name = "emergency shower";
-	pixel_y = 7
+"Ze" = (
+/obj/effect/turf_decal/trimline/dark/corner{
+	dir = 1
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
+/obj/machinery/holopad{
+	pixel_x = 16;
+	pixel_y = -16
 	},
-/turf/open/floor/noslip/dark,
+/obj/effect/turf_decal/box/corners{
+	dir = 1;
+	pixel_x = 16;
+	pixel_y = -16
+	},
+/turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
 
 (1,1,1) = {"
 xX
 wR
-xg
-Kb
+Ie
+sT
 nL
-zK
-Mi
-mC
-Aq
-Aq
-mC
-zK
-kF
+aj
+RX
+Nt
+yG
+yG
+Nt
+aj
+dI
 vi
 Vn
 xX
@@ -694,27 +726,27 @@ xX
 (2,1,1) = {"
 wR
 wR
-UW
+TD
 ac
 nL
-dl
+Ix
 bm
 cB
-jK
-jK
+ER
+ER
 Ae
 HD
 hT
-xQ
+xa
 pJ
 Ys
 "}
 (3,1,1) = {"
-Up
+sT
 bV
-UW
+nQ
 wh
-Kb
+sT
 Ns
 Yt
 lm
@@ -723,21 +755,21 @@ gg
 Ae
 HD
 hT
-xQ
+xa
 EA
 rc
 "}
 (4,1,1) = {"
-Kb
-Ho
+sT
+yf
 UW
-Co
-Xn
+tn
+in
+JM
 gy
 gy
-gy
-cc
-gg
+Ze
+Pv
 Lv
 QY
 BB
@@ -748,42 +780,42 @@ xX
 (5,1,1) = {"
 nL
 hG
-iw
-qI
+xD
+TL
 wR
-oh
-qq
+Sm
 qq
 qq
-Bi
+sp
+ou
 sv
 sv
 rp
-TN
+BW
 nL
 xX
 "}
 (6,1,1) = {"
-Kb
-Pw
+sT
+ec
 HD
-vN
+rZ
 nL
 gk
 KD
 OV
 rX
-jH
-dM
-mb
+nL
+sT
+QG
 nL
 nL
 wR
 xX
 "}
 (7,1,1) = {"
-Kb
-se
+sT
+Nx
 CU
 tQ
 nL
@@ -792,10 +824,10 @@ HD
 HD
 hT
 hG
-iq
-LR
+BP
+Fb
 xB
-xQ
+xa
 pJ
 Ys
 "}
@@ -805,15 +837,15 @@ wR
 Ju
 cq
 nL
-mi
+Au
 HD
 ci
-MJ
+mX
 nL
-ZY
+sf
 zE
-No
-xQ
+yV
+xa
 EA
 rc
 "}
@@ -828,8 +860,8 @@ kF
 NC
 nL
 nL
-Up
-Up
+sT
+sT
 nL
 vi
 Vn