diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index bd69f9a48fd..4d909be0024 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -59898,6 +59898,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/medical/morgue)
+"dvR" = (
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitegreen"
+	},
+/area/station/medical/virology)
 "dvS" = (
 /obj/effect/decal/cleanable/fungus,
 /turf/simulated/wall,
@@ -62126,21 +62132,13 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/aft/south)
 "dHO" = (
-/obj/effect/spawner/window/reinforced/grilled,
-/obj/structure/cable{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
 /obj/structure/cable{
 	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	d2 = 8;
-	icon_state = "0-8"
+	d2 = 2;
+	icon_state = "1-2"
 	},
+/obj/structure/cable,
+/obj/effect/spawner/window/reinforced/grilled,
 /turf/simulated/floor/plating,
 /area/station/hallway/secondary/exit)
 "dHQ" = (
@@ -62384,18 +62382,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/exit)
-"dJD" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/secondary/exit)
-"dJF" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
-	},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/secondary/exit)
 "dJG" = (
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -63134,11 +63120,11 @@
 "dNS" = (
 /obj/docking_port/stationary{
 	dir = 4;
-	dwidth = 11;
-	height = 18;
+	dwidth = 15;
+	height = 21;
 	id = "emergency_home";
 	name = "emergency evac bay";
-	width = 29
+	width = 32
 	},
 /turf/space,
 /area/space)
@@ -64408,6 +64394,16 @@
 /obj/item/crowbar/red,
 /turf/simulated/floor/plasteel/dark,
 /area/station/maintenance/apmaint)
+"dSB" = (
+/obj/machinery/atmospherics/unary/portables_connector{
+	dir = 8
+	},
+/obj/machinery/atmospherics/portable/canister/air,
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/simulated/floor/plasteel,
+/area/station/hallway/secondary/exit)
 "dSD" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -67022,22 +67018,6 @@
 	icon_state = "yellowcorner"
 	},
 /area/station/hallway/primary/port/east)
-"ezr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "ezR" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
@@ -69798,6 +69778,14 @@
 	icon_state = "darkredfull"
 	},
 /area/station/security/processing)
+"gfw" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/station/hallway/secondary/exit)
 "gfB" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
@@ -71527,16 +71515,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/command/office/rd)
-"hli" = (
-/obj/machinery/atmospherics/unary/portables_connector{
-	dir = 8
-	},
-/obj/machinery/atmospherics/portable/canister/air,
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
-	},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/secondary/exit)
 "hly" = (
 /obj/structure/table/wood,
 /turf/simulated/floor/plasteel/dark,
@@ -73948,15 +73926,6 @@
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/security/armory/secure)
-"iMy" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/turf/simulated/wall/r_wall,
-/area/station/medical/virology)
 "iNa" = (
 /obj/item/relic,
 /turf/simulated/floor/engine,
@@ -74282,10 +74251,6 @@
 	icon_state = "bar"
 	},
 /area/station/service/kitchen)
-"iVe" = (
-/obj/effect/spawner/airlock,
-/turf/simulated/wall,
-/area/station/service/chapel/office)
 "iVg" = (
 /obj/machinery/economy/atm/directional/west,
 /turf/simulated/floor/plasteel{
@@ -74451,6 +74416,13 @@
 	icon_state = "neutralfull"
 	},
 /area/station/engineering/atmos)
+"jac" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "red"
+	},
+/area/station/hallway/secondary/exit)
 "jaE" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "Custodial Maintenance"
@@ -74837,11 +74809,6 @@
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/sleeper)
-"jmY" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/wall/r_wall,
-/area/station/medical/virology)
 "jnk" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -74882,6 +74849,18 @@
 	icon_state = "darkredcorners"
 	},
 /area/station/security/main)
+"joI" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/station/hallway/secondary/exit)
 "joU" = (
 /obj/machinery/economy/vending/cigarette,
 /obj/effect/turf_decal/delivery/hollow,
@@ -75659,13 +75638,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/port)
-"jNX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/turf/simulated/wall/r_wall,
-/area/station/medical/virology)
 "jNY" = (
 /obj/effect/turf_decal/woodsiding{
 	dir = 1
@@ -75745,6 +75717,7 @@
 	},
 /area/station/medical/cloning)
 "jQA" = (
+/obj/item/kirbyplants,
 /turf/simulated/floor/plasteel{
 	dir = 10;
 	icon_state = "whitegreen"
@@ -76131,6 +76104,15 @@
 	icon_state = "whiteblue"
 	},
 /area/station/medical/storage)
+"kdg" = (
+/obj/structure/sign/vacuum{
+	pixel_x = -32
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel,
+/area/station/hallway/secondary/exit)
 "kdm" = (
 /obj/machinery/power/apc/critical/directional/north,
 /obj/machinery/firealarm{
@@ -76231,15 +76213,6 @@
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/medical/morgue)
-"kfC" = (
-/obj/structure/sign/vacuum{
-	pixel_x = -32
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/secondary/exit)
 "kfT" = (
 /obj/structure/cable{
 	d2 = 4;
@@ -77037,6 +77010,15 @@
 	icon_state = "neutralcorner"
 	},
 /area/station/public/locker)
+"kGo" = (
+/obj/structure/table/glass,
+/obj/structure/table/glass,
+/obj/item/storage/firstaid/toxin,
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitegreen"
+	},
+/area/station/medical/virology)
 "kGv" = (
 /obj/structure/disposalpipe/segment/corner{
 	dir = 1
@@ -77512,6 +77494,7 @@
 	ext_button_link_id = "virolab_btn_ext";
 	int_button_link_id = "virolab_btn_int"
 	},
+/obj/item/kirbyplants,
 /turf/simulated/floor/plasteel{
 	dir = 9;
 	icon_state = "whitegreen"
@@ -79578,6 +79561,13 @@
 	icon_state = "neutralcorner"
 	},
 /area/station/hallway/primary/fore/south)
+"mkH" = (
+/obj/structure/table/glass,
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitegreen"
+	},
+/area/station/medical/virology)
 "mkS" = (
 /obj/structure/table,
 /obj/item/taperecorder,
@@ -81415,13 +81405,6 @@
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/chemistry)
-"nlq" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/turf/simulated/wall/r_wall,
-/area/station/medical/virology)
 "nlA" = (
 /obj/machinery/door/airlock/command{
 	id_tag = "captainofficedoor"
@@ -82520,6 +82503,14 @@
 /obj/effect/spawner/window/reinforced/grilled,
 /turf/simulated/floor/plating,
 /area/station/security/permasolitary)
+"nSq" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "whitegreen"
+	},
+/area/station/medical/virology)
 "nSv" = (
 /obj/machinery/economy/vending/cola,
 /obj/effect/turf_decal/delivery,
@@ -82921,6 +82912,22 @@
 	icon_state = "red"
 	},
 /area/station/security/permabrig)
+"ogR" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "ogX" = (
 /obj/machinery/camera{
 	c_tag = "Experimentation Lab Office";
@@ -87648,6 +87655,12 @@
 	icon_state = "neutralfull"
 	},
 /area/station/supply/qm)
+"qYo" = (
+/obj/machinery/light,
+/turf/simulated/floor/plasteel{
+	icon_state = "whitegreen"
+	},
+/area/station/medical/virology)
 "qYC" = (
 /obj/item/kirbyplants,
 /obj/structure/cable{
@@ -87785,6 +87798,13 @@
 	icon_state = "darkred"
 	},
 /area/station/security/permabrig)
+"rbC" = (
+/obj/structure/bed/dogbed,
+/mob/living/simple_animal/mouse/white/Brain,
+/turf/simulated/floor/plasteel{
+	icon_state = "whitegreen"
+	},
+/area/station/medical/virology)
 "rcq" = (
 /obj/structure/cable{
 	d1 = 2;
@@ -89657,6 +89677,9 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
@@ -90787,6 +90810,14 @@
 	icon_state = "darkblue"
 	},
 /area/station/command/office/cmo)
+"sDb" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/station/hallway/secondary/exit)
 "sDL" = (
 /obj/machinery/atmospherics/unary/thermomachine/freezer{
 	dir = 4
@@ -91892,21 +91923,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/science/research)
-"tjT" = (
-/obj/item/radio/intercom{
-	name = "west bump";
-	pixel_x = -28
-	},
-/obj/machinery/newscaster{
-	dir = 1;
-	name = "south bump";
-	pixel_y = -28
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
-	},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/secondary/exit)
 "tkb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
@@ -92445,6 +92461,24 @@
 	icon_state = "yellowcorner"
 	},
 /area/station/hallway/primary/port/west)
+"tEp" = (
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/structure/cable{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	d2 = 8;
+	icon_state = "0-8"
+	},
+/turf/simulated/floor/plating,
+/area/station/hallway/secondary/exit)
 "tEw" = (
 /obj/structure/showcase{
 	density = 0;
@@ -92946,6 +92980,21 @@
 /obj/effect/spawner/window/reinforced/grilled,
 /turf/simulated/floor/plating,
 /area/station/security/prison/cell_block)
+"tSp" = (
+/obj/item/radio/intercom{
+	name = "west bump";
+	pixel_x = -28
+	},
+/obj/machinery/newscaster{
+	dir = 1;
+	name = "south bump";
+	pixel_y = -28
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/simulated/floor/plasteel,
+/area/station/hallway/secondary/exit)
 "tSt" = (
 /obj/structure/table,
 /obj/item/reagent_containers/drinks/drinkingglass{
@@ -93589,6 +93638,10 @@
 	icon_state = "darkred"
 	},
 /area/station/security/processing)
+"uil" = (
+/obj/effect/spawner/airlock,
+/turf/simulated/wall,
+/area/station/service/chapel/office)
 "uit" = (
 /obj/machinery/atmospherics/unary/vent_pump{
 	dir = 4;
@@ -94001,11 +94054,6 @@
 /obj/structure/barricade/wooden,
 /turf/simulated/floor/plating,
 /area/station/maintenance/apmaint)
-"utL" = (
-/obj/effect/spawner/window/reinforced/grilled,
-/obj/structure/cable,
-/turf/simulated/floor/plating,
-/area/station/hallway/secondary/exit)
 "uud" = (
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/maintenance/three,
@@ -94257,10 +94305,10 @@
 /turf/simulated/floor/wood,
 /area/station/command/office/hop)
 "uFa" = (
-/obj/effect/turf_decal/stripes/corner{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/exit)
 "uFg" = (
@@ -96107,6 +96155,14 @@
 	icon_state = "neutralcorner"
 	},
 /area/station/public/fitness)
+"vJu" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/station/hallway/secondary/exit)
 "vKf" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -96603,6 +96659,17 @@
 	icon_state = "neutralcorner"
 	},
 /area/station/hallway/primary/central)
