diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index e3c548bb41b..b2530293cff 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -1060,7 +1060,10 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
 	if(!depth || lying)
 		return
 
-	overlays_standing[WATER_LAYER] = image(icon = 'icons/mob/submerged.dmi', icon_state = "human_swimming_[depth]", layer = BODY_LAYER+WATER_LAYER) //TODO: Improve
+	var/atom/A = loc // We'd better be swimming and on a turf
+	var/image/I = image(icon = 'icons/mob/submerged.dmi', icon_state = "human_swimming_[depth]", layer = BODY_LAYER+WATER_LAYER) //TODO: Improve
+	I.color = A.color
+	overlays_standing[WATER_LAYER] = I
 
 	apply_layer(WATER_LAYER)
 
diff --git a/maps/tether/submaps/om_ships/aro2.dm b/maps/tether/submaps/om_ships/aro2.dm
index a5934fa3528..f484e9811bc 100644
--- a/maps/tether/submaps/om_ships/aro2.dm
+++ b/maps/tether/submaps/om_ships/aro2.dm
@@ -13,13 +13,13 @@
 	requires_power = 1
 
 /area/aro2/cockpit
-	name = "Aronai - Room1"
+	name = "Aronai - Cockpit"
 /area/aro2/room1
-	name = "Aronai - Room2"
+	name = "Aronai - Room1"
 /area/aro2/room2
-	name = "Aronai - Room3"
+	name = "Aronai - Room2"
 /area/aro2/room3
-	name = "Aronai - "
+	name = "Aronai - Room3"
 /area/aro2/frontroom
 	name = "Aronai - Front Living"
 /area/aro2/dining
@@ -44,6 +44,14 @@
 	requires_power = 1
 	dynamic_lighting = 1
 
+/turf/simulated/floor/water/indoors/surfluid
+	name = "surfluid pool"
+	desc = "A pool of inky-black fluid that shimmers oddly in the light if hit just right."
+	description_info = "Surfluid is KHI's main method of production, using swarms of nanites to process raw materials into finished products at the cost of immense amounts of energy."
+	color = "#222222"
+	outdoors = FALSE
+	reagent_type = "liquid_protean"
+
 // The 'ship'
 /obj/effect/overmap/visitable/ship/aro2
 	name = "spacecraft"
@@ -81,7 +89,7 @@
 /obj/effect/shuttle_landmark/shuttle_initializer/aroboat2
 	name = "Aronai's Boat Bay"
 	base_area = /area/aro2/boatdeck
-	base_turf = /turf/simulated/floor/reinforced
+	base_turf = /turf/simulated/floor/water/indoors/surfluid
 	landmark_tag = "omship_spawn_aroboat2"
 	docking_controller = "aroship2_boatbay"
 	shuttle_type = /datum/shuttle/autodock/overmap/aroboat2
diff --git a/maps/tether/submaps/om_ships/aro2.dmm b/maps/tether/submaps/om_ships/aro2.dmm
index cce9a6fdbc5..06d809e160e 100644
--- a/maps/tether/submaps/om_ships/aro2.dmm
+++ b/maps/tether/submaps/om_ships/aro2.dmm
@@ -3,39 +3,6 @@
 /obj/effect/overmap/visitable/ship/aro2,
 /turf/space,
 /area/space)
-"ab" = (
-/obj/effect/floor_decal/industrial/warning/full,
-/obj/machinery/power/pointdefense{
-	id_tag = "aroship"
-	},
-/obj/structure/cable/cyan{
-	d2 = 2;
-	icon_state = "0-2"
-	},
-/turf/simulated/floor/airless,
-/area/aro2/frontroom)
-"ac" = (
-/obj/effect/floor_decal/industrial/warning/full,
-/obj/machinery/power/pointdefense{
-	id_tag = "aroship"
-	},
-/obj/structure/cable/cyan{
-	d2 = 2;
-	icon_state = "0-2"
-	},
-/turf/simulated/floor/airless,
-/area/aro2/boatdeck)
-"ad" = (
-/obj/effect/floor_decal/industrial/warning/full,
-/obj/machinery/power/pointdefense{
-	id_tag = "aroship"
-	},
-/obj/structure/cable/cyan{
-	d2 = 2;
-	icon_state = "0-2"
-	},
-/turf/simulated/floor/airless,
-/area/aro2/room1)
 "ae" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
@@ -127,19 +94,6 @@
 	},
 /turf/simulated/wall/r_wall,
 /area/aro2/frontroom)
-"aq" = (
-/obj/structure/window/plastitanium/full,
-/obj/structure/window/plastitanium{
-	dir = 1
-	},
-/obj/machinery/door/blast/regular{
-	dir = 4;
-	icon_state = "pdoor1";
-	id = "aroshipshutter"
-	},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/frontroom)
 "ar" = (
 /turf/simulated/wall/rpshull,
 /area/aro2/boatdeck)
@@ -160,18 +114,9 @@
 "av" = (
 /turf/simulated/wall/rpshull,
 /area/aro2/room1)
-"ax" = (
-/turf/simulated/floor/carpet/blue,
-/area/aro2/frontroom)
 "az" = (
 /turf/simulated/wall/rpshull,
 /area/aro2/cockpit)
-"aA" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
 "aB" = (
 /turf/simulated/wall,
 /area/aro2/room1)
@@ -204,23 +149,17 @@
 /obj/item/weapon/bedsheet/bluedouble,
 /turf/simulated/floor/carpet/blue,
 /area/aro2/room1)
-"aF" = (
-/obj/structure/window/plastitanium/full,
-/obj/structure/window/plastitanium{
-	dir = 8
+"aI" = (
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/machinery/power/pointdefense{
+	id_tag = "aroship"
 	},
-/obj/machinery/door/blast/regular{
-	dir = 2;
-	icon_state = "pdoor1";
-	id = "aroshipshutter"
+/obj/structure/cable/cyan{
+	d2 = 8;
+	icon_state = "0-8"
 	},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/frontroom)
-"aH" = (
-/obj/structure/table/fancyblack,
-/turf/simulated/floor/carpet/blue,
-/area/aro2/frontroom)
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/boatdeck)
 "aK" = (
 /obj/machinery/door/blast/regular{
 	dir = 4;
@@ -232,44 +171,9 @@
 "aL" = (
 /turf/simulated/wall/r_wall,
 /area/aro2/cockpit)
-"aM" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 9
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
 "aN" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/simulated/floor/water/indoors/surfluid,
 /area/aro2/boatdeck)
-"aO" = (
-/obj/machinery/door/airlock,
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/room1)
 "aP" = (
 /obj/structure/cable/cyan{
 	icon_state = "1-8"
@@ -306,42 +210,14 @@
 	},
 /turf/simulated/floor/carpet/blue,
 /area/aro2/room1)
-"aS" = (
-/obj/structure/window/plastitanium/full,
-/obj/structure/window/plastitanium{
-	dir = 4
-	},
-/obj/machinery/door/blast/regular{
-	dir = 2;
-	icon_state = "pdoor1";
-	id = "aroshipshutter"
-	},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/room1)
 "aV" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 8
-	},
-/turf/simulated/floor/wood,
-/area/aro2/frontroom)
+/obj/effect/floor_decal/industrial/outline/blue,
+/obj/structure/closet/crate/secure/gear,
+/turf/simulated/floor/tiled/eris/dark/cargo,
+/area/shuttle/aroboat2)
 "aX" = (
 /turf/simulated/wall,
 /area/aro2/cockpit)
-"aY" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
 "aZ" = (
 /obj/structure/closet/secure_closet/personal,
 /obj/machinery/light{
@@ -378,28 +254,6 @@
 	},
 /turf/simulated/floor/carpet/blue,
 /area/aro2/room1)
-"bd" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/carpet/blue,
-/area/aro2/frontroom)
-"bg" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 4
-	},
-/obj/structure/cable/cyan{
-	icon_state = "1-8"
-	},
-/turf/simulated/floor/wood,
-/area/aro2/frontroom)
-"bh" = (
-/obj/structure/table/rack/shelf/steel,
-/obj/item/weapon/inducer/hybrid,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/frontroom)
 "bi" = (
 /obj/structure/window/plastitanium/full,
 /obj/structure/window/plastitanium{
@@ -408,59 +262,25 @@
 /obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/tiled/techmaint,
 /area/aro2/cockpit)
-"bj" = (
-/obj/machinery/computer/ship/navigation,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/cockpit)
-"bk" = (
-/obj/machinery/light{
-	dir = 4
-	},
+"bm" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/steel/cyancorner,
 /area/aro2/boatdeck)
-"bp" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 4
-	},
-/turf/simulated/floor/wood,
-/area/aro2/frontroom)
-"bq" = (
-/obj/structure/table/rack/shelf/steel,
-/obj/item/device/perfect_tele/alien,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/frontroom)
-"br" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 9
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/cockpit)
-"bs" = (
-/obj/machinery/computer/ship/helm{
-	req_one_access = list(101)
-	},
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/cockpit)
-"bt" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/cockpit)
 "bu" = (
 /obj/machinery/light{
 	dir = 1
@@ -470,22 +290,6 @@
 "bv" = (
 /turf/simulated/floor/tiled/techfloor,
 /area/aro2/cockpit)
-"bw" = (
-/obj/structure/bed/chair/bay/comfy/blue{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/cockpit)
-"bx" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/obj/machinery/firealarm{
-	dir = 8;
-	pixel_x = -24
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
 "by" = (
 /turf/simulated/wall,
 /area/aro2/room2)
@@ -510,74 +314,6 @@
 "bD" = (
 /turf/simulated/wall/rpshull,
 /area/aro2/room2)
-"bI" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 4
-	},
-/obj/machinery/firealarm{
-	dir = 1;
-	pixel_x = 0;
-	pixel_y = -25
-	},
-/turf/simulated/floor/wood,
-/area/aro2/frontroom)
-"bJ" = (
-/obj/structure/table/rack/shelf/steel,
-/obj/item/device/sleevemate,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/frontroom)
-"bK" = (
-/obj/machinery/computer/ship/engines{
-	dir = 4
-	},
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/cockpit)
-"bL" = (
-/obj/machinery/computer/ship/sensors{
-	dir = 8
-	},
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/cockpit)
-"bM" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"bN" = (
-/obj/machinery/door/airlock,
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/room2)
 "bO" = (
 /obj/structure/cable/cyan{
 	icon_state = "1-8"
@@ -606,19 +342,6 @@
 	},
 /turf/simulated/floor/carpet/gaycarpet,
 /area/aro2/room2)
-"bR" = (
-/obj/structure/window/plastitanium/full,
-/obj/structure/window/plastitanium{
-	dir = 4
-	},
-/obj/machinery/door/blast/regular{
-	dir = 2;
-	icon_state = "pdoor1";
-	id = "aroshipshutter"
-	},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/room2)
 "bS" = (
 /turf/simulated/wall/rpshull,
 /area/aro2/dining)
@@ -629,45 +352,18 @@
 /turf/simulated/wall,
 /area/aro2/dining)
 "bV" = (
-/obj/machinery/door/airlock/multi_tile/glass,
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/dining)
-"bW" = (
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/dining)
-"bX" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 10
-	},
-/obj/machinery/button/remote/blast_door{
+/obj/machinery/door/blast/regular{
 	dir = 4;
-	id = "aroshipshutter";
-	name = "exterior shutters";
-	pixel_x = -28
+	icon_state = "pdoor1";
+	id = "aroshipshutter"
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/cockpit)
-"bY" = (
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/cockpit)
-"bZ" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/cockpit)
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/frontroom)
 "cb" = (
 /obj/structure/table/steel,
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -711,52 +407,6 @@
 	},
 /turf/simulated/floor/carpet/gaycarpet,
 /area/aro2/room2)
-"cf" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 9
-	},
-/obj/structure/flora/pottedplant,
-/turf/simulated/floor/wood,
-/area/aro2/dining)
-"cg" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 1
-	},
-/obj/structure/bed/chair/wood,
-/turf/simulated/floor/wood,
-/area/aro2/dining)
-"ch" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 5
-	},
-/obj/machinery/computer/ship/navigation/telescreen{
-	pixel_y = 23
-	},
-/turf/simulated/floor/wood,
-/area/aro2/dining)
-"ci" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/dining)
-"cj" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 8
-	},
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/simulated/floor/wood,
-/area/aro2/dining)
 "ck" = (
 /obj/machinery/vending/food/arojoan{
 	dir = 8
@@ -839,48 +489,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/aro2/cockpit)
-"cq" = (
-/obj/machinery/button/remote/blast_door{
-	dir = 8;
-	id = "aroshipshutter";
-	name = "exterior shutters";
-	pixel_x = 28
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"cr" = (
-/obj/structure/window/plastitanium/full,
-/obj/structure/window/plastitanium{
-	dir = 8
-	},
-/obj/machinery/door/blast/regular{
-	dir = 2;
-	icon_state = "pdoor1";
-	id = "aroshipshutter"
-	},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/dining)
-"cs" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 8
-	},
-/obj/structure/bed/chair/wood{
-	dir = 4
-	},
-/turf/simulated/floor/wood,
-/area/aro2/dining)
 "ct" = (
 /obj/structure/table/fancyblack,
 /turf/simulated/floor/wood,
@@ -892,51 +500,19 @@
 	},
 /turf/simulated/floor/wood,
 /area/aro2/dining)
-"cv" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 4
-	},
-/obj/structure/bed/chair/wood{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/wood,
-/area/aro2/dining)
-"cw" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/dining)
-"cx" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 8
-	},
-/turf/simulated/floor/wood,
-/area/aro2/dining)
 "cy" = (
 /obj/machinery/vending/cola{
 	dir = 8
 	},
 /turf/simulated/floor/wood,
 /area/aro2/dining)
-"cz" = (
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/dining)
 "cA" = (
-/obj/machinery/door/airlock/multi_tile/glass,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/cockpit)
+/obj/structure/table/steel,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/boatdeck)
 "cB" = (
 /obj/structure/sign/poster{
 	dir = 1;
@@ -985,32 +561,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/aro2/dining)
-"cJ" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 4
-	},
-/obj/structure/bed/chair/wood{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/wood,
-/area/aro2/dining)
-"cK" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/dining)
 "cL" = (
 /obj/machinery/chemical_dispenser/bar_soft/full{
 	dir = 8
@@ -1018,138 +568,12 @@
 /obj/structure/table/steel,
 /turf/simulated/floor/wood,
 /area/aro2/dining)
-"cM" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"cN" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"cO" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"cP" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"cQ" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/machinery/computer/ship/navigation/telescreen{
-	pixel_y = 23
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"cR" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"cS" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
 "cT" = (
-/obj/machinery/door/airlock,
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
+/obj/machinery/door/airlock/multi_tile/glass{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/room3)
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/starboardbay)
 "cU" = (
 /obj/structure/cable/cyan{
 	icon_state = "1-8"
@@ -1178,63 +602,12 @@
 	},
 /turf/simulated/floor/carpet/purcarpet,
 /area/aro2/room3)
-"cX" = (
-/obj/structure/window/plastitanium/full,
-/obj/structure/window/plastitanium{
-	dir = 4
-	},
-/obj/machinery/door/blast/regular{
-	dir = 2;
-	icon_state = "pdoor1";
-	id = "aroshipshutter"
-	},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/room3)
 "cY" = (
 /obj/structure/bed/chair/wood{
 	dir = 1
 	},
 /turf/simulated/floor/wood,
 /area/aro2/dining)
-"cZ" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 4
-	},
-/turf/simulated/floor/wood,
-/area/aro2/dining)
-"da" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 10
-	},
-/turf/simulated/floor/wood,
-/area/aro2/dining)
-"db" = (
-/obj/effect/floor_decal/spline/fancy/wood,
-/obj/machinery/vending/snack{
-	dir = 8
-	},
-/turf/simulated/floor/wood,
-/area/aro2/dining)
-"dc" = (
-/obj/effect/floor_decal/corner_techfloor_grid,
-/obj/effect/floor_decal/techfloor/orange/corner,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"dd" = (
-/obj/structure/railing/grey,
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"de" = (
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 8
-	},
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
 "df" = (
 /obj/structure/closet/secure_closet/personal,
 /obj/machinery/light{
@@ -1271,71 +644,18 @@
 	},
 /turf/simulated/floor/carpet/purcarpet,
 /area/aro2/room3)
-"di" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 10
-	},
-/obj/machinery/alarm{
-	alarm_id = null;
-	breach_detection = 0;
-	dir = 1;
-	icon_state = "alarm0";
-	pixel_y = -22
-	},
-/turf/simulated/floor/wood,
-/area/aro2/dining)
-"dj" = (
-/obj/effect/floor_decal/spline/fancy/wood/corner{
-	dir = 8
-	},
-/turf/simulated/floor/wood,
-/area/aro2/dining)
 "dk" = (
 /turf/simulated/floor/wood,
 /area/aro2/dining)
-"dl" = (
-/obj/structure/railing/grey{
-	dir = 4
-	},
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
 "dm" = (
 /turf/simulated/floor/water/indoors,
 /area/aro2/boatdeck)
-"dn" = (
-/obj/structure/railing/grey{
-	dir = 8
-	},
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
 "do" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 10
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
 	},
-/obj/structure/flora/pottedplant/crystal,
-/obj/machinery/light,
-/turf/simulated/floor/wood,
-/area/aro2/dining)
-"dp" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/cockpit)
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
 "dq" = (
 /turf/simulated/floor/grass,
 /area/aro2/boatdeck)
@@ -1343,38 +663,8 @@
 /turf/simulated/wall,
 /area/aro2/boatdeck)
 "ds" = (
-/obj/structure/sink{
-	pixel_y = 21
-	},
-/obj/structure/cable/cyan{
-	d2 = 2;
-	icon_state = "0-2"
-	},
-/obj/machinery/power/apc{
-	cell_type = /obj/item/weapon/cell/super;
-	dir = 8;
-	name = "west bump";
-	pixel_x = -24
-	},
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/tiled/eris/dark,
 /area/aro2/boatdeck)
