From a90e54a72a2b6e3f63ea3d7eb98f9b3490dfaa59 Mon Sep 17 00:00:00 2001 From: spockye <79304582+spockye@users.noreply.github.com> Date: Wed, 20 Sep 2023 22:48:18 +0200 Subject: [PATCH] removes a extra area --- .../JungleRuins/jungle_cavecrew.dmm | 142 +++++++++--------- code/game/area/areas/ruins/jungle.dm | 4 - 2 files changed, 71 insertions(+), 75 deletions(-) diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm index 0a123e34bf3e..16adbd828e8d 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm @@ -189,7 +189,7 @@ pixel_y = -6 }, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "bU" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/statue/sandstone/assistant, @@ -250,7 +250,7 @@ pixel_x = 10 }, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "cX" = ( /obj/structure/flora/junglebush/large{ pixel_x = -7; @@ -272,7 +272,7 @@ "dd" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "dm" = ( /obj/machinery/power/smes/engineering, /obj/effect/decal/cleanable/dirt/dust, @@ -320,7 +320,7 @@ dir = 10 }, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "dO" = ( /obj/structure/table/wood, /obj/item/storage/pill_bottle/dice{ @@ -486,7 +486,7 @@ pixel_y = 11 }, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "fI" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -605,7 +605,7 @@ /obj/structure/flora/grass/jungle, /obj/structure/flora/tree/jungle/small, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "hz" = ( /obj/effect/turf_decal/techfloor{ dir = 1 @@ -635,7 +635,7 @@ "ij" = ( /mob/living/simple_animal/hostile/venus_human_trap, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "iq" = ( /obj/effect/turf_decal/techfloor{ dir = 5 @@ -673,7 +673,7 @@ /area/ruin/powered) "iW" = ( /turf/open/floor/plating/dirt, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "iZ" = ( /obj/effect/turf_decal/techfloor, /obj/effect/turf_decal/industrial/loading{ @@ -696,7 +696,7 @@ "jg" = ( /obj/structure/spacevine/dense, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "jh" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -784,7 +784,7 @@ pixel_y = -3 }, /turf/open/floor/plating/dirt/jungle/dark/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "jZ" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -805,7 +805,7 @@ pixel_x = -25 }, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "kj" = ( /obj/structure/flora/rock/jungle{ pixel_x = 5; @@ -845,7 +845,7 @@ pixel_y = 10 }, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "kB" = ( /obj/structure/cable{ icon_state = "1-9" @@ -935,7 +935,7 @@ }, /obj/structure/spacevine, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "lu" = ( /obj/machinery/door/airlock/maintenance_hatch{ dir = 4 @@ -972,7 +972,7 @@ icon_state = "tree2" }, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "lR" = ( /obj/structure/flora/rock/jungle{ pixel_x = 10; @@ -1226,7 +1226,7 @@ pixel_y = -4 }, /turf/open/floor/plating/dirt/old/dark/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "ow" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 @@ -1244,7 +1244,7 @@ "oD" = ( /obj/structure/spacevine/dense, /turf/open/water/jungle, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "oH" = ( /obj/effect/turf_decal/industrial/loading{ dir = 4 @@ -1265,7 +1265,7 @@ }, /obj/structure/flora/grass/jungle/b, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "oR" = ( /obj/structure/fermenting_barrel{ pixel_x = -7; @@ -1359,7 +1359,7 @@ "qU" = ( /obj/structure/spacevine, /turf/open/water/jungle, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "rn" = ( /obj/structure/flora/grass/jungle/b{ pixel_x = 13; @@ -1389,7 +1389,7 @@ pixel_y = 12 }, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "rA" = ( /obj/structure/railing/corner{ dir = 8 @@ -1563,7 +1563,7 @@ }, /obj/structure/flora/grass/jungle, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "tW" = ( /obj/effect/turf_decal/weather/dirt{ dir = 5 @@ -1573,7 +1573,7 @@ "tY" = ( /obj/structure/spacevine, /turf/closed/mineral/random/jungle, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "ua" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -1633,7 +1633,7 @@ pixel_y = 15 }, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "uu" = ( /obj/structure/closet/cabinet, /obj/effect/turf_decal/siding/wood{ @@ -1645,7 +1645,7 @@ /area/ruin/jungle/cavecrew/dormitories) "uC" = ( /turf/open/water/jungle, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "uK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/patterned, @@ -1792,7 +1792,7 @@ /area/ruin/jungle/cavecrew/engineering) "wt" = ( /turf/closed/mineral/random/jungle, -/area/ruin/jungle/cavecrew/rock) +/area/overmap_encounter/planetoid/cave/explored) "wu" = ( /obj/structure/railing/corner{ dir = 8 @@ -1813,7 +1813,7 @@ "wH" = ( /obj/structure/flora/tree/jungle, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "wN" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/jungle/cavecrew/security) @@ -1891,7 +1891,7 @@ dir = 6 }, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "xv" = ( /obj/effect/turf_decal/techfloor, /turf/open/floor/plasteel/patterned/brushed, @@ -2000,7 +2000,7 @@ "yx" = ( /obj/structure/grille/broken, /turf/open/floor/plating/dirt/old, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "yA" = ( /obj/structure/railing/corner{ dir = 1 @@ -2041,7 +2041,7 @@ dir = 8 }, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "yZ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2064,7 +2064,7 @@ pixel_y = -14 }, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "zJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/freezer/kitchen/wall{ @@ -2154,7 +2154,7 @@ dir = 4 }, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "Ap" = ( /obj/structure/flora/rock/pile/largejungle{ pixel_y = -17; @@ -2264,7 +2264,7 @@ pixel_x = -4 }, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "BU" = ( /obj/structure/closet/crate/silvercrate, /obj/effect/decal/cleanable/dirt/dust, @@ -2358,13 +2358,13 @@ "Dd" = ( /obj/effect/turf_decal/weather/dirt, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "Df" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/rock/pile/largejungle, /obj/structure/flora/tree/jungle, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "Dg" = ( /obj/structure/table/wood/reinforced, /obj/effect/turf_decal/siding/wood{ @@ -2394,7 +2394,7 @@ dir = 9 }, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "Dq" = ( /obj/effect/turf_decal/industrial/outline/yellow, /obj/structure/cable{ @@ -2429,14 +2429,14 @@ }, /obj/structure/spacevine, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "DJ" = ( /obj/structure/flora/ausbushes/reedbush{ pixel_y = 5; pixel_x = 10 }, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "DP" = ( /obj/effect/turf_decal/industrial/warning{ dir = 6; @@ -2493,7 +2493,7 @@ "Es" = ( /obj/structure/flora/grass/jungle/b, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "EG" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ @@ -2509,7 +2509,7 @@ pixel_y = -37 }, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "EO" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2523,7 +2523,7 @@ dir = 8 }, /turf/closed/mineral/random/jungle, -/area/ruin/jungle/cavecrew/rock) +/area/overmap_encounter/planetoid/cave/explored) "EZ" = ( /obj/effect/decal/cleanable/glass, /turf/open/floor/engine/hull/reinforced/interior, @@ -2649,7 +2649,7 @@ }, /obj/structure/flora/rock/pile/largejungle, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "Hx" = ( /obj/structure/railing{ dir = 8; @@ -2692,7 +2692,7 @@ pixel_y = 19 }, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "Ie" = ( /obj/effect/turf_decal/techfloor{ dir = 10 @@ -2788,7 +2788,7 @@ dir = 1 }, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "IN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -2837,7 +2837,7 @@ }, /obj/effect/mob_spawn/human/corpse/damaged, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "Jm" = ( /obj/structure/flora/rock{ icon_state = "basalt2"; @@ -2855,7 +2855,7 @@ /area/ruin/jungle/cavecrew/hallway) "Jz" = ( /turf/closed/wall/rust, -/area/ruin/jungle/cavecrew/rock) +/area/overmap_encounter/planetoid/cave/explored) "JA" = ( /obj/effect/turf_decal/weather/dirt{ dir = 9 @@ -2951,7 +2951,7 @@ "Kw" = ( /obj/structure/flora/rock/pile/largejungle, /turf/closed/mineral/random/jungle, -/area/ruin/jungle/cavecrew/rock) +/area/overmap_encounter/planetoid/cave/explored) "Kx" = ( /obj/effect/turf_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor/border_only{ @@ -3057,10 +3057,10 @@ "Lm" = ( /obj/structure/girder/displaced, /turf/open/floor/plating/dirt/jungle/dark/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "Ln" = ( /turf/open/floor/plating/dirt/old/dark/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "Lo" = ( /obj/structure/table/reinforced{ color = "#c1b6a5" @@ -3091,7 +3091,7 @@ /obj/structure/flora/grass/jungle, /obj/structure/flora/rock/pile/largejungle, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "LB" = ( /obj/effect/turf_decal/industrial/warning/dust{ dir = 4 @@ -3115,7 +3115,7 @@ /area/ruin/jungle/cavecrew/cargo) "Ma" = ( /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "Mg" = ( /obj/effect/turf_decal/industrial/warning/dust/corner, /obj/effect/decal/cleanable/dirt/dust, @@ -3164,7 +3164,7 @@ "MR" = ( /mob/living/simple_animal/hostile/carp, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "MT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -3176,7 +3176,7 @@ "MW" = ( /mob/living/simple_animal/crab/evil, /turf/open/floor/plating/dirt, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "MY" = ( /obj/machinery/suit_storage_unit/inherit/industrial, /obj/effect/turf_decal/industrial/outline/yellow, @@ -3193,7 +3193,7 @@ "Nf" = ( /obj/structure/spacevine, /turf/closed/mineral/random/jungle, -/area/ruin/jungle/cavecrew/rock) +/area/overmap_encounter/planetoid/cave/explored) "Nj" = ( /obj/structure/flora/ausbushes/sunnybush{ pixel_x = 12; @@ -3238,7 +3238,7 @@ pixel_y = 9 }, /turf/open/floor/plating/dirt/jungle/dark/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "Nu" = ( /obj/structure/railing{ dir = 1; @@ -3269,7 +3269,7 @@ }, /obj/structure/spacevine, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "NN" = ( /obj/machinery/power/shuttle/engine/electric{ dir = 1 @@ -3283,14 +3283,14 @@ /area/ship/storage) "NR" = ( /turf/open/floor/plating/dirt/jungle/dark, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "NW" = ( /obj/structure/destructible/tribal_torch/lit{ pixel_x = 16; pixel_y = 15 }, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "Oa" = ( /obj/effect/turf_decal/industrial/hatch/yellow, /obj/effect/decal/cleanable/dirt, @@ -3432,7 +3432,7 @@ pixel_x = 12 }, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "Qr" = ( /obj/effect/turf_decal/industrial/warning/dust/corner{ dir = 1 @@ -3443,7 +3443,7 @@ "Qx" = ( /obj/structure/flora/rock/pile/largejungle, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "Qy" = ( /turf/open/floor/wood{ icon_state = "wood-broken" @@ -3452,12 +3452,12 @@ "Qz" = ( /obj/structure/flora/tree/jungle/small, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "QE" = ( /obj/structure/spacevine, /obj/structure/spacevine, /turf/open/water/jungle, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "QG" = ( /obj/effect/turf_decal/industrial/warning, /turf/open/floor/plasteel/patterned, @@ -3532,17 +3532,17 @@ "Rh" = ( /obj/structure/spacevine, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "Ri" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/jungle/cavecrew/dormitories) "RL" = ( /obj/structure/flora/grass/jungle, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "RM" = ( /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "RP" = ( /obj/effect/turf_decal/weather/dirt{ dir = 9 @@ -3551,7 +3551,7 @@ dir = 10 }, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "RT" = ( /obj/machinery/computer/crew/syndie{ dir = 4 @@ -3815,7 +3815,7 @@ /obj/structure/flora/grass/jungle/b, /obj/structure/flora/rock/pile/largejungle, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "Vu" = ( /obj/effect/turf_decal/techfloor/hole{ dir = 4; @@ -4026,7 +4026,7 @@ /obj/structure/flora/grass/jungle, /obj/structure/flora/rock/pile/largejungle, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "Yf" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/jukebox, @@ -4066,7 +4066,7 @@ /area/ruin/jungle/cavecrew/security) "YF" = ( /turf/open/floor/plating/dirt/jungle/dark/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "YL" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ @@ -4087,7 +4087,7 @@ }, /obj/structure/fluff/fokoff_sign, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "YS" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 6 @@ -4111,7 +4111,7 @@ }, /obj/structure/flora/rock/pile/largejungle, /turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "Zi" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -4152,7 +4152,7 @@ "Zy" = ( /obj/effect/mob_spawn/human/corpse/pirate, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "Zz" = ( /obj/structure/chair/comfy/shuttle{ dir = 8; @@ -4184,7 +4184,7 @@ pixel_y = 3 }, /turf/open/water/jungle/lit, -/area/ruin/unpowered) +/area/overmap_encounter/planetoid/jungle/explored) "ZQ" = ( /obj/structure/flora/rock/pile/largejungle{ pixel_x = -20; diff --git a/code/game/area/areas/ruins/jungle.dm b/code/game/area/areas/ruins/jungle.dm index 6fc0227ce0ff..09d0e95f2f36 100644 --- a/code/game/area/areas/ruins/jungle.dm +++ b/code/game/area/areas/ruins/jungle.dm @@ -145,7 +145,3 @@ /area/ruin/jungle/cavecrew/dormitories name = "Cave Base dormitories" icon_state = "crew_quarters" - -/area/ruin/jungle/cavecrew/rock - name = "Cave Rock" - icon_state = "green"