+"waJ" = (
+/obj/structure/table/glass,
+/obj/random/plushie,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitegreen"
+	},
+/area/station/medical/virology)
 "wbi" = (
 /obj/machinery/alarm{
 	name = "north bump";
@@ -137307,7 +137374,7 @@ dIx
 dIx
 dIx
 dIx
-iVe
+uil
 abj
 aaa
 aaa
@@ -137818,7 +137885,7 @@ dPM
 dkq
 dSs
 dSP
-hli
+dSB
 dIH
 dIH
 dIH
@@ -138070,14 +138137,14 @@ dKo
 rvx
 dKo
 dKo
-dKo
-dKo
-dKo
+dNa
+dNa
+dNa
 dXJ
 dKo
 dUj
-kfC
-tjT
+kdg
+tSp
 dIH
 abj
 aaa
@@ -138326,10 +138393,10 @@ ddw
 dNa
 dKo
 dKo
-dNa
-dNa
-dNa
 dKo
+dNb
+dNN
+dOw
 dXJ
 uaj
 dKo
@@ -138583,10 +138650,10 @@ dNN
 dOw
 dKo
 dKo
-dNb
-dNN
-dOw
 dKo
+dQp
+dNO
+dRG
 dXJ
 dKo
 dKo
@@ -138840,10 +138907,10 @@ dNO
 dXF
 dKo
 dKo
-dQp
-dNO
-dRG
 dKo
+dNb
+dNP
+dOw
 dlp
 dTC
 dTC
@@ -139097,10 +139164,10 @@ dNP
 dOw
 dKo
 dKo
-dNb
-dNP
-dOw
 dKo
+dQF
+dNQ
+dRH
 dXJ
 dNb
 dTG
@@ -139354,11 +139421,11 @@ dNQ
 dOx
 dKo
 dPN
-dQF
-dNQ
-dRH
-gkk
-dXJ
+dKo
+dNb
+dMY
+dOw
+joI
 dNc
 dNQ
 dOw
@@ -139611,10 +139678,10 @@ bGr
 dOw
 dKo
 dKo
-dNb
-dMY
-dOw
 dKo
+dNb
+dNO
+dRG
 dXJ
 ibQ
 dTa
@@ -139868,10 +139935,10 @@ iqq
 iqq
 uFa
 sbt
+sDb
 dNb
-dNO
-dRG
-dKo
+eFE
+dOw
 dSD
 dNc
 dNO
@@ -140120,14 +140187,14 @@ dXn
 pIY
 nIs
 ngE
+kuJ
+kuJ
 tJT
 dXn
 dXn
-dQI
+gfw
 dKo
-dNb
-eFE
-dOw
+dRn
 dKo
 dSD
 dNb
@@ -140377,14 +140444,14 @@ hmz
 dTJ
 dTJ
 dMs
+jac
+jac
 vSW
 scA
 ajq
-dJD
+gfw
 dKo
 dKo
-dRn
-dKo
 dKo
 dlD
 dTH
@@ -140635,11 +140702,11 @@ dKo
 dKo
 dVp
 dKp
+dKp
+dKp
 pGr
 rev
-dJF
-dTI
-dTI
+vJu
 dTI
 dTI
 dTI
@@ -140892,11 +140959,11 @@ dTy
 dUu
 ulH
 dTy
+dTy
+dTy
 rmq
 msT
 dKP
-dKP
-dKP
 dLK
 dKP
 dKP
@@ -141147,8 +141214,10 @@ pIY
 kuJ
 kpd
 kpd
+tEp
 dHO
-utL
+dHO
+tJT
 dKQ
 jpk
 dKQ
@@ -141161,8 +141230,6 @@ dKQ
 pjC
 dKQ
 pjC
-pjC
-pjC
 abj
 aaa
 aaa
@@ -141403,8 +141470,10 @@ abj
 abj
 abj
 abj
-aaa
-aaa
+abj
+abj
+abj
+abj
 pjC
 dKP
 pjC
@@ -141418,8 +141487,6 @@ dKP
 pjC
 dKP
 pjC
-abj
-aaa
 aaa
 aaa
 aaa
@@ -141662,6 +141729,8 @@ aaa
 aaa
 aaa
 aaa
+aaa
+aaa
 pjC
 dKQ
 pjC
@@ -141719,8 +141788,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
 "}
 (162,1,1) = {"
 aaa
@@ -141922,6 +141989,8 @@ aaa
 aaa
 aaa
 aaa
+aaa
+aaa
 dNS
 aaa
 aaa
@@ -141976,8 +142045,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
 "}
 (163,1,1) = {"
 aaa
@@ -146799,8 +146866,8 @@ dFG
 dFG
 aaa
 aaa
-abj
-abj
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -147054,12 +147121,12 @@ hPM
 eLU
 xGo
 dFG
-dFG
-sSu
-dFG
-sSu
-dFG
-dFG
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -147310,14 +147377,14 @@ eQz
 dNu
 nZk
 gLq
-dGw
-mBy
-hYe
-dGw
-qRW
-gYJ
 dFG
-abj
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -147567,14 +147634,14 @@ dFF
 tpR
 rPH
 pax
-dGw
-bBb
-xRQ
-dGw
-bFY
-ubP
 dFG
+aaa
+aaa
 abj
+abj
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -147824,16 +147891,16 @@ cTX
 dFG
 fzd
 dFG
-dGw
-dqL
-fbD
-dGw
-iKv
-hWu
 dFG
-abj
-abj
-abj
+dFG
+sSu
+dFG
+sSu
+dFG
+dFG
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -148082,22 +148149,22 @@ kTY
 gVn
 jQA
 dGw
-xtU
-kDH
+mBy
+hYe
 dGw
-kDH
-xtU
-dFG
-dFG
-oHT
-xnL
-eyb
-dFG
+qRW
+gYJ
 dFG
 abj
 aaa
 aaa
 aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaZ
 aaa
 aaa
@@ -148335,21 +148402,15 @@ wnk
 npb
 abj
 dFG
-qBj
+waJ
 cBf
 wdL
 dGw
-ghG
-sRC
-pcJ
-nEy
-fga
+bBb
+xRQ
 dGw
-fBU
-lrT
-ebB
-wWX
-xES
+bFY
+ubP
 dFG
 abj
 aaa
@@ -148403,6 +148464,12 @@ aaa
 aaa
 aaa
 aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 "}
 (188,1,1) = {"
 aaa
@@ -148592,24 +148659,24 @@ oDF
 bng
 aaa
 dFG
-rEg
+kGo
 cBf
-wdL
+rbC
 dGw
-pFr
-mfK
-arQ
-vFN
-xHg
-tTg
-dNn
-dWX
-cBf
-jBE
-wdL
-oWo
-rEn
-oTr
+dqL
+fbD
+dGw
+iKv
+hWu
+dFG
+abj
+abj
+abj
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -148849,23 +148916,23 @@ cUA
 bng
 aaa
 dFG
-wro
+mkH
 cBf
 wdL
 dGw
+xtU
+kDH
 dGw
-tCf
-tCf
-tCf
-dGw
-dGw
-hGZ
-qgr
-ezr
-wWW
-qfH
-sRk
-uNq
+kDH
+xtU
+dFG
+dFG
+oHT
+xnL
+eyb
+dFG
+dFG
+abj
 aaa
 aaa
 aaa
@@ -149106,24 +149173,24 @@ iKN
 bng
 abj
 dFG
-erE
+qBj
 cBf
-dOd
-ghS
-mJw
-dLe
-dLe
-dLe
-jhr
+qYo
 dGw
-dJr
-qJe
-mrs
-cEB
-sAa
-wkW
-pqY
-pDw
+ghG
+sRC
+pcJ
+nEy
+fga
+dGw
+fBU
+lrT
+ebB
+wWX
+xES
+dFG
+abj
+aaa
 aaa
 aaa
 aaa
@@ -149363,24 +149430,24 @@ oDF
 npb
 aaa
 dFG
-xOG
-adX
-qTE
-jGI
-lXn
-xCT
-xTt
-ncB
-abM
-vTs
-vmp
-tID
-ipg
-sMn
-uUi
-dFG
-abj
-aaa
+rEg
+cBf
+nSq
+dGw
+pFr
+mfK
+arQ
+vFN
+xHg
+tTg
+dNn
+dWX
+cBf
+jBE
+wdL
+oWo
+rEn
+oTr
 aaa
 aaa
 aaa
@@ -149620,23 +149687,23 @@ lvO
 bng
 abj
 dFG
-dwz
-spz
-kqX
-mxM
-jdH
-qPN
-thz
-qPN
-oJi
+dvR
+cBf
+wdL
 dGw
 dGw
-dNr
-bPV
-dNr
-dFG
-dFG
-aaa
+tCf
+tCf
+tCf
+dGw
+dGw
+hGZ
+qgr
+ogR
+wWW
+qfH
+sRk
+uNq
 aaa
 aaa
 aaa
@@ -149877,24 +149944,24 @@ lvO
 bng
 aaa
 dFG
-dFG
-dGw
-nIC
-dGw
-dGw
-dNr
-scc
-dNr
-dGw
-dGw
-fPb
+erE
+cBf
+dOd
+ghS
+mJw
 dLe
-gbQ
-pAB
-dFG
-abj
-aaa
-aaa
+dLe
+dLe
+jhr
+dGw
+dJr
+qJe
+mrs
+cEB
+sAa
+wkW
+pqY
+pDw
 aaa
 aaa
 aaa
@@ -150133,21 +150200,22 @@ cSY
 lvO
 ryp
 abj
-aaa
 dFG
-fdt
-jDK
-dGw
-oCp
-dLe
-gYx
-dLe
-svD
-dGw
-xUg
-dWX
-dPU
-vVX
+xOG
+adX
+qTE
+jGI
+lXn
+xCT
+xTt
+ncB
+abM
+vTs
+vmp
+tID
+ipg
+sMn
+uUi
 dFG
 abj
 aaa
@@ -150201,7 +150269,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 "}
 (195,1,1) = {"
 aaa
@@ -150390,24 +150457,24 @@ cSZ
 cUA
 npb
 aaa
-aaa
 dFG
-veV
-qmB
+dwz
+spz
+kqX
+mxM
+jdH
+qPN
+thz
+qPN
+oJi
 dGw
-wro
-eoJ
-liE
-sVx
-mJY
 dGw
-uuh
-eoJ
-pGL
-rYa
-nlq
-abj
-abj
+dNr
+bPV
+dNr
+dFG
+dFG
+aaa
 aaa
 aaa
 aaa
@@ -150647,21 +150714,21 @@ obN
 oDF
 bng
 aaa
-aaa
 dFG
-saH
-opY
+dFG
 dGw
-uZp
-imG
-cBf
-dWX
-rdA
+nIC
 dGw
-psH
-qPN
-rHX
-hDu
+dGw
+dNr
+scc
+dNr
+dGw
+dGw
+fPb
+dLe
+gbQ
+pAB
 dFG
 abj
 aaa
@@ -150906,21 +150973,21 @@ bqC
 abj
 aaa
 dFG
-iGQ
-jNp
+fdt
+jDK
 dGw
-bwl
-njF
-dMx
-sYf
-rOl
+oCp
+dLe
+gYx
+dLe
+svD
+dGw
+xUg
+dWX
+dPU
+vVX
 dFG
-iMy
-vOB
-hzL
-jmY
-jNX
-aaa
+abj
 aaa
 aaa
 aaa
@@ -151163,22 +151230,22 @@ dDG
 abj
 aaa
 dFG
-dFG
-dFG
-dFG
-dFG
-vOB
-kce
-tKX
-dFG
+veV
+qmB
+dGw
+wro
+eoJ
+liE
+sVx
+mJY
+dGw
+uuh
+eoJ
+pGL
+rYa
 dFG
 abj
 abj
-abj
-abj
-aaa
-aaa
-aaa
 aaa
 aaa
 aaa
@@ -151419,22 +151486,22 @@ dDH
 dDG
 abj
 aaa
-aaa
-aaa
+dFG
+saH
+opY
+dGw
+uZp
+imG
+cBf
+dWX
+rdA
+dGw
+psH
+qPN
+rHX
+hDu
+dFG
 abj
-abj
-abj
-aaa
-aaa
-abj
-abj
-abj
-aaa
-aaa
-abj
-aaa
-aaa
-aaa
 aaa
 aaa
 aaa
@@ -151676,21 +151743,21 @@ dDI
 jvR
 abj
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-abj
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+dFG
+iGQ
+jNp
+dGw
+bwl
+njF
+dMx
+sYf
+rOl
+dFG
+dFG
+vOB
+hzL
+dFG
+dFG
 aaa
 aaa
 aaa
@@ -151933,20 +152000,20 @@ dDJ
 jvR
 abj
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+dFG
+dFG
+dFG
+dFG
+dFG
+vOB
+kce
+tKX
+dFG
+dFG
+abj
+abj
+abj
+abj
 aaa
 aaa
 aaa
@@ -152192,17 +152259,17 @@ abj
 aaa
 aaa
 aaa
+abj
+abj
+abj
 aaa
 aaa
+abj
+abj
+abj
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+abj
 aaa
 aaa
 aaa
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 08d1db4e68a..d2cebcea216 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -43030,11 +43030,11 @@
 "cZp" = (
 /obj/docking_port/stationary{
 	dir = 2;
-	dwidth = 11;
-	height = 18;
+	dwidth = 15;
+	height = 21;
 	id = "emergency_home";
 	name = "emergency evac bay";
-	width = 29
+	width = 32
 	},
 /turf/space,
 /area/space)
diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm
index 484d445d177..c2a2c8ace5a 100644
--- a/_maps/map_files/cerestation/cerestation.dmm
+++ b/_maps/map_files/cerestation/cerestation.dmm
@@ -2017,6 +2017,11 @@
 	icon_state = "asteroidplating"
 	},
 /area/station/maintenance/starboard)
+"amH" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/station/maintenance/disposal/east)
 "amI" = (
 /obj/machinery/light{
 	dir = 1
@@ -13562,6 +13567,13 @@
 "bzj" = (
 /turf/simulated/floor/plating,
 /area/station/hallway/primary/port/north)
+"bzk" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plating,
+/area/station/maintenance/disposal/east)
 "bzq" = (
 /obj/machinery/economy/vending/cola,
 /turf/simulated/floor/plating,
@@ -28543,6 +28555,11 @@
 "cWz" = (
 /turf/simulated/floor/plating,
 /area/station/hallway/primary/fore/north)
+"cWA" = (
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/structure/disposalpipe/segment/corner,
+/turf/simulated/floor/plating,
+/area/station/maintenance/disposal/east)
 "cWB" = (
 /obj/structure/table,
 /obj/machinery/photocopier/faxmachine{
@@ -29148,6 +29165,12 @@
 	icon_state = "neutralfull"
 	},
 /area/station/hallway/secondary/entry/west)
+"dbu" = (
+/obj/structure/disposalpipe/segment/corner{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/station/maintenance/disposal/east)
 "dby" = (
 /obj/effect/spawner/window/reinforced/polarized{
 	id = "IAA"
@@ -59862,11 +59885,11 @@
 "mgu" = (
 /obj/docking_port/stationary{
 	dir = 4;
-	dwidth = 11;
-	height = 18;
+	dwidth = 15;
+	height = 21;
 	id = "emergency_home";
 	name = "emergency evac bay";
-	width = 29
+	width = 32
 	},
 /turf/space,
 /area/space)
@@ -77438,10 +77461,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/disposal/external/southeast)
-"rVj" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating,
-/area/station/maintenance/disposal/east)
 "rVm" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable{
@@ -153917,12 +153936,12 @@ rNK
 rNK
 rNK
 rNK
-cBe
-sJv
-jwa
-lRR
-lRR
-lRR
+lzH
+ylg
+lzH
+rNK
+rNK
+rNK
 rNK
 rNK
 rNK
@@ -154174,13 +154193,13 @@ rNK
 rNK
 rNK
 rNK
-cBe
-wYi
-fyo
-jft
-jft
-lRR
-lRR
+lzH
+ylg
+lzH
+rNK
+rNK
+rNK
+rNK
 rNK
 rNK
 rNK
@@ -154431,15 +154450,15 @@ rNK
 rNK
 rNK
 rNK
-cBe
-wYi
-fyo
-jft
-jft
-jft
-lRR
-lRR
-lRR
+lzH
+ylg
+lzH
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
 rNK
 rNK
 rNK
@@ -154687,15 +154706,10 @@ rNK
 rNK
 rNK
 rNK
-lRR
+rNK
 cBe
-fSN
-fyo
-jft
-fyo
-fyo
-fyo
-fyo
+sJv
+jwa
 lRR
 lRR
 lRR
@@ -154708,6 +154722,11 @@ rNK
 rNK
 rNK
 rNK
+rNK
+rNK
+rNK
+rNK
+rNK
 lez
 fwi
 rNK
@@ -154944,16 +154963,11 @@ rNK
 rNK
 rNK
 rNK
-lRR
-jft
-fEe
+rNK
+cBe
+wYi
 fyo
 jft
-fyo
-lqC
-tqc
-olr
-fyo
 jft
 lRR
 lRR
@@ -154965,6 +154979,11 @@ rNK
 rNK
 rNK
 rNK
+rNK
+rNK
+rNK
+rNK
+rNK
 lez
 fwi
 rNK
@@ -155200,20 +155219,20 @@ rNK
 rNK
 rNK
 rNK
-lRR
-lRR
-jft
-dFD
-fBr
-btj
-fyo
-lHw
-aIi
-lyl
+rNK
+rNK
+cBe
+wYi
 fyo
 jft
 jft
+jft
 lRR
+lRR
+lRR
+rNK
+rNK
+rNK
 rNK
 rNK
 rNK
@@ -155456,20 +155475,17 @@ rNK
 rNK
 rNK
 rNK
+rNK
+rNK
 lRR
-lRR
-jft
-jft
-vfN
-jft
-jft
-fyo
-rdl
-fyo
+cBe
+fSN
 fyo
 jft
-jft
-jft
+fyo
+fyo
+fyo
+fyo
 lRR
 lRR
 lRR
@@ -155479,6 +155495,9 @@ rNK
 rNK
 rNK
 rNK
+rNK
+rNK
+rNK
 lez
 fwi
 rNK
@@ -155713,32 +155732,32 @@ rNK
 rNK
 rNK
 rNK
+rNK
+rNK
 lRR
 jft
-jft
-jft
-vfN
-rUd
-wTe
-lHw
-bwl
+fEe
+fyo
+jft
+fyo
+lqC
+tqc
+olr
 fyo
-vap
-fPZ
-vap
-rBc
-wuV
 jft
-lRR
-lRR
-lRR
-lRR
 lRR
 lRR
 rNK
-cBe
-uCU
-cBe
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+lez
+fwi
+rNK
 rNK
 rNK
 rNK
@@ -155970,32 +155989,32 @@ rNK
 rNK
 rNK
 rNK
+rNK
+lRR
 lRR
 jft
-jft
-tgW
-tTF
-ptT
-lHw
-lHw
-rQM
+dFD
+fBr
+btj
 fyo
-dhq
-dhq
-dhq
-dhq
-kcc
+lHw
+aIi
+lyl
 fyo
 jft
 jft
-jft
-jft
-jft
-jft
-cBe
-cBe
-akY
-cBe
+lRR
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+lez
+fwi
+rNK
 rNK
 rNK
 rNK
@@ -156228,31 +156247,31 @@ rNK
 rNK
 rNK
 lRR
+lRR
 jft
 jft
+vfN
 jft
-aBg
-lHw
-lHw
-lHw
-lHw
-lHw
-lHw
-lHw
-lHw
-lHw
-lHw
-kxy
-jFx
-lJM
+jft
+fyo
+rdl
+fyo
 fyo
 jft
 jft
 jft
-bsy
-xcn
-bqd
-cBe
+lRR
+lRR
+lRR
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+lez
+fwi
+rNK
 rNK
 rNK
 rNK
@@ -156488,28 +156507,28 @@ lRR
 jft
 jft
 jft
-chW
+vfN
+rUd
+wTe
 lHw
-lHw
-ptT
-ptT
-ptT
-ptT
-ptT
-ptT
-ptT
-lHw
-lHw
-lHw
-rQM
+bwl
 fyo
+vap
+fPZ
+vap
+rBc
+wuV
 jft
-jft
-jft
-eCe
-hPj
-qyY
-fyo
+lRR
+lRR
+lRR
+lRR
+lRR
+lRR
+rNK
+cBe
+uCU
+cBe
 rNK
 rNK
 rNK
@@ -156741,31 +156760,31 @@ rNK
 rNK
 rNK
 rNK
-cBe
-cBe
-cBe
+lRR
+jft
+jft
+tgW
+tTF
+ptT
+lHw
+lHw
+rQM
 fyo
-rWp
-gTd
-gTd
-gTd
-gTd
-gTd
-gTd
-gTd
-gTd
-cvV
-cvV
-gTd
-fXl
-fXl
-fXl
-fXl
-fXl
-fXl
-gTd
-rdv
-jVa
+dhq
+dhq
+dhq
+dhq
+kcc
+fyo
+jft
+jft
+jft
+jft
+jft
+jft
+cBe
+cBe
+akY
 cBe
 rNK
 rNK
@@ -156941,90 +156960,90 @@ rCJ
 gZc
 exL
 kWC
-rVj
-wxn
-rBn
+amH
+dbu
+dQj
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
 rNK
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-xhf
-qBS
-mxA
-dYn
-udx
-rUX
-rUX
-cMv
-rUX
-rUX
-rUX
-kTa
-cMv
-rUX
-rUX
-rUX
-rUX
-cMv
-rUX
-rUX
-rUX
-rUX
-cMv
-rUX
-rUX
-rZc
-cBe
 lRR
+jft
+jft
+jft
+aBg
+lHw
+lHw
+lHw
+lHw
+lHw
+lHw
+lHw
+lHw
+lHw
+lHw
+kxy
+jFx
+lJM
+fyo
+jft
+jft
+jft
+bsy
+xcn
+bqd
+cBe
+rNK
 rNK
 rNK
 rNK
@@ -157199,89 +157218,89 @@ lUv
 lUv
 lUv
 dQj
-dQj
+bzk
 dQj
 rNK
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-xBm
-fyo
-fyo
-fyo
-fyo
-fyo
-fyo
-fyo
-fyo
-jft
-fyo
-fyo
-fyo
-fyo
-jft
-jft
-fyo
-fyo
-fyo
-fyo
-fyo
-fyo
-fyo
-fyo
-cBe
-cBe
-cBe
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
+rNK
 lRR
+jft
+jft
+jft
+chW
+lHw
+lHw
+ptT
+ptT
+ptT
+ptT
+ptT
+ptT
+ptT
+lHw
+lHw
+lHw
+rQM
+fyo
+jft
+jft
+jft
+eCe
+hPj
+qyY
+fyo
+rNK
 rNK
 rNK
 rNK
@@ -157455,6 +157474,9 @@ dQj
 rNK
 rNK
 rNK
+dQj
+qpU
+dQj
 rNK
 rNK
 rNK
@@ -157509,40 +157531,37 @@ rNK
 rNK
 rNK
 rNK
+cBe
+cBe
+cBe
+fyo
+rWp
+gTd
+gTd
+gTd
+gTd
+gTd
+gTd
+gTd
+gTd
+cvV
+cvV
+gTd
+fXl
+fXl
+fXl
+fXl
+fXl
+fXl
+gTd
+rdv
+jVa
+cBe
 rNK
 rNK
 rNK
 rNK
 rNK
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-lRR
-rNK
-rNK
-rNK
-rNK
 rNK
 rNK
 rNK
@@ -157712,89 +157731,89 @@ dQj
 rNK
 rNK
 rNK
+dQj
+cWA
+rBn
 rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-dcv
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-lRR
-lRR
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+xhf
+qBS
+mxA
+dYn
+udx
+rUX
+rUX
+cMv
+rUX
+rUX
+rUX
+kTa
+cMv
+rUX
+rUX
+rUX
+rUX
+cMv
+rUX
+rUX
+rUX
+rUX
+cMv
+rUX
+rUX
+rZc
+cBe
 lRR
 rNK
 rNK
@@ -157969,89 +157988,89 @@ dQj
 rNK
 rNK
 rNK
+dQj
+dQj
+dQj
 rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-lRR
-lRR
-lRR
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+xBm
+fyo
+fyo
+fyo
+fyo
+fyo
+fyo
+fyo
+fyo
+jft
+fyo
+fyo
+fyo
+fyo
 jft
 jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-jft
-lRR
-lRR
+fyo
+fyo
+fyo
+fyo
+fyo
+fyo
+fyo
+fyo
+cBe
+cBe
+cBe
 lRR
 rNK
 rNK
@@ -158285,13 +158304,17 @@ rNK
 rNK
 rNK
 rNK
-rNK
-rNK
-rNK
-rNK
-lRR
-lRR
-lRR
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
 jft
 jft
 jft
@@ -158306,10 +158329,6 @@ jft
 jft
 jft
 lRR
-lRR
-lRR
-rNK
-rNK
 rNK
 rNK
 rNK
@@ -158505,12 +158524,7 @@ rNK
 rNK
 rNK
 rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
+dcv
 rNK
 rNK
 rNK
@@ -158550,7 +158564,19 @@ rNK
 rNK
 lRR
 lRR
-lRR
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
 jft
 jft
 jft
@@ -158560,13 +158586,6 @@ jft
 jft
 jft
 lRR
-lRR
-lRR
-lRR
-rNK
-rNK
-rNK
-rNK
 rNK
 rNK
 rNK
@@ -158801,29 +158820,29 @@ rNK
 rNK
 rNK
 rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
 lRR
 lRR
 lRR
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
 lRR
 lRR
 lRR
-lRR
-lRR
-lRR
-lRR
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
 rNK
 rNK
 rNK
@@ -159060,25 +159079,25 @@ rNK
 rNK
 rNK
 rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
+lRR
+lRR
+lRR
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+lRR
+lRR
+lRR
 rNK
 rNK
 rNK
@@ -159319,21 +159338,21 @@ rNK
 rNK
 rNK
 rNK
-rNK
-rNK
-dcv
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
+lRR
+lRR
+lRR
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+jft
+lRR
+lRR
+lRR
+lRR
 rNK
 rNK
 rNK
@@ -159578,16 +159597,16 @@ rNK
 rNK
 rNK
 rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
-rNK
+lRR
+lRR
+lRR
+lRR
+lRR
+lRR
+lRR
+lRR
+lRR
+lRR
 rNK
 rNK
 rNK
@@ -160092,7 +160111,7 @@ rNK
 rNK
 rNK
 rNK
-rNK
+dcv
 rNK
 rNK
 rNK
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index 4b05355c319..86df6ff3250 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -23109,11 +23109,11 @@
 "brK" = (
 /obj/docking_port/stationary{
 	dir = 4;
-	dwidth = 11;
-	height = 18;
+	dwidth = 15;
+	height = 21;
 	id = "emergency_home";
 	name = "emergency evac bay";
-	width = 29
+	width = 32
 	},
 /turf/space,
 /area/space)
diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm
index a931e8f699a..e52da2862cb 100644
--- a/_maps/map_files/generic/centcomm.dmm
+++ b/_maps/map_files/generic/centcomm.dmm
@@ -1476,17 +1476,6 @@
 	icon_state = "dark"
 	},
 /area/ghost_bar)
-"fH" = (
-/obj/docking_port/stationary/transit{
-	dir = 4;
-	dwidth = 11;
-	height = 13;
-	id = "emergency_transit";
-	name = "emergency in transit";
-	width = 24
-	},
-/turf/space/transit,
-/area/space/centcomm)
 "fI" = (
 /turf/simulated/wall/indestructible/riveted,
 /area/tdome/arena_source)
@@ -2889,12 +2878,12 @@
 "kf" = (
 /obj/docking_port/stationary{
 	area_type = /area/syndicate_mothership;
-	dwidth = 11;
-	height = 18;
+	dwidth = 15;
+	height = 21;
 	id = "emergency_syndicate";
 	name = "404 Not Found";
 	turf_type = /turf/simulated/floor/plating/asteroid/snow/airless;
-	width = 29
+	width = 32
 	},
 /turf/simulated/floor/plating/asteroid/snow/airless,
 /area/syndicate_mothership)
@@ -4505,6 +4494,17 @@
 	icon_state = "vault"
 	},
 /area/tdome/tdomeadmin)
+"pf" = (
+/obj/docking_port/stationary/transit{
+	dir = 4;
+	dwidth = 15;
+	height = 21;
+	id = "emergency_transit";
+	name = "emergency in transit";
+	width = 32
+	},
+/turf/space/transit,
+/area/space/centcomm)
 "pg" = (
 /obj/machinery/door/airlock/titanium/glass{
 	name = "trader shuttle airlock";
@@ -12205,11 +12205,11 @@
 	},
 /obj/docking_port/stationary{
 	dir = 4;
-	dwidth = 11;
-	height = 18;
+	dwidth = 15;
+	height = 21;
 	id = "emergency_away";
 	name = "emergency centcom";
-	width = 29
+	width = 32
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/escape)
@@ -16366,7 +16366,7 @@ ck
 ck
 ck
 ck
-ck
+pf
 ck
 ck
 ck
@@ -17137,7 +17137,7 @@ ck
 ck
 ck
 ck
-fH
+ck
 ck
 ck
 ck
@@ -49367,7 +49367,7 @@ aN
 aN
 aN
 aN
-aN
+Db
 aN
 aN
 aN
@@ -50399,7 +50399,7 @@ aN
 aN
 aN
 aN
-Db
+aN
 aN
 aN
 aN
@@ -50429,7 +50429,7 @@ Pb
 vy
 Iv
 Zp
-Db
+aN
 aN
 aN
 aN
@@ -50652,7 +50652,7 @@ aN
 aN
 aN
 aN
-aN
+Db
 aN
 aN
 aN
@@ -50686,7 +50686,7 @@ XB
 od
 ux
 ux
-aN
+Db
 aN
 aN
 aN
@@ -51684,7 +51684,7 @@ aN
 aN
 aN
 aN
-Db
+aN
 vy
 Ew
 Fq
@@ -51714,7 +51714,7 @@ Pb
 vy
 Iv
 Zp
-Db
+aN
 aN
 aN
 aN
@@ -51937,11 +51937,11 @@ aN
 aN
 aN
 aN
-aN
-aN
-aN
-aN
 Db
+aN
+aN
+aN
+aN
 vy
 Ez
 Fq
@@ -52451,7 +52451,7 @@ aN
 aN
 aN
 aN
-aN
+Db
 aN
 aN
 aN
@@ -52485,7 +52485,7 @@ JC
 vy
 Iv
 Zp
-aN
+Db
 aN
 aN
 aN
@@ -53226,7 +53226,7 @@ aN
 aN
 aN
 aN
-Db
+aN
 aN
 aN
 aN
@@ -53256,7 +53256,7 @@ YT
 vy
 Iv
 Zp
-Db
+aN
 aN
 aN
 aN
@@ -53736,7 +53736,7 @@ aN
 aN
 aN
 aN
-aN
+Db
 aN
 aN
 aN
@@ -53770,7 +53770,7 @@ qF
 od
 Iv
 Zp
-aN
+Db
 aN
 aN
 aN
@@ -54254,37 +54254,37 @@ aN
 aN
 aN
 aN
-Db
 aN
 aN
 aN
 aN
-Db
 aN
 aN
 aN
 aN
-Db
 aN
 aN
 aN
 aN
-Db
 aN
 aN
 aN
 aN
-Db
 aN
 aN
 aN
 aN
-Db
 aN
 aN
 aN
 aN
-Db
+aN
+aN
+aN
+aN
+aN
+aN
+aN
 aN
 aN
 aN
@@ -55021,41 +55021,41 @@ aN
 aN
 aN
 aN
+Db
+aN
+aN
+aN
+Db
 aN
 aN
 aN
 aN
+Db
 aN
 aN
 aN
 aN
+Db
 aN
 aN
 aN
 aN
+Db
 aN
 aN
 aN
 aN
+Db
 aN
 aN
 aN
 aN
+Db
 aN
 aN
 aN
 aN
-aN
-aN
-aN
-aN
-aN
-aN
-aN
-aN
-aN
-aN
-aN
+Db
 aN
 aN
 aN
diff --git a/_maps/map_files/shuttles/emergency_raven.dmm b/_maps/map_files/shuttles/emergency_raven.dmm
new file mode 100644
index 00000000000..772b96481b8
--- /dev/null
+++ b/_maps/map_files/shuttles/emergency_raven.dmm
@@ -0,0 +1,2205 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/turf/template_noop,
+/area/template_noop)
+"ab" = (
+/obj/machinery/door/poddoor/preopen{
+	id = "raven_cockpit_windows";
+	name = "Cockpit Blast Door";
+	id_tag = "raven_cockpit_windows"
+	},
+/obj/effect/spawner/window/plastitanium,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"ac" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"ad" = (
+/obj/machinery/computer/security,
+/obj/effect/turf_decal/delivery/white/hollow,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"ae" = (
+/obj/structure/table/reinforced,
+/obj/machinery/hologram/holopad,
+/obj/machinery/recharger,
+/obj/effect/turf_decal/delivery/white/hollow,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"af" = (
+/obj/machinery/computer/emergency_shuttle,
+/obj/effect/turf_decal/delivery/white/hollow,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"ag" = (
+/obj/structure/table/reinforced,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door_control{
+	pixel_x = -5;
+	pixel_y = 6;
+	id = "raven_cockpit_windows";
+	name = "Cockpit Window Blast Doors"
+	},
+/obj/machinery/turretid/lethal{
+	req_access = list(18);
+	check_access = 0;
+	check_arrest = 0;
+	check_records = 0
+	},
+/obj/effect/turf_decal/delivery/white/hollow,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"ah" = (
+/obj/machinery/computer/communications,
+/obj/effect/turf_decal/delivery/white/hollow,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"ai" = (
+/obj/machinery/computer/aifixer,
+/obj/effect/turf_decal/delivery/white/hollow,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"ak" = (
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"al" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "darkblue"
+	},
+/area/shuttle/escape)
+"aq" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "darkblue"
+	},
+/area/shuttle/escape)
+"av" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "darkblue"
+	},
+/area/shuttle/escape)
+"aw" = (
+/obj/machinery/computer/station_alert{
+	dir = 8
+	},
+/obj/effect/turf_decal/delivery/white/hollow,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"ax" = (
+/obj/structure/sign/electricshock,
+/turf/simulated/wall/mineral/plastitanium/nodiagonal,
+/area/shuttle/escape)
+"ay" = (
+/obj/machinery/computer/crew{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/delivery/white/hollow,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"aA" = (
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "darkbluecorners"
+	},
+/area/shuttle/escape)
+"aC" = (
+/obj/effect/spawner/window/plastitanium,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"aE" = (
+/turf/simulated/floor/plasteel{
+	icon_state = "darkbluecorners"
+	},
+/area/shuttle/escape)
+"aG" = (
+/obj/machinery/computer/atmos_alert{
+	dir = 8
+	},
+/obj/effect/turf_decal/delivery/white/hollow,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"aI" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/emergency,
+/obj/item/wrench,
+/obj/item/restraints/handcuffs,
+/turf/simulated/floor/plasteel{
+	dir = 10;
+	icon_state = "darkblue"
+	},
+/area/shuttle/escape)
+"aM" = (
+/obj/structure/rack,
+/obj/item/tank/internals/oxygen/red,
+/obj/item/clothing/mask/gas,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/extinguisher,
+/turf/simulated/floor/plasteel{
+	dir = 6;
+	icon_state = "darkblue"
+	},
+/area/shuttle/escape)
+"aN" = (
+/obj/machinery/porta_turret/ai_turret,
+/turf/simulated/wall/mineral/plastitanium,
+/area/shuttle/escape)
+"aO" = (
+/turf/simulated/wall/mineral/plastitanium,
+/area/shuttle/escape)
+"aP" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/obj/structure/chair/comfy/shuttle,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"aQ" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/structure/chair/comfy/shuttle,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"aR" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/obj/structure/chair/comfy/shuttle,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"aT" = (
+/obj/machinery/computer/operating,
+/turf/simulated/floor/plasteel{
+	dir = 9;
+	icon_state = "whiteblue"
+	},
+/area/shuttle/escape)
+"aU" = (
+/obj/item/surgical_drapes,
+/obj/machinery/optable,
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whiteblue"
+	},
+/area/shuttle/escape)
+"aV" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/surgical_tray,
+/obj/item/reagent_containers/glass/bottle/reagent/hydrocodone,
+/obj/item/stack/nanopaste,
+/turf/simulated/floor/plasteel{
+	dir = 5;
+	icon_state = "whiteblue"
+	},
+/area/shuttle/escape)
+"aW" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/obj/item/storage/box/handcuffs{
+	pixel_x = 2;
+	pixel_y = 2
+	},
+/obj/item/restraints/handcuffs{
+	pixel_y = 3
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table/reinforced,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"aX" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/turf/simulated/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"aY" = (
+/turf/simulated/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"aZ" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/turf/simulated/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"ba" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/simulated/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"bb" = (
+/obj/machinery/light/spot,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"bc" = (
+/obj/effect/turf_decal/delivery/white,
+/obj/machinery/door/poddoor/preopen{
+	id = "ravenbridgeblast";
+	name = "Cockpit Blast Door";
+	id_tag = "ravenbridgeblast"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"be" = (
+/obj/structure/chair/office/light{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/shuttle/escape)
+"bf" = (
+/turf/simulated/floor/plasteel/white,
+/area/shuttle/escape)
+"bh" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/spot{
+	dir = 4
+	},
+/obj/machinery/sleeper,
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whiteblue"
+	},
+/area/shuttle/escape)
+"bi" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/item/book/manual/wiki/security_space_law{
+	pixel_x = -4;
+	pixel_y = 4
+	},
+/obj/structure/table/reinforced,
+/obj/machinery/light/spot{
+	dir = 8
+	},
+/turf/simulated/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"bj" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/simulated/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"bk" = (
+/obj/machinery/door/airlock/security/glass{
+	name = "Holding Area"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/security/general,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"bl" = (
+/obj/effect/turf_decal/stripes/white/end{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"bn" = (
+/obj/effect/turf_decal/stripes/white/end{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"bo" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock/medical/glass{
+	name = "Escape Shuttle Infirmary"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/command/general,
+/turf/simulated/floor/plasteel/white,
+/area/shuttle/escape)
+"br" = (
+/obj/effect/spawner/window/plastitanium,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"bt" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/simulated/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"bu" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/turf/simulated/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"bv" = (
+/obj/effect/turf_decal/stripes/corner,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"bw" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/simulated/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"bx" = (
+/obj/machinery/door/airlock/command/glass{
+	name = "Cockpit"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/command/general,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"by" = (
+/obj/structure/closet/crate/freezer/iv_storage,
+/turf/simulated/floor/plasteel{
+	dir = 10;
+	icon_state = "whiteblue"
+	},
+/area/shuttle/escape)
+"bC" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table/reinforced,
+/obj/machinery/recharger,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"bD" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/simulated/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"bE" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"bF" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/simulated/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"bJ" = (
+/obj/machinery/economy/vending/medical,
+/turf/simulated/floor/plasteel{
+	dir = 10;
+	icon_state = "whiteblue"
+	},
+/area/shuttle/escape)
+"bL" = (
+/obj/structure/table/reinforced,
+/obj/item/defibrillator/loaded,
+/turf/simulated/floor/plasteel{
+	dir = 6;
+	icon_state = "whiteblue"
+	},
+/area/shuttle/escape)
+"bM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table/reinforced,
+/obj/item/storage/firstaid/doctor,
+/obj/item/storage/firstaid/toxin,
+/turf/simulated/floor/plasteel/white,
+/area/shuttle/escape)
+"bN" = (
+/obj/structure/sign/security,
+/turf/simulated/wall/mineral/plastitanium/nodiagonal,
+/area/shuttle/escape)
+"bO" = (
+/obj/structure/closet/firecloset,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"bR" = (
+/obj/structure/closet/emcloset,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"bS" = (
+/obj/structure/sign/lifestar,
+/turf/simulated/wall/mineral/plastitanium/nodiagonal,
+/area/shuttle/escape)
+"bT" = (
+/obj/machinery/door/airlock/medical/glass{
+	name = "Escape Shuttle Infirmary"
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"bU" = (
+/obj/structure/closet/emcloset,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"bV" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/emergency,
+/obj/item/radio,
+/obj/item/clothing/mask/gas,
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"bW" = (
+/obj/effect/turf_decal/raven/eight,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"cb" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/radio,
+/obj/item/clothing/mask/gas,
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"cc" = (
+/obj/structure/closet/emcloset,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"cd" = (
+/obj/machinery/door/airlock/external{
+	id_tag = "s_docking_airlock"
+	},
+/obj/structure/fans/tiny,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"ce" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"cf" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"cg" = (
+/obj/structure/sign/vacuum/external,
+/turf/simulated/wall/mineral/plastitanium/nodiagonal,
+/area/shuttle/escape)
+"ch" = (
+/obj/effect/turf_decal/stripes/white/corner{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"cl" = (
+/obj/effect/turf_decal/stripes/white/corner,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"cm" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"co" = (
+/obj/machinery/porta_turret/ai_turret,
+/turf/simulated/wall/mineral/plastitanium/nodiagonal,
+/area/shuttle/escape)
+"cr" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"cs" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"ct" = (
+/obj/machinery/door/airlock/external/glass,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"cu" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"cv" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"cx" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"cy" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"cz" = (
+/obj/effect/turf_decal/stripes/white/corner{
+	dir = 1
+	},
+/obj/structure/extinguisher_cabinet{
+	name = "west bump";
+	pixel_x = -27
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"cB" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"cC" = (
+/obj/effect/turf_decal/stripes/white/corner{
+	dir = 4
+	},
+/obj/structure/extinguisher_cabinet{
+	name = "east bump";
+	pixel_x = 27
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"cD" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"cE" = (
+/obj/machinery/suit_storage_unit/standard_unit,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"cL" = (
+/obj/effect/turf_decal/stripes/white/line,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"cM" = (
+/obj/effect/turf_decal/stripes/white/line,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"cP" = (
+/turf/simulated/wall/mineral/plastitanium/nodiagonal,
+/area/shuttle/escape)
+"cR" = (
+/obj/effect/turf_decal/delivery/white,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "escape_cargo_shutters";
+	name = "Cargo Bay Shutters";
+	id_tag = "escape_cargo_shutters";
+	dir = 2
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"cT" = (
+/obj/machinery/suit_storage_unit/standard_unit,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"cU" = (
+/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/structure/closet/crate/internals,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"cV" = (
+/obj/structure/closet/emcloset,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"cW" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/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/multitool,
+/obj/machinery/door_control{
+	id = "escape_cargo_shutters";
+	name = "Warehouse Door Control";
+	pixel_x = -1;
+	pixel_y = 24;
+	req_access_txt = "31"
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"cX" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"cY" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"cZ" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 4
+	},
+/obj/structure/rack,
+/obj/item/tank/internals/oxygen/red,
+/obj/item/clothing/mask/gas,
+/obj/machinery/door_control{
+	id = "qm_warehouse";
+	name = "Warehouse Door Control";
+	pixel_x = -1;
+	pixel_y = 24;
+	req_access_txt = "31"
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"da" = (
+/obj/machinery/door/airlock/public/glass{
+	name = "Emergency Shuttle Seating"
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"db" = (
+/obj/structure/closet/crate/medical,
+/obj/item/healthanalyzer{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/lazarus_injector,
+/mob/living/simple_animal/bot/medbot{
+	name = "\improper emergency medibot";
+	pixel_x = -3;
+	pixel_y = 2
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"dd" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"de" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock/public/glass{
+	name = "Emergency Shuttle Seating"
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"df" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"dg" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 6
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"dh" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"di" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 10
+	},
+/obj/machinery/light/small{
+	dir = 4;
+	pixel_y = 8
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"dj" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/space_heater,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"dk" = (
+/obj/effect/turf_decal/box/white/corners,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"dl" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"dm" = (
+/obj/effect/turf_decal/box/white/corners,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"dn" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"do" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 10
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"dq" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"du" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/radio,
+/obj/item/clothing/mask/gas,
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"dv" = (
+/obj/structure/rack,
+/obj/item/crowbar,
+/obj/item/wrench,
+/obj/item/flashlight,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"dw" = (
+/obj/structure/rack,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/storage/belt/utility,
+/obj/item/radio/off{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/radio/off,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"dx" = (
+/obj/structure/rack,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/stack/medical/bruise_pack,
+/obj/item/stack/medical/ointment{
+	pixel_x = 5
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"dy" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/multitool{
+	pixel_x = 7;
+	pixel_y = -4
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"dz" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/emergency,
+/obj/item/radio,
+/obj/item/clothing/mask/gas,
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"dA" = (
+/obj/machinery/door/airlock/engineering{
+	name = "Emergency Shutle Engineering"
+	},
+/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"dB" = (
+/obj/structure/sign/engineering,
+/turf/simulated/wall/mineral/plastitanium/nodiagonal,
+/area/shuttle/escape)
+"dE" = (
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"dH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/secure_closet/engineering_personal,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"dI" = (
+/obj/structure/closet/secure_closet/engineering_personal,
+/obj/structure/extinguisher_cabinet{
+	name = "north bump";
+	pixel_y = 30
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"dQ" = (
+/obj/machinery/recharge_station,
+/obj/structure/extinguisher_cabinet{
+	name = "north bump";
+	pixel_y = 30
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"dR" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/recharge_station,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"dS" = (
+/obj/machinery/shieldgen/raven,
+/obj/effect/turf_decal/delivery/white/hollow,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"dT" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"dV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/shieldgen/raven,
+/obj/effect/turf_decal/delivery/white/hollow,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"ed" = (
+/obj/structure/cable,
+/obj/machinery/power/port_gen/pacman/upgraded{
+	anchored = 1
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"el" = (
+/obj/machinery/light/spot{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"em" = (
+/obj/structure/shuttle/engine/propulsion,
+/turf/simulated/floor/plating/airless,
+/area/shuttle/escape)
+"en" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/spot,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"eo" = (
+/obj/docking_port/mobile/emergency{
+	dwidth = 15;
+	height = 21;
+	width = 32;
+	timid = 1
+	},
+/obj/machinery/door/airlock/external{
+	id_tag = "s_docking_airlock"
+	},
+/obj/structure/fans/tiny,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"ep" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/obj/machinery/light/spot{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"fc" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/structure/window/plasmareinforced,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"fn" = (
+/obj/structure/shuttle/engine/heater,
+/turf/simulated/floor/plating/airless,
+/area/shuttle/escape)
+"fD" = (
+/obj/machinery/space_heater,
+/obj/structure/window/plasmareinforced,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"gL" = (
+/obj/machinery/computer/med_data{
+	dir = 4
+	},
+/obj/effect/turf_decal/delivery/white/hollow,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"hu" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"jL" = (
+/turf/simulated/floor/plasteel{
+	dir = 6;
+	icon_state = "whiteblue"
+	},
+/area/shuttle/escape)
+"jZ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+	d2 = 4;
+	icon_state = "0-4"
+	},
+/obj/machinery/power/tesla_coil{
+	anchored = 1
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"ky" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/obj/machinery/light/spot{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"kF" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 6
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"ly" = (
+/obj/machinery/door/airlock/hatch,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"lB" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/table/reinforced,
+/obj/item/clothing/glasses/meson/engine,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"lC" = (
+/turf/simulated/floor/plasteel{
+	dir = 5;
+	icon_state = "darkblue"
+	},
+/area/shuttle/escape)
+"ml" = (
+/obj/effect/turf_decal/raven/three,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"nK" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/stack/sheet/mineral/plastitanium{
+	amount = 50;
+	pixel_x = -2;
+	pixel_y = 2
+	},
+/obj/structure/table/reinforced,
+/obj/structure/window/plasmareinforced,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"op" = (
+/obj/machinery/light/spot,
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel{
+	dir = 6;
+	icon_state = "darkblue"
+	},
+/area/shuttle/escape)
+"ou" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"ph" = (
+/obj/effect/turf_decal/raven/one,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"qa" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 4
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"qC" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/cell/high,
+/obj/structure/table/reinforced,
+/obj/structure/window/plasmareinforced,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"rq" = (
+/turf/simulated/floor/plasteel{
+	icon_state = "whitebluecorner"
+	},
+/area/shuttle/escape)
+"sr" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/window/plasmareinforced,
+/obj/structure/closet/secure_closet/engineering_welding,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"ss" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "darkblue"
+	},
+/area/shuttle/escape)
+"uM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/spot,
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel{
+	dir = 10;
+	icon_state = "darkblue"
+	},
+/area/shuttle/escape)
+"vw" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/window/plasmareinforced,
+/obj/structure/closet/secure_closet/engineering_electrical,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"wi" = (
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/table/reinforced,
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"wp" = (
+/obj/machinery/iv_drip,
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "whitebluecorner"
+	},
+/area/shuttle/escape)
+"wr" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/shieldgen/raven,
+/obj/effect/turf_decal/delivery/white/hollow,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"xH" = (
+/obj/machinery/light/spot{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"yY" = (
+/turf/simulated/floor/plasteel{
+	dir = 9;
+	icon_state = "darkblue"
+	},
+/area/shuttle/escape)
+"zo" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+	d2 = 8;
+	icon_state = "0-8"
+	},
+/obj/machinery/power/tesla_coil{
+	anchored = 1
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"zR" = (
+/obj/machinery/door_control{
+	id = "ravenbridgeblast";
+	name = "Cockpick Airlock Blastdoor Control";
+	pixel_x = 5;
+	pixel_y = -35;
+	req_access = list(19)
+	},
+/obj/effect/turf_decal/raven/two,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"zT" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"zV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/secure_data,
+/obj/effect/turf_decal/delivery/white/hollow,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"An" = (
+/obj/effect/turf_decal/caution,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"AO" = (
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 8
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"By" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/sleeper,
+/turf/simulated/floor/plasteel{
+	dir = 5;
+	icon_state = "whiteblue"
+	},
+/area/shuttle/escape)
+"BD" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"BW" = (
+/turf/simulated/floor/plasteel{
+	dir = 9;
+	icon_state = "darkred"
+	},
+/area/shuttle/escape)
+"Db" = (
+/obj/effect/turf_decal/raven/nine,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"Ge" = (
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "darkblue"
+	},
+/area/shuttle/escape)
+"GL" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/med_data{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel{
+	dir = 9;
+	icon_state = "whiteblue"
+	},
+/area/shuttle/escape)
+"HB" = (
+/obj/effect/turf_decal/stripes/white/corner{
+	dir = 8
+	},
+/obj/machinery/door_control{
+	id = "escape_cargo_shutters";
+	name = "Warehouse Door Control";
+	pixel_x = -1;
+	pixel_y = -24;
+	req_access_txt = "31"
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"HN" = (
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
+	},
+/area/shuttle/escape)
+"Ia" = (
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "darkred"
+	},
+/area/shuttle/escape)
+"Jx" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"JO" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/obj/machinery/light/spot,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"Kd" = (
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "whiteblue"
+	},
+/area/shuttle/escape)
+"Ls" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/storage/toolbox/electrical{
+	pixel_x = -2;
+	pixel_y = 5
+	},
+/obj/item/storage/toolbox/mechanical,
+/obj/structure/table/reinforced,
+/obj/item/multitool,
+/obj/structure/window/plasmareinforced,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"Mm" = (
+/obj/item/stack/sheet/plastitaniumglass{
+	amount = 20;
+	pixel_x = -2;
+	pixel_y = 2
+	},
+/obj/item/stack/sheet/glass{
+	amount = 20;
+	pixel_x = 2;
+	pixel_y = -2
+	},
+/obj/structure/table/reinforced,
+/obj/structure/window/plasmareinforced,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"Na" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"Nd" = (
+/obj/structure/window/plasmareinforced,
+/obj/structure/dispenser,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"Ng" = (
+/obj/effect/turf_decal/raven/five,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"NK" = (
+/obj/structure/rack,
+/obj/item/storage/box/lights/tubes,
+/obj/structure/window/plasmareinforced,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"NQ" = (
+/obj/effect/turf_decal/raven/four,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"Ob" = (
+/obj/structure/reagent_dispensers/fueltank,
+/obj/structure/window/plasmareinforced,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"Pa" = (
+/obj/machinery/light/spot,
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"Px" = (
+/obj/machinery/shieldgen/raven,
+/obj/effect/turf_decal/delivery/white/hollow,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"Rw" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"Sa" = (
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"Sk" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "darkred"
+	},
+/area/shuttle/escape)
+"Ux" = (
+/obj/effect/turf_decal/stripes/white/corner,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door_control{
+	id = "escape_cargo_shutters";
+	name = "Warehouse Door Control";
+	pixel_x = -1;
+	pixel_y = -24;
+	req_access_txt = "31"
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"US" = (
+/turf/simulated/floor/plasteel{
+	icon_state = "whiteblue"
+	},
+/area/shuttle/escape)
+"Xd" = (
+/obj/effect/turf_decal/raven/seven,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"YX" = (
+/obj/effect/turf_decal/raven/six,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"ZA" = (
+/obj/effect/turf_decal/stripes/white/line,
+/obj/effect/turf_decal/stripes/white/line{
+	dir = 1
+	},
+/obj/machinery/light/spot,
+/turf/simulated/floor/plasteel/dark,
+/area/shuttle/escape)
+"ZF" = (
+/obj/structure/window/plasmareinforced,
+/obj/machinery/atmospherics/portable/canister/air,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"ZM" = (
+/obj/structure/cable{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/obj/structure/table/reinforced,
+/obj/item/stack/sheet/mineral/plasma/fifty,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+
+(1,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aO
+cP
+cd
+co
+eo
+cP
+aO
+aa
+aO
+cP
+cd
+co
+cd
+cP
+aO
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(2,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aN
+br
+cP
+cP
+bU
+ce
+cu
+cx
+cE
+cP
+br
+cP
+cT
+ce
+df
+cx
+bU
+cP
+cP
+br
+aN
+aa
+aa
+aa
+"}
+(3,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aO
+cP
+cP
+wr
+cP
+cP
+bV
+cf
+cv
+en
+cP
+cP
+Px
+cP
+cP
+ep
+cv
+cD
+du
+cP
+cP
+dS
+cP
+aO
+aa
+aa
+"}
+(4,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aN
+cP
+aW
+bi
+bt
+bC
+cP
+cP
+cg
+ct
+cP
+cP
+hu
+ak
+hu
+cP
+cP
+ct
+cg
+cP
+cP
+dH
+dE
+nK
+cP
+aN
+aa
+"}
+(5,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+cP
+aP
+bu
+aY
+aZ
+bD
+br
+Sk
+ch
+cr
+cz
+ac
+ak
+ak
+ak
+cU
+aC
+dg
+AO
+dv
+cP
+dI
+dE
+Mm
+cP
+cP
+aa
+"}
+(6,1,1) = {"
+aa
+ab
+ab
+ab
+cP
+cP
+aQ
+aY
+aY
+aY
+bE
+bk
+Ia
+Jx
+Jx
+Jx
+Jx
+Jx
+ak
+ak
+ak
+da
+dh
+ak
+ak
+dA
+dE
+dE
+Nd
+fn
+em
+aa
+"}
+(7,1,1) = {"
+ab
+ab
+Px
+gL
+ay
+cP
+aR
+aX
+aY
+bv
+bF
+br
+Ia
+Rw
+Rw
+zT
+Rw
+Rw
+ak
+ak
+cV
+aC
+di
+dq
+dw
+dB
+dE
+dE
+fc
+fn
+em
+aa
+"}
+(8,1,1) = {"
+ab
+zV
+yY
+aq
+uM
+cP
+cP
+ba
+bj
+bw
+cP
+bN
+el
+ak
+ak
+ak
+ak
+ak
+bb
+cP
+cP
+cP
+cP
+ly
+cP
+ax
+xH
+dT
+Ob
+fn
+em
+aa
+"}
+(9,1,1) = {"
+ab
+ad
+al
+ak
+aA
+aI
+cP
+cP
+bk
+cP
+cP
+bO
+ak
+Jx
+Jx
+Jx
+Jx
+Jx
+Ux
+cP
+cW
+db
+dj
+ak
+cP
+jZ
+dE
+dE
+vw
+fn
+em
+aa
+"}
+(10,1,1) = {"
+ab
+ae
+Ge
+Xd
+NQ
+ph
+bx
+bc
+bl
+bx
+BW
+ak
+ak
+Rw
+Rw
+Rw
+zT
+Rw
+cL
+cR
+cY
+ac
+dk
+ak
+cP
+wi
+dE
+dE
+cP
+cP
+cP
+aa
+"}
+(11,1,1) = {"
+ab
+af
+al
+bW
+Ng
+zR
+cP
+bc
+ZA
+cP
+An
+ak
+ak
+ak
+ac
+cB
+ak
+ak
+cM
+cR
+ak
+ak
+ak
+Pa
+cP
+ZM
+Sa
+Sa
+ed
+cP
+aa
+aa
+"}
+(12,1,1) = {"
+ab
+ag
+Ge
+Db
+YX
+ml
+bx
+bc
+bn
+bx
+lC
+ac
+ak
+ou
+Jx
+Jx
+Jx
+Jx
+cM
+cR
+dl
+ak
+cX
+ak
+cP
+lB
+dE
+dE
+cP
+cP
+cP
+aa
+"}
+(13,1,1) = {"
+ab
+ah
+al
+ak
+aE
+aM
+cP
+cP
+bo
+cP
+cP
+bR
+ak
+Rw
+Rw
+Rw
+Rw
+Rw
+HB
+cP
+cZ
+dd
+dm
+ac
+cP
+zo
+dE
+dE
+sr
+fn
+em
+aa
+"}
+(14,1,1) = {"
+ab
+ai
+lC
+av
+op
+cP
+cP
+GL
+Kd
+by
+cP
+bS
+el
+ak
+ak
+ak
+ak
+ak
+bb
+cP
+cP
+cP
+cP
+ly
+cP
+ax
+xH
+dE
+fD
+fn
+em
+aa
+"}
+(15,1,1) = {"
+ab
+ab
+wr
+aw
+aG
+cP
+aT
+be
+bf
+wp
+bJ
+br
+Ge
+Jx
+Jx
+Jx
+Jx
+ou
+ak
+ak
+bO
+aC
+kF
+cr
+dx
+dB
+dE
+dE
+ZF
+fn
+em
+aa
+"}
+(16,1,1) = {"
+aa
+ab
+ab
+ab
+cP
+cP
+aU
+bf
+bf
+bf
+US
+bT
+ss
+Rw
+Rw
+Rw
+Rw
+Rw
+ak
+ak
+ak
+de
+dn
+ak
+ak
+dA
+dE
+dE
+NK
+fn
+em
+aa
+"}
+(17,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+cP
+aV
+HN
+bf
+rq
+bL
+br
+ss
+cl
+cs
+cC
+ak
+ak
+ak
+ak
+cU
+aC
+do
+qa
+dy
+cP
+dQ
+dT
+qC
+cP
+cP
+aa
+"}
+(18,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aN
+cP
+By
+bh
+jL
+bM
+cP
+cP
+cg
+ct
+cP
+cP
+Na
+ak
+BD
+cP
+cP
+ct
+cg
+cP
+cP
+dR
+dE
+Ls
+cP
+aN
+aa
+"}
+(19,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aO
+cP
+cP
+Px
+cP
+cP
+cb
+cm
+cu
+JO
+cP
+cP
+wr
+cP
+cP
+ky
+cu
+cx
+dz
+cP
+cP
+dV
+cP
+aO
+aa
+aa
+"}
+(20,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aN
+br
+cP
+cP
+cc
+cf
+cv
+cD
+cE
+cP
+br
+cP
+cE
+cf
+cv
+cy
+cc
+cP
+cP
+br
+aN
+aa
+aa
+aa
+"}
+(21,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aO
+cP
+cd
+co
+cd
+cP
+aO
+aa
+aO
+cP
+cd
+co
+cd
+cP
+aO
+aa
+aa
+aa
+aa
+aa
+aa
+"}
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index 09a91560d31..7c47f32eb81 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -111,6 +111,14 @@
 	name = "Emergency shuttle JUNG-13"
 	description = "You can hear screeching and hissing as this shuttle docks."
 
+/datum/map_template/shuttle/emergency/raven
+	suffix = "raven"
+	name = "CentCom Raven Cruiser"
+	description = "The CentCom Raven Cruiser is a former high-risk salvage vessel, now repurposed into an emergency escape shuttle. \
+	Once first to the scene to pick through warzones for valuable remains, it now serves as an excellent escape option for stations under heavy fire from outside forces. \
+	This escape shuttle boasts shields and numerous anti-personnel turrets guarding its perimeter to fend off meteors and enemy boarding attempts."
+	admin_notes = "Comes with turrets that will target simple mobs."
+
 /datum/map_template/shuttle/ferry/base
 	suffix = "base"
 	name = "transport ferry"
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index afc9e630994..3ad64115567 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -140,6 +140,7 @@
 	var/list/deployed_shields = list()
 	var/is_open = FALSE //Whether or not the wires are exposed
 	var/locked = FALSE
+	var/shield_range = 2
 
 /obj/machinery/shieldgen/Destroy()
 	QDEL_LIST_CONTENTS(deployed_shields)
@@ -155,7 +156,7 @@
 	update_icon(UPDATE_ICON_STATE)
 	anchored = TRUE
 
-	for(var/turf/target_tile in range(2, src))
+	for(var/turf/target_tile in range(shield_range, src))
 		if(isspaceturf(target_tile) && !(locate(/obj/machinery/shield) in target_tile))
 			if(malfunction && prob(33) || !malfunction)
 				var/obj/machinery/shield/new_shield = new(target_tile)
@@ -295,6 +296,12 @@
 /obj/machinery/shieldgen/update_icon_state()
 	icon_state = "shield[active ? "on" : "off"][malfunction ? "br" : ""]"
 
+/obj/machinery/shieldgen/raven
+	name = "military shield generator"
+	desc = "Military grade shield generators used to protect spaceships from incoming fire."
+	shield_range = 4
+	anchored = TRUE
+
 ////FIELD GEN START //shameless copypasta from fieldgen, powersink, and grille
 #define MAX_STORED_POWER 500
 /obj/machinery/shieldwallgen
diff --git a/code/game/objects/effects/decals/turfdecals/markings.dm b/code/game/objects/effects/decals/turfdecals/markings.dm
index d70d42b684e..433e4ef94c7 100644
--- a/code/game/objects/effects/decals/turfdecals/markings.dm
+++ b/code/game/objects/effects/decals/turfdecals/markings.dm
@@ -198,3 +198,33 @@
 
 /obj/effect/turf_decal/siding/box
 	icon_state = "siding_box"
+
+/obj/effect/turf_decal/raven_ship_sign
+	icon_state = "RAVEN2"
+
+/obj/effect/turf_decal/raven/one
+	icon_state = "RAVEN1"
+
+/obj/effect/turf_decal/raven/two
+	icon_state = "RAVEN2"
+
+/obj/effect/turf_decal/raven/three
+	icon_state = "RAVEN3"
+
+/obj/effect/turf_decal/raven/four
+	icon_state = "RAVEN4"
+
+/obj/effect/turf_decal/raven/five
+	icon_state = "RAVEN5"
+
+/obj/effect/turf_decal/raven/six
+	icon_state = "RAVEN6"
+
+/obj/effect/turf_decal/raven/seven
+	icon_state = "RAVEN7"
+
+/obj/effect/turf_decal/raven/eight
+	icon_state = "RAVEN8"
+
+/obj/effect/turf_decal/raven/nine
+	icon_state = "RAVEN9"
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index 958806c6b50..fc353913a78 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -158,6 +158,17 @@
 	// Tom fears no cable.
 	ADD_TRAIT(src, TRAIT_SHOCKIMMUNE, SPECIES_TRAIT)
 
+/mob/living/simple_animal/mouse/white/Brain
+	name = "Brain"
+	real_name = "Brain"
+	response_harm = "splats"
+	unique_pet = TRUE
+	gold_core_spawnable = NO_SPAWN
+
+/mob/living/simple_animal/mouse/white/Brain/update_desc()
+	. = ..()
+	desc = "Gee Virology, what are we going to do tonight? The same thing we do every night, try to take over the world!"
+
 /mob/living/simple_animal/mouse/blobinfected
 	maxHealth = 100
 	health = 100
diff --git a/code/modules/supply/supply_packs/pack_shuttle.dm b/code/modules/supply/supply_packs/pack_shuttle.dm
index 88747b19fc5..6afc8e46aff 100644
--- a/code/modules/supply/supply_packs/pack_shuttle.dm
+++ b/code/modules/supply/supply_packs/pack_shuttle.dm
@@ -83,14 +83,18 @@
 	cost = 3750
 	template = /datum/map_template/shuttle/emergency/cramped
 
-// these, otoh, have some pretty silly features, and are hidden behind emag
-
 /datum/supply_packs/abstract/shuttle/military
-	// if you can pool enough money together for this one, maybe you deserve it
-	speed_factor = 1.5
-	cost = 4250
+	cost = 3500
 	template = /datum/map_template/shuttle/emergency/military
 
+// if you can pool enough money together for this one, maybe you deserve it
+
+/datum/supply_packs/abstract/shuttle/raven
+	cost = 4500 //I do wonder about shuttle prices, especially considering how many guns you could get for this price. Perhaps a lowering in the future.
+	template = /datum/map_template/shuttle/emergency/raven
+
+// these, otoh, have some pretty silly features, and are hidden behind emag
+
 /datum/supply_packs/abstract/shuttle/clown
 	speed_factor = 0.75  // this one's a little slower, enjoy your ride!
 	cmag_hidden = TRUE
diff --git a/icons/turf/decals.dmi b/icons/turf/decals.dmi
index fc8e93b6e53..52372c44c16 100644
Binary files a/icons/turf/decals.dmi and b/icons/turf/decals.dmi differ