-"dt" = (
-/obj/structure/toilet{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/white,
-/area/aro2/boatdeck)
-"du" = (
-/obj/effect/floor_decal/industrial/warning/full,
-/obj/machinery/power/pointdefense{
-	id_tag = "aroship"
-	},
-/obj/structure/cable/cyan{
-	d2 = 4;
-	icon_state = "0-4"
-	},
-/turf/simulated/floor/airless,
-/area/aro2/dining)
 "dv" = (
 /obj/structure/cable/cyan{
 	d1 = 4;
@@ -1391,104 +681,10 @@
 	},
 /turf/simulated/wall/r_wall,
 /area/aro2/dining)
-"dy" = (
-/obj/effect/floor_decal/spline/fancy/wood/corner{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/wood,
-/area/aro2/dining)
-"dz" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/turf/simulated/floor/wood,
-/area/aro2/dining)
-"dA" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 1
-	},
-/turf/simulated/floor/wood,
-/area/aro2/dining)
-"dB" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 5
-	},
-/obj/machinery/button/remote/blast_door{
-	dir = 8;
-	id = "aroshipshutter";
-	name = "exterior shutters";
-	pixel_x = 28
-	},
-/obj/structure/closet/crate/bin,
-/turf/simulated/floor/wood,
-/area/aro2/dining)
 "dC" = (
 /obj/structure/flora/tree/jungle_small,
 /turf/simulated/floor/grass,
 /area/aro2/boatdeck)
-"dD" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"dE" = (
-/obj/machinery/door/airlock,
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"dF" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/structure/cable/cyan{
-	icon_state = "1-8"
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/white,
-/area/aro2/boatdeck)
 "dG" = (
 /obj/structure/cable/cyan{
 	d1 = 4;
@@ -1497,31 +693,6 @@
 	},
 /turf/simulated/wall/r_wall,
 /area/aro2/boatdeck)
-"dH" = (
-/obj/effect/floor_decal/industrial/warning/full,
-/obj/machinery/power/pointdefense{
-	id_tag = "aroship"
-	},
-/obj/structure/cable/cyan{
-	d2 = 8;
-	icon_state = "0-8"
-	},
-/turf/simulated/floor/airless,
-/area/aro2/boatdeck)
-"dI" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 8
-	},
-/obj/structure/table/steel,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 4
-	},
-/obj/machinery/firealarm{
-	dir = 8;
-	pixel_x = -24
-	},
-/turf/simulated/floor/wood,
-/area/aro2/dining)
 "dJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -1555,194 +726,81 @@
 	},
 /turf/simulated/floor/wood,
 /area/aro2/dining)
-"dM" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 4
-	},
-/obj/structure/table/steel,
-/obj/machinery/power/apc{
-	dir = 4;
-	name = "east bump";
-	pixel_x = 24
-	},
-/obj/structure/cable/cyan{
-	d2 = 8;
-	icon_state = "0-8"
-	},
-/turf/simulated/floor/wood,
-/area/aro2/dining)
-"dN" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"dO" = (
-/obj/machinery/shower{
-	dir = 8
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals10,
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 4
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 8
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 1
-	},
-/obj/machinery/alarm{
-	alarm_id = null;
-	breach_detection = 0;
-	dir = 1;
-	icon_state = "alarm0";
-	pixel_y = -22
-	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -24;
-	pixel_y = 6
-	},
-/turf/simulated/floor/tiled/white,
-/area/aro2/boatdeck)
-"dP" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 10
-	},
-/obj/structure/table/steel,
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/simulated/floor/wood,
-/area/aro2/dining)
 "dQ" = (
-/obj/effect/floor_decal/spline/fancy/wood,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/wood,
-/area/aro2/dining)
-"dR" = (
-/obj/effect/floor_decal/spline/fancy/wood,
+/obj/structure/table/steel,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/surfluid)
+"dU" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 1
 	},
