Update some things for consistency

_maps/shuttles/emergency_airless.dmm

@@ -39,7 +39,9 @@
 	preferred_direction = 2;
 	width = 30
 	},
-/turf/closed/wall,
+/obj/machinery/door/airlock,
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
 /area/shuttle/escape)
 "h" = (
 /obj/machinery/computer/emergency_shuttle{
@@ -47,6 +49,11 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/escape)
+"K" = (
+/obj/machinery/door/airlock,
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/escape)
 
 (1,1,1) = {"
 a
@@ -58,7 +65,7 @@ e
 e
 e
 e
-e
+K
 e
 g
 e
@@ -66,9 +73,9 @@ e
 e
 e
 e
+K
 e
-e
+K
-e
 e
 e
 e

_maps/shuttles/emergency_bar.dmm

@@ -516,7 +516,6 @@
 /area/shuttle/escape)
 "bw" = (
 /obj/structure/table/optable,
-/obj/item/surgical_drapes,
 /obj/machinery/light/small{
 	brightness = 3;
 	dir = 8

_maps/shuttles/emergency_box.dmm

@@ -365,10 +365,19 @@
 "ga" = (
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
+"gJ" = (
+/obj/structure/table/optable,
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/escape)
 "XC" = (
 /obj/structure/closet/emcloset,
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
+"ZQ" = (
+/obj/item/storage/backpack/duffelbag/med/surgery,
+/obj/structure/table,
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/escape)
 
 (1,1,1) = {"
 aa
@@ -534,7 +543,7 @@ aC
 ac
 XC
 bs
-XC
+gJ
 bi
 bk
 "}
@@ -558,7 +567,7 @@ aC
 aZ
 ga
 ga
-ga
+ZQ
 bi
 bk
 "}

_maps/shuttles/emergency_cere.dmm

@@ -1294,26 +1294,17 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/item/circular_saw,
+/obj/item/storage/backpack/duffelbag/med/surgery,
-/obj/item/scalpel{
-	pixel_y = 12
-	},
-/obj/item/hemostat,
-/obj/item/surgicaldrill,
-/obj/item/cautery{
-	pixel_x = 4
-	},
-/obj/item/retractor,
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/blue,
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
+/obj/effect/turf_decal/tile/blue,
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "cG" = (
@@ -1364,15 +1355,13 @@
 /obj/item/clothing/suit/apron/surgical,
 /obj/item/clothing/gloves/color/latex,
 /obj/item/clothing/mask/surgical,
-/obj/item/surgical_drapes,
+/obj/effect/turf_decal/tile/blue{
-/obj/item/razor,
+	dir = 4
+	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},

_maps/shuttles/emergency_clown.dmm

@@ -342,6 +342,11 @@
 /obj/structure/shuttle/engine/propulsion,
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
+"bL" = (
+/obj/item/toy/snappop/phoenix,
+/obj/item/pneumatic_cannon/pie/selfcharge,
+/turf/open/floor/bluespace,
+/area/shuttle/escape)
 "Zf" = (
 /obj/structure/closet/emcloset,
 /obj/item/toy/sword,
@@ -471,7 +476,7 @@ bg
 (6,1,1) = {"
 ac
 ag
-ak
+bL
 aq
 ab
 av

_maps/shuttles/emergency_delta.dmm

@@ -147,7 +147,6 @@
 /area/shuttle/escape)
 "al" = (
 /obj/structure/table/optable,
-/obj/item/surgical_drapes,
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
@@ -157,18 +156,7 @@
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "am" = (
-/obj/item/scalpel{
+/obj/item/storage/backpack/duffelbag/med/surgery,
-	pixel_y = 12
-	},
-/obj/item/circular_saw,
-/obj/item/retractor{
-	pixel_x = 4
-	},
-/obj/item/hemostat{
-	pixel_x = -4
-	},
-/obj/item/clothing/gloves/color/latex,
-/obj/item/clothing/mask/surgical,
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
@@ -176,8 +164,6 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
-/obj/item/surgicaldrill,
-/obj/item/cautery,
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "an" = (
@@ -911,6 +897,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
 "bM" = (

_maps/shuttles/emergency_goon.dmm

@@ -28,6 +28,7 @@
 /obj/machinery/door/airlock/titanium{
 	name = "Emergency Shuttle Airlock"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "h" = (
@@ -41,6 +42,7 @@
 	name = "NES Port";
 	width = 19
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "l" = (
@@ -67,9 +69,7 @@
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "q" = (
-/obj/machinery/sleeper{
+/obj/machinery/sleeper,
-	dir = 4
-	},
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
 "r" = (
@@ -93,11 +93,6 @@
 	},
 /turf/open/floor/mineral/titanium/yellow,
 /area/shuttle/escape)
-"v" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/mineral/titanium/white,
-/area/shuttle/escape)
 "w" = (
 /obj/machinery/door/airlock/public/glass{
 	name = "Emergency Shuttle Infirmary"
@@ -186,12 +181,18 @@
 /obj/structure/window/reinforced,
 /turf/open/floor/mineral/titanium/yellow,
 /area/shuttle/escape)
+"P" = (
+/obj/structure/table/optable,
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/escape)
 "Q" = (
 /obj/machinery/light,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "R" = (
 /obj/machinery/light/small,
+/obj/structure/table,
+/obj/item/storage/backpack/duffelbag/med/surgery,
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
 "S" = (
@@ -272,8 +273,8 @@ X
 c
 d
 q
-v
+n
-q
+P
 d
 H
 H
@@ -284,7 +285,7 @@ Y
 (4,1,1) = {"
 d
 l
-n
+q
 n
 R
 d

_maps/shuttles/emergency_gorilla.dmm

@@ -166,7 +166,7 @@
 "aI" = (
 /obj/docking_port/mobile/emergency{
 	height = 15;
-	name = "Box emergency shuttle"
+	name = "Gorilla Emergency Shuttle"
 	},
 /obj/machinery/door/airlock/security/glass{
 	name = "Emergency Shuttle Airlock"

_maps/shuttles/emergency_luxury.dmm

@@ -12,6 +12,7 @@
 /area/shuttle/escape/luxury)
 "ad" = (
 /obj/machinery/door/airlock/gold,
+/obj/structure/fans/tiny,
 /turf/open/floor/carpet/red,
 /area/shuttle/escape/luxury)
 "ae" = (
@@ -19,10 +20,12 @@
 	dir = 2;
 	dwidth = 5;
 	height = 14;
+	movement_force = list("KNOCKDOWN" = 3, "THROW" = 0);
 	name = "Luxury emergency shuttle";
 	width = 25
 	},
 /obj/machinery/door/airlock/gold,
+/obj/structure/fans/tiny,
 /turf/open/floor/carpet/red,
 /area/shuttle/escape/luxury)
 "af" = (
@@ -45,9 +48,11 @@
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape/luxury)
 "aj" = (
-/obj/machinery/door/airlock/gold{
+/obj/machinery/door/airlock/gold/glass{
+	name = "shuttle brig";
 	req_access_txt = "2"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape/luxury)
 "ak" = (
@@ -404,7 +409,7 @@
 /area/shuttle/escape/luxury)
 "bz" = (
 /obj/machinery/shower{
-	pixel_y = 19
+	dir = 4
 	},
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape/luxury)
@@ -456,6 +461,13 @@
 	},
 /turf/open/floor/carpet/royalblue,
 /area/shuttle/escape/luxury)
+"Uj" = (
+/obj/machinery/door/airlock/gold/glass{
+	name = "shuttle brig";
+	req_access_txt = "2"
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape/luxury)
 
 (1,1,1) = {"
 ac
@@ -814,7 +826,7 @@ ac
 bH
 al
 al
-aj
+Uj
 af
 af
 ac

_maps/shuttles/emergency_meta.dmm

@@ -523,7 +523,6 @@
 /area/shuttle/escape)
 "bz" = (
 /obj/structure/table/optable,
-/obj/item/surgical_drapes,
 /obj/machinery/light{
 	dir = 8
 	},
@@ -586,25 +585,12 @@
 /area/shuttle/escape)
 "bH" = (
 /obj/structure/table,
-/obj/item/scalpel{
+/obj/item/storage/backpack/duffelbag/med/surgery,
-	pixel_y = 12
-	},
-/obj/item/circular_saw,
-/obj/item/retractor{
-	pixel_x = 4
-	},
-/obj/item/hemostat{
-	pixel_x = -4
-	},
-/obj/item/clothing/gloves/color/latex,
-/obj/item/clothing/mask/surgical,
 /obj/item/radio/intercom{
 	dir = 2;
 	name = "Station Intercom (General)";
 	pixel_x = -27
 	},
-/obj/item/surgicaldrill,
-/obj/item/cautery,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "bI" = (

_maps/shuttles/emergency_omega.dmm

@@ -785,41 +785,27 @@
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
 "bn" = (
-/obj/item/scalpel{
+/obj/effect/turf_decal/tile/blue{
-	pixel_y = 12
+	dir = 4
 	},
-/obj/item/circular_saw,
+/obj/effect/turf_decal/tile/blue{
-/obj/item/retractor{
+	dir = 8
-	pixel_x = 4
 	},
-/obj/item/hemostat{
-	pixel_x = -4
-	},
-/obj/item/clothing/gloves/color/latex,
-/obj/item/clothing/mask/surgical,
 /obj/structure/table/reinforced,
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -24
 	},
-/obj/effect/turf_decal/tile/blue{
+/obj/item/storage/backpack/duffelbag/med/surgery,
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj/item/cautery,
-/obj/item/surgicaldrill,
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "bo" = (
 /obj/structure/table/optable,
-/obj/item/surgical_drapes,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "bp" = (

_maps/shuttles/emergency_pubby.dmm

@@ -457,14 +457,12 @@
 /turf/open/floor/plasteel/dark,
 /area/shuttle/escape)
 "aZ" = (
-/obj/structure/table/glass,
+/obj/machinery/sleeper,
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/item/storage/firstaid/regular,
 /obj/structure/window/reinforced{
-	dir = 4;
+	dir = 4
-	layer = 2.9
 	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
@@ -504,13 +502,18 @@
 /turf/open/floor/plasteel/cafeteria,
 /area/shuttle/escape)
 "be" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/table,
-/obj/effect/turf_decal/tile/blue{
+/obj/item/storage/firstaid,
-	dir = 4
+/obj/item/storage/firstaid/fire{
+	pixel_x = -3;
+	pixel_y = 3
 	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "bf" = (
@@ -526,30 +529,12 @@
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "bh" = (
-/obj/structure/window/reinforced,
-/obj/structure/table/glass,
-/obj/item/defibrillator/loaded,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
-/area/shuttle/escape)
-"bi" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/table/glass,
-/obj/item/storage/firstaid/regular,
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "bj" = (
@@ -568,11 +553,8 @@
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "bn" = (
-/obj/structure/closet/crate{
+/obj/structure/reagent_dispensers/fueltank,
-	icon_state = "crateopen"
-	},
 /obj/machinery/light,
-/obj/item/storage/toolbox/mechanical,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "bo" = (
@@ -712,6 +694,21 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/escape)
+"sI" = (
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/item/storage/backpack/duffelbag/med/surgery,
+/obj/structure/table,
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/shuttle/escape)
 "xt" = (
 /obj/structure/window/reinforced{
 	dir = 8;
@@ -719,6 +716,17 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/escape)
+"Jw" = (
+/obj/structure/window/reinforced,
+/obj/structure/table/optable,
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/shuttle/escape)
 "Uu" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -806,9 +814,9 @@ aX
 bb
 be
 bh
+Jw
+bg
 bl
-bg
-bg
 ab
 aa
 bs
@@ -853,8 +861,8 @@ ab
 aZ
 bb
 bb
-bi
+bh
-bl
+sI
 bg
 bn
 ab

_maps/shuttles/emergency_raven.dmm

@@ -149,9 +149,6 @@
 /area/shuttle/escape)
 "as" = (
 /obj/structure/table/optable,
-/obj/item/surgical_drapes,
-/obj/item/clothing/gloves/color/latex,
-/obj/item/clothing/mask/surgical,
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
@@ -228,18 +225,13 @@
 /area/shuttle/escape)
 "aB" = (
 /obj/structure/table/reinforced,
-/obj/item/scalpel,
+/obj/item/storage/backpack/duffelbag/med/surgery,
-/obj/item/circular_saw,
-/obj/item/retractor,
-/obj/item/hemostat,
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/purple{
 	dir = 8
 	},
-/obj/item/surgicaldrill,
-/obj/item/cautery,
 /turf/open/floor/plasteel/dark,
 /area/shuttle/escape)
 "aC" = (

_maps/shuttles/emergency_syndicate.dmm

@@ -1706,38 +1706,31 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/item/retractor,
+/obj/item/storage/backpack/duffelbag/med/surgery,
-/obj/item/hemostat,
-/obj/item/cautery,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
 /obj/effect/turf_decal/tile/neutral,
 /turf/open/floor/plasteel/dark,
 /area/shuttle/escape)
 "cI" = (
 /obj/structure/table/reinforced,
-/obj/item/circular_saw,
-/obj/item/surgicaldrill,
-/obj/item/scalpel{
-	pixel_y = 15
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
 	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
 /turf/open/floor/plasteel/dark,
 /area/shuttle/escape)
 "cJ" = (

_maps/shuttles/emergency_wabbajack.dmm

@@ -205,15 +205,6 @@
 /obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
-"aE" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/machinery/sleeper{
-	dir = 8
-	},
-/turf/open/floor/mineral/titanium/white,
-/area/shuttle/escape)
 "aF" = (
 /obj/machinery/door/airlock/titanium{
 	name = "Emergency Shuttle Airlock"
@@ -222,15 +213,12 @@
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "aG" = (
+/obj/machinery/sleeper{
+	dir = 8
+	},
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 27
 	},
-/obj/structure/table/glass,
-/obj/item/storage/box/syringes{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/storage/box/beakers,
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
 "aH" = (
@@ -262,9 +250,8 @@
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
 "aL" = (
-/obj/machinery/sleeper{
+/obj/structure/table,
-	dir = 8
+/obj/item/storage/backpack/duffelbag/med/surgery,
-	},
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
 "aM" = (
@@ -277,12 +264,7 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
 "aT" = (
-/obj/structure/table/glass,
+/obj/structure/table/optable,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
-	pixel_x = 2;
-	pixel_y = 2
-	},
-/obj/item/reagent_containers/glass/bottle/charcoal,
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
 "aU" = (
@@ -496,6 +478,15 @@
 	},
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
+"cF" = (
+/obj/machinery/sleeper{
+	dir = 8
+	},
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/escape)
 "ji" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 8
@@ -734,8 +725,8 @@ aw
 aw
 ab
 aG
-aE
 aK
+cF
 aL
 aT
 as

_maps/shuttles/ferry_fancy.dmm

@@ -11,6 +11,7 @@
 /area/shuttle/transport)
 "d" = (
 /obj/machinery/door/airlock/external,
+/obj/structure/fans/tiny,
 /turf/open/floor/pod/dark,
 /area/shuttle/transport)
 "e" = (
@@ -74,6 +75,7 @@
 	preferred_direction = 4;
 	width = 5
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/pod/light,
 /area/shuttle/transport)
 "o" = (
@@ -98,6 +100,7 @@
 /area/shuttle/transport)
 "r" = (
 /obj/machinery/door/airlock/external,
+/obj/structure/fans/tiny,
 /turf/open/floor/pod/light,
 /area/shuttle/transport)