diff --git a/_maps/shuttles/subshuttles/nanotrasen_malp.dmm b/_maps/shuttles/subshuttles/nanotrasen_malp.dmm
index 586fa7756e..e4b97c98fc 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_malp.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_malp.dmm
@@ -38,6 +38,11 @@
 /obj/effect/turf_decal/siding/thinplating/light{
 	dir = 8
 	},
+/obj/machinery/atmospherics/components/binary/pump/layer4{
+	dir = 4;
+	name = "Off Ship Scrubber Network";
+	desc = "This pumps vents gasses outside the ship. Not to be used when docked inside a hangerbay. A pump that moves gas by pressure."
+	},
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/bridge)
 "bW" = (
@@ -165,6 +170,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
 /turf/open/floor/carpet/black,
 /area/ship/bridge)
 "gC" = (
@@ -220,6 +228,18 @@
 	},
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/bridge)
+"mZ" = (
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters{
+	id = "malp_window"
+	},
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/turf/open/floor/plating,
+/area/ship/bridge)
 "pi" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -257,19 +277,27 @@
 /obj/effect/turf_decal/siding/blue{
 	dir = 5
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
 /turf/open/floor/carpet/black,
 /area/ship/bridge)
 "rl" = (
-/obj/machinery/atmospherics/components/binary/pump/layer2,
-/obj/machinery/atmospherics/components/binary/pump/layer4{
-	dir = 1
-	},
 /obj/effect/turf_decal/siding/thinplating/light{
 	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/components/binary/pump/layer4{
+	dir = 1;
+	name = "Ship Scrubber Network";
+	desc = "This pumps vents gasses into another ships scrubber network. To be used when docked inside a hangerbay. A pump that moves gas by pressure."
+	},
+/obj/machinery/atmospherics/components/binary/pump/layer2{
+	name = "Ship Atmos Network";
+	desc = "This pumps takes gasses from another ship. To be used when docked inside a hangerbay. A pump that moves gas by pressure."
+	},
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/bridge)
 "tV" = (
@@ -331,6 +359,9 @@
 /obj/machinery/porta_turret/ship/weak{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 5
+	},
 /turf/open/floor/plating,
 /area/ship/bridge)
 "wC" = (
@@ -477,6 +508,9 @@
 	name = "MALP Windows"
 	},
 /obj/machinery/light/directional/east,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "Cw" = (
@@ -514,6 +548,9 @@
 /obj/effect/turf_decal/siding/red{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "Gd" = (
@@ -552,6 +589,15 @@
 	},
 /obj/effect/turf_decal/siding/yellow/end,
 /obj/structure/crate_shelf,
+/obj/item/storage/firstaid/brute{
+	pixel_x = 4;
+	pixel_y = 4
+	},
+/obj/item/storage/firstaid/fire,
+/obj/item/storage/firstaid/medical,
+/obj/item/storage/firstaid/o2,
+/obj/item/storage/firstaid/radiation,
+/obj/item/storage/firstaid/toxin,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "Jw" = (
@@ -581,6 +627,13 @@
 	},
 /turf/open/floor/carpet/black,
 /area/ship/bridge)
+"Mi" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/ship/bridge)
 "MD" = (
 /obj/machinery/computer/helm{
 	dir = 8
@@ -670,7 +723,6 @@
 /area/ship/bridge)
 "RF" = (
 /obj/structure/railing,
-/obj/machinery/light/floor,
 /obj/effect/turf_decal/siding/thinplating/light{
 	dir = 10
 	},
@@ -740,6 +792,7 @@
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/structure/closet/secure_closet/security/sec,
+/obj/item/ammo_box/c9mm/ap,
 /turf/open/floor/plating,
 /area/ship/bridge)
 
@@ -840,7 +893,7 @@ ei
 MD
 wX
 Bi
-Gd
+mZ
 wA
 "}
 (11,1,1) = {"
@@ -851,5 +904,5 @@ wC
 wC
 Cw
 kT
-MG
+Mi
 "}
diff --git a/_maps/shuttles/subshuttles/nanotrasen_sierra.dmm b/_maps/shuttles/subshuttles/nanotrasen_sierra.dmm
index f1b57cee90..bc818cefa0 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_sierra.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_sierra.dmm
@@ -1,27 +1,29 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"a" = (
-/obj/machinery/power/apc/auto_name/directional/east{
-	locked = 0
-	},
-/obj/structure/cable/yellow{
-	icon_state = "0-8"
+"bw" = (
+/obj/machinery/button/door{
+	dir = 4;
+	pixel_y = 4;
+	pixel_x = -23;
+	id = "sierra_blast";
+	name = "Sierra Cargo Door"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"b" = (
-/obj/machinery/power/terminal{
-	dir = 1
+/obj/machinery/button/shieldwallgen{
+	dir = 4;
+	id = "sierra_holo";
+	pixel_x = -22;
+	pixel_y = -6
 	},
-/obj/machinery/stasis,
 /obj/structure/cable/yellow{
-	icon_state = "0-4"
+	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"c" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 8
-	},
+"cs" = (
+/obj/structure/sign/number/random,
+/turf/closed/wall/mineral/titanium,
+/area/ship/bridge)
+"cD" = (
+/obj/structure/table,
 /obj/structure/railing{
 	dir = 4;
 	layer = 4.1
@@ -34,78 +36,60 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"d" = (
-/obj/structure/window/reinforced{
-	dir = 1
+"cT" = (
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
+	dir = 4
 	},
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 2
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
 	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"ey" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/cable{
-	icon_state = "0-1"
+	icon_state = "1-2"
 	},
-/obj/machinery/door/window,
-/obj/machinery/door/poddoor/preopen{
-	id = "sierra_engine"
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"e" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 4;
-	name = "Helm"
-	},
-/obj/item/radio/intercom/directional/west,
+"eX" = (
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"f" = (
+"ir" = (
 /obj/machinery/power/shuttle/engine/electric{
 	dir = 4
 	},
-/obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/structure/window/reinforced,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
 /turf/open/floor/plating,
 /area/ship/bridge)
-"g" = (
-/obj/structure/table,
-/obj/machinery/light/directional/west,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/item/storage/firstaid/brute{
-	pixel_x = -10;
-	pixel_y = 11
-	},
-/obj/item/storage/firstaid/fire{
-	pixel_x = 3;
-	pixel_y = 9
-	},
-/obj/item/storage/firstaid/medical{
-	pixel_x = -9;
-	pixel_y = 2
-	},
-/obj/item/storage/firstaid/o2{
-	pixel_x = 2;
-	pixel_y = 0
-	},
-/obj/machinery/door/window{
-	icon_state = "right";
-	name = "Medical Supplies";
-	opacity = 1
-	},
+"iC" = (
+/obj/structure/closet/emcloset/wall/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"h" = (
-/obj/machinery/light/directional/east,
-/obj/machinery/suit_storage_unit,
-/turf/open/floor/plasteel/dark,
+"jt" = (
+/turf/template_noop,
+/area/template_noop)
+"jR" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{
+	dir = 1
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
 /area/ship/bridge)
-"j" = (
+"kP" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced{
 	dir = 1
@@ -116,13 +100,26 @@
 	},
 /turf/open/floor/plating,
 /area/ship/bridge)
-"k" = (
-/turf/template_noop,
-/area/template_noop)
-"l" = (
+"mw" = (
+/obj/structure/window/reinforced,
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/door/window{
+	dir = 1
+	},
+/obj/machinery/door/poddoor/preopen{
+	id = "sierra_engine"
+	},
+/turf/open/floor/plating,
+/area/ship/bridge)
+"mV" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/bridge)
-"m" = (
+"od" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
@@ -131,90 +128,63 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"n" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 8
-	},
-/obj/structure/railing{
-	dir = 4;
-	layer = 4.1
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
+"qg" = (
+/obj/machinery/light/directional/east,
+/obj/machinery/suit_storage_unit,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"o" = (
-/obj/structure/cable/yellow{
+"qU" = (
+/obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
+/obj/machinery/atmospherics/components/binary/pump/layer2{
+	name = "Ship Atmos Network";
+	desc = "This pumps takes gasses from another ship. To be used when docked inside a hangerbay. A pump that moves gas by pressure."
+	},
+/obj/machinery/atmospherics/components/binary/pump/layer4{
+	dir = 1;
+	name = "Ship Scrubber Network";
+	desc = "This pumps vents gasses into another ships scrubber network. To be used when docked inside a hangerbay. A pump that moves gas by pressure."
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"p" = (
+"rm" = (
 /obj/machinery/light/directional/west,
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"q" = (
-/obj/machinery/button/door{
-	dir = 4;
-	pixel_y = 7;
-	pixel_x = -23;
-	id = "sierra_window";
-	name = "Sierra Windows"
-	},
-/obj/machinery/button/door{
-	dir = 4;
-	pixel_y = -6;
-	pixel_x = -23;
-	id = "sierra_engine";
-	name = "Sierra Engine Blast Doors"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"r" = (
+"sQ" = (
 /obj/structure/table,
-/obj/item/radio/intercom/wideband/table{
+/obj/machinery/light/directional/west,
+/obj/structure/window/reinforced{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"s" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"t" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
+/obj/item/storage/firstaid/brute{
+	pixel_x = -10;
+	pixel_y = 11
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 4
+/obj/item/storage/firstaid/fire{
+	pixel_x = 3;
+	pixel_y = 9
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/item/storage/firstaid/medical{
+	pixel_x = -9;
+	pixel_y = 2
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"u" = (
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
+/obj/item/storage/firstaid/o2{
+	pixel_x = 2;
+	pixel_y = 0
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
+/obj/machinery/door/window{
+	icon_state = "right";
+	name = "Medical Supplies";
+	opacity = 1
 	},
-/obj/structure/closet/firecloset/wall/directional/south,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"v" = (
+"vv" = (
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
@@ -234,67 +204,85 @@
 	},
 /turf/open/floor/plating,
 /area/ship/bridge)
-"w" = (
-/obj/machinery/power/smes/engineering,
-/obj/structure/cable/yellow,
+"vG" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"x" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
+"wt" = (
+/obj/machinery/power/terminal,
+/obj/structure/table,
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"wD" = (
+/obj/structure/grille,
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/poddoor/shutters{
+	id = "sierra_window"
 	},
 /turf/open/floor/plating,
 /area/ship/bridge)
-"y" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 4
+"wZ" = (
+/obj/machinery/power/port_gen/pacman,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
 	},
-/obj/structure/window/reinforced{
-	dir = 1
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Ad" = (
+/obj/machinery/power/smes/engineering,
+/obj/structure/cable/yellow,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"CJ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
 	},
-/obj/structure/window/reinforced,
 /obj/structure/cable{
-	icon_state = "0-4"
+	icon_state = "1-2"
 	},
-/turf/open/floor/plating,
-/area/ship/bridge)
-"z" = (
-/obj/item/radio/intercom/wideband/directional/west,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"A" = (
+"EW" = (
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/item/storage/toolbox/emergency,
+/obj/item/storage/toolbox/electrical,
+/obj/item/storage/toolbox/mechanical,
+/obj/structure/cable,
+/obj/item/stack/sheet/mineral/plasma/ten,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"B" = (
-/obj/structure/closet/emcloset/wall/directional/east,
+"Fd" = (
+/obj/item/radio/intercom/wideband/directional/west,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"C" = (
-/obj/machinery/button/door{
-	dir = 4;
-	pixel_y = 4;
-	pixel_x = -23;
-	id = "sierra_blast";
-	name = "Sierra Cargo Door"
+"GN" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
 	},
-/obj/machinery/button/shieldwallgen{
-	dir = 4;
-	id = "sierra_holo";
-	pixel_x = -22;
-	pixel_y = -6
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/structure/cable/yellow{
+/obj/structure/cable{
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"D" = (
-/obj/structure/table,
+"Jc" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /obj/structure/railing{
 	dir = 4;
 	layer = 4.1
@@ -302,118 +290,115 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"E" = (
-/obj/structure/grille,
-/obj/effect/spawner/structure/window/shuttle,
-/obj/machinery/door/poddoor/shutters{
-	dir = 8;
-	id = "sierra_window"
+"Kh" = (
+/obj/machinery/power/shuttle/engine/electric{
+	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"F" = (
 /obj/structure/window/reinforced,
-/obj/machinery/power/smes/shuttle/precharged{
+/obj/structure/window/reinforced{
 	dir = 1
 	},
 /obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/machinery/door/window{
-	dir = 1
-	},
-/obj/machinery/door/poddoor/preopen{
-	id = "sierra_engine"
+	icon_state = "0-4"
 	},
 /turf/open/floor/plating,
 /area/ship/bridge)
-"G" = (
-/obj/machinery/holopad/emergency/medical,
+"Km" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"H" = (
+"KH" = (
 /obj/structure/grille,
-/obj/effect/spawner/structure/window/shuttle,
-/obj/machinery/door/poddoor/shutters{
-	id = "sierra_window"
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
 /turf/open/floor/plating,
 /area/ship/bridge)
-"I" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
+"KM" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4;
+	name = "Helm"
 	},
+/obj/item/radio/intercom/directional/west,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"J" = (
-/obj/structure/sign/number/random,
-/turf/closed/wall/mineral/titanium/nodiagonal,
+"LB" = (
+/obj/machinery/holopad/emergency/medical,
+/turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"K" = (
-/obj/machinery/power/port_gen/pacman,
-/obj/structure/cable/yellow{
-	icon_state = "0-8"
+"LQ" = (
+/obj/structure/table,
+/obj/item/radio/intercom/wideband/table{
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"L" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+"MX" = (
+/obj/machinery/computer/helm{
 	dir = 8
 	},
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"M" = (
-/obj/machinery/portable_atmospherics/canister/air,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
-	dir = 4
+"Nq" = (
+/obj/machinery/button/door{
+	dir = 4;
+	pixel_y = 7;
+	pixel_x = -23;
+	id = "sierra_window";
+	name = "Sierra Windows"
 	},
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
+/obj/machinery/button/door{
+	dir = 4;
+	pixel_y = -6;
+	pixel_x = -23;
+	id = "sierra_engine";
+	name = "Sierra Engine Blast Doors"
 	},
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Nr" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"N" = (
-/obj/machinery/atmospherics/components/binary/pump/layer2,
-/obj/machinery/atmospherics/components/binary/pump/layer4{
+"OB" = (
+/obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 2
+	},
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "0-1"
 	},
-/turf/open/floor/plasteel/dark,
+/obj/machinery/door/window,
+/obj/machinery/door/poddoor/preopen{
+	id = "sierra_engine"
+	},
+/turf/open/floor/plating,
 /area/ship/bridge)
-"O" = (
+"Ph" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
+	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"P" = (
-/obj/machinery/power/terminal,
-/obj/structure/table,
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"Q" = (
+"Pp" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/door/firedoor/border_only,
@@ -442,178 +427,228 @@
 	},
 /turf/open/floor/plating,
 /area/ship/bridge)
-"R" = (
+"Ql" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"S" = (
-/obj/machinery/power/terminal{
+"QJ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 8
 	},
 /obj/structure/cable/yellow{
-	icon_state = "0-4"
+	icon_state = "1-2"
 	},
-/obj/item/storage/toolbox/emergency,
-/obj/item/storage/toolbox/electrical,
-/obj/item/storage/toolbox/mechanical,
-/obj/structure/cable,
-/obj/item/stack/sheet/mineral/plasma/ten,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"T" = (
-/obj/machinery/computer/helm{
+"QQ" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 23
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"U" = (
-/obj/structure/sign/number/random,
-/turf/closed/wall/mineral/titanium,
-/area/ship/bridge)
-"V" = (
-/obj/machinery/light/directional/east,
+"Se" = (
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/machinery/stasis,
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"W" = (
-/turf/closed/wall/mineral/titanium,
-/area/ship/bridge)
-"X" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+"Te" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/obj/structure/railing{
+	dir = 4;
+	layer = 4.1
+	},
+/obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"Y" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+"We" = (
+/obj/machinery/light/directional/east,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Yw" = (
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/machinery/light_switch{
-	dir = 8;
-	pixel_x = 23
+/obj/structure/closet/firecloset/wall/directional/south,
+/obj/machinery/atmospherics/components/binary/pump/layer4{
+	dir = 4;
+	name = "Off Ship Scrubber Network";
+	desc = "This pumps vents gasses outside the ship. Not to be used when docked inside a hangerbay. A pump that moves gas by pressure."
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"Z" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
+"YC" = (
+/obj/machinery/power/apc/auto_name/directional/east{
+	locked = 0
 	},
 /obj/structure/cable/yellow{
-	icon_state = "4-8"
+	icon_state = "0-8"
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
+"YK" = (
+/obj/structure/sign/number/random,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/bridge)
+"YW" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/bridge)
+"Zb" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Zc" = (
+/obj/structure/grille,
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/poddoor/shutters{
+	dir = 8;
+	id = "sierra_window"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"ZM" = (
+/obj/structure/grille,
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/poddoor/shutters{
+	id = "sierra_window"
+	},
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/turf/open/floor/plating,
+/area/ship/bridge)
 
 (1,1,1) = {"
-k
-W
-l
-l
-l
-l
-W
-k
+jt
+YW
+mV
+mV
+mV
+mV
+YW
+jt
 "}
 (2,1,1) = {"
-y
-l
-g
-z
-R
-p
-l
-f
+ir
+mV
+sQ
+Fd
+Ql
+rm
+mV
+Kh
 "}
 (3,1,1) = {"
-j
-d
-b
-X
-G
-P
-F
-x
+kP
+OB
+Se
+Nr
+LB
+wt
+mw
+KH
 "}
 (4,1,1) = {"
-l
-l
-D
-I
-n
-c
-l
-l
+mV
+mV
+cD
+Ph
+Jc
+Te
+mV
+mV
 "}
 (5,1,1) = {"
-v
-C
-o
-L
-m
-M
-w
-l
+vv
+bw
+Km
+QJ
+od
+cT
+Ad
+mV
 "}
 (6,1,1) = {"
-Q
-N
-s
-t
-Z
-O
-S
-J
+Pp
+qU
+vG
+GN
+ey
+CJ
+EW
+YK
 "}
 (7,1,1) = {"
-l
-A
-B
-Y
-a
-A
-K
-J
+mV
+eX
+iC
+QQ
+YC
+Zb
+wZ
+YK
 "}
 (8,1,1) = {"
-W
-l
-W
-W
-W
-u
-l
-U
+YW
+mV
+YW
+YW
+YW
+Yw
+mV
+cs
 "}
 (9,1,1) = {"
-k
-H
-h
-e
-q
-V
-H
-k
+jt
+wD
+qg
+KM
+Nq
+We
+ZM
+jR
 "}
 (10,1,1) = {"
-k
-W
-l
-T
-r
-l
-W
-k
+jt
+YW
+mV
+MX
+LQ
+mV
+YW
+jt
 "}
 (11,1,1) = {"
-k
-k
-W
-E
-E
-W
-k
-k
+jt
+jt
+YW
+Zc
+Zc
+YW
+jt
+jt
 "}