-/turf/simulated/floor/wood,
-/area/aro2/dining)
-"dS" = (
-/obj/effect/floor_decal/spline/fancy/wood,
-/turf/simulated/floor/wood,
-/area/aro2/dining)
-"dT" = (
-/obj/effect/floor_decal/spline/fancy/wood,
-/obj/structure/table/steel,
-/turf/simulated/floor/wood,
-/area/aro2/dining)
-"dU" = (
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 6
-	},
-/obj/structure/table/steel,
-/turf/simulated/floor/wood,
-/area/aro2/dining)
-"dV" = (
-/obj/machinery/door/airlock/multi_tile/glass{
-	dir = 2
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/simulated/floor/tiled/eris/techmaint_panels,
 /area/aro2/dining)
 "dW" = (
 /obj/structure/sign/poster,
 /turf/simulated/wall,
 /area/aro2/dining)
-"dX" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"dY" = (
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 4
-	},
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"dZ" = (
-/obj/structure/railing/grey{
-	dir = 1
-	},
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
 "ea" = (
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 1
-	},
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"eb" = (
 /obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"eb" = (
+/obj/structure/railing/grey{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"ec" = (
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"ed" = (
-/obj/machinery/computer/ship/navigation/telescreen{
-	pixel_y = 23
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"ee" = (
-/obj/structure/railing/grey,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"ef" = (
-/obj/machinery/firealarm{
-	dir = 8;
-	pixel_x = -24
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"eg" = (
 /obj/structure/railing/grey{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/water/indoors/surfluid,
 /area/aro2/boatdeck)
-"eh" = (
-/obj/machinery/telecomms/allinone,
-/turf/simulated/floor/tiled/techfloor/grid,
+"eg" = (
+/obj/structure/table/steel,
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
 /area/aro2/boatdeck)
+"ei" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"ej" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/powerarea)
 "ek" = (
 /obj/structure/sign/poster{
 	dir = 1;
@@ -1751,103 +809,155 @@
 /turf/simulated/wall/r_wall,
 /area/aro2/boatdeck)
 "el" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"em" = (
-/obj/machinery/ntnet_relay,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"en" = (
-/obj/machinery/pointdefense_control{
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/machinery/power/pointdefense{
 	id_tag = "aroship"
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"eo" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
+/obj/structure/cable/cyan,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/powerarea)
+"en" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
 "ep" = (
-/obj/machinery/recharge_station,
-/turf/simulated/floor/tiled/techfloor,
+/obj/effect/floor_decal/industrial/loading{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"er" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"eD" = (
+/obj/machinery/door/airlock/multi_tile/glass,
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/dining)
+"eE" = (
+/obj/structure/table/steel,
+/obj/fiftyspawner/plasteel,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/powerarea)
+"eF" = (
+/obj/structure/railing/grey,
+/obj/structure/railing/grey{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark,
 /area/aro2/boatdeck)
-"eq" = (
+"eN" = (
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/portbay)
+"eP" = (
+/obj/machinery/door/airlock/multi_tile/glass,
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/cockpit)
+"eU" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/observation)
+"eV" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/aro2/frontroom)
+"eY" = (
+/obj/structure/railing/grey,
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"fh" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"fl" = (
+/obj/machinery/computer/ship/navigation/telescreen{
+	pixel_y = 23
+	},
+/obj/structure/table/steel,
+/obj/item/weapon/storage/toolbox/mechanical,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/airarea)
+"fm" = (
+/obj/machinery/light{
+	dir = 4
+	},
 /obj/structure/cable/cyan{
 	d1 = 2;
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"er" = (
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"fn" = (
 /obj/structure/cable/cyan{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -24;
+	pixel_y = 6
+	},
+/obj/machinery/vending/dinnerware{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/alarm{
-	alarm_id = null;
-	breach_detection = 0;
-	dir = 1;
-	icon_state = "alarm0";
-	pixel_y = -22
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"es" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"et" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"eu" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
+/turf/simulated/floor/wood,
+/area/aro2/dining)
+"fo" = (
 /obj/structure/cable/cyan{
 	d1 = 2;
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"ev" = (
-/obj/structure/railing/grey{
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
 /obj/structure/cable/cyan{
@@ -1855,63 +965,28 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"fu" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"ew" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
+	dir = 10
 	},
 /obj/structure/cable/cyan{
 	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"ex" = (
-/obj/structure/cable/cyan{
-	d2 = 8;
-	icon_state = "0-8"
-	},
-/obj/machinery/power/apc{
-	dir = 2;
-	name = "south bump";
-	pixel_y = -28
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable/cyan{
-	icon_state = "0-4"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"ey" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
+	d2 = 2;
+	icon_state = "1-2"
 	},
 /obj/structure/cable/cyan{
 	d1 = 2;
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"ez" = (
-/obj/machinery/door/airlock/multi_tile/glass,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/dining)
-"eA" = (
+/turf/simulated/floor/tiled/eris/steel/bar_flat,
+/area/aro2/frontroom)
+"fv" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
 	d2 = 2;
@@ -1920,215 +995,37 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/dining)
-"eB" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/eris/dark,
 /area/aro2/boatdeck)
-"eC" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"eD" = (
-/obj/machinery/embedded_controller/radio/simple_docking_controller{
-	frequency = 1380;
-	id_tag = "aroship2_boatbay";
-	pixel_y = 28
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"eF" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"eJ" = (
-/obj/machinery/button/remote/blast_door{
-	dir = 8;
-	id = "aroshipshutter";
-	name = "exterior shutters";
-	pixel_x = 28
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"eK" = (
+"fy" = (
+/turf/simulated/floor/tiled/eris/dark/cargo,
+/area/shuttle/aroboat2)
+"fA" = (
 /obj/effect/floor_decal/industrial/warning/full,
 /obj/machinery/power/pointdefense{
 	id_tag = "aroship"
 	},
 /obj/structure/cable/cyan{
-	d2 = 4;
-	icon_state = "0-4"
-	},
-/turf/simulated/floor/airless,
-/area/aro2/boatdeck)
-"eL" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"eM" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2"
+	icon_state = "0-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"eN" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/obj/machinery/computer/shuttle_control/explore/aroboat2,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"eO" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"eT" = (
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"eU" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
-"eV" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"eW" = (
-/obj/structure/window/plastitanium/full,
-/obj/structure/window/plastitanium{
-	dir = 8
-	},
-/obj/machinery/door/blast/regular{
-	dir = 2;
-	icon_state = "pdoor1";
-	id = "aroshipshutter"
-	},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/boatdeck)
-"eX" = (
-/obj/structure/bed/chair/bay/comfy/blue,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"eZ" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/aroboat2)
-"fg" = (
-/obj/structure/window/plastitanium/full,
-/obj/structure/window/plastitanium{
-	dir = 4
-	},
-/obj/machinery/door/blast/regular{
-	dir = 2;
-	icon_state = "pdoor1";
-	id = "aroshipshutter"
-	},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/boatdeck)
-"fh" = (
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/room1)
+"fC" = (
 /obj/structure/table/steel,
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fi" = (
-/obj/structure/table/steel,
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
+/obj/structure/cable/cyan,
+/obj/machinery/power/apc{
+	dir = 4;
+	name = "east bump";
+	pixel_x = 24
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fj" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fo" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/powerarea)
+"fG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
@@ -2137,327 +1034,68 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fp" = (
-/obj/structure/table/steel,
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fq" = (
-/obj/structure/bed/chair/bay/comfy/blue{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fr" = (
-/obj/structure/bed/chair/bay/comfy/blue{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fs" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fw" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fy" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fz" = (
-/obj/structure/bed/chair/bay/comfy/blue{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fA" = (
-/obj/structure/bed/chair/bay/comfy/blue{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fB" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fD" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fE" = (
-/obj/machinery/alarm{
-	dir = 4;
-	icon_state = "alarm0";
-	pixel_x = -22;
-	pixel_y = 0
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fF" = (
-/obj/effect/floor_decal/industrial/loading{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/monotile,
-/area/aro2/portbay)
-"fH" = (
-/obj/machinery/firealarm{
-	dir = 4;
-	pixel_x = 26
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fI" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fJ" = (
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/simulated/floor/tiled/eris/dark,
 /area/aro2/boatdeck)
 "fK" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_flat,
+/area/aro2/frontroom)
+"fM" = (
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fL" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fM" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fN" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fO" = (
-/obj/machinery/computer/ship/navigation/telescreen{
-	pixel_y = 23
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fP" = (
 /obj/structure/cable/cyan{
 	d1 = 2;
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
 "fQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/starboardbay)
 "fR" = (
-/obj/machinery/computer/ship/navigation/telescreen{
-	pixel_y = 23
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_x = 0;
+	pixel_y = -25
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fS" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
 "fT" = (
 /turf/simulated/wall/rpshull,
 /area/aro2/portbay)
 "fU" = (
 /turf/simulated/wall/r_wall,
 /area/aro2/portbay)
-"fV" = (
-/obj/effect/floor_decal/techfloor/orange/corner,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fW" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 8
+"fX" = (
+/turf/simulated/floor/tiled/eris/dark/golden,
+/area/aro2/cockpit)
+"fZ" = (
+/obj/structure/cable/cyan{
+	icon_state = "1-8"
 	},
 /obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fX" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 8
-	},
-/obj/machinery/light,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fY" = (
-/obj/effect/floor_decal/techfloor/orange/corner,
-/obj/machinery/light,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"fZ" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/observation)
 "ga" = (
 /turf/simulated/wall/r_wall,
 /area/aro2/starboardbay)
@@ -2470,37 +1108,6 @@
 "gd" = (
 /turf/simulated/wall,
 /area/aro2/surfluid)
-"ge" = (
-/obj/machinery/door/airlock/multi_tile/glass,
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/surfluid)
-"gf" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/surfluid)
-"gg" = (
-/obj/machinery/door/airlock/multi_tile/glass,
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/surfluid)
 "gh" = (
 /obj/structure/sign/poster{
 	dir = 1;
@@ -2511,287 +1118,57 @@
 "gi" = (
 /turf/simulated/wall,
 /area/aro2/starboardbay)
-"gj" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 9
+"go" = (
+/obj/mecha/combat/fighter/pinnace/loaded,
+/obj/machinery/mech_recharger{
+	icon = 'icons/turf/shuttle_alien_blue.dmi'
 	},
-/obj/structure/table/rack/shelf/steel,
-/obj/item/weapon/storage/toolbox/syndicate,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"gk" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 5
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/aro2/starboardbay)
+"gr" = (
+/obj/structure/table/fancyblack,
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/tiled/eris/steel/bar_light,
+/area/aro2/frontroom)
+"gt" = (
+/obj/structure/railing/grey{
+	dir = 8
 	},
-/obj/structure/table/rack/shelf/steel,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"gl" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 9
-	},
-/obj/structure/closet/crate/bin,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gm" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gn" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 1
+/turf/simulated/floor/tiled/eris/steel/cyancorner,
+/area/aro2/boatdeck)
+"gy" = (
+/obj/machinery/light{
+	dir = 8
 	},
 /obj/structure/cable/cyan{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"go" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gp" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/structure/bed/chair/bay/comfy/blue{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gq" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d2 = 2;
-	icon_state = "0-2"
-	},
-/obj/machinery/power/apc{
-	dir = 1;
-	name = "north bump";
-	pixel_x = 0;
-	pixel_y = 28
-	},
-/obj/structure/table/steel,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gr" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/structure/table/steel,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gs" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/structure/bed/chair/bay/comfy/blue{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gt" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gu" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gv" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 9
-	},
-/obj/structure/table/rack/shelf/steel,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"gw" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 5
-	},
-/obj/structure/table/rack/shelf/steel,
-/obj/item/weapon/storage/toolbox/syndicate,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"gx" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 9
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"gy" = (
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 1
-	},
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"gz" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/obj/machinery/light_switch{
-	dir = 8;
-	on = 0;
-	pixel_x = 26;
-	pixel_y = -6
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"gA" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/eris/dark,
 /area/aro2/surfluid)
 "gB" = (
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gC" = (
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gD" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gE" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+	dir = 6
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gF" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gG" = (
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
-/obj/structure/bed/chair/bay/comfy/blue{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gH" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/bed/chair/bay/comfy/blue{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gI" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gJ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gK" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gL" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/obj/machinery/light_switch{
-	dir = 4;
-	on = 0;
-	pixel_x = -26;
-	pixel_y = -6
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"gM" = (
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 4
-	},
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"gN" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
 "gO" = (
-/obj/effect/floor_decal/industrial/warning/full,
-/obj/machinery/power/pointdefense{
-	id_tag = "aroship"
-	},
-/obj/structure/cable/cyan{
-	d2 = 4;
-	icon_state = "0-4"
-	},
-/turf/simulated/floor/airless,
-/area/aro2/portbay)
+/obj/machinery/recharge_station,
+/turf/simulated/floor/tiled/eris/dark/cargo,
+/area/shuttle/aroboat2)
 "gP" = (
 /obj/structure/cable/cyan{
 	d1 = 4;
@@ -2808,128 +1185,24 @@
 	},
 /turf/simulated/wall/r_wall,
 /area/aro2/portbay)
-"gR" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 9
-	},
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"gS" = (
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 1
-	},
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
 "gT" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"gU" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"gV" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/portbay)
-"gW" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gX" = (
+/obj/machinery/door/airlock/multi_tile/glass,
 /obj/structure/cable/cyan{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gY" = (
-/obj/machinery/firealarm{
-	dir = 1;
-	pixel_x = 0;
-	pixel_y = -25
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"gZ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"ha" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/starboardbay)
-"hb" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"hc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"hd" = (
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 4
-	},
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"he" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 5
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/observation)
+"gV" = (
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/airarea)
 "hf" = (
 /obj/structure/cable/cyan{
 	d1 = 4;
@@ -2947,90 +1220,28 @@
 /turf/simulated/wall/rpshull,
 /area/aro2/starboardbay)
 "hh" = (
-/obj/effect/floor_decal/industrial/warning/full,
-/obj/machinery/power/pointdefense{
-	id_tag = "aroship"
-	},
-/obj/structure/cable/cyan{
-	d2 = 8;
-	icon_state = "0-8"
-	},
-/turf/simulated/floor/airless,
-/area/aro2/starboardbay)
-"hi" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 9
-	},
-/obj/machinery/button/remote/blast_door{
-	dir = 4;
-	id = "aroshipshutter";
-	name = "exterior shutters";
-	pixel_x = -28
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/airarea)
 "hj" = (
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 1
-	},
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
+/obj/machinery/light,
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"hm" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"hk" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"hl" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"hm" = (
-/obj/effect/floor_decal/techfloor/orange/corner,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"hn" = (
-/obj/machinery/door/airlock/multi_tile/glass{
-	dir = 1
-	},
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/portbay)
-"ho" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"hp" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"hr" = (
-/obj/machinery/light{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
 	},
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/shuttle/aroboat2)
+"hB" = (
+/obj/structure/table/steel,
+/turf/simulated/floor/wood,
+/area/aro2/dining)
+"hE" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
 	d2 = 2;
@@ -3040,1004 +1251,142 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/eris/dark,
 /area/aro2/surfluid)
-"hs" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"ht" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"hu" = (
-/obj/effect/floor_decal/techfloor/orange/corner,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"hv" = (
-/obj/machinery/door/airlock/multi_tile/glass{
-	dir = 1
-	},
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/starboardbay)
-"hw" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"hx" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"hy" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"hz" = (
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 4
-	},
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"hA" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 5
-	},
-/obj/machinery/button/remote/blast_door{
-	dir = 8;
-	id = "aroshipshutter";
-	name = "exterior shutters";
-	pixel_x = 28
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"hB" = (
-/obj/structure/fans/hardlight,
-/obj/machinery/door/blast/regular{
-	dir = 2;
-	icon_state = "pdoor1";
-	id = "aroshipshutter"
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/portbay)
-"hC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"hD" = (
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/portbay)
-"hE" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/obj/structure/table/rack/shelf/steel,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"hH" = (
-/obj/structure/railing/grey{
-	dir = 8
-	},
-/obj/structure/table/steel,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"hI" = (
-/obj/structure/railing/grey{
-	dir = 4
-	},
-/obj/structure/table/steel,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"hK" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/obj/structure/table/rack/shelf/steel,
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"hL" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/starboardbay)
-"hM" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
-	dir = 10
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/starboardbay)
-"hN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"hO" = (
-/obj/structure/fans/hardlight,
-/obj/machinery/door/blast/regular{
-	dir = 2;
-	icon_state = "pdoor1";
-	id = "aroshipshutter"
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/starboardbay)
-"hP" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"hQ" = (
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"hR" = (
-/obj/mecha/combat/fighter/pinnace/loaded,
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/portbay)
-"hS" = (
-/obj/machinery/atmospherics/portables_connector/aux{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/portbay)
-"hT" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/obj/machinery/atmospherics/portables_connector/aux{
-	dir = 8
-	},
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"hU" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/obj/machinery/atmospherics/portables_connector/aux{
-	dir = 1
-	},
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"hV" = (
-/obj/mecha/combat/fighter/pinnace/loaded,
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/starboardbay)
 "hW" = (
-/obj/machinery/atmospherics/portables_connector/aux{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/starboardbay)
-"hX" = (
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"hY" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"hZ" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"ia" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/obj/machinery/alarm{
-	dir = 4;
-	icon_state = "alarm0";
-	pixel_x = -22;
-	pixel_y = 0
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"ib" = (
-/obj/effect/floor_decal/industrial/warning/dust{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"ic" = (
-/obj/effect/floor_decal/industrial/warning/dust{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"id" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"ie" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/aux{
-	dir = 4
+	dir = 10
 	},
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
 /area/aro2/starboardbay)
 "if" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 10
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
-/obj/machinery/alarm{
-	dir = 1;
-	pixel_y = -25
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
 "ig" = (
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 8
+/obj/machinery/power/terminal{
+	dir = 4
 	},
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 8
+/obj/structure/cable/cyan{
+	d2 = 8;
+	icon_state = "0-8"
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
+/obj/structure/cable/cyan,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/powerarea)
 "ih" = (
-/obj/effect/floor_decal/corner_techfloor_grid,
-/obj/effect/floor_decal/techfloor/orange/corner,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
+/obj/machinery/atmospherics/portables_connector{
+	dir = 8
+	},
+/obj/effect/floor_decal/industrial/outline/blue,
+/obj/machinery/portable_atmospherics/canister/empty,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/airarea)
 "ii" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 6
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
 	},
-/obj/machinery/alarm{
-	dir = 1;
-	pixel_y = -25
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"ij" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 10
-	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/eris/dark,
 /area/aro2/portbay)
 "ik" = (
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 8
-	},
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 8
+/obj/machinery/computer/ship/navigation/telescreen{
+	pixel_y = 23
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
+	dir = 4
 	},
 /obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
 "il" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/railing/grey{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
 "im" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"in" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"ip" = (
-/obj/machinery/light{
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"iq" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"ir" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"is" = (
-/obj/effect/floor_decal/corner_techfloor_grid,
-/obj/effect/floor_decal/techfloor/orange/corner,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"it" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"iu" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 10
-	},
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
-/obj/machinery/firealarm{
-	dir = 1;
-	pixel_x = 0;
-	pixel_y = -25
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"iv" = (
-/obj/effect/floor_decal/corner_techfloor_grid{
-	dir = 8
-	},
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 8
-	},
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"iw" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"ix" = (
-/obj/effect/floor_decal/techfloor/orange/corner,
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"iy" = (
-/obj/machinery/door/airlock/multi_tile/glass{
-	dir = 1
-	},
-/obj/effect/floor_decal/techfloor/orange,
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/portbay)
-"iz" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 8
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"iA" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"iB" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/shuttle/aroboat2)
 "iC" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/structure/railing/grey{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/effect/floor_decal/industrial/warning/dust{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"iD" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/surfluid)
-"iE" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/structure/reagent_dispensers/watertank/high,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/surfluid)
-"iF" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/structure/reagent_dispensers/foam,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/surfluid)
-"iG" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/effect/floor_decal/industrial/warning/dust{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"iH" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"iI" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"iJ" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/effect/floor_decal/industrial/warning/dust{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"iK" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/reagent_dispensers/foam,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/surfluid)
-"iL" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/reagent_dispensers/watertank/high,
-/turf/simulated/floor/tiled/techfloor/grid,
+/obj/structure/table/steel,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
 /area/aro2/surfluid)
 "iM" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/surfluid)
-"iN" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/effect/floor_decal/industrial/warning/dust{
+/obj/structure/railing/grey{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"iO" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"iP" = (
-/obj/effect/floor_decal/techfloor/orange/corner,
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"iQ" = (
-/obj/machinery/door/airlock/multi_tile/glass{
-	dir = 1
-	},
-/obj/effect/floor_decal/techfloor/orange,
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/starboardbay)
-"iR" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 8
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"iS" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"iT" = (
-/obj/effect/floor_decal/corner_techfloor_grid,
-/obj/effect/floor_decal/techfloor/orange/corner,
 /obj/structure/cable/cyan{
 	d1 = 2;
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"iN" = (
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/surfluid)
+"iQ" = (
+/obj/machinery/computer/ship/navigation/telescreen{
+	pixel_y = 23
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
 "iU" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 6
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
 /obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
+	d2 = 4;
+	icon_state = "0-4"
 	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
-/obj/machinery/firealarm{
-	dir = 1;
-	pixel_x = 0;
-	pixel_y = -25
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"iV" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 10
-	},
-/obj/structure/cable/cyan,
 /obj/machinery/power/apc{
 	dir = 2;
 	name = "south bump";
 	pixel_y = -28
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"iW" = (
-/obj/effect/floor_decal/industrial/warning/dust/corner{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"iX" = (
-/obj/effect/floor_decal/industrial/warning/dust{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"iY" = (
-/obj/effect/floor_decal/industrial/warning/dust/corner{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"iZ" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"ja" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 6
-	},
-/obj/structure/cable/cyan,
-/obj/machinery/power/apc{
-	dir = 2;
-	name = "south bump";
-	pixel_y = -28
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"jb" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 10
-	},
-/obj/structure/table/rack/shelf/steel,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"jc" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 6
-	},
-/obj/structure/table/rack/shelf/steel,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/portbay)
-"jd" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 10
-	},
-/obj/machinery/recharge_station,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"je" = (
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
+/turf/simulated/floor/tiled/eris/steel/bar_flat,
+/area/aro2/frontroom)
 "jf" = (
-/obj/effect/floor_decal/techfloor/orange,
-/obj/machinery/light,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"jg" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 8
+/obj/machinery/button/remote/blast_door{
+	dir = 4;
+	id = "aroshipshutter";
+	name = "exterior shutters";
+	pixel_x = -28
 	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"jh" = (
-/obj/effect/floor_decal/techfloor/orange,
-/obj/machinery/alarm{
-	alarm_id = null;
-	breach_detection = 0;
-	dir = 1;
-	icon_state = "alarm0";
-	pixel_y = -22
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"ji" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 6
-	},
-/obj/machinery/recharge_station,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/surfluid)
-"jj" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 10
-	},
-/obj/structure/table/rack/shelf/steel,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
-"jk" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 6
-	},
-/obj/structure/table/rack/shelf/steel,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/starboardbay)
+/turf/simulated/floor/tiled/eris/dark/golden,
+/area/aro2/cockpit)
 "jl" = (
 /turf/simulated/wall/r_wall,
 /area/aro2/powerarea)
 "jm" = (
 /turf/simulated/wall,
 /area/aro2/powerarea)
-"jn" = (
-/obj/machinery/door/airlock/multi_tile/glass,
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/powerarea)
-"jo" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/powerarea)
 "jp" = (
 /obj/structure/sign/poster{
 	dir = 1;
@@ -4046,685 +1395,109 @@
 /turf/simulated/wall,
 /area/aro2/observation)
 "jq" = (
-/obj/machinery/door/airlock/multi_tile/glass,
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/observation)
-"jr" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/observation)
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/starboardbay)
 "js" = (
 /turf/simulated/wall,
 /area/aro2/observation)
 "jt" = (
 /turf/simulated/wall,
 /area/aro2/airarea)
-"ju" = (
-/obj/machinery/door/airlock/multi_tile/glass,
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/airarea)
-"jv" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/airarea)
 "jw" = (
 /turf/simulated/wall/r_wall,
 /area/aro2/airarea)
 "jx" = (
 /turf/simulated/wall/rpshull,
 /area/aro2/powerarea)
-"jy" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 9
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"jz" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"jA" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/machinery/light_switch{
-	on = 0;
-	pixel_y = 26
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"jB" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"jC" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"jD" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/structure/table/steel,
-/obj/item/weapon/storage/toolbox/electrical,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"jE" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/machinery/computer/ship/navigation/telescreen{
-	pixel_y = 23
-	},
-/obj/structure/table/steel,
-/obj/fiftyspawner/glass,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
 "jF" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 5
-	},
-/obj/structure/table/steel,
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/fiftyspawner/steel,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"jH" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/observation)
-"jI" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/observation)
-"jK" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 9
-	},
-/obj/structure/table/steel,
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/fiftyspawner/rods,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
-"jL" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/machinery/computer/ship/navigation/telescreen{
-	pixel_y = 23
-	},
-/obj/structure/table/steel,
-/obj/item/weapon/storage/toolbox/mechanical,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
-"jM" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/structure/table/steel,
-/obj/fiftyspawner/wood,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
-"jN" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
-"jO" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
-"jP" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/machinery/light_switch{
-	on = 0;
-	pixel_y = 26
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
-"jQ" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
-"jR" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
-"jS" = (
-/turf/simulated/wall/rpshull,
-/area/aro2/airarea)
-"jT" = (
-/obj/effect/floor_decal/techfloor/orange{
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
-/obj/machinery/button/remote/blast_door{
-	dir = 4;
-	id = "aroshipshutter";
-	name = "exterior shutters";
-	pixel_x = -28
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"jH" = (
+/obj/structure/table/steel,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/boatdeck)
+"jM" = (
+/obj/structure/cable/cyan{
+	d2 = 8;
+	icon_state = "0-8"
+	},
+/obj/machinery/power/apc{
+	dir = 2;
+	name = "south bump";
+	pixel_y = -28
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"jU" = (
-/obj/machinery/power/rtg/abductor/hybrid/built,
 /obj/structure/cable/cyan{
 	icon_state = "0-4"
 	},
-/turf/simulated/floor/plating,
-/area/aro2/powerarea)
-"jV" = (
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/turf/simulated/floor/plating,
-/area/aro2/powerarea)
-"jW" = (
-/turf/simulated/floor/plating,
-/area/aro2/powerarea)
-"jX" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"jY" = (
-/obj/effect/floor_decal/techfloor/orange{
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"jN" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/observation)
-"jZ" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/dark,
-/area/aro2/observation)
-"ka" = (
-/turf/simulated/floor/tiled/dark,
-/area/aro2/observation)
-"kb" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/observation)
-"kc" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/aro2/starboardbay)
+"jS" = (
+/turf/simulated/wall/rpshull,
 /area/aro2/airarea)
 "kd" = (
-/turf/simulated/floor/plating,
-/area/aro2/airarea)
-"ke" = (
-/obj/machinery/atmospherics/pipe/simple/visible/blue{
-	dir = 6
-	},
-/obj/machinery/meter,
-/turf/simulated/floor/plating,
-/area/aro2/airarea)
-"kf" = (
-/obj/machinery/atmospherics/portables_connector{
-	dir = 8
-	},
-/obj/effect/floor_decal/industrial/outline/red,
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/simulated/floor/plating,
-/area/aro2/airarea)
-"kg" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
 /obj/machinery/button/remote/blast_door{
 	dir = 8;
 	id = "aroshipshutter";
 	name = "exterior shutters";
 	pixel_x = 28
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
-"kh" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"ke" = (
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_x = 0;
+	pixel_y = -25
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"ki" = (
-/obj/machinery/power/terminal{
-	dir = 4
-	},
-/obj/structure/cable/cyan{
-	d2 = 8;
-	icon_state = "0-8"
-	},
-/obj/structure/cable/cyan,
-/turf/simulated/floor/plating,
-/area/aro2/powerarea)
-"kj" = (
-/obj/machinery/power/smes/buildable/hybrid{
-	input_attempt = 1;
-	input_level = 250000;
-	input_level_max = 250000
-	},
-/obj/structure/cable/cyan{
-	d2 = 4;
-	icon_state = "0-4"
-	},
-/turf/simulated/floor/plating,
-/area/aro2/powerarea)
-"kk" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/plating,
-/area/aro2/powerarea)
-"kl" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/structure/cable/cyan{
-	d2 = 2;
-	icon_state = "0-2"
-	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
 /area/aro2/powerarea)
 "km" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 4
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/plating/eris/under,
 /area/aro2/powerarea)
-"kn" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/powerarea)
-"ko" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/observation)
-"kp" = (
-/obj/structure/cable/cyan{
-	icon_state = "1-8"
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/turf/simulated/floor/tiled/dark,
-/area/aro2/observation)
-"kq" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/turf/simulated/floor/tiled/dark,
-/area/aro2/observation)
-"kr" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 4
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/observation)
-"ks" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/airarea)
-"kt" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 1
-	},
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
 "ku" = (
-/obj/machinery/atmospherics/pipe/simple/visible/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
-	dir = 10
-	},
-/turf/simulated/floor/plating,
-/area/aro2/airarea)
-"kv" = (
-/obj/machinery/atmospherics/pipe/simple/visible/universal{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/aro2/airarea)
-"kw" = (
-/obj/machinery/atmospherics/pipe/simple/visible/blue{
-	dir = 8
-	},
-/obj/machinery/meter,
-/turf/simulated/floor/plating,
-/area/aro2/airarea)
+/obj/structure/flora/pottedplant,
+/turf/simulated/floor/wood,
+/area/aro2/dining)
 "kx" = (
-/obj/machinery/atmospherics/binary/pump/on{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
 	},
-/turf/simulated/floor/plating,
-/area/aro2/airarea)
-"ky" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/blue,
-/turf/simulated/floor/plating,
-/area/aro2/airarea)
-"kz" = (
-/obj/machinery/atmospherics/portables_connector{
-	dir = 8
-	},
-/obj/effect/floor_decal/industrial/outline,
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/simulated/floor/plating,
-/area/aro2/airarea)
-"kA" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
-"kB" = (
-/obj/structure/window/plastitanium/full,
-/obj/structure/window/plastitanium{
-	dir = 8
-	},
-/obj/machinery/door/blast/regular{
-	dir = 2;
-	icon_state = "pdoor1";
-	id = "aroshipshutter"
-	},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/powerarea)
-"kC" = (
-/obj/machinery/power/terminal{
-	dir = 4
-	},
-/obj/structure/cable/cyan{
-	d2 = 8;
-	icon_state = "0-8"
-	},
-/obj/structure/cable/cyan{
-	d2 = 2;
-	icon_state = "0-2"
-	},
-/turf/simulated/floor/plating,
-/area/aro2/powerarea)
-"kD" = (
-/obj/structure/cable/cyan{
-	d2 = 4;
-	icon_state = "0-4"
-	},
-/obj/machinery/power/smes/buildable/hybrid{
-	input_attempt = 1;
-	input_level = 250000;
-	input_level_max = 250000
-	},
-/turf/simulated/floor/plating,
-/area/aro2/powerarea)
-"kE" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
-/turf/simulated/floor/plating,
-/area/aro2/powerarea)
-"kF" = (
-/obj/effect/floor_decal/techfloor/orange/corner,
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"kG" = (
-/obj/machinery/door/airlock/multi_tile/glass{
-	dir = 2
-	},
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/powerarea)
-"kH" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/observation)
-"kI" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/dark,
-/area/aro2/observation)
-"kJ" = (
-/obj/effect/floor_decal/techfloor/orange/corner,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/observation)
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
 "kK" = (
-/obj/machinery/door/airlock/multi_tile/glass{
-	dir = 2
-	},
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/airarea)
-"kL" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
-	dir = 8
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
-"kM" = (
-/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
-	dir = 5
-	},
-/turf/simulated/floor/plating,
-/area/aro2/airarea)
-"kN" = (
-/obj/machinery/atmospherics/pipe/simple/visible/red{
-	dir = 8
-	},
-/obj/machinery/meter,
-/turf/simulated/floor/plating,
-/area/aro2/airarea)
-"kO" = (
-/obj/machinery/atmospherics/binary/pump/on{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/turf/simulated/floor/plating,
-/area/aro2/airarea)
-"kP" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/red{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/aro2/airarea)
-"kQ" = (
-/obj/machinery/atmospherics/portables_connector{
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"kO" = (
+/obj/machinery/light{
 	dir = 8
 	},
-/obj/effect/floor_decal/industrial/outline/blue,
-/obj/machinery/portable_atmospherics/canister/empty,
-/turf/simulated/floor/plating,
-/area/aro2/airarea)
-"kR" = (
+/turf/simulated/floor/tiled/eris/steel/cyancorner,
+/area/aro2/boatdeck)
+"kP" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"le" = (
 /obj/structure/window/plastitanium/full,
 /obj/structure/window/plastitanium{
 	dir = 4
@@ -4735,154 +1508,8 @@
 	id = "aroshipshutter"
 	},
 /obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/airarea)
-"kS" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/obj/structure/table/steel,
-/obj/structure/cable/cyan,
-/obj/machinery/power/apc{
-	dir = 4;
-	name = "east bump";
-	pixel_x = 24
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"kT" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 8
-	},
-/obj/structure/table/steel,
-/obj/structure/cable/cyan,
-/obj/machinery/power/apc{
-	cell_type = /obj/item/weapon/cell/super;
-	dir = 8;
-	name = "west bump";
-	pixel_x = -24
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
-"kU" = (
-/obj/machinery/atmospherics/pipe/simple/visible/red{
-	dir = 5
-	},
-/obj/machinery/meter,
-/turf/simulated/floor/plating,
-/area/aro2/airarea)
-"kV" = (
-/obj/machinery/atmospherics/portables_connector{
-	dir = 8
-	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/portable_atmospherics/canister/empty,
-/turf/simulated/floor/plating,
-/area/aro2/airarea)
-"kW" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 10
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"kX" = (
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"kY" = (
-/obj/effect/floor_decal/techfloor/orange,
-/obj/machinery/light,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"kZ" = (
-/obj/effect/floor_decal/techfloor/orange,
-/obj/machinery/alarm{
-	alarm_id = null;
-	breach_detection = 0;
-	dir = 1;
-	icon_state = "alarm0";
-	pixel_y = -22
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"la" = (
-/obj/effect/floor_decal/techfloor/orange,
-/obj/machinery/firealarm{
-	dir = 1;
-	pixel_x = 0;
-	pixel_y = -25
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"lb" = (
-/obj/effect/floor_decal/techfloor/orange,
-/obj/structure/table/steel,
-/obj/fiftyspawner/plasteel,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"lc" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 6
-	},
-/obj/structure/table/steel,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 1
-	},
-/obj/fiftyspawner/plasteel/hull,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"ld" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 10
-	},
-/obj/structure/table/steel,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
-"le" = (
-/obj/effect/floor_decal/techfloor/orange,
-/obj/structure/table/steel,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
-"lf" = (
-/obj/effect/floor_decal/techfloor/orange,
-/obj/machinery/firealarm{
-	dir = 1;
-	pixel_x = 0;
-	pixel_y = -25
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
-"lg" = (
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
-"lh" = (
-/obj/effect/floor_decal/techfloor/orange,
-/obj/machinery/alarm{
-	alarm_id = null;
-	breach_detection = 0;
-	dir = 1;
-	icon_state = "alarm0";
-	pixel_y = -22
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
-"li" = (
-/obj/effect/floor_decal/techfloor/orange,
-/obj/machinery/light,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
-"lj" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/room3)
 "lk" = (
 /obj/structure/cable/cyan{
 	d1 = 2;
@@ -4913,54 +1540,14 @@
 /turf/simulated/wall/r_wall,
 /area/aro2/powerarea)
 "ln" = (
-/obj/effect/floor_decal/techfloor/orange{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
 	},
-/obj/machinery/light{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/observation)
-"lo" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
-/turf/simulated/floor/tiled/dark,
-/area/aro2/observation)
-"lp" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
-/turf/simulated/floor/tiled/dark,
-/area/aro2/observation)
-"lq" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 4
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/observation)
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
 "lr" = (
 /obj/structure/cable/cyan{
 	d1 = 4;
@@ -4998,34 +1585,6 @@
 	},
 /turf/simulated/wall/rpshull,
 /area/aro2/powerarea)
-"lv" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 10
-	},
-/obj/machinery/alarm{
-	dir = 4;
-	icon_state = "alarm0";
-	pixel_x = -22;
-	pixel_y = 0
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/observation)
-"lw" = (
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/observation)
-"lx" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 6
-	},
-/obj/machinery/power/apc{
-	dir = 4;
-	name = "east bump";
-	pixel_x = 24
-	},
-/obj/structure/cable/cyan,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/observation)
 "ly" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
@@ -5034,83 +1593,43 @@
 	},
 /turf/simulated/wall/rpshull,
 /area/aro2/airarea)
-"lz" = (
-/obj/effect/floor_decal/industrial/warning/full,
-/obj/machinery/power/pointdefense{
-	id_tag = "aroship"
-	},
-/obj/structure/cable/cyan,
-/turf/simulated/floor/airless,
-/area/aro2/powerarea)
 "lA" = (
 /obj/structure/sign/warning,
 /turf/simulated/wall/rpshull,
 /area/aro2/portbay)
-"lB" = (
-/obj/structure/window/plastitanium/full,
-/obj/structure/window/plastitanium,
-/obj/machinery/door/blast/regular{
-	dir = 4;
-	icon_state = "pdoor1";
-	id = "aroshipshutter"
-	},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/techmaint,
-/area/aro2/observation)
 "lC" = (
 /obj/structure/sign/warning,
 /turf/simulated/wall/rpshull,
 /area/aro2/starboardbay)
-"lD" = (
-/obj/effect/floor_decal/industrial/warning/full,
-/obj/machinery/power/pointdefense{
-	id_tag = "aroship"
-	},
-/obj/structure/cable/cyan,
-/turf/simulated/floor/airless,
-/area/aro2/airarea)
 "lE" = (
 /obj/structure/sign/pods,
 /turf/simulated/wall,
 /area/aro2/portbay)
-"lH" = (
+"lI" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/aroboat2)
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
 "lK" = (
 /obj/structure/sign/pods,
 /turf/simulated/wall,
 /area/aro2/starboardbay)
-"lL" = (
-/obj/machinery/ion_engine{
-	dir = 1;
-	icon_state = "nozzle"
-	},
-/obj/effect/floor_decal/industrial/warning/full,
-/turf/simulated/floor/airless,
-/area/aro2/powerarea)
 "lM" = (
 /obj/structure/sign/fire,
 /turf/simulated/wall/rpshull,
 /area/aro2/powerarea)
-"lN" = (
-/obj/machinery/ion_engine{
-	dir = 1;
-	icon_state = "nozzle"
-	},
-/obj/effect/floor_decal/industrial/warning/full,
-/turf/simulated/floor/airless,
-/area/aro2/airarea)
 "lO" = (
 /obj/structure/sign/fire,
 /turf/simulated/wall/rpshull,
@@ -5136,100 +1655,331 @@
 /obj/structure/flora/pottedplant/stoutbush,
 /turf/simulated/floor/carpet/purcarpet,
 /area/aro2/room3)
-"mh" = (
-/obj/machinery/alarm{
-	alarm_id = null;
-	breach_detection = 0;
-	dir = 1;
-	icon_state = "alarm0";
-	pixel_y = -22
+"lV" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
 	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -24;
-	pixel_y = 6
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/shuttle_landmark/shuttle_initializer/aroboat2,
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/shuttle/aroboat2)
+"lW" = (
+/obj/machinery/light{
+	dir = 4
 	},
-/obj/effect/floor_decal/spline/fancy/wood/corner{
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 1
 	},
-/turf/simulated/floor/wood,
-/area/aro2/frontroom)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"ma" = (
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/powerarea)
+"mg" = (
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+	frequency = 1380;
+	id_tag = "aroship2_boatbay";
+	pixel_y = 28
+	},
+/turf/simulated/floor/water/indoors/surfluid,
+/area/aro2/boatdeck)
 "mp" = (
 /obj/structure/table/bench/wooden,
 /turf/simulated/floor/tiled/techfloor,
 /area/aro2/dining)
-"mD" = (
-/obj/effect/floor_decal/industrial/loading{
+"ms" = (
+/obj/structure/railing/grey,
+/turf/simulated/floor/water/indoors/surfluid,
+/area/aro2/surfluid)
+"mz" = (
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"mH" = (
+/obj/structure/table/rack/shelf/steel,
+/obj/item/device/perfect_tele/alien,
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/aro2/frontroom)
+"mI" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"mP" = (
+/obj/structure/table/steel,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
+/obj/machinery/firealarm{
+	dir = 8;
+	pixel_x = -24
+	},
+/turf/simulated/floor/wood,
+/area/aro2/dining)
+"mU" = (
+/obj/machinery/power/shield_generator/upgraded{
+	field_radius = 39;
+	initial_shield_modes = 2113;
+	target_radius = 39
+	},
+/obj/structure/cable/cyan{
+	d2 = 4;
+	icon_state = "0-4"
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_flat,
+/area/aro2/boatdeck)
+"ng" = (
+/obj/structure/railing/grey{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/steel/cyancorner,
+/area/aro2/boatdeck)
+"ni" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"nn" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/powerarea)
+"nq" = (
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/airarea)
+"nu" = (
+/turf/simulated/floor/tiled/eris/steel/cyancorner,
+/area/aro2/boatdeck)
+"nA" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"nB" = (
+/obj/machinery/light{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/monotile,
-/area/aro2/starboardbay)
-"mY" = (
-/obj/machinery/computer/shuttle_control/explore/aroboat2{
-	dir = 8;
-	icon_state = "computer"
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/aroboat2)
-"na" = (
-/obj/structure/railing/grey,
-/turf/simulated/floor/water/indoors{
-	color = "#222222";
-	desc = "A pool of inky-black fluid that shimmers oddly in the light if hit just right.";
-	description_info = "Surfluid is KHI's main method of production, using swarms of nanites to process raw materials into finished products at the cost of immense amounts of energy.";
-	name = "surfluid pool"
-	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/airarea)
+"nO" = (
+/turf/simulated/floor/tiled/eris/dark,
 /area/aro2/surfluid)
-"nk" = (
-/obj/effect/floor_decal/industrial/outline/blue,
-/obj/structure/closet/crate/secure/gear,
-/turf/simulated/floor/tiled/monotile,
-/area/shuttle/aroboat2)
-"nm" = (
-/obj/machinery/shipsensors{
-	dir = 1
+"nY" = (
+/obj/machinery/light{
+	dir = 4
 	},
-/obj/effect/floor_decal/industrial/warning/dust{
-	dir = 1
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/industrial/warning/dust,
-/turf/simulated/floor/airless,
-/area/aro2/cockpit)
-"nA" = (
-/obj/structure/table/fancyblack,
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/carpet/blue,
-/area/aro2/frontroom)
-"oa" = (
-/obj/machinery/light,
-/obj/machinery/power/apc{
-	dir = 4;
-	name = "east bump";
-	pixel_x = 24
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
 	},
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_x = 0;
+	pixel_y = -25
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"oi" = (
 /obj/structure/cable/cyan,
-/turf/simulated/floor/tiled/techfloor/grid,
+/obj/machinery/power/apc{
+	dir = 2;
+	name = "south bump";
+	pixel_y = -28
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"oj" = (
+/obj/machinery/power/rtg/abductor/hybrid/built,
+/obj/structure/cable/cyan{
+	icon_state = "0-4"
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/powerarea)
+"ok" = (
+/obj/machinery/atmospherics/binary/pump/aux,
+/turf/simulated/floor/tiled/eris/dark/cargo,
 /area/shuttle/aroboat2)
-"oe" = (
-/obj/structure/table/steel,
-/turf/simulated/floor/tiled/monotile,
-/area/shuttle/aroboat2)
-"oQ" = (
-/obj/structure/window/plastitanium/full,
-/obj/structure/window/plastitanium{
+"os" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/steel/cyancorner,
+/area/aro2/boatdeck)
+"oy" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/airarea)
+"oG" = (
+/obj/structure/fans/hardlight,
 /obj/machinery/door/blast/regular{
-	dir = 8;
+	dir = 2;
 	icon_state = "pdoor1";
-	id = "aroboatshut"
+	id = "aroshipshutter"
 	},
-/obj/machinery/door/firedoor/glass{
-	dir = 2
+/turf/simulated/floor/tiled/eris/white/danger,
+/area/aro2/starboardbay)
+"oI" = (
+/obj/machinery/computer/ship/navigation,
+/turf/simulated/floor/tiled/eris/dark/golden,
+/area/aro2/cockpit)
+"oM" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/eris/steel/bar_flat,
+/area/aro2/frontroom)
+"oP" = (
+/obj/structure/table/rack/shelf/steel,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/portbay)
+"oQ" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"oR" = (
+/obj/structure/sink{
+	pixel_y = 21
+	},
+/obj/structure/cable/cyan{
+	d2 = 2;
+	icon_state = "0-2"
+	},
+/obj/machinery/power/apc{
+	cell_type = /obj/item/weapon/cell/super;
+	dir = 8;
+	name = "west bump";
+	pixel_x = -24
+	},
+/turf/simulated/floor/tiled/eris/white/techfloor,
+/area/aro2/boatdeck)
+"oU" = (
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_x = 0;
+	pixel_y = -25
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_flat,
+/area/aro2/frontroom)
+"pm" = (
+/obj/structure/table/steel,
+/turf/simulated/floor/tiled/eris/dark/cargo,
 /area/shuttle/aroboat2)
-"pw" = (
+"pn" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/observation)
+"pK" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"pP" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"pQ" = (
+/turf/simulated/floor/water/indoors/surfluid,
+/area/aro2/surfluid)
+"pT" = (
+/obj/structure/bed/chair/bay/comfy/blue,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/boatdeck)
+"pX" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"qd" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"qi" = (
 /obj/structure/cable/cyan{
 	d1 = 2;
 	d2 = 8;
@@ -5246,57 +1996,356 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 1
+/turf/simulated/floor/tiled/eris/steel/bar_flat,
+/area/aro2/frontroom)
+"ql" = (
+/obj/machinery/light{
+	dir = 8
 	},
-/turf/simulated/floor/wood,
-/area/aro2/frontroom)
-"qQ" = (
-/obj/structure/bed/chair/bay/comfy/blue,
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/aroboat2)
-"sg" = (
-/obj/effect/floor_decal/spline/fancy/wood,
-/turf/simulated/floor/wood,
-/area/aro2/frontroom)
-"tj" = (
-/obj/machinery/button/remote/blast_door{
-	dir = 4;
-	id = "aroshipshutter";
-	name = "exterior shutters";
-	pixel_x = -28
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
 	},
 /obj/structure/cable/cyan{
 	d1 = 1;
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/obj/effect/floor_decal/spline/fancy/wood{
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_x = 0;
+	pixel_y = -25
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"qq" = (
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"qv" = (
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/machinery/atmospherics/portables_connector/aux{
+	icon_state = "map_connector-aux"
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/machinery/alarm{
+	dir = 4;
+	icon_state = "alarm0";
+	pixel_x = -22;
+	pixel_y = 0
+	},
+/turf/simulated/floor/tiled/eris/dark/cargo,
+/area/shuttle/aroboat2)
+"qA" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"qD" = (
+/obj/machinery/button/remote/blast_door{
+	dir = 8;
+	id = "aroshipshutter";
+	name = "exterior shutters";
+	pixel_x = 28
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/airarea)
+"qG" = (
+/obj/structure/table/rack/shelf/steel,
+/obj/item/device/sleevemate,
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/aro2/frontroom)
+"qH" = (
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"qJ" = (
+/obj/structure/bed/chair/wood{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /turf/simulated/floor/wood,
-/area/aro2/frontroom)
-"tl" = (
-/obj/structure/fans/hardlight,
+/area/aro2/dining)
+"qQ" = (
+/obj/structure/bed/chair/bay/comfy/blue,
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/aroboat2)
+"qT" = (
+/obj/machinery/atmospherics/portables_connector{
+	dir = 8
+	},
+/obj/effect/floor_decal/industrial/outline/red,
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/airarea)
+"rl" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/shuttle/aroboat2)
+"rr" = (
+/obj/machinery/atmospherics/portables_connector/aux{
+	dir = 1;
+	icon_state = "map_connector-aux"
+	},
+/obj/effect/floor_decal/industrial/outline,
+/turf/simulated/floor/tiled/eris/dark/cargo,
+/area/shuttle/aroboat2)
+"rt" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"rx" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/surfluid)
+"rE" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/cockpit)
+"rH" = (
+/obj/effect/floor_decal/industrial/outline/blue,
+/obj/structure/closet/crate/internals,
+/turf/simulated/floor/tiled/eris/dark/cargo,
+/area/shuttle/aroboat2)
+"rK" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/aro2/dining)
+"rL" = (
+/obj/machinery/alarm{
+	dir = 4;
+	icon_state = "alarm0";
+	pixel_x = -22;
+	pixel_y = 0
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"sc" = (
+/obj/machinery/ntnet_relay,
+/turf/simulated/floor/tiled/eris/steel/bar_flat,
+/area/aro2/boatdeck)
+"sg" = (
+/obj/structure/bed/chair/bay/comfy/blue{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark/cargo,
+/area/shuttle/aroboat2)
+"sl" = (
+/obj/structure/table/steel,
+/obj/structure/cable/cyan,
+/obj/machinery/power/apc{
+	cell_type = /obj/item/weapon/cell/super;
+	dir = 8;
+	name = "west bump";
+	pixel_x = -24
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/airarea)
+"sm" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/aro2/dining)
+"sn" = (
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium{
+	dir = 4
+	},
+/obj/machinery/door/blast/regular{
+	dir = 2;
+	icon_state = "pdoor1";
+	id = "aroshipshutter"
+	},
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/boatdeck)
+"sz" = (
+/obj/machinery/door/airlock/multi_tile/glass{
+	dir = 2
+	},
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/airarea)
+"sF" = (
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"sP" = (
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/powerarea)
+"sU" = (
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/machinery/power/pointdefense{
+	id_tag = "aroship"
+	},
+/obj/structure/cable/cyan{
+	d2 = 2;
+	icon_state = "0-2"
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/boatdeck)
+"tg" = (
+/obj/structure/bed/chair/wood{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/aro2/dining)
+"tj" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/reagent_dispensers/foam,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/surfluid)
+"tr" = (
+/obj/effect/floor_decal/industrial/warning/dust{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"tw" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"ty" = (
+/obj/machinery/door/airlock/multi_tile/glass{
+	dir = 2
+	},
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/powerarea)
+"tJ" = (
+/obj/machinery/vending/snack{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/aro2/dining)
+"tN" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/alarm{
+	alarm_id = null;
+	breach_detection = 0;
+	dir = 1;
+	icon_state = "alarm0";
+	pixel_y = -22
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"tO" = (
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium{
+	dir = 1
+	},
 /obj/machinery/door/blast/regular{
 	dir = 8;
 	icon_state = "pdoor1";
 	id = "aroboatshut"
 	},
-/turf/simulated/floor/tiled/techfloor,
+/obj/machinery/door/firedoor/glass{
+	dir = 2
+	},
+/turf/simulated/floor/plating/eris/under,
 /area/shuttle/aroboat2)
-"ts" = (
-/obj/machinery/power/shield_generator/upgraded{
-	field_radius = 39;
-	initial_shield_modes = 2113;
-	target_radius = 39
-	},
-/obj/structure/cable/cyan{
-	d2 = 4;
-	icon_state = "0-4"
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/aro2/boatdeck)
 "tT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -5312,22 +2361,307 @@
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/shuttle/aroboat2)
-"uD" = (
-/obj/structure/railing/grey{
+"tZ" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/light{
+	dir = 8;
+	icon_state = "tube1"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"uc" = (
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"ue" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/turf/simulated/floor/wood,
+/area/aro2/dining)
+"uf" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"uk" = (
+/obj/structure/closet/crate/bin,
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"uo" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/shuttle/aroboat2)
+"up" = (
+/obj/machinery/atmospherics/portables_connector/aux{
 	dir = 8
 	},
-/turf/simulated/floor/water/indoors{
-	color = "#222222";
-	desc = "A pool of inky-black fluid that shimmers oddly in the light if hit just right.";
-	description_info = "Surfluid is KHI's main method of production, using swarms of nanites to process raw materials into finished products at the cost of immense amounts of energy.";
-	name = "surfluid pool"
-	},
-/area/aro2/surfluid)
-"uJ" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/simulated/floor/tiled/monotile,
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
 /area/aro2/portbay)
-"wj" = (
+"uq" = (
+/obj/machinery/light,
+/obj/machinery/power/apc{
+	dir = 4;
+	name = "east bump";
+	pixel_x = 24
+	},
+/obj/structure/cable/cyan,
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/shuttle/aroboat2)
+"uy" = (
+/obj/machinery/door/airlock,
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/boatdeck)
+"uG" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"uK" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"uQ" = (
+/obj/structure/table/steel,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/aro2/dining)
+"uX" = (
+/obj/machinery/button/remote/blast_door{
+	dir = 8;
+	id = "aroshipshutter";
+	name = "exterior shutters";
+	pixel_x = 28
+	},
+/obj/structure/closet/crate/bin,
+/turf/simulated/floor/wood,
+/area/aro2/dining)
+"va" = (
+/obj/machinery/computer/ship/engines,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/observation)
+"vc" = (
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+	frequency = 1380;
+	id_tag = "aroboat2_docker";
+	pixel_y = 28
+	},
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/shuttle/aroboat2)
+"vf" = (
+/obj/machinery/light_switch{
+	dir = 4;
+	on = 0;
+	pixel_x = -26;
+	pixel_y = -6
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"vg" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"vo" = (
+/obj/machinery/computer/ship/engines{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark/golden,
+/area/aro2/cockpit)
+"vp" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"vr" = (
+/obj/machinery/door/airlock/multi_tile/glass,
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/airarea)
+"vt" = (
+/obj/machinery/door/airlock/multi_tile/glass,
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/dining)
+"vI" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark/cyancorner,
+/area/aro2/dining)
+"vN" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/structure/closet/crate/bin,
+/turf/simulated/floor/tiled/eris/steel/bar_flat,
+/area/aro2/frontroom)
+"wa" = (
+/obj/machinery/alarm{
+	alarm_id = null;
+	breach_detection = 0;
+	dir = 1;
+	icon_state = "alarm0";
+	pixel_y = -22
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/airarea)
+"wh" = (
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium{
+	dir = 1
+	},
+/obj/machinery/door/blast/regular{
+	dir = 8;
+	icon_state = "pdoor1";
+	id = "aroboatshut"
+	},
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating/eris/under,
+/area/shuttle/aroboat2)
+"wl" = (
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/aro2/frontroom)
+"wm" = (
+/obj/structure/bed/chair/bay/comfy/blue{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/boatdeck)
+"wn" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"wz" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/steel/cyancorner,
+/area/aro2/boatdeck)
+"wM" = (
+/obj/structure/table/rack/shelf/steel,
+/obj/item/weapon/storage/toolbox/syndicate,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/starboardbay)
+"wS" = (
+/obj/machinery/recharge_station,
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"wT" = (
+/obj/machinery/button/remote/blast_door{
+	dir = 8;
+	id = "aroshipshutter";
+	name = "exterior shutters";
+	pixel_x = 28
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"wY" = (
+/obj/machinery/alarm{
+	dir = 1;
+	pixel_y = -25
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"wZ" = (
+/obj/machinery/button/remote/blast_door{
+	dir = 4;
+	id = "aroshipshutter";
+	name = "exterior shutters";
+	pixel_x = -28
+	},
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_flat,
+/area/aro2/frontroom)
+"xk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 1
 	},
@@ -5339,19 +2673,29 @@
 /obj/structure/bed/chair/wood{
 	dir = 8
 	},
-/turf/simulated/floor/carpet/blue,
+/turf/simulated/floor/tiled/eris/steel/bar_light,
 /area/aro2/frontroom)
-"xe" = (
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/aroboat2)
-"xw" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
+"xt" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/red{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/aroboat2)
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/airarea)
+"xx" = (
+/obj/machinery/door/airlock,
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/room2)
 "xH" = (
 /obj/effect/shuttle_landmark{
 	base_area = /area/space;
@@ -5361,47 +2705,234 @@
 	},
 /turf/space,
 /area/space)
-"xO" = (
-/obj/effect/floor_decal/industrial/loading{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/monotile,
-/area/aro2/portbay)
-"ye" = (
+"xN" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+	dir = 1
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/aroboat2)
-"yu" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/aux,
-/obj/effect/floor_decal/industrial/hatch,
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/aroboat2)
-"yD" = (
+/turf/simulated/floor/tiled/eris/dark/cyancorner,
+/area/aro2/dining)
+"xZ" = (
+/obj/machinery/shipsensors{
+	dir = 1
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/cockpit)
+"yk" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"yw" = (
+/obj/structure/table/rack/shelf/steel,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/starboardbay)
+"yC" = (
+/obj/machinery/alarm{
+	dir = 4;
+	icon_state = "alarm0";
+	pixel_x = -22;
+	pixel_y = 0
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"yG" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/aroboat2)
-"yO" = (
-/obj/structure/bed/chair/bay/comfy/blue{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
 	},
 /obj/structure/cable/cyan{
 	d1 = 2;
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/aroboat2)
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"yY" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"zg" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/aro2/starboardbay)
+"zk" = (
+/obj/machinery/power/apc{
+	dir = 4;
+	name = "east bump";
+	pixel_x = 24
+	},
+/obj/structure/cable/cyan,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/observation)
+"zt" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/reagent_dispensers/foam,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/surfluid)
+"zC" = (
+/obj/machinery/light,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/powerarea)
+"zE" = (
+/obj/structure/bed/chair/bay/comfy/blue{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/surfluid)
+"zG" = (
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/dining)
+"zJ" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/obj/machinery/button/remote/blast_door{
+	dir = 8;
+	id = "aroshipshutter";
+	name = "exterior shutters";
+	pixel_x = 28
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"zL" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"zQ" = (
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/starboardbay)
+"zV" = (
+/turf/simulated/floor/tiled/eris/steel/bar_flat,
+/area/aro2/frontroom)
+"Ae" = (
+/obj/effect/floor_decal/industrial/warning/dust,
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"Aj" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"Al" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/airarea)
+"Ao" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"Av" = (
+/obj/structure/railing/grey{
+	dir = 1
+	},
+/turf/simulated/floor/water/indoors/surfluid,
+/area/aro2/boatdeck)
+"Aw" = (
+/obj/structure/cable/cyan{
+	d2 = 4;
+	icon_state = "0-4"
+	},
+/obj/machinery/power/smes/buildable/hybrid{
+	input_attempt = 1;
+	input_level = 250000;
+	input_level_max = 250000
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/powerarea)
+"Ax" = (
+/obj/structure/flora/pottedplant/crystal,
+/obj/machinery/light,
+/turf/simulated/floor/wood,
+/area/aro2/dining)
+"AA" = (
+/obj/machinery/firealarm{
+	dir = 8;
+	pixel_x = -24
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"AE" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"AF" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"AK" = (
+/obj/effect/floor_decal/industrial/loading{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
 "AL" = (
 /obj/effect/shuttle_landmark{
 	base_area = /area/space;
@@ -5411,198 +2942,475 @@
 	},
 /turf/space,
 /area/space)
-"Be" = (
-/obj/effect/floor_decal/industrial/loading{
+"AP" = (
+/obj/machinery/door/airlock/multi_tile/glass,
+/obj/structure/fans/hardlight,
+/obj/effect/map_helper/airlock/door/simple,
+/obj/machinery/door/blast/regular{
+	dir = 8;
+	icon_state = "pdoor1";
+	id = "aroboatshut"
+	},
+/obj/machinery/button/remote/blast_door{
+	dir = 4;
+	id = "aroboatshut";
+	name = "exterior shutters";
+	pixel_x = -28
+	},
+/turf/simulated/floor/tiled/eris/white/gray_perforated,
+/area/shuttle/aroboat2)
+"AT" = (
+/obj/structure/table/fancyblack,
+/obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/monotile,
-/area/aro2/starboardbay)
-"BL" = (
-/obj/structure/table/steel,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/airarea)
-"Cp" = (
+/turf/simulated/floor/tiled/eris/steel/bar_light,
+/area/aro2/frontroom)
+"AW" = (
+/obj/machinery/computer/ship/navigation/telescreen{
+	pixel_y = 23
+	},
 /obj/structure/cable/cyan{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/spline/fancy/wood{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
 	},
-/turf/simulated/floor/wood,
-/area/aro2/frontroom)
-"CQ" = (
-/obj/effect/floor_decal/spline/fancy/wood/corner{
-	dir = 4
-	},
-/turf/simulated/floor/wood,
-/area/aro2/frontroom)
-"CS" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 4
-	},
-/turf/simulated/floor/wood,
-/area/aro2/frontroom)
-"DO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
+	dir = 8
 	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"Bg" = (
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"Bj" = (
+/obj/structure/bed/chair/bay/comfy/blue{
+	dir = 4
 	},
 /obj/structure/cable/cyan{
 	d1 = 2;
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/simulated/floor/carpet/blue,
-/area/aro2/frontroom)
-"Ey" = (
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/shuttle/aroboat2)
+"Bu" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"By" = (
+/obj/machinery/light,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/airarea)
+"BB" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"BI" = (
+/obj/effect/floor_decal/industrial/loading{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"Cz" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"CG" = (
+/obj/machinery/pointdefense_control{
+	id_tag = "aroship"
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_flat,
+/area/aro2/boatdeck)
+"CL" = (
+/obj/structure/railing/grey,
+/obj/structure/railing/grey{
+	dir = 4
+	},
+/turf/simulated/floor/water/indoors/surfluid,
+/area/aro2/boatdeck)
+"CX" = (
+/obj/machinery/door/airlock,
 /obj/structure/cable/cyan{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 1
-	},
-/turf/simulated/floor/wood,
-/area/aro2/frontroom)
-"EI" = (
-/obj/structure/bed/chair/wood{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/floor/carpet/blue,
-/area/aro2/frontroom)
-"Fk" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/aroboat2)
-"Fu" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"Fz" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/effect/floor_decal/spline/fancy/wood{
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/room1)
+"Dm" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
 	},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/portbay)
+"Dx" = (
+/obj/machinery/alarm{
+	alarm_id = null;
+	breach_detection = 0;
+	dir = 1;
+	icon_state = "alarm0";
+	pixel_y = -22
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"DC" = (
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium,
+/obj/machinery/door/blast/regular{
+	dir = 4;
+	icon_state = "pdoor1";
+	id = "aroshipshutter"
+	},
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/observation)
+"DD" = (
+/obj/structure/window/plastitanium/full,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/surfluid)
+"DG" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"DL" = (
+/obj/machinery/door/airlock/multi_tile/glass,
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/powerarea)
+"DT" = (
+/obj/machinery/door/airlock/multi_tile/glass{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/portbay)
+"DU" = (
+/obj/machinery/firealarm{
+	dir = 8;
+	pixel_x = -24
+	},
+/turf/simulated/floor/tiled/eris/steel/cyancorner,
+/area/aro2/boatdeck)
+"DX" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"Ed" = (
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/machinery/power/pointdefense{
+	id_tag = "aroship"
+	},
+/obj/structure/cable/cyan{
+	d2 = 4;
+	icon_state = "0-4"
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/dining)
+"Ef" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"El" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/shuttle/aroboat2)
+"Eu" = (
+/obj/structure/table/steel,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/airarea)
+"Ex" = (
+/obj/structure/toilet{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/white/techfloor,
+/area/aro2/boatdeck)
+"ED" = (
+/obj/structure/table/fancyblack,
+/turf/simulated/floor/tiled/eris/steel/bar_light,
 /area/aro2/frontroom)
+"EO" = (
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/observation)
+"EQ" = (
+/obj/machinery/alarm{
+	alarm_id = null;
+	breach_detection = 0;
+	dir = 1;
+	icon_state = "alarm0";
+	pixel_y = -22
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/powerarea)
+"EU" = (
+/obj/machinery/power/rtg/abductor/hybrid/built,
+/obj/structure/cable/cyan{
+	d2 = 4;
+	icon_state = "0-4"
+	},
+/obj/machinery/light,
+/turf/simulated/floor/tiled/eris/dark/cargo,
+/area/shuttle/aroboat2)
+"EY" = (
+/obj/machinery/computer/ship/navigation/telescreen{
+	pixel_y = 23
+	},
+/obj/structure/table/steel,
+/obj/fiftyspawner/glass,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/powerarea)
+"Fn" = (
+/obj/machinery/atmospherics/pipe/simple/visible/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
+	dir = 10
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/airarea)
+"Fw" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
 "FA" = (
 /obj/structure/bed/chair/bay/comfy/blue{
 	dir = 8
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/shuttle/aroboat2)
+"FP" = (
+/obj/structure/cable/cyan{
+	d2 = 2;
+	icon_state = "0-2"
+	},
+/obj/machinery/power/apc{
+	dir = 1;
+	name = "north bump";
+	pixel_x = 0;
+	pixel_y = 28
+	},
+/obj/structure/table/steel,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/surfluid)
+"FQ" = (
+/obj/machinery/atmospherics/pipe/simple/visible/blue{
+	dir = 8
+	},
+/obj/machinery/meter,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/airarea)
+"FT" = (
+/obj/machinery/atmospherics/pipe/simple/visible/universal{
+	dir = 8
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/airarea)
 "FY" = (
-/obj/effect/floor_decal/industrial/outline,
-/obj/structure/closet/crate/large,
-/turf/simulated/floor/tiled/monotile,
-/area/shuttle/aroboat2)
-"GX" = (
+/obj/machinery/door/airlock,
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/room3)
+"FZ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"Ga" = (
 /obj/structure/table/steel,
 /obj/machinery/recharger,
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/tiled/eris/dark/cargo,
 /area/shuttle/aroboat2)
-"Hw" = (
-/obj/effect/floor_decal/industrial/warning/dust{
-	dir = 1
+"Ge" = (
+/obj/machinery/button/remote/blast_door{
+	dir = 8;
+	id = "aroshipshutter";
+	name = "exterior shutters";
+	pixel_x = 28
 	},
-/obj/effect/floor_decal/industrial/warning/dust,
-/turf/simulated/floor/airless,
-/area/aro2/cockpit)
-"HL" = (
-/obj/effect/floor_decal/industrial/outline/blue,
-/obj/structure/closet/crate/internals,
-/turf/simulated/floor/tiled/monotile,
-/area/shuttle/aroboat2)
-"Ib" = (
-/obj/machinery/portable_atmospherics/canister/air,
-/obj/machinery/atmospherics/portables_connector/aux{
-	icon_state = "map_connector-aux"
-	},
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/machinery/alarm{
-	dir = 4;
-	icon_state = "alarm0";
-	pixel_x = -22;
-	pixel_y = 0
-	},
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/aroboat2)
-"Iv" = (
-/obj/structure/railing/grey{
-	dir = 1
-	},
-/turf/simulated/floor/water/indoors{
-	color = "#222222";
-	desc = "A pool of inky-black fluid that shimmers oddly in the light if hit just right.";
-	description_info = "Surfluid is KHI's main method of production, using swarms of nanites to process raw materials into finished products at the cost of immense amounts of energy.";
-	name = "surfluid pool"
-	},
-/area/aro2/surfluid)
-"JF" = (
-/obj/structure/table/steel,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/powerarea)
-"JS" = (
-/turf/simulated/floor/tiled/monotile,
-/area/shuttle/aroboat2)
-"Kd" = (
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/aroboat2)
-"Ki" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/shuttle_landmark/shuttle_initializer/aroboat2,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/aroboat2)
-"Kx" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 5
-	},
-/obj/machinery/computer/ship/helm{
-	req_one_access = list(101)
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/observation)
-"KC" = (
-/obj/machinery/light,
-/obj/effect/floor_decal/spline/fancy/wood{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 1
 	},
-/turf/simulated/floor/wood,
-/area/aro2/frontroom)
-"Lk" = (
-/obj/machinery/atmospherics/binary/pump/aux,
-/turf/simulated/floor/tiled/dark,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/steel/cyancorner,
+/area/aro2/boatdeck)
+"Gs" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/observation)
+"Gu" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/powerarea)
+"Gx" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
+/obj/effect/floor_decal/industrial/hatch,
+/turf/simulated/floor/tiled/eris/dark/cargo,
 /area/shuttle/aroboat2)
-"LV" = (
+"GF" = (
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium{
+	dir = 4
+	},
+/obj/machinery/door/blast/regular{
+	dir = 2;
+	icon_state = "pdoor1";
+	id = "aroshipshutter"
+	},
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/airarea)
+"GJ" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/powerarea)
+"Hb" = (
+/obj/structure/table/steel,
+/obj/machinery/power/apc{
+	dir = 4;
+	name = "east bump";
+	pixel_x = 24
+	},
+/obj/structure/cable/cyan{
+	d2 = 8;
+	icon_state = "0-8"
+	},
+/turf/simulated/floor/wood,
+/area/aro2/dining)
+"Hd" = (
+/obj/machinery/computer/shuttle_control/explore/aroboat2{
+	dir = 8;
+	icon_state = "computer"
+	},
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/shuttle/aroboat2)
+"Hg" = (
+/obj/machinery/atmospherics/portables_connector/aux{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/aro2/starboardbay)
+"Hh" = (
+/obj/machinery/mech_recharger{
+	icon = 'icons/turf/shuttle_alien_blue.dmi'
+	},
+/turf/simulated/floor/tiled/eris/dark/cargo,
+/area/shuttle/aroboat2)
+"Hm" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"Ht" = (
+/obj/effect/floor_decal/industrial/warning/dust{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"HB" = (
 /obj/machinery/door/airlock/multi_tile/glass,
 /obj/structure/fans/hardlight,
 /obj/structure/cable/cyan{
@@ -5624,121 +3432,1164 @@
 	name = "exterior shutters";
 	pixel_x = -28
 	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/eris/white/gray_perforated,
 /area/shuttle/aroboat2)
-"LW" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"Mb" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/aroboat2)
-"Mf" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/carpet/blue,
+"HC" = (
+/obj/structure/table/rack/shelf/steel,
+/obj/item/weapon/inducer/hybrid,
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
 /area/aro2/frontroom)
-"NI" = (
-/obj/machinery/recharge_station,
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/aroboat2)
-"NZ" = (
-/obj/machinery/light{
-	dir = 1
+"HF" = (
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/machinery/power/pointdefense{
+	id_tag = "aroship"
 	},
-/obj/structure/closet/crate/bin,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/aroboat2)
-"Oh" = (
-/obj/effect/floor_decal/techfloor/orange{
-	dir = 9
-	},
-/obj/machinery/computer/ship/engines,
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/observation)
-"Ol" = (
 /obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+	d2 = 8;
+	icon_state = "0-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/starboardbay)
+"HH" = (
+/obj/machinery/ion_engine{
+	dir = 1;
+	icon_state = "nozzle"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/aroboat2)
-"Ow" = (
-/obj/structure/railing/grey{
-	dir = 4
-	},
-/turf/simulated/floor/water/indoors{
-	color = "#222222";
-	desc = "A pool of inky-black fluid that shimmers oddly in the light if hit just right.";
-	description_info = "Surfluid is KHI's main method of production, using swarms of nanites to process raw materials into finished products at the cost of immense amounts of energy.";
-	name = "surfluid pool"
-	},
-/area/aro2/surfluid)
-"Oy" = (
-/obj/effect/floor_decal/spline/fancy/wood{
+/obj/effect/floor_decal/industrial/warning/full,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/airarea)
+"HO" = (
+/obj/machinery/shower{
 	dir = 8
 	},
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
+/obj/machinery/alarm{
+	alarm_id = null;
+	breach_detection = 0;
+	dir = 1;
+	icon_state = "alarm0";
+	pixel_y = -22
 	},
 /obj/machinery/light_switch{
 	dir = 4;
 	pixel_x = -24;
 	pixel_y = 6
 	},
-/obj/machinery/vending/dinnerware{
+/turf/simulated/floor/tiled/eris/white/techfloor,
+/area/aro2/boatdeck)
+"HP" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"HQ" = (
+/obj/structure/table/steel,
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/fiftyspawner/rods,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/airarea)
+"Ib" = (
+/obj/machinery/computer/shuttle_control/explore/aroboat2{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_flat,
+/area/aro2/boatdeck)
+"Ig" = (
+/obj/machinery/computer/ship/sensors{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/dark/golden,
+/area/aro2/cockpit)
+"Ii" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"Iq" = (
+/obj/machinery/power/terminal{
+	dir = 4
+	},
+/obj/structure/cable/cyan{
+	d2 = 8;
+	icon_state = "0-8"
+	},
+/obj/structure/cable/cyan{
+	d2 = 2;
+	icon_state = "0-2"
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/powerarea)
+"Ir" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/observation)
+"IB" = (
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium{
+	dir = 8
+	},
+/obj/machinery/door/blast/regular{
+	dir = 2;
+	icon_state = "pdoor1";
+	id = "aroshipshutter"
+	},
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/dining)
+"ID" = (
+/obj/machinery/door/airlock/multi_tile/glass,
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/surfluid)
+"IK" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"IN" = (
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_x = 0;
+	pixel_y = -25
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/airarea)
+"Jb" = (
+/obj/mecha/combat/fighter/pinnace/loaded,
+/obj/machinery/mech_recharger{
+	icon = 'icons/turf/shuttle_alien_blue.dmi'
+	},
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/aro2/portbay)
+"Jh" = (
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"Jm" = (
+/obj/machinery/door/airlock/multi_tile/glass{
+	dir = 1
+	},
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/portbay)
+"Js" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"JD" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/shuttle/aroboat2)
+"JS" = (
+/obj/machinery/light_switch{
+	dir = 8;
+	on = 0;
+	pixel_x = 26;
+	pixel_y = -6
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"Ka" = (
+/obj/structure/fans/hardlight,
+/obj/machinery/door/blast/regular{
+	dir = 8;
+	icon_state = "pdoor1";
+	id = "aroboatshut"
+	},
+/turf/simulated/floor/tiled/eris/white/gray_perforated,
+/area/shuttle/aroboat2)
+"Kd" = (
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/aroboat2)
+"Ki" = (
+/obj/structure/fans/hardlight,
+/obj/machinery/door/blast/regular{
+	dir = 2;
+	icon_state = "pdoor1";
+	id = "aroshipshutter"
+	},
+/turf/simulated/floor/tiled/eris/white/danger,
+/area/aro2/portbay)
+"Kk" = (
+/obj/machinery/atmospherics/pipe/simple/visible/red{
+	dir = 8
+	},
+/obj/machinery/meter,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/airarea)
+"Km" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"Kr" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"Ku" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"Kv" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"Kx" = (
+/obj/structure/bed/chair/wood{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_light,
+/area/aro2/frontroom)
+"KE" = (
+/obj/machinery/alarm{
+	alarm_id = null;
+	breach_detection = 0;
+	dir = 1;
+	icon_state = "alarm0";
+	pixel_y = -22
+	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -24;
+	pixel_y = 6
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_flat,
+/area/aro2/frontroom)
+"KI" = (
+/obj/effect/floor_decal/industrial/hatch,
+/turf/simulated/floor/tiled/eris/dark/cargo,
+/area/shuttle/aroboat2)
+"KT" = (
+/obj/structure/table/steel,
+/obj/structure/flora/pottedplant{
+	pixel_y = 13
+	},
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/boatdeck)
+"Lg" = (
+/obj/structure/bed/chair/wood{
 	dir = 4
 	},
 /turf/simulated/floor/wood,
 /area/aro2/dining)
-"Pk" = (
-/obj/structure/window/plastitanium/full,
-/turf/simulated/floor/tiled/techmaint,
+"Lh" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"Lk" = (
+/obj/structure/table/steel,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
+	},
+/obj/fiftyspawner/plasteel/hull,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/powerarea)
+"Ll" = (
+/obj/machinery/recharge_station,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/boatdeck)
+"Ln" = (
+/obj/machinery/door/airlock/multi_tile/glass{
+	dir = 1
+	},
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/starboardbay)
+"Lp" = (
+/obj/machinery/ion_engine{
+	dir = 1;
+	icon_state = "nozzle"
+	},
+/obj/effect/floor_decal/industrial/warning/full,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/powerarea)
+"Lr" = (
+/obj/structure/railing/grey{
+	dir = 1
+	},
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"Lu" = (
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/shuttle/aroboat2)
+"Lw" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/aro2/frontroom)
+"LD" = (
+/obj/effect/floor_decal/industrial/warning/dust{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark,
 /area/aro2/surfluid)
-"Qj" = (
+"LE" = (
+/obj/machinery/computer/ship/helm{
+	req_one_access = list(101)
+	},
+/turf/simulated/floor/tiled/eris/dark/golden,
+/area/aro2/cockpit)
+"LN" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"Mb" = (
+/obj/structure/bed/chair/bay/comfy/blue{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/boatdeck)
+"Mp" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/steel/cyancorner,
+/area/aro2/boatdeck)
+"Mv" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/closet/crate/bin,
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/shuttle/aroboat2)
+"Mz" = (
+/obj/machinery/light,
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"MG" = (
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium{
+	dir = 8
+	},
+/obj/machinery/door/blast/regular{
+	dir = 2;
+	icon_state = "pdoor1";
+	id = "aroshipshutter"
+	},
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/frontroom)
+"MH" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/shuttle/aroboat2)
+"ML" = (
+/obj/structure/bed/chair/bay/comfy/blue{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/boatdeck)
+"MR" = (
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/machinery/power/pointdefense{
+	id_tag = "aroship"
+	},
+/obj/structure/cable/cyan{
+	d2 = 4;
+	icon_state = "0-4"
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/boatdeck)
+"Ni" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"Ns" = (
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/observation)
+"Nu" = (
+/obj/structure/bed/chair/bay/comfy/blue{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/surfluid)
+"Nz" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"NC" = (
+/obj/machinery/atmospherics/portables_connector/aux{
+	dir = 1
+	},
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/starboardbay)
+"NQ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"OA" = (
+/obj/structure/railing/grey{
+	dir = 4
+	},
+/turf/simulated/floor/water/indoors/surfluid,
+/area/aro2/surfluid)
+"OB" = (
+/obj/machinery/button/remote/blast_door{
+	dir = 4;
+	id = "aroshipshutter";
+	name = "exterior shutters";
+	pixel_x = -28
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"OE" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_flat,
+/area/aro2/frontroom)
+"OK" = (
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/machinery/power/pointdefense{
+	id_tag = "aroship"
+	},
+/obj/structure/cable/cyan,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/airarea)
+"ON" = (
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/portbay)
+"OQ" = (
+/obj/machinery/alarm{
+	alarm_id = null;
+	breach_detection = 0;
+	dir = 1;
+	icon_state = "alarm0";
+	pixel_y = -22
+	},
+/turf/simulated/floor/wood,
+/area/aro2/dining)
+"OR" = (
+/obj/structure/bed/chair/wood{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_light,
+/area/aro2/frontroom)
+"OV" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/steel/cyancorner,
+/area/aro2/boatdeck)
+"OZ" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/industrial/warning/dust,
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"Pd" = (
+/obj/machinery/atmospherics/portables_connector{
+	dir = 8
+	},
+/obj/effect/floor_decal/industrial/outline,
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/airarea)
+"Ph" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/observation)
+"Pi" = (
+/obj/machinery/computer/ship/navigation/telescreen{
+	pixel_y = 23
+	},
+/turf/simulated/floor/wood,
+/area/aro2/dining)
+"Pm" = (
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium{
+	dir = 8
+	},
+/obj/machinery/door/blast/regular{
+	dir = 2;
+	icon_state = "pdoor1";
+	id = "aroshipshutter"
+	},
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/boatdeck)
+"Pr" = (
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/eris/steel/cyancorner,
+/area/aro2/boatdeck)
+"Py" = (
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/airarea)
+"Pz" = (
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/aro2/portbay)
+"PF" = (
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/machinery/power/pointdefense{
+	id_tag = "aroship"
+	},
+/obj/structure/cable/cyan{
+	d2 = 4;
+	icon_state = "0-4"
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/portbay)
+"PM" = (
+/obj/structure/bed/chair/bay/comfy/blue{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark/golden,
+/area/aro2/cockpit)
+"PO" = (
+/obj/structure/railing/grey{
+	dir = 1
+	},
+/turf/simulated/floor/water/indoors/surfluid,
+/area/aro2/surfluid)
+"PQ" = (
+/obj/structure/cable/cyan,
+/obj/machinery/power/apc{
+	dir = 2;
+	name = "south bump";
+	pixel_y = -28
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"PV" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"Qg" = (
+/obj/structure/table/steel,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/powerarea)
+"Qu" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/surfluid)
+"Qz" = (
+/turf/space,
+/area/space)
+"QE" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/surfluid)
+"QH" = (
+/obj/machinery/alarm{
+	dir = 4;
+	icon_state = "alarm0";
+	pixel_x = -22;
+	pixel_y = 0
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/observation)
+"QN" = (
+/obj/structure/table/steel,
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/fiftyspawner/steel,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/powerarea)
+"QT" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"QU" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"QW" = (
+/turf/simulated/floor/tiled/eris/dark/cyancorner,
+/area/aro2/dining)
+"QY" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/steel/cyancorner,
+/area/aro2/boatdeck)
+"Rc" = (
+/obj/machinery/atmospherics/pipe/simple/visible/red{
+	dir = 5
+	},
+/obj/machinery/meter,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/airarea)
+"Rp" = (
+/obj/machinery/atmospherics/binary/pump/on{
+	dir = 8
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/airarea)
+"Rq" = (
 /obj/structure/window/plastitanium/full,
 /obj/structure/window/plastitanium{
 	dir = 4
 	},
 /obj/machinery/door/blast/regular{
+	dir = 2;
+	icon_state = "pdoor1";
+	id = "aroshipshutter"
+	},
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/room1)
+"RR" = (
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/powerarea)
+"RY" = (
+/obj/structure/railing/grey,
+/turf/simulated/floor/water/indoors/surfluid,
+/area/aro2/boatdeck)
+"Sd" = (
+/obj/machinery/atmospherics/portables_connector/aux{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/aro2/portbay)
+"Sg" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/structure/cable/cyan{
+	icon_state = "1-8"
+	},
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/eris/white/techfloor,
+/area/aro2/boatdeck)
+"Sm" = (
+/obj/machinery/atmospherics/binary/pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/airarea)
+"Sq" = (
+/obj/structure/railing/grey{
+	dir = 8
+	},
+/turf/simulated/floor/water/indoors/surfluid,
+/area/aro2/surfluid)
+"St" = (
+/obj/machinery/computer/ship/navigation/telescreen{
+	pixel_y = 23
+	},
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/steel/cyancorner,
+/area/aro2/boatdeck)
+"Sx" = (
+/obj/structure/railing/grey{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/steel/cyancorner,
+/area/aro2/boatdeck)
+"Sy" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"Sz" = (
+/obj/machinery/door/airlock/multi_tile/glass{
+	dir = 2
+	},
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/dining)
+"SD" = (
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium{
+	dir = 4
+	},
+/obj/machinery/door/blast/regular{
+	dir = 2;
+	icon_state = "pdoor1";
+	id = "aroshipshutter"
+	},
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/room2)
+"SE" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/reagent_dispensers/watertank/high,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/surfluid)
+"SJ" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/aro2/dining)
+"SK" = (
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
+/obj/structure/bed/chair/bay/comfy/blue{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/surfluid)
+"SN" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/powerarea)
+"Ta" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark/cyancorner,
+/area/aro2/dining)
+"Tb" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/observation)
+"Tf" = (
+/obj/machinery/telecomms/allinone,
+/turf/simulated/floor/tiled/eris/steel/bar_flat,
+/area/aro2/boatdeck)
+"To" = (
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/cockpit)
+"Tu" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/eris/techmaint_cargo,
+/area/shuttle/aroboat2)
+"Tx" = (
+/obj/machinery/alarm{
 	dir = 1;
+	pixel_y = -25
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"Tz" = (
+/obj/structure/railing/grey{
+	dir = 4
+	},
+/turf/simulated/floor/water/indoors/surfluid,
+/area/aro2/boatdeck)
+"TE" = (
+/obj/machinery/light_switch{
+	on = 0;
+	pixel_y = 26
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/airarea)
+"TJ" = (
+/obj/effect/floor_decal/industrial/outline,
+/obj/structure/closet/crate/large,
+/turf/simulated/floor/tiled/eris/dark/cargo,
+/area/shuttle/aroboat2)
+"TL" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"TQ" = (
+/obj/effect/shuttle_landmark{
+	base_area = /area/space;
+	base_turf = /turf/space;
+	landmark_tag = "aronai2_starboard";
+	name = "Starboard"
+	},
+/turf/space,
+/area/space)
+"TT" = (
+/obj/structure/table/rack/shelf/steel,
+/obj/item/weapon/storage/toolbox/syndicate,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/portbay)
+"TU" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/eris/steel/cyancorner,
+/area/aro2/boatdeck)
+"TZ" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/blue,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/airarea)
+"Uk" = (
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium,
+/obj/machinery/door/blast/regular{
+	dir = 8;
 	icon_state = "pdoor1";
 	id = "aroboatshut"
 	},
 /obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/plating/eris/under,
 /area/shuttle/aroboat2)
-"Qz" = (
-/turf/space,
-/area/space)
-"Rx" = (
-/obj/machinery/power/rtg/abductor/hybrid/built,
-/obj/structure/cable/cyan{
-	d2 = 4;
-	icon_state = "0-4"
+"Ul" = (
+/obj/structure/railing/grey{
+	dir = 1
 	},
-/obj/machinery/light,
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/aroboat2)
-"Ry" = (
+/obj/structure/railing/grey{
+	dir = 8
+	},
+/turf/simulated/floor/water/indoors/surfluid,
+/area/aro2/boatdeck)
+"Uv" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"Ux" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/cable/cyan{
+	d2 = 2;
+	icon_state = "0-2"
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/powerarea)
+"UK" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/observation)
+"UN" = (
 /obj/structure/cable/cyan{
 	d1 = 4;
 	d2 = 8;
@@ -5755,183 +4606,280 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/simulated/floor/tiled/techfloor,
+/turf/simulated/floor/tiled/eris/dark,
 /area/aro2/boatdeck)
-"RD" = (
-/obj/structure/cable/cyan{
-	d2 = 4;
-	icon_state = "0-4"
+"UY" = (
+/obj/structure/table/rack/shelf/steel,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+	dir = 6
 	},
-/obj/machinery/power/apc{
-	dir = 2;
-	name = "south bump";
-	pixel_y = -28
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/starboardbay)
+"Ve" = (
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = 26
 	},
-/obj/effect/floor_decal/spline/fancy/wood{
-	dir = 1
-	},
-/turf/simulated/floor/wood,
-/area/aro2/frontroom)
-"RZ" = (
-/obj/structure/table/bench/wooden,
-/turf/simulated/floor/wood,
-/area/aro2/frontroom)
-"SB" = (
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"Vg" = (
+/obj/structure/table/steel,
+/obj/item/weapon/storage/toolbox/electrical,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/powerarea)
+"Vm" = (
 /obj/structure/railing/grey{
 	dir = 8
 	},
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"Vo" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/observation)
+"Vp" = (
+/obj/structure/railing/grey{
+	dir = 8
+	},
+/turf/simulated/floor/water/indoors/surfluid,
+/area/aro2/boatdeck)
+"Vx" = (
+/turf/simulated/wall/rdshull,
+/area/shuttle/aroboat2)
+"Vy" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"VH" = (
+/obj/machinery/light_switch{
+	on = 0;
+	pixel_y = 26
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/powerarea)
+"VJ" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
 /obj/structure/cable/cyan{
 	d1 = 2;
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/simulated/floor/tiled/techfloor,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/turf/simulated/floor/tiled/eris/steel/cyancorner,
 /area/aro2/boatdeck)
-"Tn" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/turf/simulated/floor/carpet/blue,
-/area/aro2/frontroom)
-"Tp" = (
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/aroboat2)
-"TN" = (
+"VN" = (
 /obj/structure/window/plastitanium/full,
-/obj/structure/window/plastitanium,
+/obj/structure/window/plastitanium{
+	dir = 8
+	},
 /obj/machinery/door/blast/regular{
-	dir = 8;
+	dir = 2;
 	icon_state = "pdoor1";
-	id = "aroboatshut"
+	id = "aroshipshutter"
 	},
 /obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/aroboat2)
-"TQ" = (
-/obj/effect/shuttle_landmark{
-	base_area = /area/space;
-	base_turf = /turf/space;
-	landmark_tag = "aronai2_starboard";
-	name = "Starboard"
-	},
-/turf/space,
-/area/space)
-"Ul" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/simulated/floor/tiled/monotile,
-/area/aro2/starboardbay)
-"Ur" = (
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/powerarea)
+"VT" = (
 /obj/structure/cable/cyan{
-	d1 = 4;
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/structure/cable/cyan{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
+/obj/structure/cable/cyan{
+	d1 = 2;
 	d2 = 8;
-	icon_state = "4-8"
+	icon_state = "2-8"
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/aroboat2)
-"UG" = (
-/obj/structure/table/fancyblack,
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/simulated/floor/carpet/blue,
-/area/aro2/frontroom)
-"UK" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/closet/crate/bin,
-/turf/simulated/floor/wood,
-/area/aro2/frontroom)
-"UM" = (
-/obj/structure/bed/chair/wood{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/turf/simulated/floor/carpet/blue,
-/area/aro2/frontroom)
-"UN" = (
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/aroboat2)
-"UZ" = (
-/obj/effect/floor_decal/industrial/hatch,
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/aroboat2)
-"Vk" = (
-/obj/machinery/atmospherics/portables_connector/aux{
-	dir = 1;
-	icon_state = "map_connector-aux"
-	},
-/obj/effect/floor_decal/industrial/outline,
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/aroboat2)
-"Vu" = (
-/obj/structure/railing/grey{
-	dir = 8
-	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/aro2/boatdeck)
-"Vx" = (
-/turf/simulated/wall/rdshull,
-/area/shuttle/aroboat2)
-"VI" = (
-/obj/machinery/embedded_controller/radio/simple_docking_controller{
-	frequency = 1380;
-	id_tag = "aroboat2_docker";
-	pixel_y = 28
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/aroboat2)
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
 "VV" = (
 /obj/structure/table/fancyblack,
 /turf/simulated/floor/carpet/bcarpet,
 /area/shuttle/aroboat2)
-"VX" = (
-/obj/structure/window/plastitanium/full,
-/obj/structure/window/plastitanium{
-	dir = 1
-	},
-/obj/machinery/door/blast/regular{
-	dir = 8;
-	icon_state = "pdoor1";
-	id = "aroboatshut"
-	},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/aroboat2)
-"Xg" = (
-/turf/simulated/floor/water/indoors{
-	color = "#222222";
-	desc = "A pool of inky-black fluid that shimmers oddly in the light if hit just right.";
-	description_info = "Surfluid is KHI's main method of production, using swarms of nanites to process raw materials into finished products at the cost of immense amounts of energy.";
-	name = "surfluid pool"
-	},
-/area/aro2/surfluid)
-"Xl" = (
+"VZ" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/effect/floor_decal/spline/fancy/wood/corner,
-/turf/simulated/floor/wood,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"We" = (
+/obj/structure/table/bench/wooden,
+/turf/simulated/floor/tiled/eris/steel/bar_flat,
 /area/aro2/frontroom)
+"Wg" = (
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/machinery/power/pointdefense{
+	id_tag = "aroship"
+	},
+/obj/structure/cable/cyan{
+	d2 = 2;
+	icon_state = "0-2"
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/frontroom)
+"Wo" = (
+/obj/effect/floor_decal/industrial/loading{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"Wu" = (
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"Wv" = (
+/obj/structure/table/steel,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/airarea)
+"WB" = (
+/obj/machinery/atmospherics/pipe/simple/visible/blue{
+	dir = 6
+	},
+/obj/machinery/meter,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/airarea)
+"WL" = (
+/obj/machinery/button/remote/blast_door{
+	dir = 4;
+	id = "aroshipshutter";
+	name = "exterior shutters";
+	pixel_x = -28
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/powerarea)
+"WS" = (
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/portbay)
+"WV" = (
+/obj/structure/railing/grey,
+/turf/simulated/floor/tiled/eris/steel/cyancorner,
+/area/aro2/boatdeck)
+"WY" = (
+/obj/structure/cable/cyan{
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_flat,
+/area/aro2/frontroom)
+"Xd" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
+"Xq" = (
+/obj/machinery/atmospherics/portables_connector{
+	dir = 8
+	},
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/portable_atmospherics/canister/empty,
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/airarea)
+"XJ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/starboardbay)
+"XN" = (
+/obj/machinery/power/smes/buildable/hybrid{
+	input_attempt = 1;
+	input_level = 250000;
+	input_level_max = 250000
+	},
+/obj/structure/cable/cyan{
+	d2 = 4;
+	icon_state = "0-4"
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/powerarea)
+"XO" = (
+/obj/structure/table/steel,
+/obj/fiftyspawner/wood,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/airarea)
+"XQ" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/surfluid)
+"XZ" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/boatdeck)
 "Yl" = (
 /obj/effect/shuttle_landmark{
 	base_area = /area/space;
@@ -5941,29 +4889,123 @@
 	},
 /turf/space,
 /area/space)
-"Yx" = (
+"Yq" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /obj/structure/bed/chair/bay/comfy/blue{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/monotile,
-/area/shuttle/aroboat2)
-"ZP" = (
-/obj/machinery/door/airlock/multi_tile/glass,
-/obj/structure/fans/hardlight,
-/obj/effect/map_helper/airlock/door/simple,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/surfluid)
+"Ys" = (
+/obj/machinery/light,
+/turf/simulated/floor/tiled/eris/steel/bar_flat,
+/area/aro2/frontroom)
+"YF" = (
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium{
+	dir = 4
+	},
 /obj/machinery/door/blast/regular{
-	dir = 8;
+	dir = 1;
 	icon_state = "pdoor1";
 	id = "aroboatshut"
 	},
-/obj/machinery/button/remote/blast_door{
-	dir = 4;
-	id = "aroboatshut";
-	name = "exterior shutters";
-	pixel_x = -28
-	},
-/turf/simulated/floor/tiled/techfloor,
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating/eris/under,
 /area/shuttle/aroboat2)
+"YK" = (
+/obj/machinery/computer/ship/helm{
+	req_one_access = list(101)
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/aro2/observation)
+"YL" = (
+/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
+	dir = 5
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/airarea)
+"YN" = (
+/obj/structure/bed/chair/bay/comfy/blue{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/boatdeck)
+"YP" = (
+/obj/structure/bed/chair/wood,
+/turf/simulated/floor/wood,
+/area/aro2/dining)
+"YQ" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/dark,
+/area/aro2/surfluid)
+"YY" = (
+/obj/structure/railing/grey,
+/obj/structure/railing/grey{
+	dir = 8
+	},
+/turf/simulated/floor/water/indoors/surfluid,
+/area/aro2/boatdeck)
+"Zo" = (
+/obj/structure/railing/grey{
+	dir = 8
+	},
+/obj/structure/table/steel,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/surfluid)
+"ZG" = (
+/obj/machinery/door/airlock/multi_tile/glass,
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/techmaint_panels,
+/area/aro2/surfluid)
+"ZJ" = (
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/reagent_dispensers/watertank/high,
+/turf/simulated/floor/tiled/eris/techmaint_perforated,
+/area/aro2/surfluid)
+"ZT" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/aro2/powerarea)
 
 (1,1,1) = {"
 Qz
@@ -13285,7 +12327,7 @@ Qz
 Qz
 Qz
 Qz
-gO
+PF
 Qz
 Qz
 Qz
@@ -13293,7 +12335,7 @@ Qz
 Qz
 Qz
 Qz
-gO
+PF
 Qz
 Qz
 Qz
@@ -13429,11 +12471,11 @@ Qz
 Qz
 gP
 lA
-hB
-hB
-hB
-hB
-hB
+Ki
+Ki
+Ki
+Ki
+Ki
 lA
 gP
 Qz
@@ -13571,11 +12613,11 @@ Qz
 fT
 gP
 fU
-fF
-fF
-uJ
-xO
-xO
+ep
+ep
+Jh
+BI
+BI
 fU
 gP
 fT
@@ -13713,11 +12755,11 @@ fT
 fT
 gQ
 fU
-gx
-hP
-hP
-hP
-if
+sF
+sF
+sF
+sF
+Tx
 fU
 gQ
 fT
@@ -13854,13 +12896,13 @@ fT
 fT
 fU
 gQ
-hi
-gy
-hQ
-hQ
-hQ
-ig
-ij
+OB
+sF
+er
+sF
+WS
+pP
+Ao
 gQ
 fU
 fT
@@ -13973,7 +13015,7 @@ Qz
 Qz
 Qz
 Qz
-du
+Ed
 Qz
 Qz
 Qz
@@ -13983,7 +13025,7 @@ Qz
 Qz
 Qz
 Qz
-eK
+MR
 Qz
 Qz
 Qz
@@ -13995,15 +13037,15 @@ fT
 fT
 fU
 fU
-gR
-hj
-hC
-hC
-hC
-hC
-hC
-ik
-iu
+fM
+uG
+uG
+Km
+zL
+zL
+zL
+Hm
+ql
 fU
 fU
 fT
@@ -14099,20 +13141,20 @@ Qz
 Qz
 Qz
 Qz
-ab
+Wg
 ae
 ah
 ah
-aF
-aF
-aF
+MG
+MG
+MG
 ah
 ah
 bS
 bS
-cr
-cr
-cr
+IB
+IB
+IB
 bS
 bS
 dv
@@ -14126,9 +13168,9 @@ ar
 ar
 ar
 ak
-eW
-eW
-eW
+Pm
+Pm
+Pm
 ar
 ar
 ar
@@ -14136,28 +13178,28 @@ ar
 fT
 fU
 fU
-gx
-gS
-hk
-hD
-hR
-hQ
-hD
-hR
-il
-iv
-iV
+sF
+sF
+sF
+Pz
+Jb
+sF
+Pz
+Jb
+ln
+qq
+PQ
 fU
 jl
 jx
 jx
 jx
-kB
-kB
+VN
+VN
 jx
 lk
 lu
-lz
+el
 Qz
 Qz
 Qz
@@ -14245,9 +13287,9 @@ Qz
 af
 ao
 ao
-RZ
-RZ
-RZ
+We
+We
+We
 ao
 ao
 bT
@@ -14268,34 +13310,34 @@ as
 as
 as
 dG
-eX
-fh
-fq
+pT
+eg
+wm
 as
 as
 as
 as
 fU
 fU
-gj
-gy
-gT
-hl
-hD
-hS
-hQ
-hD
-hS
-im
-iw
-ig
-jb
+TT
+sF
+AE
+sF
+Pz
+Sd
+sF
+Pz
+Sd
+ii
+en
+sF
+oP
 jl
 jl
 jl
 jl
-JF
-JF
+Qg
+Qg
 jl
 ll
 jx
@@ -14386,18 +13428,18 @@ Qz
 Qz
 ag
 ap
-Xl
-CS
-CS
-CS
-tj
-mh
+oM
+oM
+oM
+oM
+wZ
+KE
 bU
-cf
-cs
-cs
-cx
-di
+ku
+Lg
+Lg
+dk
+OQ
 bT
 dw
 bS
@@ -14406,42 +13448,42 @@ ar
 ar
 as
 as
-ep
-ec
-ec
-eL
-eX
-fi
-fr
-ec
-fE
-ec
-ec
-ec
+ds
+ds
+ds
+Lh
+pT
+jH
+YN
+ds
+yC
+ds
+ds
+ds
 gc
-gk
-gz
-gU
-hm
-hE
-hT
-hZ
-hE
-hT
-gU
-ix
-hZ
-jc
+oP
+JS
+Fw
+sF
+oP
+up
+ON
+oP
+up
+vp
+tw
+sF
+oP
 jm
-jy
-jT
-kh
-kh
-kh
-kW
+sP
+WL
+sP
+sP
+sP
+sP
 ll
 jx
-lL
+Lp
 Qz
 Qz
 Qz
@@ -14526,64 +13568,64 @@ Qz
 Qz
 Qz
 Qz
-aq
-RZ
-sg
-ax
-EI
-EI
-bd
-KC
+bV
+We
+zV
+zV
+Kx
+Kx
+fK
+Ys
 bU
-cg
+YP
 ct
 ct
 cY
-dj
-do
+dk
+Ax
 dw
 bT
 bT
 bT
 as
 as
-ec
-ec
-ec
-ec
-eL
-ec
-LW
-Fu
-ec
-ec
-ec
-fL
-ec
+ds
+ds
+Bu
+ds
+Lh
+ds
+uK
+wn
+ds
+ds
+ds
+vg
+ds
 gc
 gc
 gc
-gV
-hn
+Dm
+DT
 lE
 gc
 gc
 gc
 gc
-gV
-iy
+eN
+Jm
 lE
 gc
 jm
-jz
-jU
-jU
-jU
-jU
-kX
+sP
+oj
+oj
+oj
+oj
+sP
 ll
 jx
-lL
+Lp
 Qz
 Qz
 Qz
@@ -14668,61 +13710,61 @@ Qz
 Qz
 Qz
 Qz
-aq
-RZ
-sg
-ax
-aH
-nA
-Tn
-RD
+bV
+We
+zV
+wl
+ED
+gr
+Lw
+iU
 bU
-cg
+YP
 cu
 cI
 cY
 dk
-dj
-Oy
-dI
-dP
+dk
+fn
+mP
+uQ
 bU
-ec
-ef
-el
-eq
-eO
-eb
-eM
-eb
-fj
-fs
-eb
-eb
-fI
-fM
-ec
+ds
+AA
+ds
+gB
+lI
+Cz
+yG
+Cz
+VZ
+fv
+Cz
+zJ
+lW
+Uv
+ds
 gd
-gl
-gA
-gt
-ho
-gA
-gA
-ia
-gA
-gA
-gt
-iz
-gA
-jd
+uk
+nO
+Vy
+nO
+nO
+nO
+rL
+nO
+nO
+nO
+Kr
+nO
+wS
 jm
-jA
-jV
-ki
-kC
-kE
-kY
+VH
+RR
+ig
+Iq
+ZT
+zC
 ll
 jx
 lM
@@ -14810,64 +13852,64 @@ Qz
 Qz
 Qz
 Qz
-aq
-RZ
-sg
-ax
-UG
-aH
-Mf
-Ey
+bV
+We
+zV
+wl
+AT
+ED
+eV
+fK
 bU
-ch
-cv
-cJ
-cZ
-cZ
-cZ
-dy
+Pi
+tg
+qJ
+dk
+dk
+dk
+dL
 dJ
-dQ
-ez
-ec
-ec
-ec
-er
+sm
+vt
+ds
+ds
+ds
+tN
 dr
 dr
-eN
-aA
-aA
-aA
-aA
+Vp
+Vp
+Vp
+Vp
+Vp
 dr
 dr
-fN
-ec
+fh
+ds
 gd
-gm
-gB
-gB
-gB
-gB
-gB
-gB
-gB
-gB
-gB
-iA
-gB
-ho
-jn
-jB
-jW
-kj
-kD
-jW
-kZ
+nO
+Sy
+do
+Js
+nO
+nO
+nO
+nO
+nO
+AF
+IK
+nO
+nO
+DL
+sP
+km
+XN
+Aw
+km
+EQ
 ll
 jx
-lL
+Lp
 Qz
 Qz
 Qz
@@ -14954,62 +13996,62 @@ Qz
 Qz
 ah
 ao
-sg
-ax
-UM
-wj
-DO
-pw
-bV
-ci
-cw
-cK
-ci
-ci
-ci
-dz
-dK
-dR
-eA
-eb
-eb
-eb
-ew
-dr
+zV
+zV
+OR
+xk
+fu
+qi
 eD
-eT
-eT
-eT
-eT
-eT
-eT
+xN
+Ta
+vI
+xN
+xN
+xN
+ue
+dK
+rK
+dU
+Cz
+Cz
+Cz
+Ku
 dr
-fO
-ec
+mg
+aN
+aN
+aN
+aN
+aN
+aN
+dr
+AW
+ds
 gd
-gm
-gC
-gW
-hp
-gB
-gB
-gB
-gB
-gB
-in
-iB
-gB
-hu
-jo
-jC
-jW
-kk
-kk
-jW
-kX
+nO
+Vy
+nO
+TL
+nO
+nO
+nO
+nO
+nO
+TL
+Kr
+nO
+nO
+ma
+sP
+km
+nn
+nn
+km
+sP
 ll
 jx
-lL
+Lp
 Qz
 Qz
 Qz
@@ -15097,58 +14139,58 @@ Qz
 ah
 ao
 ao
-Fz
-aV
-Cp
-aV
-CQ
-cz
-bW
-bW
-bW
-bW
-bW
-bW
-dA
+OE
+zV
+fK
+zV
+zV
+zG
+QW
+QW
+QW
+QW
+QW
+QW
+dk
 dL
-dS
+dk
 bU
-es
-ec
-ec
-et
-cM
-eT
+Aj
+ds
+ds
+Nz
+Av
+aN
 Vx
 Vx
 Vx
 Vx
 Vx
-eT
-fJ
-fN
-fV
+aN
+RY
+fh
+ds
 gd
-gm
-gD
-gB
+nO
+Vy
+nO
 gd
-uD
-uD
-uD
-uD
-uD
+Sq
+Sq
+Sq
+Sq
+Sq
 gd
-iC
-iW
-je
+Kr
+nO
+nO
 jm
-jD
-jW
-kl
-kE
-jW
-la
+Vg
+km
+Ux
+ZT
+km
+ke
 ll
 jx
 jx
@@ -15235,62 +14277,62 @@ Qz
 Qz
 Qz
 Qz
-ab
+Wg
 ai
 ai
 ap
 ap
-UK
-bg
-bp
-bI
+vN
+WY
+zV
+oU
 bU
-cj
-cx
-cx
-da
-bW
-bW
-dA
+SJ
+dk
+dk
+dk
+QW
+QW
+dk
 dL
-dT
+hB
 bU
-ed
-ec
-ec
-et
-cM
+iQ
+ds
+ds
+Nz
+Av
 Vx
 Vx
-NI
-UZ
-UN
+gO
+KI
+Hh
 Vx
 Vx
-fJ
-fP
-fW
-ge
-gn
-gE
-gB
-Iv
-Xg
-Xg
-Xg
-Xg
-Xg
-na
-iD
-iX
-je
+RY
+fo
+Cz
+ZG
+YQ
+rt
+nO
+PO
+pQ
+pQ
+pQ
+pQ
+pQ
+ms
+rx
+nO
+nO
 jm
-jE
-jW
-kk
-jW
-jW
-lb
+EY
+km
+nn
+km
+km
+eE
 ll
 jx
 Qz
@@ -15383,60 +14425,60 @@ ah
 ah
 ao
 ao
-bh
-bq
-bJ
+HC
+mH
+qG
 bU
 ck
 cy
 cL
-db
-bW
-bW
-dB
-dM
-dU
+tJ
+QW
+QW
+uX
+Hb
+hB
 dW
-ec
-ec
-ec
-et
-cM
+ds
+ds
+ds
+Nz
+eb
 Vx
-Ib
-Lk
-yu
-Vk
-Rx
+qv
+ok
+Gx
+rr
+EU
 Vx
-fJ
-fQ
-fV
-gf
-go
-gF
-gB
-Iv
-Xg
-Xg
-Xg
-Xg
-Xg
-na
-iE
-iX
-jf
+CL
+FZ
+ds
+iN
+nO
+qA
+nO
+PO
+pQ
+pQ
+pQ
+pQ
+pQ
+ms
+ZJ
+nO
+Mz
 jm
-jF
-jX
-km
-kF
-kS
-lc
+QN
+Gu
+ej
+SN
+fC
+Lk
 lm
 lu
 lu
-lz
+el
 Qz
 Qz
 Qz
@@ -15533,46 +14575,46 @@ bU
 bU
 bU
 bU
-cz
-dV
+zG
+Sz
 bU
 bU
 bU
 bU
-ec
-ec
-ec
-eu
-eC
-LV
-Ki
-Ol
-lH
-ye
-xw
-ZP
-fJ
-fQ
-fX
+ds
+ds
+ds
+uf
+OZ
+HB
+lV
+rl
+JD
+hm
+uo
+AP
+Ht
+FZ
+hj
 gd
-gm
-gF
-gB
-Iv
-Xg
-Xg
-Xg
-Xg
-Xg
-na
-iF
-iX
-je
+nO
+qA
+nO
+PO
+pQ
+pQ
+pQ
+pQ
+pQ
+ms
+tj
+nO
+nO
 jm
 jm
 jm
-kn
-kG
+GJ
+ty
 jl
 jl
 ll
@@ -15668,58 +14710,58 @@ Qz
 az
 az
 aL
-br
-bK
-bX
+fX
+vo
+jf
 cl
 aX
-aM
-aA
-aA
-aA
-aA
-dN
-aA
-dX
-ec
-eg
-eg
-et
-cM
-tl
-xe
-Fk
-Ur
-Mb
-xe
-tl
-fJ
-fQ
-ec
-Pk
-gp
-gF
-gB
+nu
+nu
+nu
+nu
+nu
+kO
+nu
+nu
+ds
+eF
+Ib
+il
+Ae
+Ka
+Lu
+MH
+El
+im
+Lu
+Ka
+Ht
+FZ
+ds
+DD
+Nu
+XQ
+nO
 gd
-hH
-hH
-ib
-hH
-hH
+Zo
+Zo
+tr
+Zo
+Zo
 gd
-iG
-iY
-je
+Kr
+nO
+nO
 jp
-Oh
-jY
-ko
-kH
-jY
-jY
-ln
-lv
-lB
+va
+EO
+Ir
+EO
+EO
+EO
+eU
+QH
+DC
 Qz
 Qz
 Qz
@@ -15808,60 +14850,60 @@ Qz
 Qz
 Qz
 aK
-Hw
+To
 bi
-bs
-bw
-bY
+LE
+PM
+fX
 bv
-cA
-cM
-dc
-dl
-dl
-dl
-dl
-dl
-dY
-ee
-eh
-em
-ev
-cM
+eP
+nu
+nu
+ng
+ng
+ng
+ng
+ng
+nu
+eY
+Tf
+sc
+Lr
+Ul
 Vx
-FY
-FY
-eZ
+TJ
+TJ
+El
 Kd
 tX
 Vx
-fJ
-fQ
-ec
+YY
+FZ
+ds
 gd
-gq
-gG
-gX
-hr
-gX
-gX
-gX
-gX
-gX
-hr
-iH
-iZ
-jg
-jq
-jH
-jZ
-kp
-kI
-kI
-kI
-lo
-lw
-lB
+FP
+SK
+hE
+gy
+hE
+hE
+hE
+hE
+hE
+gy
+VT
+YQ
+YQ
+gT
+Vo
+Vo
+fZ
+Gs
+Gs
+Gs
+pn
+EO
+DC
 Qz
 Qz
 Qz
@@ -15950,60 +14992,60 @@ Qz
 Qz
 Qz
 aK
-nm
+xZ
 bi
-bt
-bL
-bZ
+fX
+Ig
+fX
 cm
-dp
-cN
-dd
+rE
+TU
+WV
 dm
 dm
 dm
 dm
 dm
-dZ
-ee
-ts
-en
-ev
-cM
-oQ
-HL
-nk
-eZ
+Sx
+eY
+mU
+CG
+Lr
+Av
+tO
+rH
+aV
+El
 qQ
 VV
-TN
-fJ
-fQ
-ec
+Uk
+RY
+FZ
+ds
 gd
-gr
-gH
-gB
-hs
-gB
-gB
-gB
-gB
-gB
-hs
-iI
-gB
-hu
-jr
-jI
-ka
-kq
-kI
-kI
-kI
-lp
-lw
-lB
+dQ
+Yq
+nO
+TL
+nO
+nO
+nO
+nO
+nO
+TL
+Ii
+nO
+nO
+Ns
+EO
+EO
+Ph
+Gs
+Gs
+Gs
+UK
+EO
+DC
 Qz
 Qz
 Qz
@@ -16099,53 +15141,53 @@ bv
 bv
 cn
 aX
-cO
-dd
+wz
+WV
 dm
 dq
 dq
 dq
 dm
-dZ
-ec
-SB
-Vu
-Ry
-cM
-VX
-oe
-Yx
-eZ
+Sx
+ds
+iM
+Vm
+UN
+Av
+wh
+pm
+sg
+El
 qQ
 VV
-TN
-fJ
-fQ
-ec
-Pk
-gs
-gI
-gY
+Uk
+RY
+FZ
+ds
+DD
+zE
+Qu
+fR
 gd
-hI
-hI
-ic
-hI
-hI
+iC
+iC
+LD
+iC
+iC
 gd
-iJ
-iW
-je
+Ii
+nO
+nO
 js
-Kx
-kb
-kr
-kJ
-kb
-kb
-lq
-lx
-lB
+YK
+EO
+Ir
+EO
+EO
+EO
+Tb
+zk
+DC
 Qz
 Qz
 Qz
@@ -16241,48 +15283,48 @@ bv
 tT
 co
 aX
-cP
-dd
+OV
+WV
 dm
 dq
 dC
 dq
 dm
-dZ
-ec
-ec
-ec
-et
-cM
+Sx
+ds
+ds
+ds
+Nz
+Av
 Vx
-GX
-JS
-eZ
+Ga
+fy
+El
 Kd
 FA
 Vx
-fJ
-fQ
-fY
+RY
+FZ
+hj
 gd
-gm
-gI
-gB
-Iv
-Xg
-Xg
-Xg
-Xg
-Xg
-na
-iK
-iX
-jh
-jt
-jt
-jt
-ks
+nO
 kK
+nO
+PO
+pQ
+pQ
+pQ
+pQ
+pQ
+ms
+zt
+nO
+Dx
+jt
+jt
+jt
+Al
+sz
 jw
 jw
 lr
@@ -16377,60 +15419,60 @@ ar
 az
 aL
 aL
-bj
-bw
+oI
+PM
 bv
 cb
 cp
 aX
-cQ
-dd
+St
+WV
 dm
 dq
 dq
 dq
 dm
-dZ
-ec
-ec
-ec
-et
-cM
+Sx
+ds
+ds
+ds
+Nz
+Av
 Vx
-NZ
-Tp
-yO
-yD
-oa
+Mv
+Lu
+Bj
+Tu
+uq
 Vx
-fJ
-fQ
-fZ
-gg
-gt
-gI
-gB
-Iv
-Xg
-Xg
-Xg
-Xg
-Xg
-na
-iL
-iX
-jf
+RY
+FZ
+ds
+ID
+nO
+kK
+nO
+PO
+pQ
+pQ
+pQ
+pQ
+pQ
+ms
+SE
+nO
+Mz
 jt
-jK
-kc
-kt
-kL
-kT
-ld
+HQ
+nB
+Py
+oy
+sl
+Eu
 ls
 ly
 ly
-lD
+OK
 Qz
 Qz
 Qz
@@ -16513,7 +15555,7 @@ Qz
 Qz
 Qz
 Qz
-ac
+sU
 aj
 ar
 as
@@ -16525,50 +15567,50 @@ aX
 aX
 aX
 cB
-cO
-dd
+wz
+WV
 dm
 dm
 dm
 dm
 dm
-dZ
-ec
-ec
-ec
-et
-cM
+Sx
+ds
+ds
+ds
+Nz
+Av
 Vx
 Vx
-VI
-mY
-Tp
+vc
+Hd
+Lu
 Vx
 Vx
-fJ
-fQ
-fV
-gf
-go
-gI
-gB
-Iv
-Xg
-Xg
-Xg
-Xg
-Xg
-na
-iM
-iX
-je
+RY
+FZ
+ds
+iN
+nO
+kK
+nO
+PO
+pQ
+pQ
+pQ
+pQ
+pQ
+ms
+QE
+nO
+nO
 jt
-jL
-kd
-ku
-kM
-kd
-le
+fl
+hh
+Fn
+YL
+hh
+Wv
 lr
 jS
 Qz
@@ -16659,58 +15701,58 @@ Qz
 ak
 as
 as
-aM
-aA
-aA
-bx
-aA
-aA
-aA
-aA
-cR
-de
-dn
-dn
-dn
-dn
-dn
-ea
-ec
-ec
-ec
-et
-cM
-eT
+nu
+nu
+nu
+DU
+nu
+nu
+nu
+nu
+wz
+nu
+gt
+gt
+gt
+gt
+gt
+nu
+ds
+ds
+ds
+Nz
+Av
+aN
 Vx
-Qj
-Qj
-Qj
+YF
+YF
+YF
 Vx
-eT
-fJ
-fQ
-fZ
+aN
+RY
+FZ
+ds
 gd
-gm
-gI
-gB
+nO
+kK
+nO
 gd
-Ow
-Ow
-Ow
-Ow
-Ow
+OA
+OA
+OA
+OA
+OA
 gd
-iN
-iY
-je
+Ii
+nO
+nO
 jt
-jM
-kd
-kv
-kv
-kd
-lf
+XO
+hh
+FT
+FT
+hh
+IN
 lr
 jS
 jS
@@ -16800,62 +15842,62 @@ Qz
 Qz
 ak
 as
-aA
+KT
+Pr
+QY
+os
+QY
+bm
+QY
+Ge
+QY
+VJ
+QY
+QY
+QY
+Mp
+QY
+os
+QY
+Cz
+Cz
+Cz
+LN
+dr
+aN
+aN
+aN
+aN
+aN
+aN
 aN
-aY
-bk
-aY
-bM
-aY
-cq
-aY
-cS
-aY
-aY
-aY
-dD
-aY
-bk
-eb
-eb
-eb
-eb
-eF
 dr
-eJ
-eT
-eT
-eT
-eT
-eT
-eT
-dr
-fR
-ec
+ik
+ds
 gd
-gm
-gJ
-gZ
-ht
-gB
-gB
-gB
-gB
-gB
-ip
-iO
-gB
-ho
-ju
-jN
-kd
-kw
-kN
-kd
-lg
+nO
+kK
+nO
+oQ
+nO
+nO
+nO
+nO
+nO
+oQ
+Kv
+nO
+nO
+vr
+nq
+hh
+FQ
+Kk
+hh
+nq
 lr
 jS
-lN
+HH
 Qz
 Qz
 Qz
@@ -16943,61 +15985,61 @@ Qz
 al
 at
 aB
-aO
+CX
 aB
 aB
 by
-bN
+xx
 by
 by
 cC
-cT
+FY
 cC
 cC
 dr
-dE
+uy
 dr
 dr
-ec
-ec
-ec
-ec
-ex
+Ll
+ds
+ds
+ds
+jM
 dr
 dr
-eU
-eU
-eU
-eU
-eU
+Tz
+Tz
+Tz
+Tz
+Tz
 dr
 dr
-fQ
-ec
+FZ
+ds
 gh
-gm
-gB
-gB
-gB
-gB
-gB
-gB
-gB
-gB
-gB
-iI
-gB
-hu
-jv
-jO
-kd
+nO
 kx
-kO
-kd
-lh
+pK
+pX
+nO
+nO
+nO
+nO
+nO
+qH
+nA
+nO
+nO
+gV
+nq
+hh
+Rp
+Sm
+hh
+wa
 lr
 jS
-lN
+HH
 Qz
 Qz
 Qz
@@ -17096,47 +16138,47 @@ lQ
 cU
 df
 cC
-ds
-dF
-dO
+oR
+Sg
+HO
 dr
-ec
-ec
-ec
-eo
-ey
-fB
-eB
-eV
-eB
-fo
-fy
-fD
-fD
-fK
-fS
-ec
+Ll
+ds
+ds
+ds
+uc
+tZ
+QT
+ni
+QT
+fG
+yY
+Xd
+Xd
+XZ
+QU
+ds
 gd
-gu
-gK
-go
-hu
-gK
-gK
-gK
-gK
-gK
-go
-iP
-gK
-ji
+nO
+nO
+kK
+nO
+nO
+nO
+nO
+nO
+nO
+nO
+Ii
+nO
+wS
 jt
-jP
-ke
-ky
-kP
-kU
-li
+TE
+WB
+TZ
+xt
+Rc
+By
 lr
 jS
 lO
@@ -17238,50 +16280,50 @@ cE
 cV
 dg
 cC
-dt
+Ex
 dG
 as
 as
 as
 as
 ek
-ec
-ec
-ec
-ec
-eL
-ec
-LW
-Fu
-ec
-ec
-ec
-fw
-ec
+ds
+ds
+yk
+ds
+Lh
+ds
+uK
+wn
+ds
+ds
+ds
+kP
+ds
 gi
 gi
 gi
-ha
-hv
+fQ
+cT
 lK
 gi
 gi
 gi
 gi
-ha
-iQ
+jq
+Ln
 lK
 gi
 jt
-jQ
-kf
-kz
-kQ
-kV
-lg
+nq
+qT
+Pd
+ih
+Xq
+nq
 lr
 jS
-lN
+HH
 Qz
 Qz
 Qz
@@ -17388,42 +16430,42 @@ ar
 ar
 as
 as
-ep
-ec
-ec
-eL
-eX
-fp
-fz
-ec
-fH
-ec
-ec
-ec
+ds
+ds
+wT
+Lh
+pT
+cA
+Mb
+ds
+Ve
+ds
+ds
+ds
 gi
-gv
-gL
-hb
-hw
-hK
-hU
-id
-hK
-hU
-hb
-iR
-id
-jj
+yw
+vf
+if
+Bg
+UY
+NC
+zQ
+UY
+NC
+NQ
+ea
+Bg
+yw
 jt
-jR
-kg
-kA
-kA
-kA
-lj
+nq
+qD
+nq
+nq
+nq
+nq
 lr
 jS
-lN
+HH
 Qz
 Qz
 Qz
@@ -17534,34 +16576,34 @@ as
 as
 as
 dG
-eX
-fh
-fA
+pT
+eg
+ML
 as
 as
 as
 as
 ga
 ga
-gw
-gM
-hc
-hx
-hL
-hV
-hX
-ie
-hV
-iq
-iS
-ih
-jk
+wM
+Bg
+jF
+Bg
+jN
+go
+Bg
+zg
+go
+PV
+mI
+Bg
+yw
 jw
 jw
 jw
 jw
-BL
-BL
+Wv
+Wv
 jw
 lr
 jS
@@ -17649,19 +16691,19 @@ Qz
 Qz
 Qz
 Qz
-ad
+fA
 an
 av
 av
-aS
+Rq
 av
 av
 bD
-bR
+SD
 bD
 bD
 cH
-cX
+le
 cH
 cH
 ar
@@ -17676,9 +16718,9 @@ ar
 ar
 ar
 ak
-fg
-fg
-fg
+sn
+sn
+sn
 ar
 ar
 ar
@@ -17686,28 +16728,28 @@ ar
 gb
 ga
 ga
-gN
-hd
-hy
-hM
+Bg
+Bg
+Bg
 hW
-hX
-hM
+Hg
+Bg
 hW
-ir
-iT
-ja
+Hg
+Ef
+mz
+oi
 ga
 jw
 jS
 jS
 jS
-kR
-kR
+GF
+GF
 jS
 lt
 ly
-lD
+OK
 Qz
 Qz
 Qz
@@ -17807,7 +16849,7 @@ Qz
 Qz
 Qz
 Qz
-dH
+aI
 Qz
 Qz
 Qz
@@ -17817,7 +16859,7 @@ Qz
 Qz
 Qz
 Qz
-dH
+aI
 Qz
 Qz
 Qz
@@ -17829,15 +16871,15 @@ gb
 gb
 ga
 ga
-he
-hz
-hN
-hN
-hN
-hN
-hN
-is
-iU
+fm
+Ni
+Ni
+qd
+DX
+DX
+DX
+BB
+nY
 ga
 ga
 gb
@@ -17972,13 +17014,13 @@ gb
 gb
 ga
 hf
-hA
-gM
-hX
-hX
-hX
-ih
-it
+kd
+Bg
+ei
+Bg
+HP
+DG
+XJ
 hf
 ga
 gb
@@ -18115,11 +17157,11 @@ gb
 gb
 hf
 ga
-gN
-hY
-hY
-hY
-ii
+Bg
+Bg
+Bg
+Bg
+wY
 ga
 hf
 gb
@@ -18257,11 +17299,11 @@ Qz
 gb
 hg
 ga
-mD
-mD
-Ul
-Be
-Be
+Wo
+Wo
+Wu
+AK
+AK
 ga
 hg
 gb
@@ -18399,11 +17441,11 @@ Qz
 Qz
 hg
 lC
-hO
-hO
-hO
-hO
-hO
+oG
+oG
+oG
+oG
+oG
 lC
 hg
 Qz
@@ -18539,7 +17581,7 @@ Qz
 Qz
 Qz
 Qz
-hh
+HF
 Qz
 Qz
 Qz
@@ -18547,7 +17589,7 @@ Qz
 Qz
 Qz
 Qz
-hh
+HF
 Qz
 Qz
 Qz