From aec3831cc5ec27e015d8314711b24986a2bfc6b3 Mon Sep 17 00:00:00 2001 From: Aquidu Date: Thu, 8 Aug 2024 23:20:54 -0700 Subject: [PATCH 01/12] Adds the map FIrst test --- .../JungleRuins/jungle_abandoned_garden.dmm | 1792 ++++++++++++ .../JungleRuins/jungle_hermit_plantation.dmm | 2605 +++++++++++++++++ _maps/map_catalogue.txt | 4 + code/datums/ruins/jungle.dm | 6 + code/game/area/areas/ruins/jungle.dm | 23 + 5 files changed, 4430 insertions(+) create mode 100644 _maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm create mode 100644 _maps/RandomRuins/JungleRuins/jungle_hermit_plantation.dmm diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm new file mode 100644 index 000000000000..e5f2da5cfcff --- /dev/null +++ b/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm @@ -0,0 +1,1792 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"af" = ( +/obj/machinery/door/airlock/external{ + welded = 1 + }, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"as" = ( +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/structure/curtain/cloth/grey, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/dormitories) +"au" = ( +/obj/structure/railing/wood{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"aH" = ( +/obj/structure/mineral_door/wood, +/obj/effect/decal/cleanable/glass, +/obj/item/shard, +/turf/open/floor/wood, +/area/ruin/jungle/abandonedgarden/dormitories) +"aV" = ( +/obj/item/seeds/reishi, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"aZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"bv" = ( +/obj/structure/destructible/tribal_torch, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"bQ" = ( +/obj/structure/railing/wood{ + dir = 4 + }, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"bU" = ( +/turf/open/floor/wood, +/area/ruin/jungle/abandonedgarden/dormitories) +"cb" = ( +/obj/structure/table/wood, +/obj/item/trash/candle{ + pixel_x = -6; + pixel_y = -1 + }, +/obj/item/storage/firstaid/regular{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/dormitories) +"co" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/mineral/titanium, +/area/ruin/jungle/abandonedgarden/cockpit) +"cp" = ( +/obj/structure/flora/junglebush/c, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"cr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/junglebush/large, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"cT" = ( +/obj/structure/lattice, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"da" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/shovel, +/turf/open/floor/plating/grass/jungle{ + light_range = 2 + }, +/area/ruin/jungle/abandonedgarden/hydroponics) +"db" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"dV" = ( +/obj/item/seeds/chanter, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/jungle/abandonedgarden/kitchen) +"dX" = ( +/obj/structure/railing/wood, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"en" = ( +/obj/item/seeds/amanita, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/jungle/abandonedgarden/kitchen) +"eI" = ( +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"eP" = ( +/obj/effect/decal/cleanable/glass, +/obj/structure/loom, +/obj/item/stack/sheet/cotton/cloth/five, +/turf/open/floor/wood, +/area/ruin/jungle/abandonedgarden/kitchen) +"fh" = ( +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/structure/barricade/wooden/crude{ + layer = 3.2 + }, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/cockpit) +"fB" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/kitchen) +"gb" = ( +/obj/structure/railing/wood{ + dir = 10 + }, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"gw" = ( +/obj/structure/chair/wood, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/jungle/abandonedgarden/dormitories) +"gy" = ( +/obj/structure/lattice, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/cockpit) +"gG" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/structure/flora/stump, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"gJ" = ( +/obj/structure/destructible/tribal_torch, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"gU" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/structure/spacevine, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"hD" = ( +/obj/item/seeds/wheat, +/turf/open/floor/mineral/titanium/white, +/area/ruin/jungle/abandonedgarden/kitchen) +"ib" = ( +/turf/closed/wall/mineral/wood, +/area/ruin/jungle/abandonedgarden/cockpit) +"ii" = ( +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/dormitories) +"iv" = ( +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/structure/barricade/wooden/crude{ + layer = 3.2 + }, +/obj/structure/spacevine, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/cockpit) +"iA" = ( +/obj/structure/spacevine, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"iC" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/wood, +/area/ruin/jungle/abandonedgarden/kitchen) +"iK" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/structure/flora/grass/jungle, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"iM" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/structure/spacevine, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/jungle/abandonedgarden/kitchen) +"iV" = ( +/obj/effect/turf_decal/weather/dirt/corner{ + dir = 8 + }, +/obj/structure/flora/grass/jungle, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"ju" = ( +/obj/structure/flora/rock/jungle, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"jw" = ( +/turf/open/floor/plating/dirt/jungle, +/area/ruin/jungle/abandonedgarden/hydroponics) +"jL" = ( +/obj/item/seeds/grass, +/turf/open/floor/plating/grass/jungle{ + light_range = 2 + }, +/area/ruin/jungle/abandonedgarden/hydroponics) +"jU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/spacevine/dense, +/turf/open/floor/plating/dirt/jungle, +/area/ruin/jungle/abandonedgarden/hydroponics) +"jZ" = ( +/obj/structure/flora/junglebush/b, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"kh" = ( +/turf/closed/wall/mineral/titanium, +/area/ruin/jungle/abandonedgarden/dormitories) +"ko" = ( +/obj/structure/chair/comfy/shuttle, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/jungle/abandonedgarden/kitchen) +"kV" = ( +/obj/structure/flora/stump, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"le" = ( +/obj/structure/lattice, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"lH" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/mineral/wood, +/area/ruin/jungle/abandonedgarden/cockpit) +"lM" = ( +/obj/structure/flora/grass/jungle, +/obj/structure/spacevine, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"mg" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"mw" = ( +/obj/item/seeds/glowshroom, +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/cockpit) +"mC" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/ruin/jungle/abandonedgarden/kitchen) +"mI" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/mineral/wood/nonmetal, +/area/ruin/jungle/abandonedgarden/dormitories) +"nP" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/junglebush, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"nR" = ( +/obj/structure/lattice, +/obj/effect/decal/cleanable/glass, +/obj/item/shard, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"ol" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/rock/jungle, +/obj/structure/spacevine, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"or" = ( +/obj/structure/flora/junglebush/b, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"pu" = ( +/obj/structure/bonfire, +/obj/item/stack/rods, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"qg" = ( +/obj/machinery/door/airlock/external{ + welded = 1 + }, +/obj/structure/barricade/wooden/crude{ + layer = 3.2 + }, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/cockpit) +"ql" = ( +/turf/open/floor/plating/grass/jungle{ + light_range = 2 + }, +/area/ruin/jungle/abandonedgarden/hydroponics) +"qE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/smartfridge/drying_rack, +/turf/open/floor/plating/dirt/jungle, +/area/ruin/jungle/abandonedgarden/hydroponics) +"qO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/titanium/white, +/area/ruin/jungle/abandonedgarden/kitchen) +"qR" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/mineral/wood, +/area/ruin/jungle/abandonedgarden/kitchen) +"rd" = ( +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"rs" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"rS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/toilet/greyscale{ + dir = 8; + name = "wood toilet"; + custom_materials = 2000; + color = #bb8e53 + }, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/jungle/abandonedgarden/cockpit) +"sv" = ( +/obj/item/seeds/plump, +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/kitchen) +"sw" = ( +/obj/structure/flora/junglebush/b, +/turf/open/floor/plating/grass/jungle{ + light_range = 2 + }, +/area/ruin/jungle/abandonedgarden/hydroponics) +"sA" = ( +/obj/structure/railing/wood{ + dir = 5 + }, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"ta" = ( +/obj/item/crowbar/red, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/dormitories) +"th" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/item/shard, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/cockpit) +"ti" = ( +/obj/structure/flora/rock/jungle, +/turf/open/floor/plating/dirt/jungle, +/area/ruin/jungle/abandonedgarden/hydroponics) +"tP" = ( +/obj/structure/spacevine, +/turf/closed/wall/mineral/wood, +/area/ruin/jungle/abandonedgarden/kitchen) +"ua" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/spacevine, +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/cockpit) +"up" = ( +/obj/item/reagent_containers/glass/bucket/wooden, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/plating/grass/jungle{ + light_range = 2 + }, +/area/ruin/jungle/abandonedgarden/hydroponics) +"uq" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"uO" = ( +/obj/structure/lattice{ + dir = 4 + }, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"uR" = ( +/obj/structure/flora/tree/jungle/small, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"vn" = ( +/obj/item/melee/baseball_bat, +/obj/item/shield/riot/buckler{ + pixel_x = 8; + pixel_y = -6 + }, +/turf/open/floor/wood, +/area/ruin/jungle/abandonedgarden/dormitories) +"vN" = ( +/obj/structure/spacevine, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"vS" = ( +/obj/effect/decal/cleanable/garbage, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/dormitories) +"vX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bookcase, +/turf/open/floor/wood, +/area/ruin/jungle/abandonedgarden/kitchen) +"we" = ( +/obj/structure/destructible/tribal_torch, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/jungle/abandonedgarden/kitchen) +"wf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/spacevine, +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/kitchen) +"wh" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/wood, +/area/ruin/jungle/abandonedgarden/kitchen) +"xi" = ( +/obj/structure/bed, +/obj/item/bedsheet/random, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/wood, +/area/ruin/jungle/abandonedgarden/dormitories) +"xp" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/structure/flora/grass/jungle, +/turf/open/floor/plating/grass/jungle{ + light_range = 2 + }, +/area/ruin/jungle/abandonedgarden/hydroponics) +"xH" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"ya" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"yo" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"yv" = ( +/obj/structure/salvageable/computer{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/cockpit) +"ze" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/structure/flora/junglebush/b, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"zg" = ( +/obj/item/seeds/starthistle, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"zo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/spacevine, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"zr" = ( +/obj/effect/decal/cleanable/glass, +/obj/structure/spacevine, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/jungle/abandonedgarden/kitchen) +"zZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Ap" = ( +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/cockpit) +"AA" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/grass/jungle{ + light_range = 2 + }, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Bc" = ( +/obj/structure/lattice, +/turf/open/floor/plating/dirt/jungle, +/area/ruin/jungle/abandonedgarden/dormitories) +"Bh" = ( +/obj/structure/flora/stump, +/turf/open/floor/plating/grass/jungle{ + light_range = 2 + }, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Br" = ( +/obj/structure/mineral_door/wood, +/turf/open/floor/wood, +/area/ruin/jungle/abandonedgarden/kitchen) +"Bs" = ( +/obj/structure/table/wood, +/obj/item/trash/candle{ + pixel_y = -1; + pixel_x = 7 + }, +/obj/item/reagent_containers/glass/bottle/nutrient/ez{ + pixel_x = -10; + pixel_y = 15 + }, +/obj/item/reagent_containers/glass/bottle/nutrient/l4z{ + pixel_x = -10; + pixel_y = 7 + }, +/obj/item/reagent_containers/glass/bottle/nutrient/rh{ + pixel_x = -10; + pixel_y = -1 + }, +/obj/effect/spawner/lootdrop/seeded{ + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/jungle/abandonedgarden/dormitories) +"BC" = ( +/obj/structure/spacevine/dense, +/obj/structure/spacevine, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"BD" = ( +/obj/effect/turf_decal/weather/dirt/corner, +/obj/structure/flora/stump, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"BV" = ( +/obj/machinery/door/airlock/external{ + welded = 1 + }, +/obj/structure/barricade/wooden/crude{ + layer = 3.2 + }, +/obj/structure/spacevine, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"Ce" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/tree/jungle/small, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Cj" = ( +/obj/structure/barricade/wooden/crude{ + layer = 3.2 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/machinery/door/airlock/public{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/cockpit) +"Cr" = ( +/obj/structure/lattice, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"CY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/junglebush/c, +/obj/structure/spacevine/dense, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"DC" = ( +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/plating/grass/jungle{ + light_range = 2 + }, +/area/ruin/jungle/abandonedgarden/hydroponics) +"DM" = ( +/obj/structure/lattice, +/obj/structure/spacevine, +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/kitchen) +"Eb" = ( +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Ek" = ( +/obj/structure/railing/wood{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"En" = ( +/obj/item/seeds/harebell, +/turf/open/floor/plating/dirt/jungle, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Et" = ( +/obj/effect/decal/cleanable/glass, +/obj/structure/spacevine, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"EI" = ( +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/structure/barricade/wooden/crude{ + layer = 3.2 + }, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/dormitories) +"EU" = ( +/obj/machinery/hydroponics/soil, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"EW" = ( +/obj/structure/lattice, +/obj/structure/spacevine, +/turf/open/floor/plating/grass/jungle{ + light_range = 2 + }, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Fj" = ( +/turf/template_noop, +/area/template_noop) +"Fo" = ( +/obj/structure/railing/wood{ + dir = 8 + }, +/obj/structure/spacevine, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Fq" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/junglebush, +/turf/open/floor/plating/grass/jungle{ + light_range = 2 + }, +/area/ruin/jungle/abandonedgarden/hydroponics) +"FT" = ( +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/structure/curtain/cloth/grey, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/dormitories) +"Gh" = ( +/obj/structure/railing/wood{ + dir = 6 + }, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Gs" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/structure/flora/stump, +/turf/open/floor/plating/grass/jungle{ + light_range = 2 + }, +/area/ruin/jungle/abandonedgarden/hydroponics) +"GH" = ( +/obj/structure/spacevine, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"GL" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/titanium/white, +/area/ruin/jungle/abandonedgarden/kitchen) +"Ix" = ( +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/kitchen) +"IE" = ( +/obj/structure/salvageable/computer{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/cockpit) +"IY" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Jt" = ( +/obj/structure/spacevine/dense, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Jw" = ( +/obj/structure/flora/junglebush, +/obj/structure/spacevine, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Jz" = ( +/obj/effect/spawner/lootdrop/seeded, +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/cockpit) +"JB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/fermenting_barrel, +/turf/open/floor/plating/dirt/jungle, +/area/ruin/jungle/abandonedgarden/hydroponics) +"JV" = ( +/obj/structure/flora/junglebush/large, +/turf/open/floor/plating/grass/jungle{ + light_range = 2 + }, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Km" = ( +/turf/open/floor/mineral/titanium/white, +/area/ruin/jungle/abandonedgarden/kitchen) +"Kn" = ( +/obj/structure/flora/grass/jungle, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Ko" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood, +/obj/item/reagent_containers/glass/bowl/mushroom_bowl{ + pixel_x = -6; + pixel_y = -2 + }, +/obj/item/reagent_containers/glass/bowl/mushroom_bowl{ + pixel_x = 10; + pixel_y = -2 + }, +/obj/item/reagent_containers/glass/bowl/mushroom_bowl{ + pixel_x = 10; + pixel_y = 10 + }, +/obj/item/reagent_containers/glass/bowl/mushroom_bowl{ + pixel_x = -6; + pixel_y = 10 + }, +/turf/open/floor/wood, +/area/ruin/jungle/abandonedgarden/kitchen) +"Ku" = ( +/obj/structure/railing/wood{ + dir = 1 + }, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"KJ" = ( +/obj/structure/railing/wood{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"KN" = ( +/obj/structure/large_mortar{ + pixel_x = -28; + pixel_y = -3 + }, +/obj/structure/table/wood, +/obj/item/cutting_board, +/obj/item/kitchen/knife/shiv{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/kitchen/rollingpin{ + pixel_x = -11 + }, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"KR" = ( +/obj/machinery/hydroponics/soil, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Lb" = ( +/obj/structure/lattice, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Ln" = ( +/turf/open/floor/mineral/titanium/white, +/area/ruin/jungle/abandonedgarden/cockpit) +"Mw" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"MI" = ( +/obj/structure/lattice, +/turf/open/floor/plating/dirt/jungle, +/area/ruin/jungle/abandonedgarden/hydroponics) +"MX" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/dormitories) +"Nb" = ( +/obj/structure/closet/crate{ + name = "food crate" + }, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/item/reagent_containers/food/snacks/salad/fruit, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"Ng" = ( +/obj/effect/decal/cleanable/dirt, +/turf/template_noop, +/area/template_noop) +"NL" = ( +/turf/open/floor/mineral/titanium/blue, +/area/ruin/jungle/abandonedgarden/cockpit) +"Oi" = ( +/obj/item/seeds/tower, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/jungle/abandonedgarden/dormitories) +"Or" = ( +/obj/structure/flora/tree/jungle/small, +/turf/open/floor/plating/grass/jungle{ + light_range = 2 + }, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Ow" = ( +/obj/effect/turf_decal/weather/dirt/corner{ + dir = 4 + }, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"OD" = ( +/obj/structure/flora/grass/jungle, +/turf/open/floor/plating/grass/jungle{ + light_range = 2 + }, +/area/ruin/jungle/abandonedgarden/hydroponics) +"OM" = ( +/turf/closed/wall/mineral/titanium, +/area/ruin/jungle/abandonedgarden/cockpit) +"Pg" = ( +/obj/structure/lattice, +/turf/open/floor/plating/grass/jungle{ + light_range = 2 + }, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Pu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"PP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/spacevine, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Qf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/ruin/jungle/abandonedgarden/kitchen) +"Qs" = ( +/obj/item/seeds/nettle, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"QB" = ( +/obj/structure/railing/wood{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/spacevine, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"QE" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/storage/bag/plants/portaseeder, +/obj/item/cultivator/rake, +/obj/item/hatchet/wooden, +/obj/effect/decal/cleanable/dirt, +/obj/item/shovel/spade, +/obj/item/reagent_containers/spray/pestspray, +/obj/item/plant_analyzer, +/turf/open/floor/wood, +/area/ruin/jungle/abandonedgarden/kitchen) +"QX" = ( +/obj/structure/lattice, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"Rl" = ( +/obj/structure/dresser, +/obj/item/trash/candle{ + pixel_x = -8; + pixel_y = 18 + }, +/obj/item/storage/fancy/candle_box{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/lighter/greyscale{ + pixel_x = -7; + pixel_y = 4 + }, +/turf/open/floor/wood, +/area/ruin/jungle/abandonedgarden/dormitories) +"Rr" = ( +/obj/structure/railing/wood{ + dir = 1 + }, +/obj/structure/spacevine, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"RT" = ( +/obj/structure/flora/rock/jungle, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"RV" = ( +/obj/effect/turf_decal/weather/dirt/corner{ + dir = 1 + }, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Sc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/spacevine/dense, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Sg" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/mineral/titanium, +/area/ruin/jungle/abandonedgarden/kitchen) +"To" = ( +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/cockpit) +"Tr" = ( +/obj/structure/lattice, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"TO" = ( +/obj/structure/flora/tree/jungle, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"TQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/grass/jungle, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"TZ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/dirt/jungle, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Ub" = ( +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Ug" = ( +/obj/structure/spacevine/dense, +/turf/open/floor/plating/dirt/jungle, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Uh" = ( +/obj/structure/sink/puddle, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Uj" = ( +/obj/structure/lattice, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/cockpit) +"Ur" = ( +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/plating/grass/jungle{ + light_range = 2 + }, +/area/ruin/jungle/abandonedgarden/hydroponics) +"UQ" = ( +/obj/structure/lattice, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Vc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood, +/obj/item/pestle{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/item/kitchen/spoon/plastic{ + pixel_x = -3; + pixel_y = 7 + }, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"Vo" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/dirt/jungle, +/area/ruin/jungle/abandonedgarden/dormitories) +"VO" = ( +/obj/structure/flora/junglebush/large, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Wg" = ( +/obj/structure/lattice, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/cockpit) +"Wm" = ( +/obj/structure/barricade/wooden/crude{ + layer = 3.2 + }, +/obj/machinery/door/airlock/public{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/jungle/abandonedgarden/dormitories) +"Wr" = ( +/turf/open/floor/wood, +/area/ruin/jungle/abandonedgarden/kitchen) +"Wy" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/ruin/jungle/abandonedgarden/dormitories) +"WT" = ( +/turf/closed/wall/mineral/wood, +/area/ruin/jungle/abandonedgarden/kitchen) +"WZ" = ( +/obj/structure/flora/grass/jungle/b, +/obj/structure/spacevine, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Xe" = ( +/obj/machinery/door/airlock/public{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/white, +/area/ruin/jungle/abandonedgarden/cockpit) +"Xk" = ( +/obj/item/clothing/shoes/sandal{ + pixel_x = -7; + pixel_y = 13 + }, +/turf/open/floor/plating/dirt/jungle, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Xq" = ( +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/cockpit) +"Xr" = ( +/obj/structure/spacevine, +/turf/open/floor/plating/grass/jungle{ + light_range = 2 + }, +/area/ruin/jungle/abandonedgarden/hydroponics) +"XD" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/jungle/abandonedgarden/kitchen) +"XF" = ( +/obj/structure/barricade/wooden/crude{ + layer = 3.2 + }, +/obj/machinery/door/airlock/external{ + welded = 1 + }, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) +"XU" = ( +/obj/structure/spacevine, +/turf/closed/wall/mineral/titanium, +/area/ruin/jungle/abandonedgarden/cockpit) +"Yw" = ( +/obj/structure/flora/junglebush, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Yx" = ( +/obj/structure/railing/wood, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"YN" = ( +/turf/closed/wall/mineral/wood/nonmetal, +/area/ruin/jungle/abandonedgarden/dormitories) +"Za" = ( +/turf/closed/wall/mineral/titanium, +/area/ruin/jungle/abandonedgarden/kitchen) +"Zb" = ( +/obj/structure/flora/junglebush/c, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) +"Zq" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/dormitories) +"ZD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/mineral/titanium/white, +/area/ruin/jungle/abandonedgarden/kitchen) +"ZG" = ( +/obj/structure/destructible/tribal_torch, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/jungle/abandonedgarden/kitchen) +"ZS" = ( +/obj/effect/decal/cleanable/glass, +/obj/item/shard, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/cockpit) +"ZW" = ( +/obj/item/flashlight/flare/torch, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/grass/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) + +(1,1,1) = {" +Fj +Fj +Ub +TO +Ub +VO +lM +GH +Yw +Eb +Eb +Fj +Fj +Fj +Fj +Fj +Fj +Fj +Fj +Fj +"} +(2,1,1) = {" +Ng +Ub +Ub +Kn +Ub +GH +Jt +Jt +WZ +Ub +Ub +Kn +Fj +Fj +Fj +Fj +Fj +Fj +Fj +Fj +"} +(3,1,1) = {" +GH +Ub +OM +OM +fh +iv +iv +iv +OM +ib +Lb +Ub +TO +Ng +Fj +Ng +Fj +Fj +Fj +Fj +"} +(4,1,1) = {" +iA +OM +OM +mw +Uj +IE +yv +gy +ua +lH +ib +rs +Ub +or +Fj +Fj +Fj +Fj +Fj +Fj +"} +(5,1,1) = {" +eI +qg +Xq +NL +Ap +Ln +ZS +To +Wg +Jz +ib +Lb +kV +cr +Ub +Fj +Fj +Fj +Fj +Fj +"} +(6,1,1) = {" +db +qg +rS +OM +ib +Xe +Cj +OM +OM +th +lH +Et +rs +IY +uR +Ub +Fj +Fj +Fj +Fj +"} +(7,1,1) = {" +eI +OM +OM +co +iM +Km +Mw +Nb +OM +OM +XU +Ug +GH +Ub +Pu +Yw +Ub +Fj +Fj +Fj +"} +(8,1,1) = {" +Zb +eI +Za +en +we +rd +le +bv +iC +Za +JB +iA +lM +ZW +Ub +Ub +Kn +ju +Fj +Fj +"} +(9,1,1) = {" +iA +eI +XF +Ix +GL +QX +Ix +Wr +Wr +Br +TZ +ql +GH +IY +or +VO +Eb +Ub +Ub +Fj +"} +(10,1,1) = {" +Kn +zZ +Za +ko +rd +zg +rd +Wr +Ko +Za +Xk +ql +BD +nP +uq +uq +uq +gU +iV +Ub +"} +(11,1,1) = {" +Ub +db +Za +fB +wf +rd +uO +aV +Vc +qR +jL +DC +Ur +QB +Fo +eI +KJ +gb +ya +ju +"} +(12,1,1) = {" +aZ +UQ +WT +QE +mC +rd +pu +Km +KN +WT +ql +Pg +Ur +Rr +KR +eI +EU +dX +ya +TO +"} +(13,1,1) = {" +Eb +Ub +WT +vX +Qf +Ix +GL +ZD +nR +WT +MI +ql +da +Ku +KR +eI +KR +dX +ze +Eb +"} +(14,1,1) = {" +Ub +Ub +WT +eP +Wr +hD +rd +GL +fB +Sg +qE +OD +AA +Ku +EU +db +EU +dX +ya +Ub +"} +(15,1,1) = {" +IY +Jw +BV +zr +qO +Km +yo +Km +sv +af +jw +ql +Gs +Ku +EU +db +EU +dX +iK +Ub +"} +(16,1,1) = {" +TQ +iA +Za +XD +ZG +Wr +yo +gJ +DM +tP +Xr +ql +Ur +eI +eI +eI +eI +db +ya +or +"} +(17,1,1) = {" +zZ +eI +Za +Za +dV +wh +Tr +vN +tP +tP +EW +DC +Ur +Ek +KR +eI +EU +dX +gG +or +"} +(18,1,1) = {" +VO +iA +PP +kh +kh +aH +Wm +kh +kh +jU +MI +DC +Ur +Ku +EU +eI +EU +dX +ya +Ub +"} +(19,1,1) = {" +zo +Sc +kh +kh +Oi +Wy +ii +ta +kh +kh +En +ql +xp +Ku +EU +eI +KR +Yx +ya +Kn +"} +(20,1,1) = {" +iA +CY +as +Rl +vn +bU +Zq +gw +cb +EI +TZ +Bh +Ur +Ek +EU +db +EU +dX +ya +Ub +"} +(21,1,1) = {" +iA +BC +FT +xi +Wy +Bc +MX +Vo +Bs +EI +ti +sw +Fq +sA +au +eI +bQ +Gh +gG +Ub +"} +(22,1,1) = {" +Ub +ol +kh +YN +mI +YN +YN +YN +YN +kh +jw +Or +Ow +up +xH +mg +xH +mg +RV +Yw +"} +(23,1,1) = {" +Ub +eI +kh +vS +db +eI +ii +RT +eI +ii +Ub +eI +Ub +ql +Uh +GH +Kn +Pu +eI +Ub +"} +(24,1,1) = {" +Yw +eI +ii +eI +cp +eI +db +db +eI +db +Ub +OD +GH +ql +IY +Ub +Kn +Ub +eI +Fj +"} +(25,1,1) = {" +Ub +Ce +eI +eI +Qs +eI +Cr +eI +eI +jZ +eI +Ub +IY +JV +Kn +Ub +Ub +TO +Fj +Fj +"} +(26,1,1) = {" +Ub +eI +eI +db +eI +eI +eI +eI +cT +eI +ql +uR +Kn +ql +Ub +ql +eI +Fj +Fj +Fj +"} +(27,1,1) = {" +Kn +Ub +RT +eI +Cr +db +jZ +db +eI +db +Ub +Eb +Ub +eI +or +Zb +Fj +Fj +Fj +Fj +"} +(28,1,1) = {" +Ub +Kn +uR +eI +db +eI +eI +eI +eI +Ub +Ub +eI +Ub +Ub +Yw +Fj +Fj +Fj +Fj +Fj +"} +(29,1,1) = {" +Ub +Ub +Eb +eI +Yw +eI +iA +cT +Ub +Kn +uR +eI +Ub +Eb +Fj +Fj +Fj +Fj +Fj +Fj +"} +(30,1,1) = {" +Fj +Ng +Ng +Fj +Fj +Fj +eI +Ng +Ng +Fj +Fj +Fj +Fj +Fj +Fj +Fj +Fj +Fj +Fj +Fj +"} diff --git a/_maps/RandomRuins/JungleRuins/jungle_hermit_plantation.dmm b/_maps/RandomRuins/JungleRuins/jungle_hermit_plantation.dmm new file mode 100644 index 000000000000..0113e4b15fb9 --- /dev/null +++ b/_maps/RandomRuins/JungleRuins/jungle_hermit_plantation.dmm @@ -0,0 +1,2605 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/area/space, +/turf/open/space/basic) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(5,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(6,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(7,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(8,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(9,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(10,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(11,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(12,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(13,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(14,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(15,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(16,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(17,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(18,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(19,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(20,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(21,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(22,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(23,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(24,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(25,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(26,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(27,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(28,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(29,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(30,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(31,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(32,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(33,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(34,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(35,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(36,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(37,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(38,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(39,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(40,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(41,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(42,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(43,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(44,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(45,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(46,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(47,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(48,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(49,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(50,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/_maps/map_catalogue.txt b/_maps/map_catalogue.txt index 7309dbb6f42b..3e676a6b6a72 100644 --- a/_maps/map_catalogue.txt +++ b/_maps/map_catalogue.txt @@ -69,6 +69,10 @@ Find the key for using this catalogue in "map_catalogue_key.txt" Size = (x = 36)(y = 35)(z = 1) Tags = "Medium Combat Challenge", "Medium Loot", "Antag Gear", "Necropolis Loot", "Liveable" + File Name "_maps\RandomRuins\JungleRuins\jungle_abandoned_garden + Size = (x = 30)(y = 20)(z = 1) + Tags = "Minor Loot" "No Combat" "Liveable" + LavaRuins: File Name = "_maps\RandomRuins\LavaRuins\lavaland_surface_buried_shrine.dmm" Size = (x = 67)(y = 55)(z = 1) diff --git a/code/datums/ruins/jungle.dm b/code/datums/ruins/jungle.dm index f1e2e16bfec8..75ca12f5a2f7 100644 --- a/code/datums/ruins/jungle.dm +++ b/code/datums/ruins/jungle.dm @@ -45,3 +45,9 @@ id = "abandoned-library" description = "A forgotten library, with a few angry monkeys." suffix = "jungle_abandoned_library.dmm" + +/datum/map_template/ruin/jungle/garden + name = "Abandoned Garden" + id = "abandonedgarden" + description = "An abandoned makeshift garden home built out of a crashed shuttle." + suffix = "jungle_abandoned_garden.dmm" diff --git a/code/game/area/areas/ruins/jungle.dm b/code/game/area/areas/ruins/jungle.dm index 2d2fc76f97b1..7f9d6647d585 100644 --- a/code/game/area/areas/ruins/jungle.dm +++ b/code/game/area/areas/ruins/jungle.dm @@ -134,3 +134,26 @@ /area/ruin/jungle/cavecrew/dormitories name = "Cave Base dormitories" icon_state = "crew_quarters" + +// Abandoned Garden + +/area/ruin/jungle/abandonedgarden/hydroponics + name = "Abandoned Garden Hydroponics" + icon_state = "hydro" + always_unpowered = TRUE + allow_weather = TRUE + +/area/ruin/jungle/abandonedgarden/kitchen + name = "Abandoned Garden Kitchen" + icon_state = "kitchen" + always_unpowered = TRUE + +/area/ruin/jungle/abandonedgarden/dormitories + name = "Abandoned Garden Dorms" + icon_state = "crew_quarters" + always_unpowered = TRUE + +/area/ruin/jungle/abandonedgarden/cockpit + name = "Abandoned Garden Cockpit" + icon_state = "bridge" + always_unpowered = TRUE From 02979a62606b4b3959a58a1d2c41e852adc7a8bb Mon Sep 17 00:00:00 2001 From: Aquidu Date: Thu, 8 Aug 2024 23:38:22 -0700 Subject: [PATCH 02/12] Removes old version of the map Forgot this part --- .../JungleRuins/jungle_hermit_plantation.dmm | 2605 ----------------- 1 file changed, 2605 deletions(-) delete mode 100644 _maps/RandomRuins/JungleRuins/jungle_hermit_plantation.dmm diff --git a/_maps/RandomRuins/JungleRuins/jungle_hermit_plantation.dmm b/_maps/RandomRuins/JungleRuins/jungle_hermit_plantation.dmm deleted file mode 100644 index 0113e4b15fb9..000000000000 --- a/_maps/RandomRuins/JungleRuins/jungle_hermit_plantation.dmm +++ /dev/null @@ -1,2605 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/area/space, -/turf/open/space/basic) - -(1,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(3,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(4,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(5,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(6,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(8,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(9,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(10,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(11,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(12,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(13,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(14,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(15,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(16,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(17,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(18,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(19,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(20,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(21,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(22,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(23,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(24,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(25,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(26,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(27,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(28,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(29,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(30,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(31,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(32,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(33,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(34,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(35,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(36,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(37,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(38,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(39,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(40,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(41,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(42,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(43,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(44,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(45,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(46,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(47,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(48,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(49,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(50,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} From 8c86620404b97e16d577bc4f0865d3f1a2c41056 Mon Sep 17 00:00:00 2001 From: Aquidu Date: Fri, 9 Aug 2024 03:27:42 -0700 Subject: [PATCH 03/12] Removed wooden toilet I couldn't figure out how to change the toilet's material to wood in a way that didn't cause errors, so while I liked the joke and it added immersion I've removed it in the name of debugging. --- _maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm index e5f2da5cfcff..eaab8b10ee82 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm @@ -332,12 +332,6 @@ /area/ruin/jungle/abandonedgarden/hydroponics) "rS" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/toilet/greyscale{ - dir = 8; - name = "wood toilet"; - custom_materials = 2000; - color = #bb8e53 - }, /turf/open/floor/mineral/titanium/blue, /area/ruin/jungle/abandonedgarden/cockpit) "sv" = ( From bbcb9a5568bd830b9f290d8b6a5e57e3710a848c Mon Sep 17 00:00:00 2001 From: Aquidu Date: Fri, 9 Aug 2024 06:23:25 -0700 Subject: [PATCH 04/12] Removes cleanable dirt from passthrough turf Leftover cleanables from another version. Makes it look nicer, and prevents any issues of the dirt spawning on a weird spot. --- .../JungleRuins/jungle_abandoned_garden.dmm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm index eaab8b10ee82..c88da517e2fd 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm @@ -818,10 +818,6 @@ /obj/item/reagent_containers/food/snacks/salad/fruit, /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/kitchen) -"Ng" = ( -/obj/effect/decal/cleanable/dirt, -/turf/template_noop, -/area/template_noop) "NL" = ( /turf/open/floor/mineral/titanium/blue, /area/ruin/jungle/abandonedgarden/cockpit) @@ -1147,7 +1143,7 @@ Fj Fj "} (2,1,1) = {" -Ng +Fj Ub Ub Kn @@ -1182,9 +1178,9 @@ ib Lb Ub TO -Ng Fj -Ng +Fj +Fj Fj Fj Fj @@ -1764,14 +1760,14 @@ Fj "} (30,1,1) = {" Fj -Ng -Ng +Fj +Fj Fj Fj Fj eI -Ng -Ng +Fj +Fj Fj Fj Fj From e748e90a59bbdc2393ae0474f488c718fe232fe2 Mon Sep 17 00:00:00 2001 From: Aquidu Date: Wed, 4 Sep 2024 02:10:35 -0700 Subject: [PATCH 05/12] Updating as per reviewed Adds cabinet by bed Adds bonfire railings Adds moth plush, art easel, paper, pen, crayons, painting slot, another torch in the bedroom, fire closet, shortwave radio, more trash, and jumpsuits. Swaps external airlocks for shuttle airlocks Changes seed loot to no longer have cherry bombs. --- .../JungleRuins/jungle_abandoned_garden.dmm | 230 ++++++++++++------ .../game/objects/effects/spawners/lootdrop.dm | 1 - 2 files changed, 162 insertions(+), 69 deletions(-) diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm index c88da517e2fd..80542dd1bce4 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm @@ -1,9 +1,11 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "af" = ( -/obj/machinery/door/airlock/external{ +/obj/structure/barricade/wooden/crude{ + layer = 3.2 + }, +/obj/machinery/door/airlock/shuttle{ welded = 1 }, -/obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/kitchen) "as" = ( @@ -26,6 +28,9 @@ /area/ruin/jungle/abandonedgarden/dormitories) "aV" = ( /obj/item/seeds/reishi, +/obj/structure/railing/corner{ + dir = 4 + }, /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/kitchen) "aZ" = ( @@ -57,6 +62,10 @@ pixel_y = 6 }, /obj/effect/decal/cleanable/dirt, +/obj/item/radio{ + pixel_x = -9; + pixel_y = 8 + }, /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/dormitories) "co" = ( @@ -73,7 +82,7 @@ /turf/open/floor/plating/grass/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) "cT" = ( -/obj/structure/lattice, +/obj/effect/decal/fakelattice, /turf/open/floor/plating/dirt/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) "da" = ( @@ -88,6 +97,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/dirt/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) +"ds" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/hydroponics, +/obj/item/plant_analyzer, +/obj/item/reagent_containers/spray/pestspray, +/obj/item/hatchet/wooden, +/obj/item/storage/bag/plants/portaseeder, +/obj/item/shovel/spade, +/obj/item/cultivator/rake, +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/kitchen) "dV" = ( /obj/item/seeds/chanter, /turf/open/floor/mineral/titanium/blue, @@ -97,7 +117,6 @@ /turf/open/floor/plating/dirt/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) "en" = ( -/obj/item/seeds/amanita, /turf/open/floor/mineral/titanium/blue, /area/ruin/jungle/abandonedgarden/kitchen) "eI" = ( @@ -116,10 +135,23 @@ }, /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/cockpit) +"fj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/white, +/area/ruin/jungle/abandonedgarden/kitchen) "fB" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/ruin/jungle/abandonedgarden/kitchen) +"fQ" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/white, +/area/ruin/jungle/abandonedgarden/kitchen) "gb" = ( /obj/structure/railing/wood{ dir = 10 @@ -131,7 +163,7 @@ /turf/open/floor/mineral/titanium/blue, /area/ruin/jungle/abandonedgarden/dormitories) "gy" = ( -/obj/structure/lattice, +/obj/effect/decal/fakelattice, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/cockpit) @@ -190,6 +222,7 @@ "iM" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/spacevine, +/obj/item/seeds/amanita, /turf/open/floor/mineral/titanium/blue, /area/ruin/jungle/abandonedgarden/kitchen) "iV" = ( @@ -233,7 +266,7 @@ /turf/open/floor/plating/grass/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) "le" = ( -/obj/structure/lattice, +/obj/effect/decal/fakelattice, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -275,7 +308,7 @@ /turf/open/floor/plating/grass/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) "nR" = ( -/obj/structure/lattice, +/obj/effect/decal/fakelattice, /obj/effect/decal/cleanable/glass, /obj/item/shard, /turf/open/floor/plating, @@ -296,7 +329,7 @@ /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/kitchen) "qg" = ( -/obj/machinery/door/airlock/external{ +/obj/machinery/door/airlock/shuttle{ welded = 1 }, /obj/structure/barricade/wooden/crude{ @@ -391,10 +424,11 @@ /turf/open/floor/plating/grass/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) "uO" = ( -/obj/structure/lattice{ +/obj/effect/decal/fakelattice, +/obj/structure/chair/wood{ dir = 4 }, -/obj/structure/chair/wood{ +/obj/structure/railing{ dir = 4 }, /turf/open/floor/plating, @@ -404,19 +438,22 @@ /turf/open/floor/plating/grass/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) "vn" = ( -/obj/item/melee/baseball_bat, -/obj/item/shield/riot/buckler{ - pixel_x = 8; - pixel_y = -6 +/obj/structure/railing/corner{ + dir = 8 }, -/turf/open/floor/wood, -/area/ruin/jungle/abandonedgarden/dormitories) +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/kitchen) "vN" = ( /obj/structure/spacevine, +/obj/structure/closet/firecloset/full, /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/kitchen) "vS" = ( /obj/effect/decal/cleanable/garbage, +/obj/item/trash/cheesie{ + pixel_x = 10; + pixel_y = 13 + }, /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/dormitories) "vX" = ( @@ -440,8 +477,14 @@ /area/ruin/jungle/abandonedgarden/kitchen) "xi" = ( /obj/structure/bed, -/obj/item/bedsheet/random, /obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/item/toy/plush/moth/ragged{ + pixel_x = -4; + pixel_y = 3; + desc = "A ragged, well-worn mothperson plushie. It appears to have been hand-sewn, and is stuffed with raw cotton."; + name = "worn-out moth plushie" + }, +/obj/item/bedsheet/random, /turf/open/floor/wood, /area/ruin/jungle/abandonedgarden/dormitories) "xp" = ( @@ -475,6 +518,10 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/cockpit) +"yx" = ( +/obj/structure/railing, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) "ze" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -512,7 +559,8 @@ }, /area/ruin/jungle/abandonedgarden/hydroponics) "Bc" = ( -/obj/structure/lattice, +/obj/effect/decal/fakelattice, +/obj/structure/destructible/tribal_torch, /turf/open/floor/plating/dirt/jungle, /area/ruin/jungle/abandonedgarden/dormitories) "Bh" = ( @@ -560,7 +608,7 @@ /turf/open/floor/plating/grass/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) "BV" = ( -/obj/machinery/door/airlock/external{ +/obj/machinery/door/airlock/shuttle{ welded = 1 }, /obj/structure/barricade/wooden/crude{ @@ -586,7 +634,7 @@ /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/cockpit) "Cr" = ( -/obj/structure/lattice, +/obj/effect/decal/fakelattice, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/dirt/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) @@ -603,7 +651,7 @@ }, /area/ruin/jungle/abandonedgarden/hydroponics) "DM" = ( -/obj/structure/lattice, +/obj/effect/decal/fakelattice, /obj/structure/spacevine, /turf/open/floor/plating/rust, /area/ruin/jungle/abandonedgarden/kitchen) @@ -627,6 +675,18 @@ /obj/structure/spacevine, /turf/open/floor/plating/dirt/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) +"ED" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/trash/can/food/beans{ + pixel_x = -8; + pixel_y = 10 + }, +/obj/item/trash/raisins{ + pixel_x = 11; + pixel_y = 15 + }, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) "EI" = ( /obj/structure/window/reinforced/fulltile/shuttle, /obj/structure/barricade/wooden/crude{ @@ -639,12 +699,16 @@ /turf/open/floor/plating/dirt/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) "EW" = ( -/obj/structure/lattice, +/obj/effect/decal/fakelattice, /obj/structure/spacevine, /turf/open/floor/plating/grass/jungle{ light_range = 2 }, /area/ruin/jungle/abandonedgarden/hydroponics) +"Fe" = ( +/obj/structure/sign/painting/library, +/turf/closed/wall/mineral/titanium, +/area/ruin/jungle/abandonedgarden/kitchen) "Fj" = ( /turf/template_noop, /area/template_noop) @@ -690,6 +754,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/titanium/white, /area/ruin/jungle/abandonedgarden/kitchen) +"HS" = ( +/obj/item/trash/popcorn{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/trash/chips{ + pixel_x = -6; + pixel_y = -2 + }, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) "Ix" = ( /turf/open/floor/plating/rust, /area/ruin/jungle/abandonedgarden/kitchen) @@ -791,7 +866,7 @@ /turf/open/floor/plating/dirt/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) "Lb" = ( -/obj/structure/lattice, +/obj/effect/decal/fakelattice, /turf/open/floor/plating/grass/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) "Ln" = ( @@ -802,11 +877,12 @@ /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/kitchen) "MI" = ( -/obj/structure/lattice, +/obj/effect/decal/fakelattice, /turf/open/floor/plating/dirt/jungle, /area/ruin/jungle/abandonedgarden/hydroponics) "MX" = ( /obj/effect/decal/cleanable/dirt, +/obj/item/seeds/tower, /turf/open/floor/plating/rust, /area/ruin/jungle/abandonedgarden/dormitories) "Nb" = ( @@ -821,9 +897,24 @@ "NL" = ( /turf/open/floor/mineral/titanium/blue, /area/ruin/jungle/abandonedgarden/cockpit) +"Oh" = ( +/obj/structure/railing/corner, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/kitchen) "Oi" = ( -/obj/item/seeds/tower, -/obj/effect/decal/cleanable/cobweb, +/obj/structure/dresser, +/obj/item/storage/fancy/candle_box{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/lighter/greyscale{ + pixel_x = -7; + pixel_y = 4 + }, +/obj/item/trash/candle{ + pixel_x = -8; + pixel_y = 18 + }, /turf/open/floor/mineral/titanium/blue, /area/ruin/jungle/abandonedgarden/dormitories) "Or" = ( @@ -848,7 +939,7 @@ /turf/closed/wall/mineral/titanium, /area/ruin/jungle/abandonedgarden/cockpit) "Pg" = ( -/obj/structure/lattice, +/obj/effect/decal/fakelattice, /turf/open/floor/plating/grass/jungle{ light_range = 2 }, @@ -881,34 +972,38 @@ /turf/open/floor/plating/dirt/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) "QE" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/storage/bag/plants/portaseeder, -/obj/item/cultivator/rake, -/obj/item/hatchet/wooden, /obj/effect/decal/cleanable/dirt, -/obj/item/shovel/spade, -/obj/item/reagent_containers/spray/pestspray, -/obj/item/plant_analyzer, +/obj/structure/table/wood, +/obj/item/pen/charcoal{ + pixel_x = -6; + pixel_y = -2 + }, +/obj/item/paper/crumpled{ + pixel_x = 8; + pixel_y = -2 + }, +/obj/item/storage/crayons{ + pixel_x = 0; + pixel_y = 12 + }, /turf/open/floor/wood, /area/ruin/jungle/abandonedgarden/kitchen) "QX" = ( -/obj/structure/lattice, +/obj/effect/decal/fakelattice, /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/kitchen) "Rl" = ( -/obj/structure/dresser, -/obj/item/trash/candle{ - pixel_x = -8; - pixel_y = 18 - }, -/obj/item/storage/fancy/candle_box{ +/obj/structure/closet/cabinet, +/obj/item/shield/riot/buckler{ pixel_x = 8; - pixel_y = 6 - }, -/obj/item/lighter/greyscale{ - pixel_x = -7; - pixel_y = 4 + pixel_y = -6 }, +/obj/item/melee/baseball_bat, +/obj/item/clothing/under/color/white, +/obj/item/clothing/under/color/white, +/obj/item/clothing/under/color/jumpskirt/white, +/obj/item/clothing/under/color/jumpskirt/white, +/obj/effect/decal/cleanable/cobweb, /turf/open/floor/wood, /area/ruin/jungle/abandonedgarden/dormitories) "Rr" = ( @@ -941,7 +1036,7 @@ /turf/open/floor/plating/rust, /area/ruin/jungle/abandonedgarden/cockpit) "Tr" = ( -/obj/structure/lattice, +/obj/effect/decal/fakelattice, /obj/effect/decal/cleanable/glass, /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/kitchen) @@ -970,7 +1065,7 @@ /turf/open/floor/plating/grass/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) "Uj" = ( -/obj/structure/lattice, +/obj/effect/decal/fakelattice, /obj/effect/decal/cleanable/glass, /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/cockpit) @@ -981,7 +1076,7 @@ }, /area/ruin/jungle/abandonedgarden/hydroponics) "UQ" = ( -/obj/structure/lattice, +/obj/effect/decal/fakelattice, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/grass/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) @@ -1007,7 +1102,7 @@ /turf/open/floor/plating/grass/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) "Wg" = ( -/obj/structure/lattice, +/obj/effect/decal/fakelattice, /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/cockpit) "Wm" = ( @@ -1063,13 +1158,9 @@ /turf/open/floor/mineral/titanium/blue, /area/ruin/jungle/abandonedgarden/kitchen) "XF" = ( -/obj/structure/barricade/wooden/crude{ - layer = 3.2 - }, -/obj/machinery/door/airlock/external{ - welded = 1 - }, -/turf/open/floor/plating, +/obj/structure/easel, +/obj/item/canvas/twentythreeXtwentythree, +/turf/open/floor/plating/rust, /area/ruin/jungle/abandonedgarden/kitchen) "XU" = ( /obj/structure/spacevine, @@ -1102,6 +1193,9 @@ "ZD" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/glass, +/obj/structure/railing/corner{ + dir = 1 + }, /turf/open/floor/mineral/titanium/white, /area/ruin/jungle/abandonedgarden/kitchen) "ZG" = ( @@ -1299,8 +1393,8 @@ Fj (9,1,1) = {" iA eI +af XF -Ix GL QX Ix @@ -1321,7 +1415,7 @@ Fj (10,1,1) = {" Kn zZ -Za +Fe ko rd zg @@ -1344,9 +1438,9 @@ Ub Ub db Za -fB +ds wf -rd +Oh uO aV Vc @@ -1368,9 +1462,9 @@ UQ WT QE mC -rd +yx pu -Km +fQ KN WT ql @@ -1390,8 +1484,8 @@ Ub WT vX Qf -Ix -GL +vn +fj ZD nR WT @@ -1543,7 +1637,7 @@ iA CY as Rl -vn +bU bU Zq gw @@ -1609,7 +1703,7 @@ Ub eI kh vS -db +ED eI ii RT @@ -1630,7 +1724,7 @@ Ub Yw eI ii -eI +HS cp eI db diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 8eadf9c62a2c..c898d341dd31 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -736,7 +736,6 @@ /obj/item/seeds/reishi, /obj/item/seeds/cannabis, /obj/item/seeds/starthistle, - /obj/item/seeds/cherry/bomb, /obj/item/seeds/berry/glow, /obj/item/seeds/sunflower/moonflower ) From 6869253c8febcf2f895220ea4d2b923ea7f3657d Mon Sep 17 00:00:00 2001 From: Aquidu Date: Thu, 12 Sep 2024 20:21:15 -0700 Subject: [PATCH 06/12] ty zevo hope this is better --- .../JungleRuins/jungle_abandoned_garden.dmm | 659 ++++++++++++------ 1 file changed, 456 insertions(+), 203 deletions(-) diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm index 80542dd1bce4..788316a73c2a 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm @@ -69,9 +69,9 @@ /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/dormitories) "co" = ( -/obj/effect/decal/cleanable/dirt, -/turf/closed/wall/mineral/titanium, -/area/ruin/jungle/abandonedgarden/cockpit) +/obj/item/seeds/nettle, +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/hydroponics) "cp" = ( /obj/structure/flora/junglebush/c, /turf/open/floor/plating/dirt/jungle/lit, @@ -81,6 +81,14 @@ /obj/structure/flora/junglebush/large, /turf/open/floor/plating/grass/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) +"cw" = ( +/obj/effect/decal/cleanable/garbage, +/obj/item/trash/cheesie{ + pixel_x = 10; + pixel_y = 13 + }, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/hydroponics) "cT" = ( /obj/effect/decal/fakelattice, /turf/open/floor/plating/dirt/jungle/lit, @@ -129,12 +137,8 @@ /turf/open/floor/wood, /area/ruin/jungle/abandonedgarden/kitchen) "fh" = ( -/obj/structure/window/reinforced/fulltile/shuttle, -/obj/structure/barricade/wooden/crude{ - layer = 3.2 - }, -/turf/open/floor/plating, -/area/ruin/jungle/abandonedgarden/cockpit) +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/hydroponics) "fj" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing{ @@ -197,13 +201,10 @@ /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/dormitories) "iv" = ( -/obj/structure/window/reinforced/fulltile/shuttle, -/obj/structure/barricade/wooden/crude{ - layer = 3.2 - }, -/obj/structure/spacevine, -/turf/open/floor/plating, -/area/ruin/jungle/abandonedgarden/cockpit) +/obj/effect/decal/fakelattice, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/hydroponics) "iA" = ( /obj/structure/spacevine, /turf/open/floor/plating/dirt/jungle/lit, @@ -251,9 +252,10 @@ /turf/open/floor/plating/dirt/jungle, /area/ruin/jungle/abandonedgarden/hydroponics) "jZ" = ( -/obj/structure/flora/junglebush/b, -/turf/open/floor/plating/dirt/jungle/lit, -/area/ruin/jungle/abandonedgarden/hydroponics) +/obj/structure/table_frame, +/obj/structure/spacevine, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/cockpit) "kh" = ( /turf/closed/wall/mineral/titanium, /area/ruin/jungle/abandonedgarden/dormitories) @@ -272,9 +274,9 @@ /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/kitchen) "lH" = ( -/obj/effect/decal/cleanable/dirt, -/turf/closed/wall/mineral/wood, -/area/ruin/jungle/abandonedgarden/cockpit) +/obj/effect/decal/fakelattice, +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/hydroponics) "lM" = ( /obj/structure/flora/grass/jungle, /obj/structure/spacevine, @@ -287,10 +289,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/grass/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) -"mw" = ( -/obj/item/seeds/glowshroom, +"mr" = ( +/obj/structure/spacevine/dense, /turf/open/floor/plating/rust, -/area/ruin/jungle/abandonedgarden/cockpit) +/area/ruin/jungle/abandonedgarden/hydroponics) +"mw" = ( +/turf/closed/wall/mineral/titanium, +/area/ruin/jungle/abandonedgarden/hydroponics) "mC" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, @@ -329,14 +334,16 @@ /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/kitchen) "qg" = ( -/obj/machinery/door/airlock/shuttle{ - welded = 1 - }, /obj/structure/barricade/wooden/crude{ layer = 3.2 }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/machinery/door/airlock/public{ + dir = 4 + }, /turf/open/floor/plating, -/area/ruin/jungle/abandonedgarden/cockpit) +/area/ruin/jungle/abandonedgarden/kitchen) "ql" = ( /turf/open/floor/plating/grass/jungle{ light_range = 2 @@ -367,6 +374,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/titanium/blue, /area/ruin/jungle/abandonedgarden/cockpit) +"rZ" = ( +/obj/structure/spacevine/dense, +/turf/closed/wall/mineral/titanium, +/area/ruin/jungle/abandonedgarden/cockpit) "sv" = ( /obj/item/seeds/plump, /turf/open/floor/plating/rust, @@ -388,11 +399,10 @@ /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/dormitories) "th" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/glass, /obj/item/shard, -/turf/open/floor/plating, -/area/ruin/jungle/abandonedgarden/cockpit) +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/hydroponics) "ti" = ( /obj/structure/flora/rock/jungle, /turf/open/floor/plating/dirt/jungle, @@ -402,12 +412,11 @@ /turf/closed/wall/mineral/wood, /area/ruin/jungle/abandonedgarden/kitchen) "ua" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/glass, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/structure/spacevine, -/turf/open/floor/plating/rust, -/area/ruin/jungle/abandonedgarden/cockpit) +/obj/machinery/door/airlock/public{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/white, +/area/ruin/jungle/abandonedgarden/kitchen) "up" = ( /obj/item/reagent_containers/glass/bucket/wooden, /obj/effect/turf_decal/weather/dirt{ @@ -449,13 +458,9 @@ /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/kitchen) "vS" = ( -/obj/effect/decal/cleanable/garbage, -/obj/item/trash/cheesie{ - pixel_x = 10; - pixel_y = 13 - }, -/turf/open/floor/plating, -/area/ruin/jungle/abandonedgarden/dormitories) +/obj/structure/spacevine, +/turf/closed/wall/mineral/titanium, +/area/ruin/jungle/abandonedgarden/hydroponics) "vX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bookcase, @@ -511,13 +516,8 @@ /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/kitchen) "yv" = ( -/obj/structure/salvageable/computer{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/glass, /turf/open/floor/plating, -/area/ruin/jungle/abandonedgarden/cockpit) +/area/ruin/jungle/abandonedgarden/hydroponics) "yx" = ( /obj/structure/railing, /turf/open/floor/plating, @@ -533,6 +533,10 @@ /obj/item/seeds/starthistle, /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/kitchen) +"zh" = ( +/obj/structure/spacevine/dense, +/turf/open/floor/plating/dirt/jungle/lit, +/area/ruin/jungle/abandonedgarden/hydroponics) "zo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/spacevine, @@ -623,14 +627,9 @@ /turf/open/floor/plating/grass/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) "Cj" = ( -/obj/structure/barricade/wooden/crude{ - layer = 3.2 - }, -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/glass, -/obj/machinery/door/airlock/public{ - dir = 4 - }, +/obj/effect/decal/cleanable/dirt, +/obj/item/shard, /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/cockpit) "Cr" = ( @@ -765,6 +764,11 @@ }, /turf/open/floor/plating/dirt/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) +"Ia" = ( +/obj/effect/decal/fakelattice, +/obj/structure/spacevine, +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/hydroponics) "Ix" = ( /turf/open/floor/plating/rust, /area/ruin/jungle/abandonedgarden/kitchen) @@ -772,7 +776,7 @@ /obj/structure/salvageable/computer{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/cockpit) "IY" = ( @@ -780,18 +784,19 @@ /turf/open/floor/plating/grass/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) "Jt" = ( -/obj/structure/spacevine/dense, -/turf/open/floor/plating/grass/jungle/lit, -/area/ruin/jungle/abandonedgarden/hydroponics) +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/seeded, +/turf/open/floor/plating, +/area/ruin/jungle/abandonedgarden/cockpit) "Jw" = ( /obj/structure/flora/junglebush, /obj/structure/spacevine, /turf/open/floor/plating/grass/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) "Jz" = ( -/obj/effect/spawner/lootdrop/seeded, +/obj/effect/decal/cleanable/glass, /turf/open/floor/plating/rust, -/area/ruin/jungle/abandonedgarden/cockpit) +/area/ruin/jungle/abandonedgarden/hydroponics) "JB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/fermenting_barrel, @@ -872,6 +877,9 @@ "Ln" = ( /turf/open/floor/mineral/titanium/white, /area/ruin/jungle/abandonedgarden/cockpit) +"Mm" = ( +/turf/open/floor/mineral/titanium/blue, +/area/ruin/jungle/abandonedgarden/hydroponics) "Mw" = ( /obj/effect/decal/cleanable/glass, /turf/open/floor/plating, @@ -895,7 +903,10 @@ /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/kitchen) "NL" = ( -/turf/open/floor/mineral/titanium/blue, +/obj/structure/table_frame, +/obj/item/seeds/glowshroom, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/cockpit) "Oh" = ( /obj/structure/railing/corner, @@ -935,6 +946,10 @@ light_range = 2 }, /area/ruin/jungle/abandonedgarden/hydroponics) +"OL" = ( +/obj/structure/flora/junglebush/b, +/turf/closed/wall/mineral/titanium, +/area/ruin/jungle/abandonedgarden/hydroponics) "OM" = ( /turf/closed/wall/mineral/titanium, /area/ruin/jungle/abandonedgarden/cockpit) @@ -960,8 +975,10 @@ /turf/open/floor/wood, /area/ruin/jungle/abandonedgarden/kitchen) "Qs" = ( -/obj/item/seeds/nettle, -/turf/open/floor/plating/dirt/jungle/lit, +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/blue, /area/ruin/jungle/abandonedgarden/hydroponics) "QB" = ( /obj/structure/railing/wood{ @@ -992,6 +1009,12 @@ /obj/effect/decal/fakelattice, /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/kitchen) +"Rf" = ( +/obj/structure/door_assembly/door_assembly_public{ + dir = 4 + }, +/turf/open/floor/plating/rust, +/area/ruin/jungle/abandonedgarden/hydroponics) "Rl" = ( /obj/structure/closet/cabinet, /obj/item/shield/riot/buckler{ @@ -1032,8 +1055,17 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall/mineral/titanium, /area/ruin/jungle/abandonedgarden/kitchen) +"Sz" = ( +/obj/structure/spacevine, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/dirt/jungle, +/area/ruin/jungle/abandonedgarden/hydroponics) "To" = ( -/turf/open/floor/plating/rust, +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/structure/barricade/wooden/crude{ + layer = 3.2 + }, +/turf/open/space/basic, /area/ruin/jungle/abandonedgarden/cockpit) "Tr" = ( /obj/effect/decal/fakelattice, @@ -1065,16 +1097,20 @@ /turf/open/floor/plating/grass/jungle/lit, /area/ruin/jungle/abandonedgarden/hydroponics) "Uj" = ( -/obj/effect/decal/fakelattice, -/obj/effect/decal/cleanable/glass, -/turf/open/floor/plating, -/area/ruin/jungle/abandonedgarden/cockpit) +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/structure/spacevine, +/turf/open/space/basic, +/area/ruin/jungle/abandonedgarden/hydroponics) "Ur" = ( /obj/effect/turf_decal/weather/dirt, /turf/open/floor/plating/grass/jungle{ light_range = 2 }, /area/ruin/jungle/abandonedgarden/hydroponics) +"UE" = ( +/obj/structure/window/reinforced/fulltile/shuttle, +/turf/open/space/basic, +/area/ruin/jungle/abandonedgarden/hydroponics) "UQ" = ( /obj/effect/decal/fakelattice, /obj/effect/decal/cleanable/dirt, @@ -1125,15 +1161,12 @@ /turf/closed/wall/mineral/wood, /area/ruin/jungle/abandonedgarden/kitchen) "WZ" = ( -/obj/structure/flora/grass/jungle/b, /obj/structure/spacevine, -/turf/open/floor/plating/grass/jungle/lit, +/turf/open/floor/plating/rust, /area/ruin/jungle/abandonedgarden/hydroponics) "Xe" = ( -/obj/machinery/door/airlock/public{ - dir = 4 - }, -/turf/open/floor/mineral/titanium/white, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/cockpit) "Xk" = ( /obj/item/clothing/shoes/sandal{ @@ -1143,9 +1176,8 @@ /turf/open/floor/plating/dirt/jungle, /area/ruin/jungle/abandonedgarden/hydroponics) "Xq" = ( -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plating/rust, -/area/ruin/jungle/abandonedgarden/cockpit) +/turf/open/floor/mineral/titanium/white, +/area/ruin/jungle/abandonedgarden/hydroponics) "Xr" = ( /obj/structure/spacevine, /turf/open/floor/plating/grass/jungle{ @@ -1204,9 +1236,10 @@ /turf/open/floor/mineral/titanium/blue, /area/ruin/jungle/abandonedgarden/kitchen) "ZS" = ( -/obj/effect/decal/cleanable/glass, -/obj/item/shard, -/turf/open/floor/plating, +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/white, /area/ruin/jungle/abandonedgarden/cockpit) "ZW" = ( /obj/item/flashlight/flare/torch, @@ -1217,15 +1250,6 @@ (1,1,1) = {" Fj Fj -Ub -TO -Ub -VO -lM -GH -Yw -Eb -Eb Fj Fj Fj @@ -1235,20 +1259,7 @@ Fj Fj Fj Fj -"} -(2,1,1) = {" Fj -Ub -Ub -Kn -Ub -GH -Jt -Jt -WZ -Ub -Ub -Kn Fj Fj Fj @@ -1258,20 +1269,20 @@ Fj Fj Fj "} -(3,1,1) = {" -GH -Ub -OM -OM -fh -iv -iv -iv -OM -ib -Lb +(2,1,1) = {" +Fj +Fj +Fj +eI +eI +eI +eI +eI +eI Ub -TO +Fj +Fj +Fj Fj Fj Fj @@ -1280,21 +1291,21 @@ Fj Fj Fj "} -(4,1,1) = {" -iA -OM +(3,1,1) = {" +Fj +Fj +Ub +eI OM -mw -Uj -IE -yv -gy -ua -lH ib -rs +ib +OM Ub -or +eI +Fj +Fj +Fj +Fj Fj Fj Fj @@ -1302,18 +1313,106 @@ Fj Fj Fj "} -(5,1,1) = {" -eI -qg -Xq +(4,1,1) = {" +Fj +Ub +Ub +TO +ib +IE +IE +To +Yw +Eb +Eb +Fj +Fj +Fj +Fj +Fj +Fj +Fj +Fj +Fj +"} +(5,1,1) = {" +Fj +Ub +eI +Kn +To +Cj +ZS +To +Eb +eI +Ub +Kn +Fj +Fj +Fj +Fj +Fj +Fj +Fj +Fj +"} +(6,1,1) = {" +GH +Ub +Ub +OM +OM +Xe +gy +OM +OM +Ub +Lb +Ub +TO +Fj +Fj +Fj +Fj +Fj +Fj +Fj +"} +(7,1,1) = {" +iA +eI +eI +XU NL Ap Ln -ZS -To +Jt +XU +GH +Ub +rs +Ub +or +Fj +Fj +Fj +Fj +Fj +Fj +"} +(8,1,1) = {" +eI +GH +GH +XU +rS Wg -Jz -ib +Ap +jZ +rZ +iA +Ub Lb kV cr @@ -1324,18 +1423,18 @@ Fj Fj Fj "} -(6,1,1) = {" +(9,1,1) = {" db +Ub +Ub +Za +WT +ua qg -rS -OM -ib -Xe -Cj -OM -OM -th -lH +Za +Za +Ub +Ub Et rs IY @@ -1346,18 +1445,18 @@ Fj Fj Fj "} -(7,1,1) = {" +(10,1,1) = {" eI -OM -OM -co +eI +Za +Sg iM Km Mw Nb -OM -OM -XU +Za +Za +Sz Ug GH Ub @@ -1368,7 +1467,7 @@ Fj Fj Fj "} -(8,1,1) = {" +(11,1,1) = {" Zb eI Za @@ -1390,7 +1489,7 @@ ju Fj Fj "} -(9,1,1) = {" +(12,1,1) = {" iA eI af @@ -1412,7 +1511,7 @@ Ub Ub Fj "} -(10,1,1) = {" +(13,1,1) = {" Kn zZ Fe @@ -1434,7 +1533,7 @@ gU iV Ub "} -(11,1,1) = {" +(14,1,1) = {" Ub db Za @@ -1456,7 +1555,7 @@ gb ya ju "} -(12,1,1) = {" +(15,1,1) = {" aZ UQ WT @@ -1478,7 +1577,7 @@ dX ya TO "} -(13,1,1) = {" +(16,1,1) = {" Eb Ub WT @@ -1500,7 +1599,7 @@ dX ze Eb "} -(14,1,1) = {" +(17,1,1) = {" Ub Ub WT @@ -1522,7 +1621,7 @@ dX ya Ub "} -(15,1,1) = {" +(18,1,1) = {" IY Jw BV @@ -1544,7 +1643,7 @@ dX iK Ub "} -(16,1,1) = {" +(19,1,1) = {" TQ iA Za @@ -1566,7 +1665,7 @@ db ya or "} -(17,1,1) = {" +(20,1,1) = {" zZ eI Za @@ -1588,7 +1687,7 @@ dX gG or "} -(18,1,1) = {" +(21,1,1) = {" VO iA PP @@ -1610,7 +1709,7 @@ dX ya Ub "} -(19,1,1) = {" +(22,1,1) = {" zo Sc kh @@ -1632,7 +1731,7 @@ Yx ya Kn "} -(20,1,1) = {" +(23,1,1) = {" iA CY as @@ -1654,7 +1753,7 @@ dX ya Ub "} -(21,1,1) = {" +(24,1,1) = {" iA BC FT @@ -1676,7 +1775,7 @@ Gh gG Ub "} -(22,1,1) = {" +(25,1,1) = {" Ub ol kh @@ -1698,17 +1797,17 @@ mg RV Yw "} -(23,1,1) = {" +(26,1,1) = {" Ub eI -kh -vS +mw +cw ED eI -ii +yv RT eI -ii +yv Ub eI Ub @@ -1720,10 +1819,10 @@ Pu eI Ub "} -(24,1,1) = {" +(27,1,1) = {" Yw eI -ii +yv HS cp eI @@ -1742,17 +1841,17 @@ Ub eI Fj "} -(25,1,1) = {" +(28,1,1) = {" Ub Ce eI eI -Qs +eI eI Cr eI eI -jZ +OL eI Ub IY @@ -1764,17 +1863,17 @@ TO Fj Fj "} -(26,1,1) = {" +(29,1,1) = {" Ub eI -eI +iA db -eI +cT eI eI eI cT -eI +mw ql uR Kn @@ -1786,16 +1885,16 @@ Fj Fj Fj "} -(27,1,1) = {" +(30,1,1) = {" Kn Ub -RT +vS +fh eI -Cr -db -jZ -db eI +eI +eI +fh db Ub Eb @@ -1808,17 +1907,17 @@ Fj Fj Fj "} -(28,1,1) = {" +(31,1,1) = {" Ub Kn -uR eI -db eI eI +WZ eI eI -Ub +Qs +vS Ub eI Ub @@ -1830,21 +1929,65 @@ Fj Fj Fj "} -(29,1,1) = {" +(32,1,1) = {" +eI Ub +mw +fh +Xq +mr +Xq +lH +Jz +Kn +uR +eI Ub Eb +Ub +Fj +Fj +Fj +Fj +Fj +"} +(33,1,1) = {" +Ub eI -Yw -eI +mw +Qs +fh +mr iA -cT +eI +fh +eI +Ub +Ub Ub -Kn -uR eI Ub -Eb +Fj +Fj +Fj +Fj +Fj +"} +(34,1,1) = {" +Ub +eI +mw +fh +eI +WZ +Ia +fh +fh +mw +Ub +eI +Ub +Ub Fj Fj Fj @@ -1852,19 +1995,129 @@ Fj Fj Fj "} -(30,1,1) = {" +(35,1,1) = {" +Ub +eI +UE +Jz +lH +co +fh +fh +Qs +UE +Ub +Ub Fj Fj Fj Fj Fj Fj +Fj +Fj +"} +(36,1,1) = {" +Ub +eI +th +Jz +fh +Xq +eI +fh +Mm +Uj +iA +Ub +Fj +Fj +Fj +Fj +Fj +Fj +Fj +Fj +"} +(37,1,1) = {" +Ub +eI +vS +Qs +eI +fh +fh +Xq +fh +vS +GH +Fj +Fj +Fj +Fj +Fj +Fj +Fj +Fj +Fj +"} +(38,1,1) = {" +Ub +GH +zh +WZ +fh +fh +iv +fh +Jz eI +Ub +Fj +Fj +Fj +Fj Fj Fj Fj Fj Fj +"} +(39,1,1) = {" +Ub +Ub +iA +mw +eI +eI +Rf +eI +mw +eI +Ub +Fj +Fj +Fj +Fj +Fj +Fj +Fj +Fj +Fj +"} +(40,1,1) = {" +eI +Ub +Ub +Ub +Ub +Ub +Ub +Ub +Ub +Ub +Fj +Fj Fj Fj Fj From 853cf248eb12c1af3d06d87b5dfa4c3abef70ead Mon Sep 17 00:00:00 2001 From: Aquidu Date: Thu, 26 Sep 2024 04:35:18 -0700 Subject: [PATCH 07/12] updates the map size in the catalogue --- _maps/map_catalogue.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_catalogue.txt b/_maps/map_catalogue.txt index 3e676a6b6a72..6e9b6b0d25b8 100644 --- a/_maps/map_catalogue.txt +++ b/_maps/map_catalogue.txt @@ -70,7 +70,7 @@ Find the key for using this catalogue in "map_catalogue_key.txt" Tags = "Medium Combat Challenge", "Medium Loot", "Antag Gear", "Necropolis Loot", "Liveable" File Name "_maps\RandomRuins\JungleRuins\jungle_abandoned_garden - Size = (x = 30)(y = 20)(z = 1) + Size = (x = 40)(y = 20)(z = 1) Tags = "Minor Loot" "No Combat" "Liveable" LavaRuins: From 8af91bbaf41e89b082b24ccf89947f8cb42a8b69 Mon Sep 17 00:00:00 2001 From: Aquidu Date: Thu, 26 Sep 2024 04:39:17 -0700 Subject: [PATCH 08/12] removes the map catalogue hopefully this fixes the merge conflicts --- _maps/map_catalogue.txt | 242 ---------------------------------------- 1 file changed, 242 deletions(-) delete mode 100644 _maps/map_catalogue.txt diff --git a/_maps/map_catalogue.txt b/_maps/map_catalogue.txt deleted file mode 100644 index 6e9b6b0d25b8..000000000000 --- a/_maps/map_catalogue.txt +++ /dev/null @@ -1,242 +0,0 @@ -Find the key for using this catalogue in "map_catalogue_key.txt" - - - IceRuins: - File Name = _maps\RandomRuins\IceRuins\icemoon_hydroponics_lab.dmm - Size = (x = 33)(y = 33)(z = 1) - Tags = "Medium Loot", "Medium Combat Challenge", "Antag_Gear", "Shelter" - - File Name = _maps\RandomRuins\IceRuins\icemoon_surface_corporate_rejects.dmm - Size = (x = 34)(y = 38)(z = 1) - Tags = "Boss Combat Challenge", "Major Loot", "Antag Gear", "Shelter", "Lava" - - File Name = _maps\RandomRuins\IceRuins\icemoon_surface_engioutpost.dmm - Size = (x = 40)(y = 20)(z = 1) - Tags = "No Combat", "Minor Loot", "Shelter" - - File Name = _maps\RandomRuins\IceRuins\icemoon_underground_abandoned_newcops.dmm - Size = (x = 37)(y = 32)(z = 1) - Tags = "Medium Combat Challenge", "Minor Loot", "Shelter" - - File Name = _maps\RandomRuins\IceRuins\icemoon_underground_abandoned_village.dmm - Size = (x = 28)(y = 28)(z = 1) - Tags = "Medium Combat Challenge", "Minor Loot", "Antag Gear", "Inhospitable" - - File Name = _maps\RandomRuins\IceRuins\icemoon_underground_brazillianlab.dmm - Size = (x = 40)(y = 30)(z = 1) - Tags = "Boss Combat Challenge", "Major Loot", "Inhospitable" - - File Name = _maps\RandomRuins\IceRuins\icemoon_underground_burnies_lair.dmm - Size = (x = 20)(y = 20)(z = 1) - Tags = "Boss Combat Challenge", "Minor Loot", "Shelter", "Antag Gear" - - File Name = _maps\RandomRuins\IceRuins\icemoon_underground_drakelair.dmm - Size = (x = 29)(y = 30)(z = 1) - Tags = "Boss Combat Challenge", "Megafauna", "Major Loot", "Shelter", "Necropolis Loot" - - File Name = _maps\RandomRuins\IceRuins\icemoon_crashed_holemaker.dmm - Size = (x = 47)(y = 37)(z = 1) - Tags = "Medium Combat Challenge", "Minor Loot", "Shelter" - - - - JungleRuins: - File Name = "_maps\RandomRuins\JungleRuins\jungle_syndicate.dmm" - Size = (x = 15)(y = 15)(z = 1) - Tags = "Medium Combat Challenge", "Medium Loot", "Liveable", "Antag Gear" - - File Name = "_maps\RandomRuins\JungleRuins\jungle_interceptor.dmm" - Size = (x = 53)(y = 51)(z = 1) - Tags = "No Combat", "Medium Loot", Liveable" - - File Name = "_maps\RandomRuins\JungleRuins\jungle_medtech_outbreak.dmm" - Size = (x = 31)(y = 25)(z = 1) - Tags = "Medium Combat Challenge", "Medium Loot", Liveable" - - File Name = "_maps\RandomRuins\JungleRuins\jungle_paradise.dmm" - Size = (x = 70)(y = 66)(z = 1) - Tags = "Medium Combat Challenge", "Medium Loot", Liveable", "Hazardous" - - File Name "_maps\RandomRuins\JungleRuins\jungle_bombed_starport - Size = (x = 100)(y = 75)(z = 1) - Tags = "Medium Combat Challenge", "Major Loot", "Hazardous", "Liveable" - - File Name "_maps\RandomRuins\JungleRuins\jungle_cavecrew - Size = (x = 43)(y = 63)(z = 1) - Tags = "Medium Combat Challenge", "Hazardous", "Liveable", "Major Loot" - - File Name "_maps\RandomRuins\JungleRuins\jungle_abandoned_library - Size = (x = 36)(y = 35)(z = 1) - Tags = "Medium Combat Challenge", "Medium Loot", "Antag Gear", "Necropolis Loot", "Liveable" - - File Name "_maps\RandomRuins\JungleRuins\jungle_abandoned_garden - Size = (x = 40)(y = 20)(z = 1) - Tags = "Minor Loot" "No Combat" "Liveable" - - LavaRuins: - File Name = "_maps\RandomRuins\LavaRuins\lavaland_surface_buried_shrine.dmm" - Size = (x = 67)(y = 55)(z = 1) - Tags = "Medium Combat", "Medium Loot", "Hazardous", "Lava", "Inhospitable" - - File Name = "_maps\RandomRuins\LavaRuins\lavaland_surface_biodome_winter.dmm" - Size = (x = 46)(y = 42)(z = 1) - Tags = "Medium Combat Challenge", "Medium Loot", "Shelter" - - File Name = "_maps\RandomRuins\LavaRuins\lavaland_surface_elephant_graveyard.dmm" - Size = (x = 29)(y = 35)(z = 1) - Tags = "No Combat", "Minor Loot", "Hazardous", "Inhospitable" - - File Name = "_maps\RandomRuins\LavaRuins\lavaland_surface_lava_canyon.dmm" - Size = (x = 90)(y = 63)(z = 1) - Tags = "Medium Combat Challenge", "Medium Loot", "Megafauna", "Necropolis Loot", "Inhospitable", "Lava" - - File Name = "_maps\RandomRuins\LavaRuins\lavaland_surface_wrecked_factory.dmm" - Size = (x = 47)(y = 47)(z = 1) - Tags = "Boss Combat Challenge", "Major Loot", "Shelter", "Lava" - - File Name = "_maps\RandomRuins\LavaRuins\lavaland_crashed_starwalker.dmm" - Size = (x = 33)(y = 56)(z = 1) - Tags = "Minor Combat Challenge", "Medium Loot", "Lava" - - File Name = "_maps\RandomRuins\LavaRuins\lavaland_abandonedlisteningpost.dmm" - Size = (x = 33)(y = 56)(z = 1) - Tags = "Medium Combat Challenge", "Medium Loot", "Shelter" - - - ReebeRuins: - File Name = "_maps\RandomRuins\Ruins\reebe_swarmers.dmm" - Size = (x = 20)(y = 20)(z = 1) - Tags = "Medium Combat Challenge", "Minor Loot", "Liveable" - - File Name = "_maps\RandomRuins\Ruins\reebe_arena.dmm" - Size = (x = 79)(y = 60)(z = 1) - Tags = "Boss Combat Challenge", "Medium Loot", "Liveable" - - File Name = "_maps\RandomRuins\Ruins\reebe_decayed_sm.dmm" - Size = (x = 10)(y = 10)(z = 1) - Tags = "No Combat", "Medium Loot", "Liveable", "Hazardous" - - File Name = "_maps\RandomRuins\Ruins\reebe_floating_island.dmm" - Size = (x = 20)(y = 20)(z = 1) - Tags = "Boss Combat Challenge", "Minor Loot", "Liveable" - - - RockRuins: - File Name = "_maps\RandomRuins\RockRuins\rockplanet_budgetcuts.dmm" - Size = (x = 52)(y = 44)(z = 1) - Tags = "Hard Combat Challenge", "Medium Loot", "hospitable" - - File Name = "_maps\RandomRuins\RockRuins\rockplanet_harmfactory.dmm" - Size = (x = 42)(y = 41)(z = 1) - Tags = "Boss Combat Challenge", "Major Loot", Shelter", "Antag Gear", "Hazardous" - - File Name = "_maps\RandomRuins\RockRuins\rockplanet_shippingdock.dmm" - Size = (x = 85)(y = 73)(z = 1) - Tags = "Medium Combat Challenge", "Medium Loot", "Hazardous", "Shelter" - - File Name = "_maps\RandomRuins\RockRuins\rockplanet_nomadcrash.dmm" - Size = (x = 58)(y = 48)(z = 1) - Tags = "Medium Combat Challenge", "Medium Loot", "Hazardous", "Hospitable" - - File Name = "_maps\RandomRuins\RockRuins\rockplanet_distillery.dmm" - Size = (x = 44)(y = 45)(z = 1) - Tags = "Medium Combat Challenge", "Major Loot", "Hazardous", "Hospitable" - - - SandRuins: - File Name = "_maps\RandomRuins\Ruins\whitesands_surface_camp_saloon.dmm" - Size = (x = 30)(y = 30)(z = 1) - Tags = "Medium Combat Challenge", "Medium Loot", "Inhospitable" - - File Name = "_maps\RandomRuins\Ruins\whitesands_surface_camp_combination.dmm" - Size = (x = 59)(y = 59)(z = 1) - Tags = "Medium Combat Challenge", "Medium Loot", "Inhospitable", "Hazardous" - - File Name = "_maps\RandomRuins\Ruins\whitesands_surface_medipen_plant.dmm" - Size = (x = 23)(y = 29)(z = 1) - Tags = "No Combat", "Major Loot", "Shelter" - - File Name = "_maps\RandomRuins\Ruins\whitesands_surface_pubbyslopcrash.dmm" - Size = (x = 40)(y = 25)(z = 1) - Tags = "Minor Combat Challenge", "Medium Loot", "Shelter" - - - - SpaceRuins: - File Name = "_maps\RandomRuins\SpaceRuins\astraeus.dmm" - Size = (x = 47)(y = 35)(z = 1) - Tags = "Minor Combat Challenge", "Medium Loot", "Inhospitable" - - File Name = "_maps\RandomRuins\SpaceRuins\bigderelict1.dmm" - Size = (x = 40)(y = 34)(z = 1) - Tags = "Minor Combat Challenge", "Medium Loot", "Shelter" - - File Name = "_maps\RandomRuins\SpaceRuins\corporate_mining.dmm" - Size = (x = 50)(y = 50)(z = 1) - Tags = "No Combat", "Medium Loot", "Shelter" - - File Name = "_maps\RandomRuins\SpaceRuins\onehalf.dmm" - Size = (x = 29)(y = 20)(z = 1) - Tags = "Minor Combat Challenge", "Medium Loot", "inhospitable" - - File Name = "_maps\RandomRuins\SpaceRuins\power_puzzle.dmm" - Size = (x = 30)(y = 30)(z = 1) - Tags = "Minor Combat Challenge", "Major Loot", "Shelter", "Hazardous" - - File Name = "_maps\RandomRuins\SpaceRuins\singularitylab.dmm" - Size = (x = 118)(y = 75)(z = 1) - Tags = "Boss Combat Challenge", "Major Loot", "Shelter" - - File Name = "_maps\RandomRuins\SpaceRuins\spacemall.dmm" - Size = (x = 86)(y = 48)(z = 1) - Tags = "Medium Combat Challenge", "Major Loot", "Shelter" - - BeachRuins: - File Name = "_maps\RandomRuins\BeachRuins\beach_ancient_ruin.dmm" - Size = (x = 75)(y = 76)(z = 1) - Tags = "Medium Combat Challenge", "Medium Loot", Liveable" - - File Name = "_maps\RandomRuins\BeachRuins\beach_colony.dmm" - Size = (x = 30)(y = 30)(z = 1) - Tags = "Minor Combat Challenge", "Minor Loot" - - File Name = "_maps\RandomRuins\BeachRuins\beach_fishing_hut.dmm" - Size = (x = 30)(y = 40)(z = 1) - Tags = "Hard Combat Challenge, "Major Loot", "Hazardous" - - File Name = "_maps\RandomRuins\BeachRuins\beach_crashed_engineer.dmm" - Size = (x = 32)(y = 32)(z = 1) - Tags = "Minor Combat Challenge, "Medium Loot", "Hazardous" - - File Name = "_maps\RandomRuins\BeachRuins\beach_pirate_crash.dmm" - Size = (x = 33)(y = 26)(z = 1) - Tags = "Medium Combat Challenge", "Medium Loot", "Liveable" - - File Name = "_maps\RandomRuins\BeachRuins\beach_ocean_town.dmm" - Size = (x = 80)(y = 83)(z = 1) - Tags = "No Combat", "Minor loot", "Liveable" - - File Name = "_maps\RandomRuins\BeachRuins\beach_treasure_cove.dmm" - Size = (x = 37)(y = 43)(z = 1) - Tags = "Medium Combat Challenge", "Medium Loot", "Liveable" - - File Name = "_maps\RandomRuins\BeachRuins\beach_float_resort.dmm" - Size = (x = 38)(y = 52)(z = 1) - Tags = "No Combat", "Minor Loot", "Liveable" - - Waste Ruins: - File name ="_maps\RandomRuins\wasteruins\wasteplanet_lab.dmm" - Size = (x = 26)(y = 25)(z = 1) - Tags = "No Combat", "Medium Loot" "Shelter" "hazardous" "hospitable" - - File name ="_maps\RandomRuins\wasteruins\wasteplanet_pandora.dmm" - Size = (x = 18)(y = 21)(z = 1) - Tags = "Boss Combat Challenge", "Medium Loot" "Megafauna", "hospitable" - - File name ="_maps\RandomRuins\wasteruins\wasteplanet_unhonorable.dmm" - Size = (x = 34)(y = 34)(z = 1) - Tags = "Minor Combat Challenge", "Medium Loot", "Shelter", "Hazardous" - - File name = "_maps\RandomRuins\wasteruins\wasteplanet_abandoned_mechbay.dmm" - Size = (x = 45)(y = 47)(z = 1) - Tags = "Boss Combat Challenge", "Medium Loot", "Shelter", "Hazardous" From 492fe2995c22cf6e3c377f48b3e3c3c5d8f67c5d Mon Sep 17 00:00:00 2001 From: Aquidu Date: Thu, 26 Sep 2024 04:44:04 -0700 Subject: [PATCH 09/12] okay i think i did it i figured out the issue --- code/datums/ruins/jungle.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/datums/ruins/jungle.dm b/code/datums/ruins/jungle.dm index 75ca12f5a2f7..a0f964c8fcf7 100644 --- a/code/datums/ruins/jungle.dm +++ b/code/datums/ruins/jungle.dm @@ -9,45 +9,53 @@ id = "syndicatebunkerjungle" description = "A small bunker owned by the Syndicate." suffix = "jungle_syndicate.dmm" + ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE) /datum/map_template/ruin/jungle/interceptor name = "Old Crashed Interceptor" id = "crashedcondor" description = "An overgrown crashed Condor Class, a forgotten remnant of the Corporate Wars." suffix = "jungle_interceptor.dmm" + ruin_tags = list(RUIN_TAG_NO_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE) /datum/map_template/ruin/jungle/paradise name = "Hidden paradise" id = "paradise" description = "a crashed shuttle, and a hidden beautiful lake." suffix = "jungle_paradise.dmm" + ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE, RUIN_TAG_HAZARDOUS) /datum/map_template/ruin/jungle/airbase name = "Bombed Airbase" id = "airbase" description = "A bombed out airbase from the ICW, taken back over by nature" suffix = "jungle_bombed_starport.dmm" + ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MAJOR_LOOT, RUIN_TAG_HAZARDOUS, RUIN_TAG_LIVEABLE) /datum/map_template/ruin/jungle/medtech name = "MedTech facility" id = "medtech-facility" description = "A MedTech pharmaceutical manufacturing plant where something went terribly wrong." suffix = "jungle_medtech_outbreak.dmm" + ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE) /datum/map_template/ruin/jungle/cavecrew name = "Frontiersmen Cave" id = "cavecrew" description = "A frontiersmen base, hidden within a cave. They don't seem friendly" suffix = "jungle_cavecrew.dmm" + ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_HAZARDOUS, RUIN_TAG_LIVEABLE, RUIN_TAG_MAJOR_LOOT) /datum/map_template/ruin/jungle/library name = "Abandoned Library" id = "abandoned-library" description = "A forgotten library, with a few angry monkeys." suffix = "jungle_abandoned_library.dmm" + ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE) /datum/map_template/ruin/jungle/garden name = "Abandoned Garden" id = "abandonedgarden" description = "An abandoned makeshift garden home built out of a crashed shuttle." suffix = "jungle_abandoned_garden.dmm" + ruin_tags = list(RUIN_TAG_NO_COMBAT, RUIN_TAG_MINOR_LOOT, RUIN_TAG_LIVEABLE) From f1650dbc10061ac1cfe788688a2289cb09f218b9 Mon Sep 17 00:00:00 2001 From: Aquidu Date: Thu, 26 Sep 2024 05:07:07 -0700 Subject: [PATCH 10/12] why are my checks failing --- _maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm index 788316a73c2a..b255d60b0b28 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm @@ -856,13 +856,13 @@ }, /obj/structure/table/wood, /obj/item/cutting_board, +/obj/item/kitchen/rollingpin{ + pixel_x = -11 + }, /obj/item/kitchen/knife/shiv{ pixel_x = 7; pixel_y = 3 }, -/obj/item/kitchen/rollingpin{ - pixel_x = -11 - }, /turf/open/floor/plating, /area/ruin/jungle/abandonedgarden/kitchen) "KR" = ( From d4967c3c122ef5b2c00406a44e35c75ea3c20137 Mon Sep 17 00:00:00 2001 From: Aquidu Date: Thu, 26 Sep 2024 05:11:12 -0700 Subject: [PATCH 11/12] haha i fixed you now what do you think about that IDIOT --- _maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm index b255d60b0b28..9b99ad832d88 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_abandoned_garden.dmm @@ -859,7 +859,7 @@ /obj/item/kitchen/rollingpin{ pixel_x = -11 }, -/obj/item/kitchen/knife/shiv{ +/obj/item/melee/knife/shiv{ pixel_x = 7; pixel_y = 3 }, From bfdc9a1c31859f4bd9581bf1b7bcb7f924e41fe6 Mon Sep 17 00:00:00 2001 From: Aquidu Date: Thu, 26 Sep 2024 05:21:09 -0700 Subject: [PATCH 12/12] i hate you --- code/datums/ruins/jungle.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/datums/ruins/jungle.dm b/code/datums/ruins/jungle.dm index bdcd499a3574..a0f964c8fcf7 100644 --- a/code/datums/ruins/jungle.dm +++ b/code/datums/ruins/jungle.dm @@ -59,4 +59,3 @@ description = "An abandoned makeshift garden home built out of a crashed shuttle." suffix = "jungle_abandoned_garden.dmm" ruin_tags = list(RUIN_TAG_NO_COMBAT, RUIN_TAG_MINOR_LOOT, RUIN_TAG_LIVEABLE) - \ No newline at end of file