From 76237ab4b83fd827d7eb3f04e1ca0ff63a4c5015 Mon Sep 17 00:00:00 2001 From: Zergspower Date: Sun, 2 Oct 2022 09:02:30 -0500 Subject: [PATCH] Fixes broken cryo on Cargodise Lost, expands areas and APC's (#16456) * Fixes broken cryo on cargodise lost, expands areas and APC's * Cable Linters * Update cargodiselost.dmm * Update cargodiselost.dmm * 1 * Lol funny typo * Linter --- .../SpaceRuins/skyrat/cargodiselost.dmm | 2183 ++++++++++------- .../modules/mapping/code/areas/space.dm | 33 + .../modules/mapping/code/mob_spawns.dm | 5 - 3 files changed, 1300 insertions(+), 921 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm index de00da674f7..8f4f4f0406e 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm @@ -1,4 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"am" = ( +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) "av" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /mob/living/simple_animal/hostile/russian/ranged{ @@ -7,49 +10,54 @@ /turf/open/floor/iron/dark/green/corner{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "aC" = ( /obj/structure/rack, /obj/effect/spawner/random/entertainment/money_large, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "aH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/light{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron/dark/green/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "aL" = ( /obj/machinery/door/airlock/public{ name = "Crew Quarters" }, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark/green, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "aR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/dark/green/side{ dir = 9 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "aS" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "bd" = ( /obj/machinery/griddle, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"bi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) "bk" = ( /obj/structure/table/reinforced, /obj/item/modular_computer/tablet/pda/clear, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "bo" = ( /obj/machinery/light{ dir = 1 @@ -60,22 +68,27 @@ /turf/open/floor/iron/brown/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "bq" = ( /obj/structure/table, /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "bs" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/large, /obj/effect/spawner/random/decoration/statue, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"bt" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron/dark/brown, +/area/ruin/space/has_grav/cargodise_freighter/mining) "bM" = ( /obj/machinery/vending/coffee, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "bZ" = ( /obj/structure/window/reinforced/tinted{ dir = 4 @@ -83,24 +96,25 @@ /obj/machinery/shower/directional/south, /obj/effect/spawner/random/trash/soap, /turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "cb" = ( /obj/structure/window/reinforced/tinted{ dir = 4 }, /obj/machinery/shower/directional/south, /turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "cG" = ( /obj/effect/turf_decal/loading_area, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "cL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, /turf/open/floor/iron/dark/green/side{ dir = 4 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "da" = ( /obj/structure/window/reinforced/tinted{ dir = 4 @@ -109,35 +123,49 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/trauma) "df" = ( /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark/green/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "dg" = ( /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/iron/brown/side{ dir = 9 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "dk" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/light, +/obj/structure/cable, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "dn" = ( /obj/structure/table/reinforced, /obj/item/modular_computer/laptop/preset/civilian, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "du" = ( /obj/machinery/shower/directional/south, /obj/effect/spawner/random/trash/soap, /turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"dB" = ( +/obj/machinery/door/airlock/mining/glass{ + name = "Cargo Bay" + }, +/obj/machinery/door/poddoor{ + id = "lockdown" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/turf/open/floor/iron/brown, +/area/ruin/space/has_grav/cargodise_freighter/cargo) "dD" = ( /obj/machinery/door/airlock/survival_pod/glass, /obj/machinery/door/poddoor{ @@ -145,24 +173,24 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "dF" = ( /obj/item/storage/cans/sixbeer, /turf/open/floor/carpet, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "dL" = ( /obj/structure/chair/wood, /turf/open/floor/carpet, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "dO" = ( /obj/structure/chair/office/light, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "eb" = ( /obj/item/kirbyplants/random, /turf/open/floor/carpet, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "eJ" = ( /obj/structure/table, /obj/item/storage/backpack/duffelbag/med/surgery, @@ -176,7 +204,7 @@ pixel_y = 6 }, /turf/open/floor/iron/white, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/trauma) "eR" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate{ @@ -187,7 +215,7 @@ /turf/open/floor/iron/brown/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "eS" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -206,34 +234,39 @@ pixel_x = -6 }, /turf/open/floor/iron/white, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/trauma) "fm" = ( /obj/machinery/mineral/equipment_vendor/golem, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "fy" = ( /turf/open/floor/iron/dark/green/side{ dir = 5 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "fB" = ( /obj/machinery/light, /obj/structure/window/reinforced{ dir = 8 }, /turf/open/floor/iron/brown/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"fG" = ( +/obj/machinery/door/firedoor/closed, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "fO" = ( /obj/machinery/door/poddoor{ id = "lockdown" }, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "fX" = ( /obj/machinery/door/airlock/public/glass, /obj/machinery/door/firedoor, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "fY" = ( /obj/structure/closet/crate/secure/freezer, /obj/item/storage/box/ingredients/random, @@ -251,7 +284,7 @@ dir = 4 }, /turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "gf" = ( /obj/structure/reagent_dispensers/watertank/high{ tank_volume = 8000 @@ -261,11 +294,18 @@ dir = 8 }, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"gi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/turf/open/floor/iron/dark/green/side{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "gD" = ( /obj/machinery/smartfridge/food, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "gI" = ( /obj/structure/closet/firecloset/wall{ pixel_y = 26 @@ -274,7 +314,10 @@ /turf/open/floor/iron/dark/green/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"gL" = ( +/turf/closed/wall/mineral/titanium/spaceship, +/area/ruin/space/has_grav/cargodise_freighter/trauma) "gN" = ( /obj/structure/table/wood, /obj/item/paper, @@ -286,25 +329,39 @@ /obj/effect/spawner/random/entertainment/musical_instrument, /obj/effect/spawner/random/entertainment/toy_figure, /turf/open/floor/carpet, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"gV" = ( +/turf/closed/wall/mineral/titanium/spaceship, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"ha" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/airalarm/all_access{ + pixel_y = 34; + dir = 1 + }, +/turf/open/floor/iron/dark/green/side{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "hg" = ( /obj/structure/window/reinforced/tinted, /obj/structure/ore_box, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "hq" = ( /obj/structure/bed, /obj/item/bedsheet/dorms, /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/carpet, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "hr" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/light{ dir = 4 }, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "ht" = ( /obj/structure/table/wood, /obj/item/paper, @@ -314,11 +371,11 @@ /obj/item/radio, /obj/effect/spawner/random/entertainment/money_small, /turf/open/floor/carpet, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "hx" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron/dark/green/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "hz" = ( /obj/structure/table/wood, /obj/item/paper, @@ -329,7 +386,16 @@ /obj/effect/spawner/random/entertainment/musical_instrument, /obj/effect/spawner/random/entertainment/cigar, /turf/open/floor/carpet, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"hD" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/green/side{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "hN" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/large{ @@ -344,14 +410,14 @@ /turf/open/floor/iron/brown/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "hP" = ( /turf/closed/wall/mineral/titanium/spaceship, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "hQ" = ( /obj/effect/spawner/random/entertainment/cigarette_pack, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "hS" = ( /obj/structure/window/reinforced/tinted{ dir = 4 @@ -359,7 +425,7 @@ /obj/structure/closet/crate/freezer/blood, /obj/machinery/iv_drip, /turf/open/floor/iron/white, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/trauma) "hT" = ( /obj/structure/table/wood, /obj/item/paper, @@ -369,12 +435,12 @@ /obj/item/radio, /obj/effect/spawner/random/entertainment/money_small, /turf/open/floor/carpet, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "hZ" = ( /obj/machinery/vending/medical, /obj/machinery/light, /turf/open/floor/iron/white, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/trauma) "ie" = ( /obj/structure/table/wood, /obj/item/paper, @@ -386,14 +452,14 @@ /obj/effect/spawner/random/entertainment/coin, /obj/effect/spawner/random/entertainment/wallet_storage, /turf/open/floor/carpet, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "iF" = ( /obj/structure/closet/emcloset/anchored, /obj/machinery/light{ dir = 1 }, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "iJ" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -403,25 +469,25 @@ pixel_x = 6 }, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "iS" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "ja" = ( /obj/structure/table/wood, /obj/item/radio, /obj/effect/spawner/random/entertainment/musical_instrument, /obj/effect/spawner/random/entertainment/money_small, /turf/open/floor/carpet, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "jh" = ( /obj/structure/lattice/catwalk, /turf/template_noop, /area/space) "jo" = ( /turf/open/floor/iron/dark/green/corner, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "jq" = ( /obj/structure/table/wood, /obj/item/modular_computer/laptop/preset/civilian, @@ -430,11 +496,11 @@ }, /obj/item/clipboard, /turf/open/floor/carpet/green, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "js" = ( /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "jt" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -450,12 +516,12 @@ pixel_y = 8 }, /turf/open/floor/carpet/green, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "jv" = ( /obj/structure/window/reinforced, /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "jM" = ( /obj/machinery/door/airlock/shuttle/glass, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, @@ -463,8 +529,13 @@ /obj/machinery/door/poddoor{ id = "lockdown" }, +/obj/structure/cable, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"jO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "jR" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/gun/ballistic/automatic/cfa_rifle, @@ -479,15 +550,15 @@ /obj/item/ammo_box/magazine/cm68, /obj/item/ammo_box/magazine/cm68, /turf/open/floor/carpet/green, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "jX" = ( /obj/structure/cable, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "ke" = ( /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "kw" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/internals, @@ -495,11 +566,11 @@ /obj/item/tank/internals/oxygen/red, /obj/item/tank/internals/oxygen/red, /turf/open/floor/iron/brown/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "kA" = ( /obj/machinery/vending/boozeomat/all_access, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "kB" = ( /obj/machinery/cryopod{ dir = 1 @@ -507,7 +578,7 @@ /turf/open/floor/iron/dark/green/side{ dir = 9 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "kI" = ( /obj/machinery/portable_atmospherics/pump, /obj/machinery/light{ @@ -516,19 +587,19 @@ /turf/open/floor/iron/brown/side{ dir = 8 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "kL" = ( /obj/structure/bed, /obj/item/bedsheet/qm, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "kQ" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/bureaucracy/briefcase, /obj/effect/spawner/random/bureaucracy/folder, /obj/item/clipboard, /turf/open/floor/iron/brown/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "lh" = ( /obj/machinery/door/airlock/medical{ name = "Infirmary" @@ -537,8 +608,9 @@ id = "lockdown" }, /obj/machinery/door/firedoor, +/obj/structure/cable, /turf/open/floor/iron/dark/green, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/trauma) "lk" = ( /obj/structure/window/reinforced/tinted{ dir = 4 @@ -546,62 +618,67 @@ /obj/machinery/door/window/brigdoor/right/directional/south, /obj/structure/curtain, /turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "ll" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"lp" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/bridge) "lv" = ( /obj/machinery/door/window/brigdoor/right/directional/south, /obj/structure/curtain, /turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "lz" = ( /obj/machinery/door/firedoor/closed, /turf/open/floor/iron/dark/green/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "lC" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "lF" = ( +/obj/structure/cable, /turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "lL" = ( /obj/structure/chair/wood{ dir = 4 }, /turf/open/floor/carpet, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "lM" = ( /obj/machinery/light, /turf/open/floor/iron/brown/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "lP" = ( /obj/structure/table/wood/poker, /obj/effect/spawner/random/entertainment/deck, /turf/open/floor/carpet, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "lV" = ( /obj/structure/chair/wood{ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/carpet, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "lX" = ( /obj/structure/table/reinforced, /obj/machinery/processor, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "mf" = ( /obj/machinery/power/emitter/welded{ dir = 4 }, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "ml" = ( /obj/structure/chair{ dir = 1 @@ -610,18 +687,24 @@ dir = 8 }, /turf/open/floor/carpet, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "mz" = ( /mob/living/simple_animal/hostile/looter/big, /turf/open/floor/iron/dark/green/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "mF" = ( /obj/effect/turf_decal/caution/stand_clear/white, /obj/effect/turf_decal/stripes/white/line, /turf/open/floor/iron/dark/green/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"mN" = ( +/obj/machinery/door/window/brigdoor/right/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/ruin/space/has_grav/cargodise_freighter/quarters) "mS" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/food_or_drink/donkpockets, @@ -633,13 +716,13 @@ pixel_y = 5 }, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "nc" = ( /obj/structure/cable, /turf/open/floor/iron/brown/corner{ dir = 8 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "nl" = ( /obj/machinery/door/airlock/mining/glass{ name = "Excavation Equipment" @@ -649,13 +732,14 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/door/firedoor, +/obj/structure/cable, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "nr" = ( /turf/open/floor/iron/brown/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "ns" = ( /obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay" @@ -665,7 +749,7 @@ }, /obj/machinery/door/firedoor, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "nE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /mob/living/simple_animal/hostile/syndicate/melee/anthro{ @@ -673,26 +757,33 @@ faction = list("hostile"); name = "Geared Pirate" }, +/obj/structure/cable, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "nM" = ( /obj/structure/window/reinforced, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "nY" = ( /obj/machinery/door/window/brigdoor/right/directional/south{ dir = 1 }, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"oh" = ( +/obj/effect/turf_decal/caution, +/turf/open/floor/iron/brown/side{ + dir = 10 + }, +/area/ruin/space/has_grav/cargodise_freighter/cargo) "oi" = ( /obj/structure/fans/tiny/invisible, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "oo" = ( /obj/structure/tank_holder/oxygen/yellow, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "oQ" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate, @@ -710,7 +801,7 @@ /obj/effect/spawner/random/decoration/carpet, /obj/effect/spawner/random/decoration/carpet, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "oZ" = ( /obj/structure/window/reinforced{ dir = 4 @@ -720,21 +811,19 @@ }, /obj/machinery/hydroponics/constructable, /turf/open/floor/grass, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "pc" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron/dark/green/side{ - dir = 8 - }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/obj/structure/cable, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) "pe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/brown/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "pj" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate{ @@ -749,28 +838,28 @@ /obj/effect/spawner/random/entertainment/toy_figure, /obj/effect/spawner/random/entertainment/toy_figure, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "pu" = ( /obj/structure/closet/crate/secure/loot, /turf/open/floor/iron/brown/side{ dir = 4 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "pv" = ( /obj/machinery/ammo_workbench/unlocked, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "pD" = ( /obj/machinery/door/window/brigdoor/right/directional/south{ dir = 4 }, /turf/open/floor/iron/white, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/trauma) "pF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /mob/living/simple_animal/hostile/vox/melee, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "pH" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate, @@ -780,21 +869,34 @@ /obj/effect/spawner/random/engineering/vending_restock, /obj/effect/spawner/random/engineering/vending_restock, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"pM" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/quarters) "pN" = ( /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "pQ" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) +"qf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) "qi" = ( /obj/item/gps/computer/space, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "qm" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/solarpanel_small, @@ -807,24 +909,28 @@ dir = 8 }, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"qq" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/quarters) "qw" = ( /mob/living/simple_animal/hostile/looter, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "qy" = ( /obj/structure/closet/secure_closet/personal/wall{ pixel_x = 28 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/carpet, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "qB" = ( /obj/structure/chair/office/light{ dir = 1 }, /turf/open/floor/carpet/green, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "qF" = ( /obj/structure/closet/crate/goldcrate, /obj/item/stack/sheet/mineral/plasma/five, @@ -835,7 +941,7 @@ /obj/effect/spawner/random/entertainment/money_large, /obj/effect/spawner/random/entertainment/money_large, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "qU" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/engineering{ @@ -854,11 +960,11 @@ /turf/open/floor/iron/brown/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "qW" = ( /obj/machinery/light, /turf/open/floor/iron/dark/green/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "qY" = ( /obj/structure/window/reinforced{ dir = 8 @@ -872,17 +978,29 @@ /obj/item/gun/syringe/syndicate, /obj/item/restraints/handcuffs/cable/zipties, /turf/open/floor/iron/brown/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"re" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/computer/cryopod{ + dir = 4; + pixel_x = -24 + }, +/turf/open/floor/iron/dark/green/side{ + dir = 8 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "rm" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/carpet/green, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "rx" = ( /obj/effect/turf_decal/loading_area{ dir = 1 }, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "rz" = ( /obj/effect/turf_decal/bot, /obj/effect/spawner/random/exotic/syndie, @@ -912,7 +1030,7 @@ amount = 10 }, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "rE" = ( /obj/structure/closet/crate/secure/loot, /obj/structure/window/reinforced{ @@ -921,25 +1039,31 @@ /turf/open/floor/iron/brown/side{ dir = 4 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "rI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /mob/living/simple_animal/hostile/looter/crusher, +/obj/structure/cable, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "sa" = ( /turf/open/floor/carpet/green, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "se" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/entertainment/cigarette_pack, /obj/effect/spawner/random/entertainment/lighter, +/obj/machinery/button/door/directional/north{ + id = "lockdown"; + name = "Loading Bay Blastdoors"; + pixel_y = -24 + }, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "sh" = ( /obj/structure/chair, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "sn" = ( /obj/structure/closet/secure_closet/freezer/fridge{ req_access = null @@ -950,23 +1074,28 @@ /obj/item/storage/box/ingredients/fiesta, /obj/item/storage/box/ingredients/american, /obj/item/reagent_containers/condiment/flour{ - list_reagents = list(/datum/reagent/consumable/flour = 600); + list_reagents = list(/datum/reagent/consumable/flour=600); name = "Premium All-Purpose Flour (16KG)"; volume = 600 }, /obj/item/reagent_containers/condiment/milk, /obj/item/reagent_containers/condiment/enzyme{ - list_reagents = list(/datum/reagent/consumable/enzyme = 500); + list_reagents = list(/datum/reagent/consumable/enzyme=500); name = "universe-sized universal enyzyme"; volume = 500 }, /obj/item/reagent_containers/condiment/rice{ - list_reagents = list(/datum/reagent/consumable/rice = 150); + list_reagents = list(/datum/reagent/consumable/rice=150); name = "Basmati Rice Sack (4KG)"; volume = 150 }, /turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"su" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/turf/open/floor/wood, +/area/ruin/space/has_grav/cargodise_freighter/quarters) "sv" = ( /obj/structure/window/reinforced/tinted{ dir = 4 @@ -983,28 +1112,39 @@ }, /obj/item/storage/medkit/toxin, /turf/open/floor/iron/white, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/trauma) +"sw" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "sA" = ( /obj/structure/window/reinforced{ dir = 8 }, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "sC" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor{ id = "lockdown" }, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "sF" = ( /obj/structure/rack, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"sY" = ( +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"sZ" = ( +/obj/structure/cable, +/turf/open/floor/iron/checker, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "tc" = ( /obj/structure/rack/shelf, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "th" = ( /obj/machinery/door/airlock/survival_pod/glass, /obj/structure/cable, @@ -1012,24 +1152,25 @@ dir = 1 }, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "ti" = ( /obj/machinery/light{ dir = 4 }, /turf/open/floor/iron/brown/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "ts" = ( /obj/structure/railing{ dir = 1 }, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "tI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /mob/living/simple_animal/hostile/looter, +/obj/structure/cable, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "tJ" = ( /obj/machinery/button/door/directional/north{ id = "lockdown"; @@ -1037,12 +1178,12 @@ pixel_y = -24 }, /turf/open/floor/iron/dark/green/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "tP" = ( /obj/machinery/door/window/brigdoor/right/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "tQ" = ( /obj/machinery/computer/atmos_alert{ dir = 4 @@ -1050,30 +1191,34 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "tT" = ( /obj/effect/turf_decal/caution/stand_clear, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"uc" = ( +/turf/closed/wall/mineral/titanium/spaceship, +/area/ruin/space/has_grav/cargodise_freighter/cargo) "ug" = ( /obj/structure/safe, /obj/item/mod/control/pre_equipped/traitor, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "uj" = ( /obj/machinery/door/window/brigdoor/right/directional/south{ dir = 8 }, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "ur" = ( /obj/machinery/light{ dir = 1 }, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "ut" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/large{ @@ -1087,14 +1232,14 @@ /obj/item/reagent_containers/hashbrick, /obj/item/reagent_containers/hashbrick, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "uv" = ( /obj/machinery/power/emitter/welded{ dir = 8 }, /obj/structure/window/reinforced, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "uw" = ( /obj/structure/table/reinforced, /obj/machinery/chem_dispenser/drinks/fullupgrade{ @@ -1102,27 +1247,28 @@ }, /obj/machinery/light, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "uU" = ( /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/dark/green/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "uZ" = ( /obj/machinery/airalarm/all_access{ - pixel_y = 26 + pixel_y = 25; + dir = 1 }, /turf/open/floor/iron/dark/green/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "vi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/dark/green/corner{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "vm" = ( /obj/machinery/door/airlock/shuttle/glass, /obj/machinery/door/firedoor, @@ -1130,7 +1276,7 @@ id = "lockdown" }, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "vn" = ( /obj/structure/closet/crate/secure/freezer, /obj/item/storage/box/ingredients/random, @@ -1145,40 +1291,40 @@ dir = 4 }, /turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "vr" = ( /obj/structure/rack/shelf, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "vx" = ( /obj/machinery/suit_storage_unit/pirate, /turf/open/floor/iron/dark/green/side{ dir = 4 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "vB" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance/eight, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "vC" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ req_access = null }, /turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "vQ" = ( /obj/structure/table/reinforced, /obj/item/papercutter, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "vX" = ( /obj/structure/table/reinforced, /obj/item/paper_bin/carbon, /obj/item/pen, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "wd" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -1191,7 +1337,7 @@ }, /obj/item/pen, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "wf" = ( /obj/structure/closet/emcloset/wall{ pixel_y = 26 @@ -1199,18 +1345,19 @@ /turf/open/floor/iron/dark/green/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "wj" = ( /obj/machinery/computer/monitor{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "wm" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/radiation, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "wt" = ( /obj/machinery/light{ dir = 8 @@ -1218,21 +1365,30 @@ /turf/open/floor/iron/brown/side{ dir = 8 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"wv" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/green/side{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "ww" = ( /obj/structure/closet/firecloset/full, /obj/structure/railing{ dir = 4 }, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "wx" = ( /obj/effect/turf_decal/loading_area{ dir = 1 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "wy" = ( /obj/structure/table/reinforced, /obj/item/storage/box/beakers/variety, @@ -1243,20 +1399,20 @@ pixel_x = 6 }, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "wA" = ( /mob/living/simple_animal/hostile/giant_spider/hunter, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "wB" = ( /mob/living/simple_animal/hostile/giant_spider, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "wG" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/food_or_drink/booze, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "wN" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/secure/gear{ @@ -1267,41 +1423,50 @@ /obj/effect/spawner/random/exotic/antag_gear_weak, /obj/effect/spawner/random/exotic/antag_gear_weak, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "wR" = ( /obj/machinery/door/airlock/maintenance_hatch, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) +"wS" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) "wV" = ( /obj/structure/fans/tiny/forcefield, /obj/machinery/door/poddoor{ id = "loadholemine" }, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "xb" = ( /obj/item/kirbyplants/random, /obj/machinery/airalarm/all_access{ - pixel_y = -35 + pixel_y = -19 }, +/obj/structure/cable, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "xn" = ( /mob/living/simple_animal/hostile/vox/melee, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "xy" = ( /obj/machinery/power/port_gen/pacman/super, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "xI" = ( /obj/machinery/light{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) +"xP" = ( +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/cargodise_freighter/trauma) "xQ" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/secure/weapon{ @@ -1317,20 +1482,31 @@ /obj/item/pickaxe/drill/jackhammer, /obj/item/storage/box/minertracker, /turf/open/floor/iron/brown/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"xR" = ( +/obj/structure/closet/firecloset/wall{ + pixel_y = 26 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/turf/open/floor/iron/dark/green/side{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "ye" = ( -/obj/structure/lattice/catwalk, -/obj/structure/marker_beacon/burgundy, -/turf/template_noop, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/turf/closed/wall/mineral/titanium/spaceship, +/area/ruin/space/has_grav/cargodise_freighter/utility) "yl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/dark/green/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"yn" = ( +/turf/open/floor/wood, +/area/ruin/space/has_grav/cargodise_freighter/quarters) "yp" = ( /mob/living/simple_animal/hostile/giant_spider/badnana_spider, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "ys" = ( /obj/machinery/cryopod{ dir = 1 @@ -1338,12 +1514,12 @@ /turf/open/floor/iron/dark/green/side{ dir = 10 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "yv" = ( /obj/structure/mirror/directional/west, /obj/structure/sink/directional/east, /turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "yD" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/hydroponics{ @@ -1373,36 +1549,43 @@ dir = 8 }, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "yF" = ( /obj/machinery/light{ dir = 1 }, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "yG" = ( /turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "yT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "yV" = ( /obj/machinery/light{ dir = 4 }, /turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "yW" = ( /obj/machinery/light{ dir = 8 }, /turf/open/floor/carpet, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "yX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) +"zf" = ( +/obj/machinery/door/firedoor/closed, +/obj/structure/cable, +/turf/open/floor/iron/dark/green/side{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "zz" = ( /obj/structure/closet/firecloset/wall{ pixel_y = 26 @@ -1410,20 +1593,21 @@ /turf/open/floor/iron/dark/green/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "zD" = ( /obj/structure/chair{ dir = 8 }, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "zG" = ( /obj/structure/chair{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "zK" = ( /obj/machinery/recycler, /obj/machinery/conveyor{ @@ -1431,7 +1615,13 @@ id = "cargodise" }, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) +"zM" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark/green/side{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "zP" = ( /obj/structure/closet/secure_closet/miner/unlocked, /obj/item/gps/mining, @@ -1441,19 +1631,19 @@ dir = 8 }, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "zR" = ( /obj/structure/chair/wood{ dir = 1 }, /turf/open/floor/carpet, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "zU" = ( /obj/machinery/airalarm/all_access{ pixel_y = 26 }, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "zY" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/engineering/toolbox, @@ -1461,19 +1651,19 @@ /turf/open/floor/iron/brown/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Aa" = ( /obj/structure/cable, /obj/effect/turf_decal/caution/white, /obj/effect/turf_decal/stripes/white/line, /turf/open/floor/iron/dark/green/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Ab" = ( /obj/structure/chair{ dir = 1 }, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "Ae" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/radiation, @@ -1483,7 +1673,7 @@ /obj/effect/spawner/random/engineering/material_rare, /obj/effect/spawner/random/engineering/material_rare, /turf/open/floor/iron/brown/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Al" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/machinery/light{ @@ -1492,12 +1682,12 @@ /turf/open/floor/iron/dark/green/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Ax" = ( /obj/structure/window/reinforced, /obj/machinery/hydroponics/constructable, /turf/open/floor/grass, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "Ay" = ( /obj/structure/table/reinforced, /obj/machinery/reagentgrinder{ @@ -1505,11 +1695,14 @@ pixel_y = 5 }, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"AC" = ( +/turf/closed/wall/mineral/titanium/spaceship/nodiagonal, +/area/ruin/space/has_grav/cargodise_freighter/mining) "AK" = ( /mob/living/simple_animal/hostile/looter/ranged/space/laser, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "AM" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -1517,11 +1710,11 @@ }, /obj/machinery/hydroponics/constructable, /turf/open/floor/grass, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "AN" = ( /mob/living/simple_animal/hostile/looter/ranged/space/laser, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "AQ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -1530,35 +1723,46 @@ /turf/open/floor/iron/dark/green/side{ dir = 4 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "AW" = ( /obj/machinery/door/firedoor/closed, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "AX" = ( /obj/structure/chair{ dir = 4 }, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "Ba" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron/dark/green/side{ dir = 4 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Bb" = ( /turf/closed/wall/mineral/titanium/spaceship/nodiagonal, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Bj" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) "Bq" = ( /obj/structure/window/reinforced, /obj/machinery/vending/hydroseeds, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Bx" = ( +/obj/machinery/airalarm/all_access{ + pixel_y = 26; + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "BL" = ( /obj/machinery/portable_atmospherics/pump, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "BM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /mob/living/simple_animal/pet/dog/dobermann{ @@ -1567,89 +1771,111 @@ name = "Ace" }, /turf/open/floor/carpet, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "BN" = ( /obj/item/storage/cans/sixsoda, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "BP" = ( /obj/structure/tank_holder/anesthetic, /turf/open/floor/iron/white, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/trauma) "BY" = ( /obj/structure/cable, /turf/open/floor/iron/dark/green/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Ca" = ( /obj/structure/table, /obj/item/storage/box/gloves, /obj/item/storage/box/masks, /turf/open/floor/iron/white, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/trauma) +"Ce" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/cargodise_freighter/trauma) "CK" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/medical, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "De" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/internals, /obj/item/tank/internals/anesthetic, /obj/item/tank/internals/anesthetic, /turf/open/floor/iron/brown/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Dg" = ( /obj/machinery/door/airlock{ name = "Crew Bunk" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/carpet, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "Di" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/light{ dir = 8 }, /turf/open/floor/carpet/green, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"Dk" = ( +/turf/open/floor/engine, +/area/ruin/space/has_grav/cargodise_freighter/bridge) "Dn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/carpet/green, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "Dt" = ( /obj/structure/rack/gunrack, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "DL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/light{ dir = 1 }, /obj/machinery/firealarm/directional/north, +/obj/structure/cable, /turf/open/floor/iron/dark/green/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"DM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/airalarm/all_access{ + pixel_y = 25; + dir = 1 + }, +/turf/open/floor/iron/dark/green/side{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "DN" = ( /obj/structure/table, /obj/effect/spawner/random/food_or_drink/refreshing_beverage, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "Ec" = ( +/obj/structure/cable, /turf/open/floor/iron/dark/green/corner{ dir = 4 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Eg" = ( /mob/living/simple_animal/hostile/pirate/melee{ faction = list("hostile") }, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "Eh" = ( /obj/machinery/light, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "Ek" = ( /obj/machinery/door/airlock/qm{ name = "Chief Bedroom" @@ -1659,55 +1885,55 @@ id = "lockdown" }, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "En" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Eo" = ( /obj/effect/turf_decal/caution/stand_clear, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Er" = ( /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "Ez" = ( /obj/structure/table, /obj/effect/spawner/random/food_or_drink/three_course_meal, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "EB" = ( /obj/structure/window/reinforced, /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "EH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /mob/living/simple_animal/hostile/vox/melee, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "EO" = ( /obj/structure/closet/secure_closet/miner/unlocked, /obj/item/gps/mining, /obj/item/tank/jetpack/oxygen/harness, /obj/item/pickaxe/drill, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "Ff" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "Fx" = ( /obj/machinery/light{ dir = 1 }, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "Fy" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/secure/plasma{ @@ -1718,7 +1944,7 @@ /obj/effect/spawner/random/engineering/material_rare, /obj/effect/spawner/random/engineering/material_rare, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "FB" = ( /obj/machinery/light{ dir = 1 @@ -1726,34 +1952,44 @@ /turf/open/floor/iron/dark/green/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"FF" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "FL" = ( /obj/structure/chair{ dir = 1 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"FO" = ( +/turf/closed/wall/mineral/titanium/spaceship/nodiagonal, +/area/ruin/space/has_grav/cargodise_freighter/cargo) "FR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, /turf/open/floor/iron/white, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/trauma) "FS" = ( /obj/machinery/door/airlock/survival_pod/glass, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "FX" = ( +/obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north{ start_charge = 0 }, -/obj/structure/cable, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "FY" = ( /obj/structure/window/reinforced{ dir = 1 @@ -1763,51 +1999,79 @@ }, /obj/structure/closet/crate/secure/loot, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"Gf" = ( +/turf/closed/wall/mineral/titanium/spaceship, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Gi" = ( -/turf/closed/wall/mineral/titanium/spaceship/overspace, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/obj/structure/cable, +/turf/open/floor/iron/dark/green/side{ + dir = 4 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "GA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "GT" = ( /obj/machinery/computer{ dir = 8 }, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "GU" = ( /obj/machinery/power/smes, /obj/structure/cable, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "GW" = ( /turf/open/floor/iron/dark/green/corner{ dir = 8 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Ha" = ( /obj/machinery/oven, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Hf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/turf/open/floor/iron/dark/green/corner{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Hj" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/airalarm/all_access{ + pixel_y = 34; + dir = 1 + }, +/turf/open/floor/iron/brown/side{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Hw" = ( /obj/machinery/door/window/brigdoor/right/directional/south, /turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "Hy" = ( /obj/machinery/door/window/brigdoor/right/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"HQ" = ( +/turf/closed/wall/mineral/titanium/spaceship/nodiagonal, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "HZ" = ( /obj/machinery/door/airlock{ name = "Bathroom" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/door/firedoor, +/obj/structure/cable, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "Ib" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/medical, @@ -1818,31 +2082,38 @@ /obj/effect/spawner/random/medical/surgery_tool_advanced, /obj/effect/spawner/random/medical/surgery_tool_alien, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "IA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "IE" = ( /mob/living/simple_animal/hostile/pirate/melee{ faction = list("hostile") }, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"IH" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/cargo) "II" = ( /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "IL" = ( /obj/machinery/light{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "IV" = ( /obj/structure/window/reinforced, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "IX" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/secure/gear{ @@ -1854,7 +2125,7 @@ /obj/item/clothing/glasses/hud/security/sunglasses/gars/giga, /obj/item/clothing/under/syndicate/skyrat/enclave/real, /turf/open/floor/iron/brown/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "IZ" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/secure/science{ @@ -1871,19 +2142,19 @@ /obj/item/slime_extract/grey, /obj/item/slime_extract/grey, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Jd" = ( /obj/structure/closet/crate/radiation, /obj/item/stack/sheet/mineral/uranium{ amount = 25 }, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "Je" = ( /obj/machinery/door/airlock/public/glass, /obj/machinery/door/firedoor, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "Jj" = ( /obj/effect/turf_decal/arrows/red{ dir = 1 @@ -1924,21 +2195,17 @@ /turf/open/floor/iron/brown/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Js" = ( /obj/machinery/door/firedoor/closed, /turf/open/floor/iron/dark/green/side{ dir = 4 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "JE" = ( /obj/structure/cable, -/obj/effect/turf_decal/caution, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron/brown/side{ - dir = 10 - }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/turf/open/floor/iron/brown/side, +/area/ruin/space/has_grav/cargodise_freighter/cargo) "JM" = ( /obj/machinery/suit_storage_unit{ mask_type = /obj/item/clothing/mask/gas/explorer; @@ -1946,36 +2213,41 @@ suit_type = /obj/item/mod/control/pre_equipped/traitor_elite }, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "JQ" = ( /obj/machinery/mineral/ore_redemption, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "JR" = ( /obj/structure/tank_holder/extinguisher, /turf/open/floor/iron/dark/green/side{ dir = 4 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "JV" = ( /mob/living/simple_animal/hostile/pirate/melee{ faction = list("hostile") }, /turf/open/floor/iron/dark/green/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "JZ" = ( /obj/machinery/light{ dir = 4 }, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Kc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/turf/open/floor/iron/dark/brown, +/area/ruin/space/has_grav/cargodise_freighter/mining) "Ke" = ( /obj/structure/window/reinforced{ dir = 1 }, /obj/machinery/hydroponics/constructable, /turf/open/floor/grass, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "Km" = ( /obj/machinery/door/airlock/public{ name = "Crew Quarters" @@ -1983,27 +2255,34 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark/green, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"KA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/turf/open/floor/iron/dark/green/side{ + dir = 8 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "KC" = ( /obj/structure/fans/tiny/forcefield, /obj/machinery/door/poddoor{ id = "loadhole" }, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "KF" = ( /obj/structure/fans{ pixel_y = 26 }, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "KJ" = ( /obj/machinery/conveyor{ dir = 4; id = "cargodise" }, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "KP" = ( /obj/machinery/light{ dir = 8 @@ -2011,33 +2290,33 @@ /turf/open/floor/iron/dark/green/side{ dir = 10 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "La" = ( /obj/machinery/power/emitter/welded{ dir = 8 }, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "Lc" = ( /obj/structure/table/reinforced, /obj/machinery/chem_dispenser/drinks/fullupgrade{ dir = 4 }, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "Ld" = ( /obj/structure/closet/emcloset/wall{ pixel_x = 26 }, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "Lr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/light{ dir = 1 }, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "Lz" = ( /obj/item/stack/sheet/iron/twenty, /obj/item/circuitboard/machine/ore_silo, @@ -2053,36 +2332,45 @@ /obj/item/circuitboard/machine/protolathe/offstation, /obj/effect/spawner/random/engineering/toolbox, /obj/item/circuitboard/machine/circuit_imprinter/department/no_tax, +/obj/item/circuitboard/machine/rtg/advanced, +/obj/item/circuitboard/machine/rtg/advanced, +/obj/item/circuitboard/machine/rtg/advanced, +/obj/item/circuitboard/machine/spaceship_navigation_beacon, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "LC" = ( /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "LE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "LN" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/white/line, /turf/open/floor/iron/dark/green/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "LP" = ( /obj/structure/closet/emcloset/wall{ pixel_y = 26 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"Ma" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "Md" = ( /obj/machinery/door/airlock/qm{ name = "Chief Bedroom" }, /obj/machinery/door/firedoor, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "Ml" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/light{ @@ -2094,7 +2382,7 @@ /turf/open/floor/iron/brown/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Mp" = ( /obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay" @@ -2105,39 +2393,41 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/door/firedoor, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Mq" = ( /obj/machinery/power/terminal{ dir = 8 }, -/obj/structure/cable, /obj/machinery/airalarm/all_access{ - pixel_y = -35 + pixel_y = -25 }, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "Mz" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "MB" = ( /obj/effect/mob_spawn/ghost_role/human/lostcargoqm{ dir = 1 }, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"ME" = ( +/turf/closed/wall/mineral/titanium/spaceship/nodiagonal, +/area/ruin/space/has_grav/cargodise_freighter/utility) "MH" = ( /obj/effect/spawner/random/medical/patient_stretcher, /obj/machinery/iv_drip, /turf/open/floor/iron/white, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/trauma) "MJ" = ( /obj/structure/window/reinforced{ dir = 8 }, /obj/machinery/seed_extractor, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "MK" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate, @@ -2151,18 +2441,18 @@ /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "ML" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "MN" = ( /obj/structure/table/optable, /obj/machinery/light{ dir = 1 }, /turf/open/floor/iron/white, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/trauma) "MS" = ( /obj/machinery/button/door/directional/north{ id = "lockdown"; @@ -2174,32 +2464,34 @@ /turf/open/floor/iron/brown/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "MY" = ( /obj/machinery/door/firedoor/closed, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Ne" = ( /obj/machinery/suit_storage_unit/mining/eva, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "Nk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "Np" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, /obj/machinery/airalarm/all_access{ - pixel_y = 26 + pixel_y = 26; + dir = 1 }, /turf/open/floor/iron/dark/green/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Nu" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate, @@ -2213,18 +2505,18 @@ /obj/effect/spawner/random/food_or_drink/refreshing_beverage, /obj/effect/spawner/random/food_or_drink/refreshing_beverage, /turf/open/floor/iron/brown/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "ND" = ( /obj/structure/chair/comfy/brown{ dir = 1 }, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "NM" = ( /obj/structure/fans/tiny/invisible, /obj/structure/cable, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "NS" = ( /obj/machinery/light, /obj/structure/safe/floor, @@ -2237,24 +2529,29 @@ }, /obj/structure/bed/dogbed, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "NX" = ( /obj/structure/closet/firecloset/wall{ pixel_x = 26 }, /obj/machinery/light, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "NZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/white, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/trauma) +"Oa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/turf/open/floor/iron/checker, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "Oe" = ( /obj/structure/table/reinforced, /obj/machinery/computer/security/wooden_tv, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "Oi" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/engineering/electrical, @@ -2265,18 +2562,16 @@ /turf/open/floor/iron/brown/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Oj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/airalarm/all_access{ - pixel_y = 26 - }, -/turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/obj/structure/cable, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) "Om" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "OE" = ( /obj/effect/turf_decal/bot, /obj/effect/spawner/random/medical/organs, @@ -2290,7 +2585,7 @@ /obj/item/organ/internal/heart/gland/heal, /obj/item/organ/internal/brain/alien, /turf/open/floor/iron/brown/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "OP" = ( /turf/closed/mineral/random/high_chance, /area/ruin/unpowered/no_grav) @@ -2298,7 +2593,7 @@ /obj/machinery/computer/atmos_alert, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "Pl" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -2307,7 +2602,7 @@ pixel_y = -35 }, /turf/open/floor/iron/brown/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Pq" = ( /obj/item/storage/box/shipping, /obj/item/storage/box/shipping, @@ -2317,7 +2612,7 @@ /turf/open/floor/iron/brown/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Ps" = ( /obj/effect/turf_decal/bot, /obj/effect/spawner/random/exotic/tool, @@ -2326,24 +2621,26 @@ }, /obj/effect/spawner/random/exotic/tool, /turf/open/floor/iron/brown/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Pu" = ( /obj/machinery/door/firedoor/closed, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "PC" = ( /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/pen, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "PD" = ( /obj/machinery/door/airlock/public/glass, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/door/firedoor, +/obj/structure/cable, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "PG" = ( /obj/structure/window/reinforced/tinted{ dir = 4; @@ -2353,7 +2650,7 @@ /obj/structure/sink/directional/east, /obj/machinery/light, /turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "PH" = ( /obj/machinery/light{ dir = 4 @@ -2361,29 +2658,28 @@ /turf/open/floor/iron/dark/green/side{ dir = 4 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "PK" = ( -/obj/structure/cable, -/turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/turf/closed/wall/mineral/titanium/spaceship/nodiagonal, +/area/ruin/space/has_grav/cargodise_freighter/bridge) "PL" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/structure/cable, /turf/open/floor/iron/brown/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "PO" = ( /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark/green/side{ dir = 8 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "PQ" = ( /obj/structure/table/reinforced, /obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ dir = 1 }, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "PV" = ( /obj/structure/closet/crate/secure/engineering, /obj/item/storage/toolbox/electrical, @@ -2395,7 +2691,7 @@ /obj/item/construction/plumbing/research, /obj/item/construction/plumbing/engineering, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "PW" = ( /obj/structure/window/reinforced/tinted{ dir = 4 @@ -2404,51 +2700,62 @@ dir = 4 }, /turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "PZ" = ( /obj/structure/closet/secure_closet/freezer/meat{ req_access = null }, /turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "Qc" = ( -/obj/structure/marker_beacon/burgundy, -/obj/structure/lattice/catwalk, -/turf/template_noop, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/obj/machinery/door/airlock/hatch{ + name = "Turret Room" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/engine, +/area/ruin/space/has_grav/cargodise_freighter/bridge) "Qi" = ( /obj/structure/toilet{ dir = 4 }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "Qj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "Qk" = ( /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) +"Ql" = ( +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Qo" = ( /obj/machinery/vending/dinnerware, /obj/machinery/light, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "Qt" = ( /obj/machinery/door/airlock/survival_pod/glass, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Qv" = ( /obj/effect/spawner/random/entertainment/arcade{ dir = 4 }, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"QC" = ( +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "QU" = ( /obj/machinery/button/door/directional/north{ id = "loadholemine"; @@ -2458,13 +2765,13 @@ }, /mob/living/simple_animal/hostile/giant_spider/nurse, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "QW" = ( /obj/machinery/door/airlock/vault{ name = "Vault" }, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "QY" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -2472,7 +2779,10 @@ /turf/open/floor/iron/dark/green/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Ra" = ( +/turf/closed/wall/mineral/titanium/spaceship/nodiagonal, +/area/ruin/space/has_grav/cargodise_freighter/quarters) "Rb" = ( /obj/structure/window/reinforced{ dir = 8 @@ -2486,7 +2796,7 @@ /obj/item/reagent_containers/cup/bucket, /obj/item/reagent_containers/cup/beaker/bluespace, /turf/open/floor/grass, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "Rh" = ( /obj/machinery/door/airlock/survival_pod/glass, /obj/machinery/door/poddoor{ @@ -2495,37 +2805,37 @@ /obj/structure/cable, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Ri" = ( /turf/open/floor/iron/brown/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Rt" = ( /obj/effect/mob_spawn/ghost_role/human/lostminer{ dir = 1 }, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "Rw" = ( /obj/machinery/vending/medical/syndicate_access/cybersun{ req_access = null }, /turf/open/floor/iron/white, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/trauma) "Rx" = ( /obj/machinery/atmospherics/components/tank/air{ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "RA" = ( /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "RO" = ( /obj/structure/table, /obj/effect/spawner/random/entertainment/cigarette_pack, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "RY" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/entertainment/cigarette_pack, @@ -2533,64 +2843,64 @@ /turf/open/floor/iron/brown/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Sc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/brown/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Sk" = ( /mob/living/simple_animal/hostile/looter/crusher, /turf/open/floor/iron/brown/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Sl" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "Sv" = ( /obj/structure/closet/crate/secure/loot, /turf/open/floor/iron/brown/side{ dir = 6 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "SF" = ( /obj/effect/mob_spawn/ghost_role/human/lostminer{ dir = 1 }, /obj/machinery/light, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "SQ" = ( /obj/machinery/door/firedoor/closed, /turf/open/floor/iron/dark/green/side{ dir = 8 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "SS" = ( /obj/machinery/airalarm/all_access{ pixel_y = -35 }, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "SU" = ( /obj/machinery/door/airlock/hatch{ name = "Turret Room" }, /obj/machinery/door/firedoor, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "SY" = ( /obj/effect/mob_spawn/ghost_role/human/lostcargo{ dir = 1 }, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "SZ" = ( /obj/machinery/biogenerator, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "Ta" = ( /obj/machinery/light{ dir = 8 @@ -2598,14 +2908,14 @@ /turf/open/floor/iron/dark/green/side{ dir = 8 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Te" = ( /obj/effect/mob_spawn/ghost_role/human/lostcargo{ dir = 1 }, /obj/machinery/light, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "Ti" = ( /obj/structure/table, /obj/item/storage/medkit{ @@ -2633,20 +2943,25 @@ }, /obj/item/soap/syndie, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"Tr" = ( +/obj/structure/marker_beacon/burgundy, +/obj/structure/lattice/catwalk, +/turf/template_noop, +/area/space) "Ty" = ( /obj/machinery/door/airlock/survival_pod/glass, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "TF" = ( /obj/structure/window/reinforced{ dir = 4 }, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "TM" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/internals, @@ -2657,7 +2972,7 @@ /obj/item/tank/internals/emergency_oxygen/double, /obj/item/tank/internals/emergency_oxygen/double, /turf/open/floor/iron/brown/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Ud" = ( /obj/structure/table, /obj/item/storage/belt/utility/full/engi{ @@ -2710,7 +3025,7 @@ pixel_y = 12 }, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "Ug" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable, @@ -2751,20 +3066,21 @@ dir = 1 }, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "Uk" = ( /obj/machinery/door/airlock/freezer, /obj/structure/fans/tiny/invisible, +/obj/structure/cable, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "Ul" = ( /obj/machinery/gun_vendor/no_alert, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "Um" = ( /obj/machinery/light, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "Up" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt/dust, @@ -2781,7 +3097,16 @@ /turf/open/floor/iron/dark/green/side{ dir = 4 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"Uw" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/green/side{ + dir = 4 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "UA" = ( /obj/structure/closet/emcloset/wall{ pixel_y = 26 @@ -2789,25 +3114,25 @@ /turf/open/floor/iron/brown/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "UI" = ( /obj/effect/spawner/random/engineering/flashlight, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "UM" = ( /obj/structure/table/reinforced, /obj/item/modular_computer/tablet/pda/engineering, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "UX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "Vb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Vl" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate, @@ -2816,11 +3141,11 @@ /obj/effect/spawner/random/engineering/material, /obj/effect/spawner/random/engineering/material, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Vs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "Vu" = ( /obj/structure/table, /obj/item/crowbar/red{ @@ -2841,57 +3166,70 @@ /turf/open/floor/iron/dark/green/side{ dir = 4 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "Vx" = ( /obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "Vy" = ( /obj/machinery/vending/games, /obj/machinery/light, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "VB" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/structure/cable, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "VN" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/secure/gear, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "VZ" = ( /obj/machinery/vending/dorms, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "Wd" = ( /obj/structure/closet/emcloset/wall{ pixel_y = -26 }, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"We" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/airalarm/all_access{ + pixel_y = 34; + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/wood, +/area/ruin/space/has_grav/cargodise_freighter/quarters) "Wh" = ( /turf/open/floor/iron/dark/green/side{ dir = 4 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Wl" = ( /turf/open/floor/iron/dark/green/side{ dir = 8 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Wq" = ( +/turf/closed/wall/mineral/titanium/spaceship/nodiagonal, +/area/ruin/space/has_grav/cargodise_freighter/trauma) "Ws" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "Wt" = ( /obj/machinery/vending/donksofttoyvendor, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "Wu" = ( /obj/structure/tank_holder/extinguisher, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "Ww" = ( /obj/machinery/door/airlock/qm{ name = "Chief Bedroom" @@ -2899,18 +3237,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/door/firedoor, /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) "WL" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, /turf/open/floor/iron/dark/green/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"WM" = ( +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/mining) "WP" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "WR" = ( /obj/machinery/button/door/directional/north{ id = "loadhole"; @@ -2920,7 +3261,7 @@ /obj/effect/turf_decal/bot, /obj/structure/closet/crate/solarpanel_small, /turf/open/floor/iron/brown/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Xd" = ( /obj/structure/janitorialcart{ dir = 4 @@ -2938,7 +3279,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "Xk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/effect/turf_decal/bot, @@ -2951,54 +3292,54 @@ /obj/item/raw_anomaly_core/random, /obj/item/raw_anomaly_core/random, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Xl" = ( /obj/structure/table, /obj/effect/spawner/random/food_or_drink/soup, /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "Xm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/effect/mob_spawn/corpse/human/miner/mod, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "Xn" = ( /turf/open/floor/iron/white, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/trauma) "Xp" = ( /obj/machinery/light{ dir = 8 }, /turf/open/floor/engine, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "Xr" = ( /obj/effect/turf_decal/bot, /mob/living/simple_animal/hostile/giant_spider, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "Xs" = ( /obj/item/kirbyplants/random, /obj/machinery/light{ dir = 8 }, /turf/open/floor/iron/dark/blue, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "Xu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "XB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/dark/green/side{ dir = 8 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "XD" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8 }, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "XJ" = ( /obj/machinery/conveyor{ dir = 6; @@ -3008,21 +3349,22 @@ dir = 4 }, /turf/open/floor/iron/dark/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/mining) "XP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "XS" = ( /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "XU" = ( /turf/open/floor/iron/dark/green/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "XV" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -3031,24 +3373,27 @@ faction = list("hostile") }, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "XY" = ( /obj/machinery/computer/camera_advanced{ dir = 8 }, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "Yg" = ( /obj/structure/cable, /obj/effect/turf_decal/caution/stand_clear/white, /obj/effect/turf_decal/stripes/white/line, /turf/open/floor/iron/dark/green/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Ym" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Yp" = ( +/turf/closed/wall/mineral/titanium/spaceship, +/area/ruin/space/has_grav/cargodise_freighter/bridge) "Yt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /mob/living/simple_animal/hostile/looter, @@ -3058,11 +3403,11 @@ /turf/open/floor/iron/dark/green/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Yy" = ( /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark/green/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "YA" = ( /obj/structure/lattice/catwalk, /obj/structure/marker_beacon/burgundy, @@ -3070,37 +3415,42 @@ /area/space) "YD" = ( /turf/open/floor/wood, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"YF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "YK" = ( /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "YP" = ( /obj/effect/spawner/random/exotic/ripley, /turf/open/floor/iron/brown/side{ dir = 10 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "YR" = ( /obj/machinery/computer/crew{ dir = 1 }, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/bridge) "YV" = ( /obj/machinery/door/firedoor/closed, /turf/open/floor/iron/dark/green/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Zl" = ( /turf/open/floor/iron/dark/green/side, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Zn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/dark/green/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Zu" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/radiation{ @@ -3112,36 +3462,36 @@ /obj/effect/spawner/random/engineering/material_rare, /obj/effect/spawner/random/engineering/material_rare, /turf/open/floor/iron/brown, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Zw" = ( /obj/machinery/photocopier, /turf/open/floor/iron/brown/side{ dir = 1 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/cargo) "Zy" = ( /turf/template_noop, /area/template_noop) "Zz" = ( /obj/machinery/computer/operating, /turf/open/floor/iron/white, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/trauma) "ZB" = ( /turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "ZD" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron/dark/green/side{ dir = 9 }, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "ZN" = ( /turf/open/floor/iron/checker, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "ZS" = ( /obj/machinery/autolathe/hacked, /turf/open/floor/plating, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/utility) "ZU" = ( /obj/machinery/door/airlock/public{ name = "Crew Quarters" @@ -3150,8 +3500,9 @@ /obj/machinery/door/poddoor{ id = "lockdown" }, +/obj/structure/cable, /turf/open/floor/iron/dark/green, -/area/ruin/space/has_grav/deepstorage/lostcargo) +/area/ruin/space/has_grav/cargodise_freighter/quarters) (1,1,1) = {" Zy @@ -3204,13 +3555,13 @@ OP OP OP OP -hP -Mz -hP -hP -hP -Mz -hP +ye +wS +ye +ye +ye +wS +ye OP OP OP @@ -3229,32 +3580,32 @@ OP OP OP hP -XD -XD +pM +pM hP +pM +pM +FF +Gf +FF XD -XD -XD -hP -XD -XD -hP -hP +ye +ye uv BL BL EB La -hP -hP -XD -XD -hP -XD -XD -XD -XD -hP +ye +ye +FF +FF +uc +IH +IH +IH +IH +uc Zy OP "} @@ -3269,11 +3620,11 @@ hP hP hP hP -hP -hP -hP -hP -hP +Gf +Gf +Gf +ye +ye Qk IV ke @@ -3281,15 +3632,15 @@ LC jv Qk Wu -hP -hP -hP -hP -hP -hP -hP -hP -hP +ye +Gf +Gf +uc +uc +uc +uc +uc +uc Zy Zy "} @@ -3303,11 +3654,11 @@ lk yv yv PG -Bb +Ra kB -Ta +re ys -Bb +ME oo Qk IV @@ -3316,16 +3667,16 @@ LC nM Qk Qk -Bb +ME ZD KP -Bb -Bb -Bb -Bb -Bb -Bb -Bb +FO +dg +kI +oh +FO +FO +FO Zy "} (6,1,1) = {" @@ -3338,9 +3689,9 @@ lk yG Hw PW -Bb +Ra XU -XS +sY Zl SU Qk @@ -3354,9 +3705,9 @@ Qk SU XU Zl -Bb -dg -kI +FO +nr +YK JE Rh NM @@ -3373,29 +3724,29 @@ lk yT Hy PW -Bb +Ra FB ll Zl -Bb -Bb -Bb -Bb +ME +ME +ME +ME xy LC -Bb -Bb -Bb -Bb +ME +ME +ME +ME XU Zl -Bb +FO UA aS PL -Bb -Bb -Bb +FO +FO +FO Zy "} (8,1,1) = {" @@ -3408,29 +3759,29 @@ lk yG Hy PW -Bb +Ra XU -Vs +jO Zl -Bb +ME lC -LC +Oj xI XP -LC +Oj tQ wj GU -Bb +ME QY BY -ns +dB jX Vb nc wt YP -hP +uc Zy "} (9,1,1) = {" @@ -3441,95 +3792,95 @@ hP du lv yV -Hy +mN Qi -Bb +Ra mz -Vs +jO Zl -Bb +ME Xd -LC +Oj LC yX LC LC LC Mq -Bb +ME Yt BY -Bb -nr +FO +Hj ML YK YK kQ -hP +uc Zy "} (10,1,1) = {" Zy Zy Zy -Bb -Bb -Bb -Bb +Ra +Ra +Ra +Ra HZ -Bb -Bb +Ra +Ra df -Vs +jO Zl -Bb +ME FX WP -WP -WP -PK -PK -PK -PK -Bb +yX +yX +LC +LC +LC +LC +ME gI BY -Bb +FO nr ML ML ML lM -hP +uc Zy "} (11,1,1) = {" Zy Zy Zy -Mz +qq dF lL yW -IA +su Qv -Bb +Ra XU -Vs +jO hx -Bb +ME ZS -yX +pc Vx Rx PV Rx -WP +yX Jd -Bb +ME Zn Yg -Bb +FO YK xn YK @@ -3542,27 +3893,27 @@ Zy Zy Zy Zy -Mz +qq dL lP zR -IA -YD -Bb +su +yn +Ra XU -Vs +jO Zl -Bb -Bb +ME +ME pQ -Bb -Bb -Bb -Bb +ME +ME +ME +ME wR -Bb -Bb -Zn +ME +ME +DM LN fO Eo @@ -3577,24 +3928,24 @@ Zy Zy Zy Zy -Mz +qq eb lV BM -IA -IA +su +su ZU -Zn -Vs +gi +YF GW Ta SQ -XB +KA Wl PO Ta Wl -pc +XB SQ Wl av @@ -3611,24 +3962,24 @@ Zy (14,1,1) = {" Zy Zy -Qc -Bb -Bb -Bb -Bb +Tr +Ra +Ra +Ra +Ra IL Rt -Bb +Ra FB -Vs +YF nE -Vs -AW -Vs -Vs -Vs +YF +fG +YF +YF +YF rI -Vs +YF Ym MY Ym @@ -3647,15 +3998,15 @@ Zy Zy Zy Zy -Mz +qq gN ml -Bb -YD +Ra +We SF -Bb +Ra uU -Vs +YF jo Wh Js @@ -3669,7 +4020,7 @@ Js Wh Ec mF -Bb +FO YK YK YK @@ -3682,15 +4033,15 @@ OP Zy OP Zy -Mz +qq hq qy Dg IA Rt -Bb +Ra XU -Vs +YF qW Bb Bb @@ -3702,30 +4053,30 @@ Je Mz Bb Bb -FB +wv tJ -Bb +FO MS YK Zu ML WR -hP +uc Zy "} (17,1,1) = {" Zy OP OP -Bb -Bb -Bb -Bb +Ra +Ra +Ra +Ra IA SY -Bb +Ra zz -Vs +YF WL Bb PZ @@ -3737,30 +4088,30 @@ ZN ZN uw Bb -YV +zf lz -Bb +FO Pq YK pH ML OE -hP +uc Zy "} (18,1,1) = {" OP OP OP -Mz +qq ht ml -Bb +Ra IA SY -Bb +Ra wf -Vs +YF Zl Bb PZ @@ -3772,30 +4123,30 @@ ZN LE PQ Mz -XU +zM Zl -Bb +FO zY YK wN ML xQ -hP +uc Zy "} (19,1,1) = {" Zy OP Zy -Mz +qq hq qy Dg IA Te -Bb +Ra XU -Vs +YF Zl Bb fY @@ -3807,30 +4158,30 @@ ZN Ws mS Mz -XU +zM Zl -Bb +FO RY Xu Xk ML Nu -hP +uc Zy "} (20,1,1) = {" Zy Zy Zy -Bb -Bb -Bb -Bb +Ra +Ra +Ra +Ra IA Ti -Bb +Ra XU -Vs +YF Zl Bb Bb @@ -3842,34 +4193,34 @@ ZN Ws wy Mz -QY +hD Zl -Bb +FO Zw YK pj ML Ps -hP +uc Zy "} (21,1,1) = {" Zy Zy Zy -Mz +qq hz ml -Bb +Ra Lr Ud -Bb +Ra YV Pu lz Bb vr -ZN +sZ vr gf kA @@ -3879,68 +4230,68 @@ Qo Bb DL Yy -Bb +FO Jj YK Fy ML De -hP +uc Zy "} (22,1,1) = {" Zy OP Zy -Mz +qq hq qy Dg IA Ug -Bb +Ra XU -Vs +YF Zl Bb yF VB -Ws +Oa Ws Ws Ws Ws ZN Bb -gI +xR Zl -Bb +FO hN qw vB ML Ae -hP +uc Zy "} (23,1,1) = {" Zy Zy Zy -Bb -Bb -Bb -Bb +Ra +Ra +Ra +Ra IA Ul -Bb +Ra Al -Vs +YF Yy Bb ZN ZN -Ws +Oa ZN ZN JZ @@ -3949,31 +4300,31 @@ SZ Bb Np Zl -Bb +FO qU YK ut ML TM -hP +uc Zy "} (24,1,1) = {" OP Zy Zy -Mz +qq hT ml -Bb +Ra LP Um -Bb +Ra XU -Vs +YF Zl Bb -ZB +Bx Lc pN wG @@ -3982,77 +4333,77 @@ Rb MJ YD iJ -Zn +gi Zl -Bb +FO Oi YK bs ML kw -hP +uc Zy "} (25,1,1) = {" Zy Zy Zy -Mz +qq hq qy Dg IA -YD +yn aL XU -Vs +YF qW Bb zU ZB -GA +Ma ZB ZB nY YD YD Bq -Zn +gi Zl -Bb +FO eR YK Vl ML IX -hP +uc Zy "} (26,1,1) = {" OP OP Zy -Bb -Bb -Bb -Bb -Oj +Ra +Ra +Ra +Ra +IA IA Km Zn -Vs +YF Zl Mz ZB AX -GA +Ma zG -GA +Ma Ke YD YD Ax -Zn +gi yl Mp Sc @@ -4060,22 +4411,22 @@ ML ML ML Pl -hP +uc Zy "} (27,1,1) = {" OP OP OP -Mz +qq ie ml -Bb +Ra IA Up -Bb +Ra XU -Vs +YF Zl Mz sh @@ -4087,30 +4438,30 @@ Ke YD YD Ax -Zn +gi Zl -Bb +FO pe YK YK YK Sk -hP +uc Zy "} (28,1,1) = {" OP OP OP -Mz +qq hq qy Dg IA Vu -Bb +Ra uZ -Vs +YF Zl Mz sh @@ -4122,135 +4473,135 @@ Ke YD YD Ax -Zn +gi Zl -Bb +FO Ml rz qm yD fB -hP +uc Zy "} (29,1,1) = {" OP OP OP -Bb -Bb -Bb -Bb +Ra +Ra +Ra +Ra Lr Vy -Bb +Ra XU -Vs +YF Zl Mz ZB ZB ZB ZB -GA +Ma Ke YD YD Ax -Zn +gi Zl -Bb +FO Sc YK YK YK Ri -hP +uc Zy "} (30,1,1) = {" Zy OP Zy -Mz +qq ja ml -Bb +Ra IA VZ -Bb +Ra XU -Vs +YF Zl fX ZB sh Xl Ab -GA +Ma Ke YD YD Ax -Zn +gi Zl -Bb +FO Sc IZ Ib oQ Ri -hP +uc Zy "} (31,1,1) = {" Zy OP Zy -Mz +qq hq qy Dg IA Wt -Bb +Ra FB -Vs +YF Zl Bb bM ZB zD ZB -GA +Ma Ke YD YD Ax aH JV -Bb +FO Sc YK YK YK ti -hP +uc Zy "} (32,1,1) = {" Zy Zy Zy -Bb -Bb -Bb -Bb +Ra +Ra +Ra +Ra Md -Bb -Bb +Ra +Ra df -Vs +YF qW Bb Bb @@ -4262,15 +4613,15 @@ oZ TF TF AM -Zn +gi Zl -Bb +FO bo FY uj sA qY -hP +uc OP "} (33,1,1) = {" @@ -4285,27 +4636,27 @@ IA Ww aR vi -Vs +YF GW Wl SQ Wl Wl Wl -XB +KA Wl Wl Wl Wl -vi +Hf Zl -Bb +FO YK rE pu pu Sv -hP +uc Zy "} (34,1,1) = {" @@ -4317,64 +4668,64 @@ jt rm Dn MB -Bb -XU -XS -Vs -Vs -Vs +Ra +ha +sw +YF +YF +YF Pu -Vs -Vs -Vs -Vs +YF +YF +YF +YF tI -Vs -Vs -Vs -Vs +YF +YF +YF +YF Zl -Bb +FO ns -Bb -Bb -Bb -Bb -Bb +FO +FO +FO +FO +FO Zy "} (35,1,1) = {" Zy Zy -Qc +Tr hP jR sa sa ND -Bb +Ra XU -XS -XS -Vs -XS +sY +sY +YF +sY AW -XS -XS +sY +sY UI -Vs -XS -XS -XS -XS -XS +YF +sY +sY +sY +sY +sw GW Ta Wl Wl dD -LC -oi +Ql +QC Qt Zy "} @@ -4384,10 +4735,10 @@ Zy Zy hP kL -YD -YD +yn +yn NS -Bb +Ra fy Wh Wh @@ -4402,58 +4753,58 @@ AQ vx vx vx -PH -Wh -Wh +Uw +Gi +Gi Wh Ba -Bb -Bb -Bb -Bb +HQ +HQ +HQ +HQ Zy "} (37,1,1) = {" Zy OP Zy -hP -Bb +Yp +PK sC Ek -Bb -Bb +PK +PK vm sC sC jM -Bb -Bb -Bb -Bb -Bb +PK +PK +PK +AC +AC nl -Bb -Bb -Bb -Bb -Bb -Bb +AC +AC +AC +AC +Wq +Wq lh -Bb -Bb -hP -Gi +Wq +Wq +gL +gL Zy -Qc +Tr Zy "} (38,1,1) = {" Zy Zy Zy -Gi -hP +Yp +Yp sF Er js @@ -4462,22 +4813,22 @@ Er XS XS dk -Bb +PK ug qF -Bb +AC zP -UX +Kc Ne Ne Ne -Bb +AC Zz -Xn -Xn +Ce +xP Rw -Bb -Gi +Wq +gL Zy Zy Zy @@ -4488,30 +4839,30 @@ Zy Zy Zy Zy -hP +Yp aC EH -Vs -Vs -Vs -Vs -Vs +bi +bi +bi +bi +bi Om QW -Qk +Dk AK -Bb +AC EO -Vs -XS -XS -RA -Bb +qf +Bj +Bj +bt +AC MN Xn FR hZ -hP +gL OP Zy Zy @@ -4523,30 +4874,30 @@ OP Zy Zy Zy -hP +Yp tc XS Oe XS JM XS -Vs +bi xb -Bb +PK Fx Eg -Bb +AC EO Vs -XS -XS +am +am RA hg BP Xn NZ eJ -hP +gL Zy Zy OP @@ -4558,7 +4909,7 @@ Zy Zy OP Zy -hP +Yp tc XS OX @@ -4567,21 +4918,21 @@ YR XS dO dn -Bb +PK pv Dt -Bb +AC iF Vs Xr JQ -XS +am hg eS Xn NZ Ca -hP +gL Zy Zy OP @@ -4593,22 +4944,22 @@ Zy Zy Zy Zy -hP +Yp ur XS Er XY Er IE -Vs +bi se -Bb -Bb -Bb -Bb +PK +PK +PK +AC ww Vs -XS +am Vs Vs tP @@ -4616,7 +4967,7 @@ NZ NZ NZ MH -hP +gL Zy Zy OP @@ -4628,30 +4979,30 @@ Zy Zy Zy Zy -hP +Yp vQ XS XS XS XS iS -Vs +bi Er -SU +Qc Xp Wd -Bb +AC KJ wx Vs Vs -XS +am hg sv pD hS da -hP +gL Zy OP OP @@ -4663,7 +5014,7 @@ Zy OP OP Zy -hP +Yp vX Ff XS @@ -4672,10 +5023,10 @@ XS Ff Er NX -Bb +PK mf mf -Bb +AC KJ ts hQ @@ -4686,7 +5037,7 @@ UX Qj RA fm -hP +gV Zy OP OP @@ -4698,7 +5049,7 @@ Zy OP OP Zy -hP +Yp wd GT PC @@ -4706,11 +5057,11 @@ GT UM GT bk -hP -Bb -Mz -Mz -Bb +Yp +PK +lp +lp +AC zK ts wA @@ -4719,9 +5070,9 @@ MK CK wm wB -XS +am SS -hP +gV Zy OP OP @@ -4733,30 +5084,30 @@ Zy OP OP OP -hP -Bb -Mz -Mz -Mz -Mz -Mz -Bb -hP +Yp +PK +lp +lp +lp +lp +lp +PK +Yp YA jh jh -hP +gV XJ II -XS +am Nk Sl VN wm -XS +am RA Eh -hP +gV Zy OP OP @@ -4769,29 +5120,29 @@ Zy OP OP OP -ye +YA Zy Zy Zy Zy Zy -ye +YA Zy Zy Zy Zy -Gi -hP -Bb +gV +gV +AC KF -XS -XS +am +am yp -XS +am RA -Bb +AC FS -Bb +AC Zy OP OP @@ -4816,17 +5167,17 @@ OP OP Zy Zy -Gi -hP +gV +gV qi QU RA RA RA hr -Bb -LC -Bb +AC +WM +AC OP OP OP @@ -4852,16 +5203,16 @@ OP Zy Zy Zy -Gi -hP -Bb +gV +gV +AC wV wV wV -Bb -Bb +AC +AC oi -Bb +AC OP OP OP @@ -4894,9 +5245,9 @@ OP Zy Zy Zy -Bb +AC Ty -Bb +AC Zy OP OP diff --git a/modular_skyrat/modules/mapping/code/areas/space.dm b/modular_skyrat/modules/mapping/code/areas/space.dm index 07053391579..16ad4b27228 100644 --- a/modular_skyrat/modules/mapping/code/areas/space.dm +++ b/modular_skyrat/modules/mapping/code/areas/space.dm @@ -285,3 +285,36 @@ name = "\improper P-T Solar Array" icon_state = "solarsS" has_gravity = STANDARD_GRAVITY + +// Cargodise Lost Freighter + +/area/ruin/space/has_grav/cargodise_freighter/primaryhall + name = "Freighter Primary Hall" + +/area/ruin/space/has_grav/cargodise_freighter/trauma + name = "Freighter Trauma Center" + icon_state = "medbay1" + +/area/ruin/space/has_grav/cargodise_freighter/utility + name = "Freighter Utility Room" + icon_state = "engine" + +/area/ruin/space/has_grav/cargodise_freighter/kitchen + name = "Freighter Kitchen" + icon_state = "cafeteria" + +/area/ruin/space/has_grav/cargodise_freighter/bridge + name = "Freighter Bridge" + icon_state = "bridge" + +/area/ruin/space/has_grav/cargodise_freighter/cargo + name = "Freighter Cargo Bay" + icon_state = "cargo" + +/area/ruin/space/has_grav/cargodise_freighter/mining + name = "Freighter Mining Office" + icon_state = "cargo" + +/area/ruin/space/has_grav/cargodise_freighter/quarters + name = "Freighter Crew Quarters" + icon_state = "crew_quarters" diff --git a/modular_skyrat/modules/mapping/code/mob_spawns.dm b/modular_skyrat/modules/mapping/code/mob_spawns.dm index d23ebbe63d9..7930c4f730c 100644 --- a/modular_skyrat/modules/mapping/code/mob_spawns.dm +++ b/modular_skyrat/modules/mapping/code/mob_spawns.dm @@ -547,11 +547,6 @@ desc = "An access card designated for \"Tarkon ensign\". No one has to listen to you... But you're the closest there is for command around here." trim = /datum/id_trim/away/tarkon/ensign -//AREAS// -/area/ruin/space/has_grav/deepstorage/lostcargo - name = "Freighter Ship" - icon_state = "yellow" - //CRYO CONSOLES /obj/machinery/computer/cryopod/interdyne radio = /obj/item/radio/headset/interdyne