diff --git a/_maps/_mod_celadon/shuttles/independent/independent_bubble.dmm b/_maps/_mod_celadon/shuttles/independent/independent_bubble.dmm
index c34ad8349987..731811045922 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_bubble.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_bubble.dmm
@@ -1,407 +1,280 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"bb" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 6
-	},
-/obj/effect/landmark/start/assistant,
+"au" = (
+/obj/structure/catwalk/over,
 /turf/open/floor/plating,
-/area/ship/maintenance/starboard)
-"bv" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/effect/turf_decal/ntspaceworks_big/seven{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt/dust,
+/area/ship/cargo)
+"aV" = (
 /turf/open/floor/plating,
-/area/ship/maintenance/aft)
-"bZ" = (
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 4
-	},
-/obj/machinery/door/airlock/maintenance_hatch{
+/area/ship/external)
+"bc" = (
+/obj/machinery/power/shuttle/engine/electric{
 	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance/aft)
-"ck" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
+	icon_state = "0-4"
 	},
-/obj/effect/landmark/observer_start,
-/turf/open/floor/plasteel/mono,
-/area/ship/hallway/central)
-"cF" = (
-/obj/effect/turf_decal/corner/opaque/yellow/border,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"cG" = (
-/obj/machinery/advanced_airlock_controller{
+/obj/machinery/door/poddoor/shutters{
 	dir = 4;
-	pixel_x = -25
-	},
-/obj/machinery/atmospherics/components/binary/dp_vent_pump{
-	dir = 8
+	id = "thr"
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
-"cH" = (
-/obj/item/wrench/old,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
+/area/ship/maintenance/aft)
+"bf" = (
+/obj/structure/frame/machine,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel,
+/area/ship/science)
+"bn" = (
+/obj/machinery/light_switch{
+	pixel_x = 11;
+	pixel_y = 23
 	},
-/obj/effect/turf_decal/corner/opaque/yellow{
+/obj/machinery/power/smes/engineering,
+/obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/obj/effect/landmark/start/station_engineer,
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"da" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/obj/effect/turf_decal/ntspaceworks_big/three{
+/obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
-/turf/open/floor/plating,
-/area/ship/maintenance/aft)
-"ec" = (
-/obj/structure/fans/tiny,
-/obj/effect/turf_decal/siding/thinplating,
-/obj/machinery/door/poddoor{
-	id = "bubbledoors";
-	name = "Cargo Bay Blast Door"
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-4"
 	},
 /turf/open/floor/plating,
-/area/ship/cargo)
-"ep" = (
-/obj/machinery/atmospherics/components/unary/tank/toxins,
-/turf/open/floor/plating,
-/area/ship/maintenance/aft)
-"eT" = (
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
+/area/ship/engineering)
+"bG" = (
+/obj/structure/window/reinforced/spawner/east,
 /obj/effect/turf_decal/corner/opaque/purple{
 	dir = 10
 	},
-/turf/open/floor/plasteel,
-/area/ship/science)
-"eU" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/blue/border{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/mono,
-/area/ship/hallway/central)
-"fs" = (
-/obj/item/stack/sheet/metal/five,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/autolathe,
 /obj/item/stack/sheet/glass,
-/obj/effect/turf_decal/corner/opaque/purple{
-	dir = 10
-	},
-/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/stack/sheet/metal/five,
 /turf/open/floor/plasteel,
 /area/ship/science)
-"fI" = (
+"cg" = (
+/obj/structure/crate_shelf,
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/plasteel/fifty,
+/obj/item/pipe_dispenser,
+/obj/item/construction/plumbing,
+/obj/item/construction/rcd/arcd,
+/obj/item/construction/rcd/combat,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"cM" = (
 /obj/machinery/power/terminal{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/effect/turf_decal/ntspaceworks_big/five{
-	dir = 8
-	},
-/obj/machinery/light_switch{
-	pixel_x = 8;
-	pixel_y = 23
+/obj/machinery/button/door{
+	dir = 2;
+	pixel_y = 23;
+	id = "thr"
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/aft)
-"fS" = (
-/obj/structure/rack,
-/obj/item/storage/bag/ore,
-/obj/item/pickaxe,
-/obj/item/mining_scanner,
-/obj/item/pickaxe,
-/obj/item/storage/bag/ore,
-/obj/item/mining_scanner,
-/obj/machinery/firealarm/directional/west,
-/obj/effect/turf_decal/corner/opaque/brown{
+"cO" = (
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/catwalk/over,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"dv" = (
+/obj/effect/turf_decal/corner/opaque/purple{
 	dir = 9
 	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"gl" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/ship/external)
-"gz" = (
-/obj/effect/turf_decal/corner/opaque/brown{
+/obj/structure/frame/computer{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
+/area/ship/science)
+"dy" = (
+/obj/effect/turf_decal/corner/opaque/purple/border,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 10
+	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"dI" = (
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"gM" = (
-/obj/machinery/vending/clothing,
+/obj/machinery/door/airlock/maintenance_hatch,
+/turf/open/floor/plasteel/mono,
+/area/ship/bridge)
+"ew" = (
+/obj/structure/bed,
+/obj/item/bedsheet/dorms,
+/obj/structure/curtain/bounty,
 /turf/open/floor/carpet,
 /area/ship/crew/dorm)
-"hc" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/obj/machinery/light/broken/directional/east,
-/obj/effect/turf_decal/ntspaceworks_big/two{
-	dir = 8
-	},
-/turf/open/floor/plating/rust,
-/area/ship/maintenance/aft)
-"hh" = (
-/obj/effect/spawner/structure/window/reinforced/shutters,
-/turf/open/floor/plating,
-/area/ship/bridge)
-"hl" = (
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/corner/opaque/purple/border,
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"hq" = (
+"eI" = (
 /obj/structure/frame/computer{
 	dir = 8
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/machinery/airalarm/directional/north,
 /obj/effect/turf_decal/corner/opaque/blue/three_quarters{
 	dir = 8
 	},
-/obj/machinery/airalarm/directional/north,
 /turf/open/floor/plasteel,
 /area/ship/bridge)
-"hs" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
-	dir = 4
+"eM" = (
+/obj/effect/turf_decal/corner/opaque/brown/border{
+	dir = 1
 	},
-/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/door/window/eastright,
-/obj/structure/window/reinforced/spawner/north,
-/obj/structure/window/reinforced/spawner,
-/turf/open/floor/plating,
-/area/ship/maintenance/aft)
-"hE" = (
-/obj/structure/sign/poster/official/nanotrasen_logo{
-	pixel_x = 32
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/corner/opaque/yellow/border,
-/obj/effect/turf_decal/corner/opaque/blue/border{
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"gf" = (
+/turf/closed/wall,
+/area/ship/maintenance/starboard)
+"gA" = (
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = 11;
-	pixel_y = -20
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"im" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/area/ship/bridge)
+"gK" = (
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/corner/opaque/green/border{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
+/obj/structure/reagent_dispensers/water_cooler,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"gZ" = (
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+/obj/machinery/door/firedoor/border_only,
+/obj/effect/turf_decal/corner/opaque/brown/mono,
+/obj/machinery/mineral/ore_redemption,
+/turf/open/floor/plasteel/mono,
+/area/ship/cargo)
+"hk" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/mono,
-/area/ship/hallway/central)
-"jr" = (
-/obj/item/bedsheet/dorms,
-/obj/structure/bed,
-/obj/structure/curtain/bounty,
-/obj/effect/turf_decal/siding/wood{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/item/wrench,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
 	},
-/turf/open/floor/wood,
-/area/ship/crew/dorm)
-"jz" = (
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 9
+/turf/open/floor/plasteel,
+/area/ship/engineering)
+"ic" = (
+/obj/machinery/door/poddoor{
+	id = "bubbledoors";
+	name = "Cargo Bay Blast Door"
 	},
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
-"jI" = (
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "2-8"
 	},
 /obj/structure/cable{
-	icon_state = "1-4"
+	icon_state = "2-4"
 	},
-/turf/open/floor/plating/rust,
-/area/ship/maintenance/aft)
-"jM" = (
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 8;
-	name = "engine fuel pump"
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/cargo)
+"ii" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plating,
-/area/ship/maintenance/aft)
-"jW" = (
+/turf/open/floor/plasteel,
+/area/ship/science)
+"ix" = (
+/obj/effect/turf_decal/corner/opaque/purple/border,
+/obj/machinery/airalarm/directional/west,
+/obj/item/kirbyplants/random,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"iP" = (
+/turf/closed/wall,
+/area/ship/engineering)
+"jk" = (
 /obj/machinery/computer/helm{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 9
-	},
 /obj/effect/turf_decal/corner/opaque/blue/half{
 	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/ship/bridge)
-"kn" = (
-/obj/machinery/ore_silo,
-/obj/item/multitool,
-/obj/effect/turf_decal/corner/opaque/brown/half{
-	dir = 8
+"jE" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/structure/catwalk/over,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/plasteel,
+/turf/open/floor/plating,
 /area/ship/cargo)
-"kW" = (
-/obj/structure/window/reinforced/spawner/east,
-/obj/machinery/autolathe,
-/obj/effect/turf_decal/corner/opaque/purple{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/ship/science)
-"ln" = (
-/obj/machinery/power/terminal{
-	dir = 1
-	},
-/obj/structure/cable/yellow{
-	icon_state = "0-2"
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
+"ka" = (
+/obj/structure/bed,
+/obj/item/bedsheet/dorms,
+/obj/structure/curtain/bounty,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -11;
+	pixel_y = -20
 	},
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"lt" = (
+/turf/open/floor/carpet,
+/area/ship/crew/dorm)
+"kf" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /turf/open/floor/carpet,
 /area/ship/crew/dorm)
-"lN" = (
-/obj/machinery/power/smes/engineering,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"mg" = (
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/corner/opaque/green/border{
-	dir = 1
+"ki" = (
+/obj/machinery/ore_silo,
+/obj/item/multitool,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = 11
 	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"mV" = (
-/turf/closed/wall,
+/obj/machinery/firealarm/directional/west,
+/obj/structure/catwalk/over,
+/turf/open/floor/plating,
 /area/ship/cargo)
-"mY" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 9
-	},
+"kq" = (
 /turf/closed/wall,
-/area/ship/engineering)
-"ny" = (
-/obj/structure/window/reinforced/spawner/east,
-/obj/structure/frame/machine,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/machinery/light_switch{
-	pixel_x = 8;
-	pixel_y = 23
+/area/ship/maintenance/port)
+"kK" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/ship/science)
-"nH" = (
+"kU" = (
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plating,
+/area/ship/external)
+"lC" = (
 /turf/closed/wall,
-/area/ship/science)
-"nS" = (
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"nV" = (
-/obj/machinery/door/airlock{
-	name = "Dormitories"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/area/ship/maintenance/aft)
+"lG" = (
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = -11
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/green/mono,
-/turf/open/floor/plasteel/mono,
-/area/ship/crew/dorm)
-"op" = (
-/turf/closed/wall,
-/area/ship/maintenance/port)
-"pt" = (
-/obj/structure/table/wood,
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/closet/wall/blue{
+	pixel_y = 32
 	},
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/firealarm/directional/south,
 /obj/item/areaeditor/shuttle,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
@@ -410,1260 +283,1420 @@
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
-/turf/open/floor/wood,
-/area/ship/crew/dorm)
-"qi" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/structure/cable{
+	icon_state = "0-2"
 	},
-/obj/machinery/light/directional/south,
-/obj/item/storage/toolbox/mechanical,
 /turf/open/floor/plasteel,
-/area/ship/cargo)
-"qq" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/purple/border,
+/area/ship/bridge)
+"lV" = (
+/obj/effect/turf_decal/corner/opaque/yellow/border,
+/obj/structure/frame/machine,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
-"qY" = (
-/obj/item/kirbyplants/random,
-/obj/item/storage/box/rndboards{
-	desc = "Smells feighntly of plastic.";
-	name = "research equipment"
+"mo" = (
+/obj/machinery/power/terminal{
+	dir = 8
 	},
-/obj/machinery/light/directional/north,
-/obj/item/radio/intercom/wideband/directional/west,
-/turf/open/floor/plasteel,
-/area/ship/bridge)
-"rf" = (
-/obj/machinery/door/airlock/maintenance_hatch{
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"mt" = (
+/obj/structure/sink{
+	dir = 8;
+	pixel_x = 14
+	},
+/obj/machinery/shower{
+	dir = 8;
+	pixel_y = 11
+	},
+/obj/structure/mirror{
+	pixel_x = 28
+	},
+/obj/structure/toilet{
+	pixel_y = 7
+	},
+/turf/open/floor/plating/rust,
+/area/ship/maintenance/port)
+"nd" = (
+/obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 8
+/turf/open/floor/plating,
+/area/ship/external)
+"ni" = (
+/obj/effect/landmark/observer_start,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
-"sk" = (
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"nm" = (
+/obj/effect/turf_decal/corner/opaque/brown/mono,
+/obj/machinery/door/airlock/glass_large,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
+/turf/open/floor/plasteel/mono,
+/area/ship/cargo)
+"nK" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/green/border{
+/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"ss" = (
-/obj/structure/frame/computer{
-	dir = 8
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+/turf/open/floor/plating,
+/area/ship/external)
+"nM" = (
+/obj/structure/rack,
+/obj/machinery/airalarm/directional/west,
+/obj/item/pickaxe,
+/obj/item/pickaxe,
+/obj/item/storage/bag/ore,
+/obj/item/storage/bag/ore,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/mining_scanner,
+/obj/item/mining_scanner,
+/obj/structure/catwalk/over,
+/turf/open/floor/plating,
+/area/ship/cargo)
+"nR" = (
+/obj/effect/turf_decal/corner/opaque/brown/mono,
+/obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/obj/effect/turf_decal/corner/opaque/blue/three_quarters,
-/obj/machinery/firealarm/directional/south,
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = 11;
-	pixel_y = -20
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plasteel/mono,
+/area/ship/cargo)
+"od" = (
+/obj/structure/cable{
+	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel,
-/area/ship/bridge)
-"uw" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable,
-/obj/machinery/power/ship_gravity,
-/turf/open/floor/plating/rust,
+/obj/structure/crate_shelf,
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 6
+	},
+/turf/open/floor/plating,
 /area/ship/maintenance/aft)
-"uE" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+"oO" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/ship/science)
+"oU" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/obj/item/toy/plush/lizardplushie{
+	color = "cyan"
+	},
+/obj/item/clothing/head/wig/random{
+	pixel_x = -1;
+	pixel_y = -4
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"py" = (
+/obj/effect/turf_decal/corner/opaque/blue/border{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/holopad/emergency/command,
-/turf/open/floor/plasteel,
-/area/ship/bridge)
-"uL" = (
-/obj/effect/turf_decal/corner/opaque/yellow/border,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
-"vB" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+"pF" = (
+/obj/effect/turf_decal/corner/opaque/yellow/mono,
+/obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/engineering/glass,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
-/area/ship/science)
-"vO" = (
+/turf/open/floor/plasteel/mono,
+/area/ship/engineering)
+"pL" = (
+/obj/machinery/atmospherics/components/unary/portables_connector,
+/obj/machinery/portable_atmospherics/canister/toxins,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"pR" = (
+/obj/effect/turf_decal/corner/opaque/purple/mono,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/airlock/research/glass,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/light/directional/east,
-/obj/effect/turf_decal/number/zero{
-	dir = 8
+/turf/open/floor/plasteel/mono,
+/area/ship/science)
+"qs" = (
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/airlock/maintenance_hatch{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/cargo)
+"qu" = (
+/obj/structure/safe/floor,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"qN" = (
+/obj/structure/crate_shelf,
+/obj/structure/closet/crate/engineering,
+/obj/item/circuitboard/computer/selling_pad_control,
+/obj/item/circuitboard/machine/selling_pad,
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 9
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"rb" = (
+/obj/effect/turf_decal/corner/opaque/green/border{
+	dir = 1
+	},
+/obj/structure/table,
+/obj/item/storage/box/donkpockets{
+	pixel_x = -8
+	},
+/obj/item/storage/box/donkpockets{
+	pixel_y = 5;
+	pixel_x = -8
 	},
-/turf/open/floor/plating,
-/area/ship/maintenance/aft)
-"vR" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/closed/wall,
-/area/ship/science)
-"vS" = (
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/mineral/plasma/fifty,
-/obj/item/stack/sheet/mineral/uranium/five,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 4
+/obj/item/storage/box/donkpockets{
+	pixel_x = 8
 	},
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/east,
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"wz" = (
-/obj/effect/turf_decal/corner/opaque/brown/half{
-	dir = 4
+/obj/item/storage/box/donkpockets{
+	pixel_y = 5;
+	pixel_x = 8
 	},
-/obj/machinery/button/door{
-	id = "bubbledoors";
-	name = "Blast Door Control";
-	pixel_x = 25
+/obj/item/storage/box/donkpockets{
+	pixel_y = 10;
+	pixel_x = 8
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/machinery/suit_storage_unit/independent/mining,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"wH" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 4
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = -11
 	},
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/turf/open/floor/plating,
-/area/ship/external)
-"wO" = (
-/obj/structure/fans/tiny,
-/obj/effect/turf_decal/siding/thinplating,
-/obj/machinery/door/poddoor{
-	id = "bubbledoors";
-	name = "Cargo Bay Blast Door"
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"rc" = (
+/obj/structure/window/reinforced/spawner/east,
+/obj/structure/rack,
+/obj/item/storage/toolbox/mechanical{
+	pixel_y = 5
 	},
-/obj/effect/turf_decal/industrial/warning/corner{
+/obj/item/storage/toolbox/electrical,
+/obj/item/multitool,
+/turf/open/floor/plasteel,
+/area/ship/science)
+"rd" = (
+/obj/item/soap,
+/turf/open/floor/plating/rust,
+/area/ship/maintenance/port)
+"rv" = (
+/obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/ship/cargo)
-"xm" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 4;
-	name = "Helm"
+/area/ship/external)
+"rx" = (
+/obj/machinery/vending/clothing,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/carpet,
+/area/ship/crew/dorm)
+"rV" = (
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/maintenance_hatch,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/mono,
+/area/ship/bridge)
+"sg" = (
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "6-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "1-6"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"sk" = (
+/obj/effect/turf_decal/corner/opaque/brown/border{
 	dir = 1
 	},
-/obj/effect/landmark/start/captain,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/plasteel,
-/area/ship/bridge)
-"xC" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 5
+/area/ship/hallway/central)
+"tv" = (
+/obj/docking_port/stationary{
+	width = 30;
+	height = 15;
+	dwidth = 15;
+	dir = 2
+	},
+/turf/template_noop,
+/area/template_noop)
+"tQ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"uE" = (
+/obj/machinery/door/airlock/external,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/engineering)
+"vf" = (
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 1
 	},
 /turf/open/floor/plating,
 /area/ship/external)
-"xX" = (
+"vQ" = (
 /obj/effect/turf_decal/industrial/warning{
-	dir = 10
-	},
-/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{
 	dir = 1
 	},
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/power/port_gen/pacman,
+/obj/machinery/light/directional/east,
 /turf/open/floor/plating,
-/area/ship/external)
-"yb" = (
-/obj/machinery/door/airlock/research/glass,
-/obj/structure/cable{
-	icon_state = "1-2"
+/area/ship/engineering)
+"wf" = (
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/purple/mono,
-/turf/open/floor/plasteel/mono,
-/area/ship/science)
-"yw" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/airlock/maintenance_hatch{
+	dir = 4
 	},
-/turf/open/floor/plasteel/mono,
-/area/ship/hallway/central)
-"zu" = (
-/obj/machinery/door/airlock/engineering/glass,
-/obj/effect/turf_decal/corner/opaque/yellow/mono,
 /turf/open/floor/plasteel/mono,
 /area/ship/engineering)
-"zy" = (
-/turf/closed/wall,
-/area/ship/maintenance/starboard)
-"Ak" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/effect/turf_decal/number/two{
+"ws" = (
+/obj/machinery/computer/cargo/express{
 	dir = 8
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/corner/opaque/blue/three_quarters,
+/obj/machinery/button/door{
+	dir = 1;
+	pixel_y = -23;
+	id = "bridge"
 	},
-/turf/open/floor/plating/rust,
-/area/ship/maintenance/aft)
-"Ay" = (
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"wY" = (
+/turf/closed/wall,
+/area/ship/crew/dorm)
+"xe" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "2-4"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/plasteel/mono,
-/area/ship/hallway/central)
-"AR" = (
-/obj/docking_port/stationary{
-	width = 30;
-	height = 15;
-	dwidth = 15;
-	dir = 2
+/obj/structure/cable{
+	icon_state = "1-4"
 	},
-/turf/template_noop,
-/area/space)
-"AU" = (
-/obj/machinery/cryopod{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"yl" = (
+/obj/effect/turf_decal/corner/opaque/purple{
+	dir = 10
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 4
+/obj/machinery/power/apc/auto_name/directional/south{
+	pixel_y = -29
 	},
-/obj/machinery/light/directional/west,
-/turf/open/floor/carpet,
-/area/ship/crew/dorm)
-"BJ" = (
-/obj/structure/sign/departments/cargo{
-	pixel_y = 32
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -11;
+	pixel_y = -20
 	},
-/obj/effect/turf_decal/corner/opaque/brown/border{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"Cc" = (
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "0-1"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /turf/open/floor/plasteel,
 /area/ship/science)
-"Cg" = (
-/obj/machinery/door/airlock/maintenance_hatch{
+"yK" = (
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	id = "shield";
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 4
+/obj/machinery/door/poddoor{
+	id = "bubbledoors";
+	name = "Cargo Bay Blast Door"
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "0-4"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo)
-"Cu" = (
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/carpet,
-/area/ship/crew/dorm)
-"CP" = (
-/turf/closed/wall,
-/area/ship/bridge)
-"DP" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+"zo" = (
+/obj/effect/turf_decal/corner/opaque/green/border{
 	dir = 1
 	},
-/obj/machinery/airalarm/directional/east,
-/obj/effect/turf_decal/corner/opaque/brown/border{
-	dir = 1
+/obj/machinery/light_switch{
+	pixel_x = -13;
+	pixel_y = 23
 	},
-/obj/effect/turf_decal/corner/opaque/blue/border{
+/obj/structure/table,
+/obj/machinery/microwave{
+	pixel_y = 5
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"zu" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
-"Gf" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
+"zX" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/closed/wall,
+/area/ship/bridge)
+"Ae" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/structure/cable/yellow,
+/obj/effect/turf_decal/industrial/warning/corner{
 	dir = 4
 	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 10
+	},
+/obj/machinery/power/port_gen/pacman/super,
+/obj/machinery/airalarm/directional/south,
 /turf/open/floor/plating,
-/area/ship/external)
-"Gk" = (
-/obj/machinery/cryopod{
+/area/ship/engineering)
+"AR" = (
+/obj/structure/window/reinforced/spawner/west,
+/obj/structure/window/reinforced/spawner/north,
+/obj/structure/window/reinforced/spawner,
+/obj/machinery/atmospherics/components/unary/shuttle/heater{
 	dir = 4
 	},
-/obj/machinery/computer/cryopod/directional/north,
-/turf/open/floor/carpet,
-/area/ship/crew/dorm)
-"Gl" = (
 /turf/open/floor/plating,
-/area/ship/external)
-"Gp" = (
+/area/ship/maintenance/aft)
+"Bk" = (
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/ship/external)
-"GD" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
+/area/ship/engineering)
+"Cr" = (
+/obj/machinery/light/directional/east,
+/obj/structure/catwalk/over,
+/obj/machinery/suit_storage_unit/mining/eva,
+/turf/open/floor/plating,
+/area/ship/cargo)
+"CT" = (
+/obj/structure/crate_shelf,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/structure/window/reinforced/spawner/west,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"Dk" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/carpet,
+/area/ship/crew/dorm)
+"Dt" = (
 /obj/machinery/door/window/eastright,
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/science)
+"DN" = (
+/obj/structure/catwalk/over,
 /obj/structure/cable{
-	icon_state = "0-8"
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
+"DQ" = (
+/turf/closed/wall,
+/area/ship/cargo)
+"Ej" = (
+/obj/structure/reagent_dispensers/watertank,
+/turf/open/floor/plating/rust,
+/area/ship/maintenance/port)
+"Ew" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"ED" = (
+/obj/machinery/atmospherics/components/binary/pump{
+	name = "engine fuel pump"
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/aft)
-"GF" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/effect/turf_decal/corner/opaque/brown/border{
-	dir = 1
+"Fr" = (
+/obj/effect/turf_decal/corner/opaque/purple{
+	dir = 10
 	},
+/obj/item/kirbyplants/random,
+/obj/machinery/airalarm/directional/south,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"GH" = (
+/area/ship/science)
+"Fs" = (
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "5-8"
 	},
-/obj/effect/turf_decal/ntspaceworks_big/six{
-	dir = 8
+/obj/structure/cable{
+	icon_state = "2-5"
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/aft)
-"If" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+"FK" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 9
 	},
-/obj/effect/landmark/start/assistant,
 /turf/open/floor/plating,
-/area/ship/maintenance/port)
-"Iw" = (
-/obj/machinery/door/airlock/maintenance_hatch,
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 1
+/area/ship/external)
+"GD" = (
+/obj/machinery/holopad/emergency/command,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
 /area/ship/bridge)
-"IL" = (
-/obj/effect/turf_decal/industrial/warning{
+"GQ" = (
+/obj/machinery/light/directional/east,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
-/obj/structure/cable/yellow{
-	icon_state = "1-4"
-	},
-/obj/machinery/power/port_gen/pacman/super,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/structure/cable/yellow,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Je" = (
-/obj/effect/landmark/start/shaft_miner,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"Js" = (
-/obj/machinery/door/airlock/maintenance_hatch,
-/obj/effect/turf_decal/siding/thinplating,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /turf/open/floor/plating,
-/area/ship/bridge)
-"JG" = (
-/obj/structure/fans/tiny,
-/obj/effect/turf_decal/siding/thinplating,
-/obj/machinery/door/poddoor{
-	id = "bubbledoors";
-	name = "Cargo Bay Blast Door"
+/area/ship/maintenance/aft)
+"He" = (
+/obj/docking_port/mobile{
+	launch_status = 0;
+	port_direction = 8;
+	preferred_direction = 4;
+	dir = 2
 	},
-/obj/effect/turf_decal/industrial/warning/corner{
+/obj/machinery/door/airlock/external,
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/engineering)
+"HC" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"JU" = (
-/obj/machinery/power/terminal{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "0-4"
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"Iq" = (
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 8;
+	name = "engine fuel pump"
 	},
-/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/ship/maintenance/aft)
-"JZ" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 6
-	},
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/carpet,
-/area/ship/crew/dorm)
-"Ke" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+"Iy" = (
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "shield"
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/machinery/door/poddoor{
+	id = "bubbledoors";
+	name = "Cargo Bay Blast Door"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/turf/open/floor/plasteel,
-/area/ship/bridge)
-"KD" = (
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "0-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/cargo)
+"IM" = (
+/obj/machinery/power/shuttle/engine/fueled/plasma{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/purple/border,
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"KG" = (
-/obj/structure/frame/machine,
-/obj/effect/turf_decal/corner/opaque/purple/three_quarters{
-	dir = 1
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "thr"
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"Jo" = (
+/turf/closed/wall,
 /area/ship/science)
-"KQ" = (
-/obj/machinery/door/window/eastright,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+"Jq" = (
+/obj/machinery/computer/cryopod/directional/west,
+/obj/machinery/cryopod{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
-/turf/open/floor/plasteel,
-/area/ship/science)
-"Lk" = (
-/obj/structure/frame/machine,
-/obj/machinery/airalarm/directional/north,
-/obj/effect/turf_decal/corner/opaque/purple{
-	dir = 9
-	},
-/turf/open/floor/plasteel,
-/area/ship/science)
-"Ls" = (
+/obj/machinery/light/directional/north,
+/turf/open/floor/carpet,
+/area/ship/crew/dorm)
+"JG" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plating,
 /area/ship/engineering)
-"LK" = (
-/obj/item/bedsheet/dorms,
-/obj/structure/bed,
-/obj/structure/curtain/bounty,
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
+"Ka" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/mineral/plasma/fifty,
+/obj/item/stack/sheet/mineral/uranium/five,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
-/turf/open/floor/wood,
-/area/ship/crew/dorm)
-"Mu" = (
-/obj/machinery/firealarm/directional/south,
-/obj/effect/turf_decal/corner/opaque/purple/border,
 /turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"MJ" = (
-/turf/closed/wall,
 /area/ship/engineering)
-"MW" = (
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/plating,
-/area/ship/maintenance/aft)
-"MY" = (
-/obj/machinery/mineral/ore_redemption,
-/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"MZ" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 4
+"Kg" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/light_switch{
+	pixel_x = -13;
+	pixel_y = 23
 	},
 /obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/ntspaceworks_big/eight{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plating/rust,
-/area/ship/maintenance/aft)
-"Na" = (
-/obj/machinery/atmospherics/components/binary/pump{
-	name = "engine fuel pump"
-	},
-/obj/effect/turf_decal/ntspaceworks_big/one{
-	dir = 8
-	},
-/turf/open/floor/plating/rust,
-/area/ship/maintenance/aft)
-"Nf" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+	icon_state = "0-2"
 	},
-/obj/docking_port/mobile{
-	launch_status = 0;
-	port_direction = 8;
-	preferred_direction = 4;
-	dir = 2
+/turf/open/floor/carpet,
+/area/ship/crew/dorm)
+"Kk" = (
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "thr"
 	},
-/turf/open/floor/plating,
-/area/ship/external)
-"NN" = (
-/obj/structure/frame/computer{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "0-4"
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+/obj/machinery/power/shuttle/engine/electric{
 	dir = 4
 	},
-/obj/machinery/firealarm/directional/west,
-/obj/effect/turf_decal/corner/opaque/purple{
-	dir = 9
-	},
-/turf/open/floor/plasteel,
-/area/ship/science)
-"NX" = (
-/obj/effect/turf_decal/industrial/warning,
 /turf/open/floor/plating,
-/area/ship/external)
-"Ob" = (
-/turf/closed/wall,
 /area/ship/maintenance/aft)
-"OR" = (
-/obj/machinery/power/terminal{
-	dir = 8
+"KM" = (
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "2-8"
 	},
 /obj/structure/cable{
-	icon_state = "0-4"
+	icon_state = "1-8"
 	},
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/plasteel/fifty,
-/obj/item/pipe_dispenser,
-/obj/item/construction/rcd/arcd,
-/obj/item/construction/rcd/combat,
-/obj/item/construction/plumbing,
-/turf/open/floor/plating,
-/area/ship/maintenance/aft)
-"OY" = (
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel,
-/area/ship/bridge)
-"Rk" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 5
+/area/ship/hallway/central)
+"Nd" = (
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/turf/closed/wall,
-/area/ship/engineering)
-"Ry" = (
 /obj/structure/cable{
-	icon_state = "0-4"
+	icon_state = "1-8"
 	},
-/obj/machinery/power/apc/auto_name/directional/south,
 /turf/open/floor/plasteel,
-/area/ship/bridge)
-"RY" = (
-/obj/machinery/door/airlock/command/glass{
-	dir = 4
+/area/ship/engineering)
+"Nn" = (
+/obj/structure/cable{
+	icon_state = "4-9"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "4-10"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
 	},
-/obj/effect/turf_decal/corner/opaque/blue/mono,
-/turf/open/floor/plasteel/mono,
-/area/ship/bridge)
-"Sj" = (
 /obj/structure/cable{
-	icon_state = "0-2"
+	icon_state = "2-4"
 	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"No" = (
 /obj/machinery/power/apc/auto_name/directional/east,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/brown{
-	dir = 6
-	},
-/obj/machinery/suit_storage_unit/independent/mining,
 /obj/machinery/light_switch{
 	dir = 8;
 	pixel_x = 20;
-	pixel_y = 11
+	pixel_y = -12
 	},
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"Nw" = (
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/corner/opaque/purple/border,
+/obj/structure/tank_dispenser/oxygen,
 /turf/open/floor/plasteel,
-/area/ship/cargo)
-"Ss" = (
+/area/ship/hallway/central)
+"NA" = (
+/obj/effect/turf_decal/corner/opaque/purple/border,
+/obj/item/kirbyplants/random,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"NC" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = -11
+	},
 /obj/structure/cable{
-	icon_state = "0-8"
+	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/catwalk/over,
+/turf/open/floor/plating,
+/area/ship/cargo)
+"NR" = (
 /obj/effect/turf_decal/corner/opaque/green/border{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"Th" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/structure/cable{
-	icon_state = "1-8"
+	icon_state = "2-8"
 	},
-/obj/effect/turf_decal/number/five{
-	dir = 8
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"Pv" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/closed/wall,
+/area/ship/science)
+"PC" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/layer2{
+	dir = 1
 	},
+/obj/machinery/portable_atmospherics/canister/air,
 /turf/open/floor/plating,
-/area/ship/maintenance/aft)
-"TP" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
+/area/ship/maintenance/starboard)
+"QP" = (
 /obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 8
 	},
+/obj/machinery/firealarm/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/ship/engineering)
-"Ua" = (
-/obj/structure/sign/poster/official/build{
-	pixel_y = 32
-	},
-/obj/structure/tank_dispenser/oxygen,
-/obj/effect/turf_decal/corner/opaque/green/border{
-	dir = 1
+"Rb" = (
+/obj/effect/turf_decal/corner/opaque/yellow/border,
+/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,
 /area/ship/hallway/central)
-"Ul" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
-	dir = 1;
-	piping_layer = 4
+"RM" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
 	},
+/obj/machinery/light/directional/south,
 /turf/open/floor/plating,
-/area/ship/maintenance/starboard)
-"Uq" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 9
+/area/ship/external)
+"SR" = (
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
 	},
+/obj/structure/window/reinforced/spawner/west,
 /obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/effect/turf_decal/ntspaceworks_big/four{
-	dir = 8
+	icon_state = "0-8"
 	},
-/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/ship/maintenance/aft)
-"UC" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+"Tr" = (
+/turf/template_noop,
+/area/template_noop)
+"Ul" = (
+/obj/machinery/light_switch{
+	pixel_x = 11;
+	pixel_y = 23
 	},
-/obj/structure/cable/yellow{
-	icon_state = "0-8"
+/obj/effect/turf_decal/corner/opaque/purple{
+	dir = 9
+	},
+/obj/machinery/firealarm/directional/north,
+/obj/structure/frame/machine,
+/turf/open/floor/plasteel,
+/area/ship/science)
+"UP" = (
+/obj/effect/spawner/structure/window/reinforced/shutters,
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "bridge"
 	},
-/obj/machinery/power/port_gen/pacman,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/airalarm/directional/east,
 /turf/open/floor/plating,
-/area/ship/engineering)
-"Vt" = (
-/obj/machinery/atmospherics/pipe/layer_manifold,
-/turf/closed/wall,
-/area/ship/engineering)
-"Vw" = (
+/area/ship/bridge)
+"UR" = (
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+/obj/machinery/door/airlock/maintenance_hatch{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/landmark/start/assistant,
 /turf/open/floor/plasteel/mono,
-/area/ship/hallway/central)
-"VA" = (
+/area/ship/maintenance/aft)
+"Vu" = (
 /obj/machinery/power/terminal{
 	dir = 8
 	},
 /obj/structure/cable{
-	icon_state = "0-4"
+	icon_state = "0-1"
 	},
+/obj/machinery/power/ship_gravity,
 /turf/open/floor/plating,
 /area/ship/maintenance/aft)
-"VB" = (
-/turf/template_noop,
-/area/space)
-"VI" = (
-/obj/effect/turf_decal/corner/opaque/brown{
+"VC" = (
+/turf/closed/wall,
+/area/ship/bridge)
+"VO" = (
+/obj/effect/turf_decal/corner/opaque/purple/three_quarters{
 	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 4
-	},
-/obj/item/circuitboard/computer/selling_pad_control,
-/obj/item/circuitboard/machine/selling_pad,
-/obj/item/circuitboard/computer/cargo/express,
-/obj/structure/closet/crate/engineering,
+/obj/structure/frame/machine,
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/science)
 "VQ" = (
-/turf/closed/wall,
-/area/ship/crew/dorm)
-"Wx" = (
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/item/toy/plush/lizardplushie{
-	color = "cyan"
-	},
-/obj/item/clothing/head/wig/random{
-	pixel_x = -1;
-	pixel_y = -4
-	},
+/obj/machinery/airalarm/directional/east,
 /turf/open/floor/plating,
-/area/ship/maintenance/port)
-"WN" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
+/area/ship/maintenance/aft)
+"Wc" = (
+/obj/machinery/firealarm/directional/east,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = -12
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /turf/open/floor/plating,
-/area/ship/external)
-"Xn" = (
+/area/ship/maintenance/aft)
+"Wg" = (
 /obj/effect/turf_decal/industrial/warning{
-	dir = 9
+	dir = 5
 	},
 /turf/open/floor/plating,
 /area/ship/external)
-"Xy" = (
-/obj/machinery/door/airlock/mining/glass,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+"Wu" = (
+/obj/item/kirbyplants/random,
+/obj/machinery/firealarm/directional/west,
+/obj/machinery/light/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
-/obj/effect/turf_decal/corner/opaque/brown/mono,
-/turf/open/floor/plasteel/mono,
-/area/ship/cargo)
-"Ya" = (
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"Wx" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/structure/catwalk/over,
 /obj/structure/cable{
-	icon_state = "2-8"
+	icon_state = "1-2"
 	},
-/obj/machinery/firealarm/directional/north,
-/obj/machinery/light_switch{
-	pixel_x = 10;
-	pixel_y = 23
+/turf/open/floor/plating,
+/area/ship/cargo)
+"WF" = (
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 9
 	},
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"Yi" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/closet/firecloset/full,
 /turf/open/floor/plating,
-/area/ship/maintenance/port)
-"Ys" = (
-/obj/structure/rack,
-/obj/item/storage/toolbox/mechanical{
-	pixel_y = 5
+/area/ship/maintenance/aft)
+"Xr" = (
+/obj/effect/turf_decal/corner/opaque/blue/mono,
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
 	},
-/obj/item/storage/toolbox/electrical,
-/obj/item/multitool,
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel,
-/area/ship/science)
-"Zg" = (
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/airlock/command/glass{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "1-4"
+	icon_state = "4-8"
 	},
+/turf/open/floor/plasteel/mono,
+/area/ship/bridge)
+"XK" = (
+/obj/structure/table/wood,
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/carpet,
+/area/ship/crew/dorm)
+"Yc" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
 	},
-/turf/open/floor/plasteel/mono,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
-"ZB" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
+"Yh" = (
+/obj/machinery/button/shieldwallgen{
+	dir = 8;
+	pixel_y = 11;
+	pixel_x = 24;
+	id = "shield"
 	},
-/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/door/window/eastleft,
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/machinery/button/door{
+	dir = 8;
+	pixel_x = 26;
+	id = "bubbledoors";
+	pixel_y = 3
 	},
+/obj/structure/catwalk/over,
+/obj/machinery/suit_storage_unit/mining/eva,
 /turf/open/floor/plating,
-/area/ship/maintenance/aft)
-"ZM" = (
+/area/ship/cargo)
+"YL" = (
+/obj/effect/turf_decal/corner/opaque/green/mono,
+/obj/machinery/door/airlock{
+	name = "Dormitories"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 5
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/dorm)
+"ZG" = (
+/obj/effect/turf_decal/corner/opaque/brown/border{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 4
+	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = 11
 	},
-/obj/effect/landmark/start/scientist,
+/obj/machinery/firealarm/directional/east,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /turf/open/floor/plasteel,
-/area/ship/science)
-"ZQ" = (
-/obj/machinery/door/airlock/external,
-/turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/hallway/central)
+"ZT" = (
+/obj/effect/turf_decal/corner/opaque/yellow/border,
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 4
+	},
+/obj/structure/frame/computer{
+	anchored = 1;
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
 
 (1,1,1) = {"
-VB
-VB
-VB
-VB
-VB
-VB
-Ob
-wH
-Gf
-wH
-Ob
-VB
-VB
-VB
-VB
-VB
-VB
-VB
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+lC
+bc
+IM
+bc
+lC
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
 "}
 (2,1,1) = {"
-VB
-VB
-VB
-VB
-Ob
-wH
-Ob
-ZB
-hs
-GD
-Ob
-wH
-Ob
-VB
-VB
-VB
-VB
-VB
+Tr
+Tr
+Tr
+Tr
+lC
+Kk
+lC
+SR
+AR
+SR
+lC
+Kk
+lC
+Tr
+Tr
+Tr
+Tr
+Tr
 "}
 (3,1,1) = {"
-VB
-VB
-VB
-VB
-Ob
-ZB
-Ob
-JU
-jM
-VA
-Ob
-ZB
-Ob
-VB
-VB
-VB
-VB
-VB
+Tr
+Tr
+Tr
+Tr
+lC
+SR
+lC
+mo
+Iq
+mo
+lC
+SR
+lC
+Tr
+Tr
+Tr
+Tr
+Tr
 "}
 (4,1,1) = {"
-VB
-VB
-VB
-Ob
-Ob
-fI
-GH
-bv
-MZ
-jI
-MW
-OR
-Ob
-Ob
-VB
-VB
-VB
-VB
+Tr
+Tr
+Tr
+lC
+lC
+cM
+od
+sg
+qN
+Fs
+CT
+Vu
+lC
+lC
+Tr
+Tr
+Tr
+Tr
 "}
 (5,1,1) = {"
-VB
-VB
-VB
-Ob
-ep
-Na
-hc
-da
-Uq
-Th
-vO
-Ak
-uw
-Ob
-VB
-VB
-VB
-VB
+Tr
+Tr
+Tr
+lC
+pL
+ED
+WF
+Wc
+Nn
+GQ
+No
+VQ
+cg
+lC
+Tr
+Tr
+Tr
+Tr
 "}
 (6,1,1) = {"
-VB
-VB
-VQ
-VQ
-VQ
-VQ
-VQ
-Ob
-bZ
-Ob
-nH
-nH
-nH
-nH
-nH
-VB
-VB
-VB
+Tr
+Tr
+wY
+wY
+wY
+wY
+wY
+lC
+UR
+lC
+Jo
+Jo
+Jo
+Jo
+Jo
+Tr
+Tr
+Tr
 "}
 (7,1,1) = {"
-VB
-VB
-VQ
-Gk
-AU
-gM
-VQ
-Ua
-yw
-qq
-nH
-Lk
-NN
-KG
-nH
-VB
-VB
-VB
+Tr
+Tr
+wY
+Jq
+XK
+rx
+wY
+rb
+Yc
+ix
+Jo
+Ul
+dv
+VO
+Jo
+Tr
+Tr
+Tr
 "}
 (8,1,1) = {"
-VB
-VB
-VQ
-Cu
-JZ
-lt
-nV
-sk
-Zg
-KD
-yb
-Cc
-ZM
-eT
-nH
-VB
-VB
-VB
+Tr
+Tr
+wY
+Kg
+kf
+Dk
+YL
+NR
+xe
+dy
+pR
+ii
+oO
+yl
+Jo
+Tr
+Tr
+Tr
 "}
 (9,1,1) = {"
-VB
-Xn
-VQ
-jr
-LK
-pt
-VQ
-Ss
-Vw
-Mu
-nH
-Ys
-vB
-fs
-vR
-xX
-VB
-VB
+Tr
+FK
+wY
+ew
+ew
+ka
+wY
+zo
+HC
+NA
+Jo
+bf
+kK
+Fr
+Pv
+nK
+Tr
+Tr
 "}
 (10,1,1) = {"
-VB
-gl
-VQ
-VQ
-VQ
-VQ
-VQ
-mg
-ck
-hl
-nH
-ny
-KQ
-kW
-nH
-NX
-VB
-VB
+Tr
+RM
+wY
+wY
+wY
+wY
+wY
+gK
+ni
+Nw
+Jo
+rc
+Dt
+bG
+Jo
+kU
+Tr
+Tr
 "}
 (11,1,1) = {"
-Xn
-WN
-wO
-kn
-fS
-VI
-MY
-GF
-Ay
-uL
-MJ
-lN
-ln
-IL
-Vt
-Rk
-MJ
-VB
+FK
+vf
+yK
+ki
+nM
+NC
+gZ
+sk
+zu
+lV
+iP
+bn
+Bk
+Ae
+iP
+iP
+iP
+Tr
 "}
 (12,1,1) = {"
-Nf
-Gl
-ec
-nS
-Je
-qi
-mV
-BJ
-im
-cF
-zu
-TP
-cH
-Ls
-ZQ
-cG
-ZQ
-AR
+rv
+aV
+ic
+DN
+jE
+Wx
+nm
+eM
+KM
+Rb
+pF
+Nd
+hk
+JG
+uE
+cO
+He
+tv
 "}
 (13,1,1) = {"
-xC
-Gp
-JG
-wz
-Sj
-gz
-Xy
-DP
-eU
-hE
-MJ
-Ya
-vS
-UC
-Vt
-mY
-MJ
-VB
+Wg
+nd
+Iy
+Yh
+Cr
+au
+nR
+ZG
+py
+ZT
+iP
+QP
+Ka
+vQ
+iP
+iP
+iP
+Tr
 "}
 (14,1,1) = {"
-VB
-VB
-mV
-mV
-mV
-Cg
-mV
-CP
-RY
-CP
-CP
-rf
-MJ
-MJ
-MJ
-VB
-VB
-VB
+Tr
+Tr
+DQ
+DQ
+DQ
+qs
+DQ
+VC
+Xr
+VC
+VC
+wf
+iP
+iP
+iP
+Tr
+Tr
+Tr
 "}
 (15,1,1) = {"
-VB
-VB
-VB
-op
-Yi
-If
-CP
-qY
-uE
-Ry
-CP
-bb
-Ul
-zy
-VB
-VB
-VB
-VB
+Tr
+Tr
+Tr
+kq
+Ej
+rd
+VC
+lG
+GD
+Wu
+VC
+tQ
+PC
+gf
+Tr
+Tr
+Tr
+Tr
 "}
 (16,1,1) = {"
-VB
-VB
-VB
-op
-op
-Wx
-Js
-OY
-xm
-Ke
-Iw
-jz
-zy
-zy
-VB
-VB
-VB
-VB
+Tr
+Tr
+Tr
+kq
+kq
+mt
+dI
+qu
+gA
+Ew
+rV
+oU
+gf
+gf
+Tr
+Tr
+Tr
+Tr
 "}
 (17,1,1) = {"
-VB
-VB
-VB
-VB
-op
-op
-CP
-hq
-jW
-ss
-CP
-zy
-zy
-VB
-VB
-VB
-VB
-VB
+Tr
+Tr
+Tr
+Tr
+kq
+kq
+zX
+eI
+jk
+ws
+VC
+gf
+gf
+Tr
+Tr
+Tr
+Tr
+Tr
 "}
 (18,1,1) = {"
-VB
-VB
-VB
-VB
-VB
-VB
-CP
-hh
-hh
-hh
-CP
-VB
-VB
-VB
-VB
-VB
-VB
-VB
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+VC
+UP
+UP
+UP
+VC
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
 "}
 (19,1,1) = {"
-VB
-VB
-VB
-VB
-VB
-VB
-VB
-VB
-VB
-VB
-VB
-VB
-VB
-VB
-VB
-VB
-VB
-VB
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
 "}
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm
index fe5b89def293..a862e43d50e7 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -1258,8 +1258,8 @@
 /obj/item/clothing/mask/gas/syndicate,
 /obj/item/tank/internals/oxygen,
 /obj/item/clothing/shoes/magboots/syndie{
-	pixel_x = -6;
-	pixel_y = -5
+	pixel_x = -11;
+	pixel_y = -11
 	},
 /obj/item/clothing/suit/space/hardsuit/syndi/elite/oldsst,
 /turf/open/floor/plasteel/tech,