From e29d40e1cc1322bbd9978723839cf759e67bb2d7 Mon Sep 17 00:00:00 2001
From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com>
Date: Sat, 31 Aug 2024 22:13:41 -0700
Subject: [PATCH] cargo area tweaks

---
 .../nanotrasen/nanotrasen_harrier.dmm         | 220 +++++++++---------
 1 file changed, 110 insertions(+), 110 deletions(-)

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_harrier.dmm b/_maps/shuttles/nanotrasen/nanotrasen_harrier.dmm
index 9c5e987d118f..04ab20764057 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_harrier.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_harrier.dmm
@@ -148,7 +148,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "bd" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -286,7 +286,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "bR" = (
 /obj/effect/turf_decal/ntspaceworks_big/one{
 	dir = 8
@@ -409,7 +409,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/mono,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "cx" = (
 /obj/structure/chair/sofa/blue/corpo/left,
 /obj/effect/turf_decal/trimline/opaque/ntblue/filled/line{
@@ -459,7 +459,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "cN" = (
 /obj/structure/tank_dispenser/oxygen,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -621,10 +621,10 @@
 	},
 /obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "dG" = (
 /turf/closed/wall/mineral/titanium/exterior,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "dI" = (
 /obj/machinery/door/airlock{
 	dir = 4;
@@ -694,7 +694,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "dO" = (
 /obj/machinery/computer/atmos_control/incinerator{
 	dir = 8;
@@ -935,7 +935,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "fb" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -981,7 +981,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "fl" = (
 /obj/structure/chair/sofa/blue/corpo/left/directional/north,
 /turf/open/floor/plasteel,
@@ -1164,7 +1164,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "gq" = (
 /obj/effect/turf_decal/corner/opaque/white{
 	dir = 4
@@ -1294,7 +1294,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "gU" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -1345,7 +1345,7 @@
 "hj" = (
 /obj/structure/sign/warning/vacuum,
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "hq" = (
 /obj/structure/crate_shelf,
 /obj/structure/closet/crate{
@@ -1359,7 +1359,7 @@
 /obj/item/storage/cans/sixbeer,
 /obj/machinery/light/directional/west,
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "hx" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 4
@@ -1472,7 +1472,7 @@
 	dir = 5
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "hQ" = (
 /obj/machinery/computer/monitor{
 	dir = 8;
@@ -1523,7 +1523,7 @@
 "ih" = (
 /obj/effect/turf_decal/industrial/warning,
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "ir" = (
 /obj/structure/sign/departments/medbay/alt,
 /turf/closed/wall/mineral/titanium/nodiagonal,
@@ -1675,7 +1675,7 @@
 "je" = (
 /obj/effect/turf_decal/trimline/transparent/white/filled/warning,
 /turf/open/floor/plasteel/mono,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "jf" = (
 /turf/open/floor/plasteel/patterned,
 /area/ship/engineering/atmospherics)
@@ -1866,7 +1866,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "km" = (
 /obj/structure/closet/secure_closet/armory1{
 	populate = 0;
@@ -2072,7 +2072,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/mono,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "ln" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
@@ -2153,7 +2153,7 @@
 	dir = 9
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "lQ" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -2288,7 +2288,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "mJ" = (
 /obj/machinery/conveyor{
 	dir = 1;
@@ -2343,7 +2343,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "mZ" = (
 /obj/structure/table/reinforced,
 /obj/item/cutting_board,
@@ -2399,7 +2399,7 @@
 "nj" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "nv" = (
 /obj/machinery/deepfryer,
 /obj/effect/turf_decal/corner/opaque/white{
@@ -2446,7 +2446,7 @@
 /obj/machinery/firealarm/directional/north,
 /obj/effect/turf_decal/siding/thinplating,
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "og" = (
 /obj/structure/cable{
 	icon_state = "6-8"
@@ -2543,7 +2543,7 @@
 /area/ship/bridge)
 "oG" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "oT" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -2679,7 +2679,7 @@
 	dir = 9
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "pY" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -2740,7 +2740,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "qp" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
@@ -2826,7 +2826,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "qO" = (
 /obj/effect/turf_decal/corner/opaque/ntblue/full,
 /obj/effect/turf_decal/corner/opaque/white{
@@ -2911,7 +2911,7 @@
 	},
 /obj/machinery/light/directional/west,
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "rr" = (
 /obj/structure/closet/secure_closet/freezer/kitchen/mining,
 /obj/structure/window/reinforced{
@@ -2948,7 +2948,7 @@
 	name = "Cargo Bay Blast Door"
 	},
 /turf/open/floor/plating,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "rK" = (
 /obj/structure/chair/sofa/blue/corpo/left/directional/north,
 /obj/effect/turf_decal/trimline/opaque/ntblue/filled/line,
@@ -3032,7 +3032,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "sh" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -3093,7 +3093,7 @@
 	dir = 5
 	},
 /turf/open/floor/plasteel/mono,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "sw" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
@@ -3166,7 +3166,7 @@
 	},
 /obj/machinery/light/directional/north,
 /turf/open/floor/plating,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "sN" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -3180,7 +3180,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "sU" = (
 /turf/open/floor/wood,
 /area/ship/crew/law_office)
@@ -3213,7 +3213,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "tm" = (
 /obj/structure/disposalpipe/segment{
 	dir = 6
@@ -3240,7 +3240,7 @@
 /obj/structure/rack,
 /obj/item/pickaxe,
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "tF" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3252,7 +3252,7 @@
 	dir = 10
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "tG" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -3290,7 +3290,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "tI" = (
 /obj/effect/spawner/structure/window/shuttle,
 /obj/machinery/door/poddoor{
@@ -3327,7 +3327,7 @@
 /obj/item/clothing/head/helmet/space/orange,
 /obj/item/clothing/head/helmet/space/orange,
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "tO" = (
 /obj/structure/closet/secure_closet/freezer/meat,
 /turf/open/floor/plasteel/freezer,
@@ -3506,7 +3506,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "uu" = (
 /obj/machinery/disposal/deliveryChute{
 	dir = 8
@@ -3523,7 +3523,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "uv" = (
 /obj/machinery/atmospherics/pipe/layer_manifold/visible{
 	dir = 4
@@ -3725,7 +3725,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "vd" = (
 /obj/structure/closet/secure_closet/head_of_personnel{
 	populate = 0
@@ -3749,7 +3749,7 @@
 	tag = "QM Office"
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "vl" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -3758,7 +3758,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "vm" = (
 /obj/effect/turf_decal/corner/opaque/ntblue/full,
 /obj/effect/turf_decal/corner/opaque/white{
@@ -3786,7 +3786,7 @@
 	id = "harrier_packagesort"
 	},
 /turf/open/floor/plating,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "vs" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
@@ -3872,14 +3872,14 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "vS" = (
 /obj/structure/filingcabinet/double/grey,
 /obj/structure/sign/nanotrasen/ns{
 	pixel_y = 32
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "vT" = (
 /obj/machinery/door/airlock/public/glass{
 	dir = 4
@@ -3951,7 +3951,7 @@
 	dir = 10
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "wn" = (
 /obj/effect/turf_decal/industrial/warning/fulltile,
 /obj/machinery/door/poddoor{
@@ -3968,7 +3968,7 @@
 	icon_state = "0-1"
 	},
 /turf/open/floor/plating,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "wp" = (
 /obj/machinery/washing_machine,
 /obj/machinery/light/small/directional/east,
@@ -4038,7 +4038,7 @@
 /area/ship/hallway/starboard)
 "wH" = (
 /turf/open/floor/plasteel/mono,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "wL" = (
 /obj/structure/chair/comfy/blue/corpo/directional/south,
 /obj/effect/turf_decal/trimline/opaque/ntblue/line{
@@ -4125,7 +4125,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "xf" = (
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -4178,7 +4178,7 @@
 	dir = 9
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "xl" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -4260,7 +4260,7 @@
 	},
 /obj/item/stack/wrapping_paper,
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "xK" = (
 /obj/effect/turf_decal/corner/opaque/white{
 	dir = 4
@@ -4354,7 +4354,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "ym" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
@@ -4377,7 +4377,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "ys" = (
 /obj/machinery/atmospherics/pipe/simple/green/hidden/layer1,
 /obj/machinery/atmospherics/pipe/simple/purple/hidden{
@@ -4437,7 +4437,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "yG" = (
 /obj/structure/table/wood,
 /obj/item/storage/pill_bottle/dice,
@@ -4515,7 +4515,7 @@
 	id = "harrier_packagesort"
 	},
 /turf/open/floor/plating,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "zc" = (
 /obj/effect/spawner/structure/window/shuttle,
 /obj/machinery/atmospherics/pipe/simple/brown/visible/layer1{
@@ -4754,7 +4754,7 @@
 /obj/item/hand_labeler,
 /obj/item/destTagger,
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "Ao" = (
 /obj/machinery/computer/card{
 	dir = 8;
@@ -4773,7 +4773,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "Aw" = (
 /obj/structure/table,
 /obj/effect/turf_decal/trimline/opaque/ntblue/line,
@@ -4840,7 +4840,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "Bj" = (
 /obj/machinery/holopad/emergency/kitchen,
 /obj/effect/turf_decal/box,
@@ -5168,10 +5168,10 @@
 	pixel_x = 32
 	},
 /turf/open/floor/plating,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "CO" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "CP" = (
 /obj/machinery/atmospherics/pipe/simple/brown/visible/layer1,
 /obj/machinery/atmospherics/pipe/simple/purple/visible,
@@ -5474,7 +5474,7 @@
 	pixel_x = -32
 	},
 /turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "Ez" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -5501,7 +5501,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "ED" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/effect/turf_decal/trimline/opaque/ntblue/filled/corner{
@@ -5555,7 +5555,7 @@
 	dir = 5
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "EV" = (
 /obj/structure/bed,
 /obj/structure/curtain/bounty,
@@ -5789,7 +5789,7 @@
 /turf/open/floor/plasteel/stairs{
 	dir = 4
 	},
-/area/ship/cargo/office)
+/area/ship/cargo)
 "Gi" = (
 /obj/effect/spawner/structure/window/shuttle,
 /obj/machinery/atmospherics/pipe/simple/brown/visible/layer1{
@@ -5808,7 +5808,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "Gr" = (
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
@@ -5826,7 +5826,7 @@
 /obj/item/clothing/gloves/fingerless,
 /obj/item/storage/backpack/messenger,
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "Gy" = (
 /turf/closed/wall/mineral/titanium/interior,
 /area/ship/medical)
@@ -5847,7 +5847,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "GG" = (
 /obj/machinery/power/shuttle/engine/fueled/plasma{
 	dir = 4
@@ -5870,7 +5870,7 @@
 "GK" = (
 /obj/structure/sign/departments/cargo,
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "GY" = (
 /obj/structure/cable{
 	icon_state = "6-9"
@@ -5945,7 +5945,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "Ho" = (
 /obj/structure/filingcabinet{
 	density = 0;
@@ -6072,7 +6072,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "Ia" = (
 /obj/effect/turf_decal/corner/opaque/ntblue/full,
 /turf/open/floor/plasteel,
@@ -6158,7 +6158,7 @@
 	},
 /obj/effect/turf_decal/borderfloor,
 /turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "IS" = (
 /obj/structure/sign/warning/docking{
 	pixel_y = -8
@@ -6198,7 +6198,7 @@
 	icon_state = "0-4"
 	},
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "Jd" = (
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable{
@@ -6242,7 +6242,7 @@
 /obj/effect/spawner/structure/window/shuttle,
 /obj/machinery/door/firedoor/window,
 /turf/open/floor/plating,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "Ju" = (
 /obj/machinery/vending/cigarette,
 /obj/effect/turf_decal/siding/wood{
@@ -6252,7 +6252,7 @@
 /area/ship/crew)
 "Jv" = (
 /turf/closed/wall/mineral/titanium/exterior,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "Jw" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -6338,7 +6338,7 @@
 	pixel_y = 20
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "JP" = (
 /obj/effect/turf_decal/trimline/opaque/ntblue/line{
 	dir = 5
@@ -6535,7 +6535,7 @@
 "KA" = (
 /obj/structure/crate_shelf,
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "KB" = (
 /obj/effect/turf_decal/trimline/transparent/white/filled/warning{
 	dir = 4
@@ -6589,7 +6589,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "KO" = (
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable{
@@ -6757,7 +6757,7 @@
 	dir = 6
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "Lv" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -7036,7 +7036,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/mono,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "MW" = (
 /obj/structure/chair/sofa/blue/corpo/right/directional/east,
 /obj/effect/turf_decal/siding/wood,
@@ -7089,7 +7089,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "Nm" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
@@ -7180,7 +7180,7 @@
 	},
 /obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "Ny" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -7237,7 +7237,7 @@
 	icon_state = "0-1"
 	},
 /turf/open/floor/plating,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "NE" = (
 /obj/structure/filingcabinet/double{
 	dir = 8;
@@ -7545,7 +7545,7 @@
 /obj/machinery/door/window/eastleft,
 /obj/structure/disposalpipe/trunk,
 /turf/open/floor/plating,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "Pv" = (
 /obj/machinery/conveyor{
 	dir = 1;
@@ -7555,7 +7555,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "Pw" = (
 /obj/structure/table,
 /obj/effect/turf_decal/trimline/opaque/ntblue/line{
@@ -7633,7 +7633,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "PQ" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
@@ -7643,7 +7643,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "PU" = (
 /obj/effect/turf_decal/corner/opaque/ntblue/full,
 /obj/effect/turf_decal/corner/opaque/white{
@@ -7668,7 +7668,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "Qb" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
@@ -7774,7 +7774,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "QG" = (
 /obj/machinery/button/door{
 	dir = 4;
@@ -7836,7 +7836,7 @@
 /obj/structure/railing,
 /obj/machinery/autolathe,
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "QW" = (
 /obj/machinery/door/airlock/command{
 	dir = 8;
@@ -8252,7 +8252,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "Tj" = (
 /obj/machinery/firealarm/directional/east,
 /turf/open/floor/plasteel/mono,
@@ -8292,7 +8292,7 @@
 	pixel_y = 5
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "Tv" = (
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
@@ -8342,7 +8342,7 @@
 	},
 /obj/structure/closet/emcloset/wall/directional/west,
 /turf/open/floor/noslip,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "TO" = (
 /obj/machinery/computer/helm{
 	dir = 8;
@@ -8376,7 +8376,7 @@
 	},
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "TX" = (
 /obj/structure/filingcabinet/double{
 	pixel_x = 4
@@ -8438,7 +8438,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/mono,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "Uj" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{
 	dir = 4
@@ -8496,7 +8496,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "Ur" = (
 /obj/structure/chair,
 /obj/effect/landmark/start/assistant,
@@ -8688,7 +8688,7 @@
 /obj/effect/turf_decal/box,
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "Vi" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on/layer2,
 /turf/open/floor/engine/air,
@@ -8724,7 +8724,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "Vs" = (
 /obj/machinery/conveyor{
 	dir = 1;
@@ -8754,7 +8754,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/stairs,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "VJ" = (
 /obj/machinery/door/airlock/public/glass,
 /obj/structure/cable{
@@ -8956,10 +8956,10 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "WR" = (
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "WT" = (
 /obj/structure/table/wood,
 /obj/item/toy/cards/deck/kotahi,
@@ -9015,7 +9015,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "Xw" = (
 /obj/effect/turf_decal/industrial/warning/fulltile,
 /obj/machinery/door/poddoor{
@@ -9084,14 +9084,14 @@
 /obj/machinery/suit_storage_unit/standard_unit,
 /obj/effect/turf_decal/siding/thinplating,
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "XK" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/mono,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "XL" = (
 /obj/effect/turf_decal/corner/opaque/white{
 	dir = 4
@@ -9136,7 +9136,7 @@
 /area/ship/crew/canteen)
 "XW" = (
 /turf/open/floor/plasteel/stairs,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "XY" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -9177,7 +9177,7 @@
 	},
 /obj/effect/turf_decal/trimline/opaque/nsorange/filled/corner,
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/area/ship/storage/eva)
 "Yk" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -9230,7 +9230,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "Yz" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -9358,7 +9358,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "Zb" = (
 /turf/open/floor/plasteel,
 /area/ship/crew)
@@ -9419,7 +9419,7 @@
 /obj/item/clothing/gloves/fingerless,
 /obj/item/storage/backpack/messenger,
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "Zm" = (
 /obj/effect/turf_decal/trimline/opaque/ntblue/filled/corner{
 	dir = 4
@@ -9480,7 +9480,7 @@
 	color = "Black"
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/cargo/office)
+/area/ship/cargo)
 "ZS" = (
 /obj/effect/spawner/structure/window/shuttle,
 /obj/machinery/door/firedoor/window,