diff --git a/_maps/shuttles/solgov/solgov_homa.dmm b/_maps/shuttles/solgov/solgov_homa.dmm
index 081c55b1bce1..7490ff0cf8d6 100644
--- a/_maps/shuttles/solgov/solgov_homa.dmm
+++ b/_maps/shuttles/solgov/solgov_homa.dmm
@@ -22,7 +22,7 @@
 	},
 /obj/structure/salvageable/autolathe,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "aI" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/fakelattice{
@@ -81,9 +81,6 @@
 /area/ship/crew/canteen)
 "cD" = (
 /obj/structure/catwalk,
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
@@ -92,7 +89,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "cH" = (
 /obj/machinery/computer/helm,
 /obj/machinery/light/small/directional/north,
@@ -126,7 +123,7 @@
 	pixel_x = 31
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "dP" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -148,7 +145,7 @@
 "dX" = (
 /obj/effect/decal/cleanable/oil,
 /turf/closed/wall/mineral/plastitanium/explosive,
-/area/ship/engineering)
+/area/ship/cargo)
 "ec" = (
 /obj/item/trash/raisins,
 /obj/structure/railing{
@@ -162,7 +159,7 @@
 /obj/machinery/door/poddoor,
 /obj/structure/fans/tiny,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "fp" = (
 /obj/structure/rack,
 /obj/item/gun/ballistic/automatic/assault/ak47{
@@ -290,9 +287,8 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/spawner/lootdrop/crate_spawner,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "jd" = (
 /obj/machinery/airalarm/directional/east{
 	pixel_x = 30
@@ -321,19 +317,16 @@
 /obj/effect/decal/cleanable/generic,
 /obj/effect/decal/cleanable/plastic,
 /obj/effect/decal/cleanable/oil,
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
 /obj/machinery/atmospherics/pipe/manifold/general/hidden,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "jL" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "jW" = (
 /obj/structure/sign/poster/contraband/ambrosia_vulgaris,
 /turf/closed/wall/mineral/wood,
@@ -374,7 +367,7 @@
 	icon_state = "0-2"
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "kU" = (
 /turf/closed/wall/mineral/plastitanium/explosive,
 /area/ship/bridge)
@@ -463,11 +456,9 @@
 "nD" = (
 /obj/structure/catwalk,
 /obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/atmospherics/components/binary/pump{
-	name = "engine fuel pump"
-	},
+/obj/machinery/atmospherics/components/binary/pump,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "nU" = (
 /obj/structure/girder,
 /turf/open/floor/plating,
@@ -550,7 +541,7 @@
 	},
 /obj/structure/window/plasma/spawner,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "qw" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/structure/catwalk,
@@ -597,7 +588,7 @@
 	pixel_y = 11
 	},
 /turf/closed/wall,
-/area/ship/engineering)
+/area/ship/cargo)
 "sp" = (
 /obj/effect/decal/cleanable/leaper_sludge,
 /obj/effect/decal/cleanable/oil,
@@ -610,7 +601,7 @@
 	id = 1
 	},
 /turf/closed/wall/mineral/plastitanium/explosive,
-/area/ship/engineering)
+/area/ship/cargo)
 "sC" = (
 /obj/structure/rack,
 /obj/item/ammo_box/magazine/ak47{
@@ -693,12 +684,6 @@
 /obj/machinery/suit_storage_unit/standard_unit,
 /turf/open/floor/plasteel,
 /area/ship/security/armory)
-"tt" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/ship/engineering)
 "tI" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/trash/chips,
@@ -732,12 +717,12 @@
 "vg" = (
 /obj/structure/catwalk,
 /turf/open/floor/plating/rust,
-/area/ship/engineering)
+/area/ship/cargo)
 "wq" = (
 /obj/machinery/door/poddoor,
 /obj/structure/fans/tiny,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "ws" = (
 /obj/structure/railing{
 	layer = 4.1
@@ -837,7 +822,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "yL" = (
 /obj/effect/decal/cleanable/oil,
 /obj/structure/railing{
@@ -890,9 +875,6 @@
 /obj/effect/decal/cleanable/glass,
 /turf/open/floor/carpet/green,
 /area/ship/crew/canteen)
-"Ae" = (
-/turf/closed/wall/rust,
-/area/ship/engineering)
 "As" = (
 /obj/structure/chair/sofa/left{
 	dir = 1
@@ -915,10 +897,6 @@
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
-"AJ" = (
-/obj/structure/girder,
-/turf/open/floor/plating,
-/area/ship/engineering)
 "AT" = (
 /obj/structure/closet/wall/white/med{
 	dir = 4;
@@ -958,7 +936,7 @@
 	},
 /obj/effect/turf_decal/industrial/outline/red,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "BX" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/structure/catwalk,
@@ -973,9 +951,8 @@
 	icon_state = "0-4"
 	},
 /obj/effect/decal/cleanable/blood/gibs/torso,
-/obj/item/reagent_containers/food/snacks/grown/ambrosia,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "Ca" = (
 /obj/effect/decal/cleanable/oil,
 /turf/open/floor/carpet/red/airless,
@@ -992,10 +969,7 @@
 	},
 /obj/structure/ore_box,
 /turf/open/floor/plating,
-/area/ship/engineering)
-"CE" = (
-/turf/closed/wall,
-/area/ship/engineering)
+/area/ship/cargo)
 "Eb" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/structure/catwalk,
@@ -1005,8 +979,9 @@
 /obj/machinery/atmospherics/pipe/simple/brown/hidden{
 	dir = 6
 	},
+/obj/item/reagent_containers/food/snacks/grown/ambrosia,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "Ed" = (
 /obj/machinery/light/small/broken/directional/south,
 /obj/structure/cable{
@@ -1022,7 +997,7 @@
 /obj/structure/catwalk,
 /obj/effect/turf_decal/industrial/outline/red,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "ES" = (
 /obj/structure/fluff/clockwork/alloy_shards,
 /turf/open/floor/plating,
@@ -1055,8 +1030,9 @@
 "Gj" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/structure/catwalk,
+/obj/effect/spawner/lootdrop/crate_spawner,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "Gn" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/structure/catwalk,
@@ -1082,17 +1058,11 @@
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/structure/catwalk,
 /obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/power/apc/auto_name/directional/east{
-	pixel_x = 31
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "Hf" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -1151,7 +1121,7 @@
 /area/ship/bridge)
 "Ik" = (
 /turf/closed/wall/r_wall/rust,
-/area/ship/engineering)
+/area/ship/cargo)
 "Iu" = (
 /obj/machinery/light_switch{
 	dir = 4;
@@ -1212,7 +1182,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "Kg" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 1
@@ -1503,7 +1473,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "Sk" = (
 /obj/effect/decal/cleanable/blood/gibs/down,
 /turf/open/floor/plasteel,
@@ -1557,9 +1527,6 @@
 	},
 /turf/closed/wall/rust,
 /area/ship/cargo)
-"TP" = (
-/turf/closed/wall/mineral/plastitanium/explosive,
-/area/ship/engineering)
 "Uv" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
@@ -1583,7 +1550,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "UR" = (
 /obj/structure/fluff/broken_flooring,
 /obj/machinery/airalarm/directional/east{
@@ -1618,7 +1585,7 @@
 /obj/machinery/light/small/directional/east,
 /obj/structure/ore_box,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "VJ" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1683,7 +1650,7 @@
 "WH" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/closed/wall,
-/area/ship/engineering)
+/area/ship/cargo)
 "WQ" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/effect/decal/cleanable/oil/slippery,
@@ -1699,7 +1666,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "Yg" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/structure/catwalk,
@@ -1719,7 +1686,7 @@
 /obj/machinery/light/small/broken/directional/east,
 /obj/machinery/firealarm/directional/north,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "YB" = (
 /obj/effect/decal/cleanable/blood/gibs,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1764,9 +1731,7 @@
 /area/ship/crew/canteen)
 "ZQ" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/atmospherics/components/binary/pump{
-	name = "engine fuel pump"
-	},
+/obj/machinery/atmospherics/components/binary/pump,
 /turf/open/floor/plating,
 /area/ship/cargo)
 "ZT" = (
@@ -1816,9 +1781,9 @@ SR
 SR
 SR
 SR
-Ae
-CE
-CE
+rC
+nc
+nc
 SR
 SR
 SR
@@ -1842,12 +1807,12 @@ ad
 ZA
 SR
 Ik
-TP
+FI
 BI
-TP
-CE
-TP
-Ae
+FI
+nc
+FI
+rC
 SR
 SR
 "}
@@ -1867,14 +1832,14 @@ Ku
 ad
 ln
 tj
-TP
+FI
 kF
 BX
 Ex
 Ct
 nD
 qv
-tt
+Oz
 SR
 "}
 (5,1,1) = {"
@@ -1893,7 +1858,7 @@ AY
 jW
 mS
 LC
-AJ
+nU
 Eb
 JP
 Si
@@ -1971,13 +1936,13 @@ Fg
 YE
 Rh
 qW
-TP
-CE
-TP
+FI
+nc
+FI
 sf
 dX
 sx
-TP
+FI
 SR
 SR
 "}