diff --git a/_maps/RandomRuins/JungleRuins/jungleland_dead_bubblegum.dmm b/_maps/RandomRuins/JungleRuins/jungleland_dead_bubblegum.dmm index bfa9fb25c046..12470cbccb1a 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_dead_bubblegum.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_dead_bubblegum.dmm @@ -7,33 +7,33 @@ /obj/structure/stone_tile/block/cracked{ dir = 8 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "d" = ( /obj/effect/decal/cleanable/blood/bubblegum, /obj/structure/stone_tile/block/cracked{ dir = 1 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "g" = ( /obj/structure/stone_tile/block{ dir = 1 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "i" = ( /obj/effect/decal/cleanable/blood/bubblegum, /obj/structure/stone_tile/surrounding/cracked, /obj/structure/stone_tile/surrounding_tile, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "k" = ( /obj/effect/decal/cleanable/blood/bubblegum, /obj/structure/stone_tile/block{ dir = 4 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "m" = ( /obj/effect/decal/cleanable/blood/bubblegum, @@ -44,13 +44,13 @@ }, /obj/structure/stone_tile/surrounding/cracked, /obj/structure/stone_tile/center/cracked, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "p" = ( /obj/effect/decal/cleanable/blood/bubblegum, /obj/structure/stone_tile/center/cracked, /obj/structure/stone_tile/surrounding/cracked, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "r" = ( /obj/effect/decal/cleanable/blood/bubblegum, @@ -64,11 +64,11 @@ /obj/structure/stone_tile/cracked{ dir = 1 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "s" = ( /obj/effect/decal/cleanable/blood/bubblegum, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "v" = ( /obj/effect/decal/cleanable/blood/bubblegum, @@ -76,79 +76,79 @@ /obj/structure/stone_tile/cracked{ dir = 4 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "z" = ( /obj/effect/decal/cleanable/blood/bubblegum, /obj/effect/decal/cleanable/blood/bubblegum, /obj/structure/stone_tile/slab/cracked, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "D" = ( /mob/living/simple_animal/hostile/megafauna/bubblegum, /obj/effect/decal/cleanable/blood/bubblegum, /obj/effect/decal/cleanable/blood/bubblegum, /obj/structure/stone_tile/surrounding, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "G" = ( /obj/structure/stone_tile/slab, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "H" = ( /obj/effect/decal/cleanable/blood/bubblegum, /obj/effect/decal/cleanable/blood/bubblegum, /obj/structure/stone_tile/slab, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "I" = ( -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "L" = ( /obj/structure/stone_tile/surrounding_tile{ dir = 1 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "N" = ( /obj/structure/stone_tile/block/cracked{ dir = 4 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "Q" = ( /obj/structure/stone_tile/block/cracked{ dir = 8 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "R" = ( /obj/structure/stone_tile/block{ dir = 4 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "S" = ( /obj/effect/decal/cleanable/blood/bubblegum, /obj/structure/stone_tile/slab/cracked, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "T" = ( /obj/structure/stone_tile/surrounding_tile{ dir = 4 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "X" = ( /obj/structure/stone_tile/cracked{ dir = 8 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "Y" = ( /obj/effect/decal/cleanable/blood/bubblegum, /obj/structure/stone_tile/slab, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) (1,1,1) = {" diff --git a/_maps/RandomRuins/JungleRuins/jungleland_dead_colossus.dmm b/_maps/RandomRuins/JungleRuins/jungleland_dead_colossus.dmm index 6ce4964e5b24..32f111ad1aef 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_dead_colossus.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_dead_colossus.dmm @@ -4,7 +4,7 @@ /area/template_noop) "b" = ( /obj/structure/stone_tile/slab, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "c" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -12,21 +12,21 @@ }, /obj/structure/stone_tile/surrounding_tile, /obj/structure/stone_tile/center, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "g" = ( /obj/structure/stone_tile/block{ dir = 8 }, /obj/structure/stone_tile, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "h" = ( -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "l" = ( /obj/effect/decal/cleanable/ash, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "m" = ( /obj/structure/stone_tile/block{ @@ -35,7 +35,7 @@ /obj/structure/stone_tile/block{ dir = 4 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "o" = ( /obj/structure/stone_tile/surrounding_tile, @@ -43,14 +43,14 @@ dir = 4 }, /obj/structure/stone_tile/center, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "p" = ( /obj/structure/stone_tile/block, /obj/structure/stone_tile{ dir = 1 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "q" = ( /obj/structure/stone_tile/block{ @@ -59,32 +59,32 @@ /obj/structure/stone_tile{ dir = 8 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "u" = ( /obj/structure/stone_tile{ dir = 8 }, /obj/effect/decal/cleanable/molten_object/large, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "v" = ( /obj/structure/stone_tile{ dir = 1 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "w" = ( /obj/structure/stone_tile/surrounding_tile{ dir = 8 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "x" = ( /obj/structure/stone_tile/surrounding_tile{ dir = 1 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "y" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -94,13 +94,13 @@ dir = 1 }, /obj/structure/stone_tile/center, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "A" = ( /obj/structure/stone_tile{ dir = 4 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "D" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -110,14 +110,14 @@ dir = 8 }, /obj/structure/stone_tile/center, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "E" = ( /obj/structure/stone_tile/block, /obj/structure/stone_tile{ dir = 4 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "H" = ( /obj/structure/stone_tile/block{ @@ -126,7 +126,7 @@ /obj/structure/stone_tile{ dir = 1 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "I" = ( /obj/structure/stone_tile/block{ @@ -135,31 +135,31 @@ /obj/structure/stone_tile{ dir = 8 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "K" = ( /obj/structure/stone_tile/surrounding, /obj/structure/stone_tile/center, /mob/living/simple_animal/hostile/megafauna/colossus, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "L" = ( /obj/structure/stone_tile/block, /obj/structure/stone_tile/block{ dir = 1 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "M" = ( /obj/structure/stone_tile/block{ dir = 4 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "N" = ( /obj/structure/stone_tile/surrounding_tile, /obj/effect/decal/cleanable/ash, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "P" = ( /obj/structure/stone_tile/block{ @@ -168,44 +168,44 @@ /obj/structure/stone_tile{ dir = 4 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "R" = ( /obj/structure/stone_tile, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "S" = ( /obj/structure/stone_tile/block{ dir = 8 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "T" = ( /obj/structure/stone_tile/block, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "W" = ( /obj/structure/stone_tile/block{ dir = 1 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "X" = ( /obj/structure/stone_tile/surrounding_tile{ dir = 4 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "Y" = ( /obj/structure/stone_tile/block{ dir = 1 }, /obj/structure/stone_tile, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "Z" = ( /obj/effect/decal/cleanable/molten_object/large, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) (1,1,1) = {" diff --git a/_maps/RandomRuins/JungleRuins/jungleland_dead_crashedship.dmm b/_maps/RandomRuins/JungleRuins/jungleland_dead_crashedship.dmm index 8a7af45d9cb6..84a9f015ffd6 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_dead_crashedship.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_dead_crashedship.dmm @@ -10,7 +10,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "c" = ( /obj/item/stack/rods, @@ -30,7 +30,7 @@ /turf/open/floor/plating/lavaland_baseturf, /area/template_noop) "h" = ( -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "i" = ( /obj/structure/table, @@ -83,11 +83,11 @@ /area/template_noop) "w" = ( /obj/structure/flora/tree/dead/jungle, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "x" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "y" = ( /obj/machinery/computer{ @@ -145,7 +145,7 @@ /area/ruin/unpowered) "S" = ( /obj/structure/shuttle/engine/propulsion, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "V" = ( /turf/open/floor/plating/jungle_baseturf/dying, @@ -157,11 +157,11 @@ /obj/structure/shuttle/engine/propulsion{ dir = 8 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "Y" = ( /obj/item/stack/rods, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "Z" = ( /obj/item/stack/sheet/metal, diff --git a/_maps/RandomRuins/JungleRuins/jungleland_dead_testingfacility.dmm b/_maps/RandomRuins/JungleRuins/jungleland_dead_testingfacility.dmm index 1bee291be241..26624f4d0908 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_dead_testingfacility.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_dead_testingfacility.dmm @@ -17,7 +17,7 @@ /area/ruin/unpowered) "cV" = ( /obj/structure/fence, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "dc" = ( /obj/effect/decal/cleanable/blood/tracks, @@ -73,7 +73,7 @@ /area/ruin/unpowered) "gy" = ( /obj/structure/foamedmetal/iron, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/ruin/unpowered) "gR" = ( /obj/structure/chair, @@ -171,7 +171,7 @@ /area/ruin/unpowered) "nT" = ( /obj/structure/fence/corner, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "nW" = ( /obj/structure/chair{ @@ -198,7 +198,7 @@ /area/ruin/unpowered) "rr" = ( /obj/structure/barricade/wooden, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "se" = ( /turf/closed/wall/mineral/iron, @@ -286,7 +286,7 @@ /obj/structure/fence/cut/large{ dir = 8 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "AL" = ( /obj/structure/chair/office/dark{ @@ -296,7 +296,7 @@ /area/ruin/unpowered) "AP" = ( /obj/structure/fence/door, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "Bo" = ( /obj/structure/window/reinforced/fulltile, @@ -304,7 +304,7 @@ /turf/open/floor/plating, /area/ruin/unpowered) "Bu" = ( -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "CA" = ( /obj/effect/decal/cleanable/blood, @@ -434,7 +434,7 @@ /obj/structure/fence{ dir = 8 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "Le" = ( /obj/machinery/door/airlock/glass{ @@ -547,7 +547,7 @@ /turf/open/floor/plating, /area/ruin/unpowered) "ZO" = ( -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/ruin/unpowered) "ZP" = ( /obj/effect/decal/cleanable/dirt, diff --git a/_maps/RandomRuins/JungleRuins/jungleland_jungle_garden.dmm b/_maps/RandomRuins/JungleRuins/jungleland_jungle_garden.dmm index e4cbb110cc5e..c188bc0364b8 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_jungle_garden.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_jungle_garden.dmm @@ -11,7 +11,7 @@ /turf/open/floor/plating/dirt/jungleland/jungle, /area/template_noop) "e" = ( -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) "f" = ( /obj/structure/sink/puddle, diff --git a/_maps/RandomRuins/JungleRuins/jungleland_jungle_tartemple.dmm b/_maps/RandomRuins/JungleRuins/jungleland_jungle_tartemple.dmm index 5c017f7ce3e7..74ee317b3c95 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_jungle_tartemple.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_jungle_tartemple.dmm @@ -134,7 +134,7 @@ /turf/open/floor/plating/dirt/jungleland/barren_rocks, /area/ruin/unpowered/tar_temple) "K" = ( -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "L" = ( /obj/structure/stone_tile/surrounding_tile, diff --git a/_maps/RandomRuins/JungleRuins/jungleland_swamp_carp_pond.dmm b/_maps/RandomRuins/JungleRuins/jungleland_swamp_carp_pond.dmm index cd60a19f9df5..9d087d8facbc 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_swamp_carp_pond.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_swamp_carp_pond.dmm @@ -1,19 +1,19 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "c" = ( /obj/structure/flora/ausbushes/ppflowers, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "d" = ( /obj/item/stack/sheet/bone, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "f" = ( /obj/structure/flora/grass/jungle/b, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "h" = ( /obj/structure/flytrap, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "i" = ( /obj/structure/flora/grass/jungle/b, @@ -36,19 +36,19 @@ /area/template_noop) "p" = ( /obj/structure/flora/junglebush, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "q" = ( /obj/structure/flora/rock/pile, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) "r" = ( /obj/structure/flora/grass/jungle, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "s" = ( /mob/living/simple_animal/hostile/carp/jungle, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) "t" = ( /obj/structure/chair/sofa/bamboo/left, @@ -62,7 +62,7 @@ /obj/item/reagent_containers/food/snacks/grown/harebell{ desc = "It's as purple as a carp..." }, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "w" = ( /obj/item/stack/sheet/sinew, @@ -77,19 +77,19 @@ /turf/open/floor/plating/dirt/jungleland/jungle, /area/template_noop) "B" = ( -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) "C" = ( /obj/item/stack/sheet/animalhide/carpdragon, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "D" = ( /obj/structure/flora/tree/jungle, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "E" = ( /obj/structure/flora/rock/jungle, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "G" = ( /obj/item/stack/sheet/animalhide/carpdragon, @@ -109,7 +109,7 @@ /area/template_noop) "K" = ( /obj/item/stack/sheet/sinew, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "L" = ( /turf/open/floor/wood/jungle, @@ -120,15 +120,15 @@ /area/template_noop) "O" = ( /obj/structure/flora/stump, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "P" = ( /mob/living/simple_animal/hostile/carp/jungle, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "Q" = ( /obj/structure/flora/tree/jungle/small, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "R" = ( /obj/item/toy/plush/carpplushie/dehy_carp, @@ -140,11 +140,11 @@ /area/template_noop) "T" = ( /obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "U" = ( /obj/structure/flora/ausbushes/stalkybush, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) "V" = ( /obj/structure/flora/ausbushes/brflowers, @@ -155,11 +155,11 @@ /turf/open/floor/plating/dirt/jungleland/jungle, /area/template_noop) "Y" = ( -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "Z" = ( /obj/structure/flora/ausbushes/brflowers, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) (1,1,1) = {" diff --git a/_maps/RandomRuins/JungleRuins/jungleland_swamp_cave.dmm b/_maps/RandomRuins/JungleRuins/jungleland_swamp_cave.dmm index 4d308d949f2e..bbd2a4d1fb03 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_swamp_cave.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_swamp_cave.dmm @@ -1,70 +1,70 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "j" = ( -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered) "k" = ( /obj/item/stack/sheet/bone, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered) "l" = ( /obj/effect/decal/remains/human, /obj/item/pickaxe/silver, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered) "s" = ( /obj/effect/decal/remains/human, /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/zombie, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered) "w" = ( /obj/effect/decal/remains/human, /obj/item/clothing/suit/space/hardsuit/powerarmor_t45b, /obj/item/clothing/gloves/combat, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered) "x" = ( /turf/closed/mineral/ash_rock/jungle/deepjungle, /area/ruin/unpowered) "y" = ( /obj/structure/flora/ash/tall_shroom, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered) "z" = ( /obj/item/stack/sheet/bone, /obj/item/reagent_containers/autoinjector/medipen/survival, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered) "A" = ( /obj/structure/spawner/mining/basilisk, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered) "C" = ( /turf/open/floor/plating/dirt/jungleland/jungle, /area/template_noop) "F" = ( -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/ruin/unpowered) "H" = ( /obj/structure/flora/ash/cap_shroom, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered) "K" = ( /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/zombie, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered) "N" = ( /obj/structure/flora/ash/stem_shroom, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered) "O" = ( -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "P" = ( /obj/structure/flora/ash/cacti, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered) "R" = ( -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) "X" = ( /turf/closed/mineral/ash_rock/jungle/deepjungle, diff --git a/_maps/RandomRuins/JungleRuins/jungleland_swamp_drownedburialgrounds.dmm b/_maps/RandomRuins/JungleRuins/jungleland_swamp_drownedburialgrounds.dmm index ce5f02f291c0..6875da3fb72b 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_swamp_drownedburialgrounds.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_swamp_drownedburialgrounds.dmm @@ -1,33 +1,33 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered) "d" = ( /obj/structure/closet/crate/coffin{ opened = 1 }, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/ruin/unpowered) "g" = ( -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/ruin/unpowered) "h" = ( -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) "j" = ( /obj/structure/table/wood, /obj/item/candle/infinite{ lit = 1 }, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered) "k" = ( /obj/item/pickaxe/mini, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "v" = ( /mob/living/simple_animal/hostile/skeleton, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered) "w" = ( /mob/living/simple_animal/hostile/skeleton, @@ -35,10 +35,10 @@ /area/ruin/unpowered) "y" = ( /obj/structure/table/wood, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered) "z" = ( -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "D" = ( /obj/structure/mineral_door/wood, @@ -46,7 +46,7 @@ /area/ruin/unpowered) "E" = ( /mob/living/simple_animal/hostile/skeleton, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/ruin/unpowered) "I" = ( /obj/item/candle/infinite{ @@ -61,7 +61,7 @@ /obj/structure/closet/crate/coffin{ opened = 1 }, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered) "P" = ( /mob/living/simple_animal/hostile/skeleton/templar, @@ -69,7 +69,7 @@ /area/ruin/unpowered) "R" = ( /obj/structure/fluff/grave/empty, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered) "T" = ( /obj/structure/closet/crate/coffin/blackcoffin, @@ -79,7 +79,7 @@ /area/ruin/unpowered) "U" = ( /obj/structure/fluff/grave, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered) "V" = ( /turf/closed/mineral/ash_rock/jungle/swamp, diff --git a/_maps/RandomRuins/JungleRuins/jungleland_swamp_farm.dmm b/_maps/RandomRuins/JungleRuins/jungleland_swamp_farm.dmm index e75199d456ba..f5961cb0e6b8 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_swamp_farm.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_swamp_farm.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /obj/structure/flora/stump, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "b" = ( /obj/structure/closet/crate/wooden, @@ -12,7 +12,7 @@ /area/ruin/unpowered) "d" = ( /obj/structure/flora/ausbushes/stalkybush, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) "e" = ( /obj/structure/fans/tiny/invisible, @@ -28,7 +28,7 @@ "j" = ( /obj/machinery/hydroponics/soil, /obj/item/cultivator/rake, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "l" = ( /turf/open/floor/wood, @@ -48,11 +48,11 @@ /area/ruin/unpowered) "q" = ( /obj/structure/flora/rock/pile, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "s" = ( /mob/living/simple_animal/hostile/yog_jungle/meduracha, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) "t" = ( /obj/structure/chair/sofa/bamboo/right, @@ -77,12 +77,12 @@ "x" = ( /obj/machinery/hydroponics/soil, /obj/item/shovel, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "y" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/wheat/rice, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "A" = ( /obj/structure/mineral_door/wood, @@ -113,11 +113,11 @@ /turf/open/floor/bamboo, /area/ruin/unpowered) "G" = ( -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "I" = ( /obj/machinery/hydroponics/soil, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "K" = ( /obj/structure/chair/sofa/bamboo/left, @@ -127,11 +127,11 @@ }, /area/ruin/unpowered) "L" = ( -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) "M" = ( /obj/item/seeds/wheat/rice, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "N" = ( /obj/structure/table/wood, @@ -162,7 +162,7 @@ /obj/item/seeds/wheat/rice, /obj/item/seeds/wheat/rice, /obj/item/seeds/wheat/rice, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "T" = ( /obj/structure/table/wood, @@ -188,7 +188,7 @@ /area/ruin/unpowered) "Z" = ( /obj/structure/flora/ausbushes/reedbush, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) (1,1,1) = {" diff --git a/_maps/RandomRuins/JungleRuins/jungleland_swamp_miner.dmm b/_maps/RandomRuins/JungleRuins/jungleland_swamp_miner.dmm index 5ca03190f7b2..f8e9a5607f51 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_swamp_miner.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_swamp_miner.dmm @@ -4,75 +4,75 @@ /area/template_noop) "b" = ( /obj/structure/stone_tile/burnt, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "c" = ( /obj/structure/stone_tile/surrounding/cracked{ dir = 1 }, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) "h" = ( -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) "k" = ( /obj/structure/stone_tile/surrounding, /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "l" = ( /obj/structure/stone_tile/surrounding_tile/burnt, /obj/structure/stone_tile/center/burnt, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) "n" = ( /obj/structure/stone_tile/slab/burnt, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "v" = ( /obj/structure/stone_tile/slab/cracked, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "w" = ( -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "y" = ( /obj/structure/stone_tile/surrounding_tile/burnt, /obj/structure/stone_tile/surrounding/cracked, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "A" = ( /obj/structure/stone_tile/burnt{ dir = 1 }, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "D" = ( /obj/structure/stone_tile/block/burnt{ dir = 8 }, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) "H" = ( /obj/structure/stone_tile/surrounding/cracked{ dir = 8 }, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "J" = ( /obj/structure/stone_tile/block/cracked{ dir = 1 }, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) "S" = ( /obj/structure/stone_tile/surrounding/cracked, /obj/structure/stone_tile/center/burnt, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "W" = ( /obj/structure/stone_tile/block/cracked, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) (1,1,1) = {" diff --git a/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm b/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm index 8fe76e9b7881..e4f84e8a9721 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm @@ -314,7 +314,7 @@ /area/ruin/powered/syndicate_lava_base/engineering) "cW" = ( /obj/structure/ore_box, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/jungleland/toxic_pit) "cY" = ( /obj/structure/disposaloutlet{ @@ -658,7 +658,7 @@ dir = 4 }, /obj/item/clothing/head/fishing, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/jungleland/toxic_pit) "gC" = ( /obj/effect/turf_decal/siding/yellow/corner{ @@ -880,7 +880,7 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/powered/syndicate_lava_base/engineering) "iX" = ( -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/jungleland/toxic_pit) "iZ" = ( /obj/machinery/door/firedoor/border_only{ @@ -1218,7 +1218,7 @@ /area/ruin/powered/syndicate_lava_base/bar) "lt" = ( /obj/structure/flora/stump, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/jungleland/toxic_pit) "lw" = ( /obj/machinery/computer/arcade/orion_trail, @@ -2017,7 +2017,7 @@ /area/ruin/powered/syndicate_lava_base/telecomms) "rW" = ( /obj/structure/flytrap, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/jungleland/toxic_pit) "sa" = ( /obj/structure/dresser, @@ -2257,7 +2257,7 @@ /area/ruin/powered/syndicate_lava_base/cargo) "tZ" = ( /obj/machinery/light/small, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/powered/syndicate_lava_base/chemistry) "ue" = ( /obj/structure/table/wood, @@ -2715,7 +2715,7 @@ /area/ruin/powered/syndicate_lava_base/main) "zH" = ( /obj/structure/flora/junglebush, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/jungleland/toxic_pit) "zO" = ( /obj/effect/turf_decal/tile/bar, @@ -3296,7 +3296,7 @@ /area/ruin/powered/syndicate_lava_base/main) "EL" = ( /obj/structure/flora/tree/jungle/small, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/jungleland/toxic_pit) "EM" = ( /obj/effect/turf_decal/siding/red{ @@ -3359,7 +3359,7 @@ /turf/open/floor/engine/plasma, /area/ruin/powered/syndicate_lava_base/engineering) "Fi" = ( -/turf/open/water/toxic_pit/deep, +/turf/open/water/smooth/toxic_pit/deep, /area/jungleland/toxic_pit) "Fl" = ( /obj/effect/turf_decal/siding/brown, @@ -3574,7 +3574,7 @@ /area/ruin/powered/syndicate_lava_base/engineering) "GR" = ( /obj/structure/flora/junglebush/c, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/jungleland/toxic_pit) "GX" = ( /obj/structure/closet/crate, @@ -3705,7 +3705,7 @@ /area/ruin/powered/syndicate_lava_base/bar) "HA" = ( /obj/structure/lattice/catwalk, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/jungleland/toxic_pit) "HM" = ( /obj/structure/disposalpipe/junction{ @@ -3969,7 +3969,7 @@ /area/ruin/powered/syndicate_lava_base/virology) "JD" = ( /obj/structure/flora/grass/jungle, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/jungleland/toxic_pit) "JG" = ( /obj/structure/chair/office/dark{ @@ -4114,7 +4114,7 @@ /area/ruin/powered/syndicate_lava_base/bar) "Lj" = ( /obj/structure/flora/junglebush/b, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/jungleland/toxic_pit) "Lo" = ( /obj/effect/turf_decal/siding/yellow/corner{ @@ -4377,7 +4377,7 @@ /area/ruin/powered/syndicate_lava_base/main) "NZ" = ( /obj/structure/flora/grass/jungle/b, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/jungleland/toxic_pit) "Oa" = ( /obj/machinery/door/airlock/external{ @@ -4550,7 +4550,7 @@ /turf/open/floor/engine/n2, /area/ruin/powered/syndicate_lava_base/engineering) "PW" = ( -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/jungleland/toxic_pit) "Qb" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -5207,7 +5207,7 @@ /area/ruin/powered/syndicate_lava_base/bar) "VR" = ( /obj/structure/flora/junglebush/large, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/jungleland/toxic_pit) "VW" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -5631,7 +5631,7 @@ /area/ruin/powered/syndicate_lava_base/cargo) "ZW" = ( /obj/structure/flora/ausbushes/stalkybush, -/turf/open/water/toxic_pit/deep, +/turf/open/water/smooth/toxic_pit/deep, /area/jungleland/toxic_pit) "ZX" = ( /obj/effect/turf_decal/siding/blue{ diff --git a/_maps/RandomRuins/JungleRuins/jungleland_swamp_tartemple.dmm b/_maps/RandomRuins/JungleRuins/jungleland_swamp_tartemple.dmm index 0b62b52a7f9a..eb7a018e5a43 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_swamp_tartemple.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_swamp_tartemple.dmm @@ -1,10 +1,10 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/ruin/unpowered/tar_temple) "b" = ( /mob/living/simple_animal/hostile/tar/amalgamation, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered/tar_temple) "c" = ( /obj/structure/mineral_door/wood, @@ -16,7 +16,7 @@ /area/ruin/unpowered/tar_temple) "e" = ( /mob/living/simple_animal/hostile/tar/dryad, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "f" = ( /obj/structure/stone_tile/slab/burnt, @@ -27,10 +27,10 @@ /area/ruin/unpowered/tar_temple) "h" = ( /obj/structure/flora/ausbushes/stalkybush, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/ruin/unpowered/tar_temple) "i" = ( -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) "k" = ( /obj/structure/fluff/divine/convertaltar, @@ -41,7 +41,7 @@ /area/ruin/unpowered/tar_temple) "l" = ( /mob/living/simple_animal/hostile/tar/shade, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered/tar_temple) "m" = ( /obj/structure/stone_tile/surrounding_tile, @@ -52,11 +52,11 @@ /turf/open/floor/plating/dirt/jungleland/barren_rocks, /area/ruin/unpowered/tar_temple) "p" = ( -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered/tar_temple) "q" = ( /obj/structure/flora/ausbushes/reedbush, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/ruin/unpowered/tar_temple) "r" = ( /obj/structure/stone_tile/slab, @@ -76,11 +76,11 @@ /turf/open/floor/plating/dirt/jungleland/barren_rocks, /area/ruin/unpowered/tar_temple) "y" = ( -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "z" = ( /obj/structure/flora/ausbushes/reedbush, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) "A" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -90,7 +90,7 @@ /area/ruin/unpowered/tar_temple) "D" = ( /obj/structure/fluff/tarstatue, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered/tar_temple) "E" = ( /obj/structure/table/wood, @@ -107,11 +107,11 @@ /area/ruin/unpowered/tar_temple) "H" = ( /mob/living/simple_animal/hostile/tar/shade, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "I" = ( /obj/effect/decal/remains/human, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/ruin/unpowered/tar_temple) "K" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -133,7 +133,7 @@ /turf/open/floor/plating/dirt/jungleland/barren_rocks, /area/ruin/unpowered/tar_temple) "Q" = ( -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/template_noop) "R" = ( /obj/effect/decal/remains/human, @@ -147,7 +147,7 @@ /area/ruin/unpowered/tar_temple) "T" = ( /obj/structure/flora/ausbushes/stalkybush, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) "U" = ( /obj/structure/stone_tile/slab/cracked{ @@ -157,7 +157,7 @@ /area/ruin/unpowered/tar_temple) "V" = ( /obj/structure/barricade/wooden, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered/tar_temple) "W" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -169,11 +169,11 @@ /obj/structure/necropolis_gate{ name = "ancient gate" }, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered/tar_temple) "Z" = ( /obj/structure/bonfire/prelit, -/turf/open/floor/plating/dirt/jungleland/toxic_pit, +/turf/open/floor/plating/dirt/jungleland/shallow_mud, /area/ruin/unpowered/tar_temple) (1,1,1) = {" diff --git a/_maps/RandomRuins/JungleRuins/jungleland_tar_king.dmm b/_maps/RandomRuins/JungleRuins/jungleland_tar_king.dmm index f9c21ef6a911..a7cc340ee4bf 100644 --- a/_maps/RandomRuins/JungleRuins/jungleland_tar_king.dmm +++ b/_maps/RandomRuins/JungleRuins/jungleland_tar_king.dmm @@ -14,16 +14,16 @@ /obj/structure/stone_tile/cracked{ dir = 8 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "ah" = ( /obj/structure/stone_tile/surrounding_tile/burnt{ dir = 8 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "ai" = ( -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "aj" = ( /obj/structure/stone_tile/surrounding_tile/cracked{ @@ -34,7 +34,7 @@ dir = 5 }, /obj/structure/stone_tile/surrounding_tile/cracked, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "ak" = ( /obj/item/melee/spear/bamboospear{ @@ -54,7 +54,7 @@ pixel_y = -18 }, /obj/effect/decal/remains/human, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "al" = ( /turf/template_noop, @@ -66,7 +66,7 @@ /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 9 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "aq" = ( /obj/structure/flora/ausbushes/brflowers{ @@ -85,11 +85,11 @@ /obj/structure/stone_tile/surrounding_tile/burnt{ dir = 8 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "at" = ( /obj/structure/stone_tile/surrounding_tile/burnt, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "au" = ( /obj/structure/stone_tile/surrounding_tile/cracked{ @@ -99,7 +99,7 @@ /obj/structure/stone_tile/block/cracked{ dir = 8 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "av" = ( /obj/structure/flora/ausbushes/lavendergrass{ @@ -135,7 +135,7 @@ /turf/open/floor/plating/dirt/jungleland/obsidian, /area/ruin/unpowered/tar_temple) "az" = ( -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "aF" = ( /obj/structure/stone_tile/block/cracked, @@ -145,7 +145,7 @@ /obj/structure/stone_tile/burnt{ dir = 4 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "aH" = ( /obj/structure/stone_tile/cracked{ @@ -154,7 +154,7 @@ /obj/structure/stone_tile/surrounding_tile/burnt{ dir = 4 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "aI" = ( /obj/structure/flora/ausbushes/ppflowers{ @@ -173,11 +173,11 @@ /obj/structure/stone_tile/surrounding_tile/burnt{ dir = 1 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "aM" = ( /obj/structure/tar_altar, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "aN" = ( /turf/open/floor/plating/dirt/jungleland/obsidian, @@ -187,7 +187,7 @@ dir = 1 }, /obj/structure/stone_tile/surrounding_tile/cracked, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "aP" = ( /obj/structure/stone_tile/surrounding_tile/cracked{ @@ -196,7 +196,7 @@ /obj/structure/stone_tile/cracked{ dir = 8 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "aS" = ( /obj/structure/necropolis_gate{ @@ -209,11 +209,11 @@ dir = 1 }, /obj/structure/stone_tile/burnt, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "aX" = ( /obj/structure/bonfire, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "aY" = ( /turf/open/floor/plating/dirt/jungleland/barren_rocks, @@ -230,7 +230,7 @@ /obj/structure/stone_tile/block{ dir = 8 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "gg" = ( /obj/structure/stone_tile/burnt{ @@ -239,7 +239,7 @@ /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 8 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "ko" = ( /obj/structure/flora/ausbushes/brflowers{ @@ -258,7 +258,7 @@ /obj/structure/stone_tile/cracked{ dir = 8 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "pP" = ( /mob/living/simple_animal/hostile/tar/amalgamation, @@ -269,20 +269,20 @@ dir = 6 }, /obj/structure/stone_tile/surrounding_tile/burnt, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "rI" = ( /obj/structure/stone_tile/surrounding_tile/burnt{ dir = 4 }, /obj/structure/stone_tile/surrounding_tile/burnt, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "tG" = ( /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 1 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "wB" = ( /obj/structure/stone_tile/surrounding_tile/burnt{ @@ -294,7 +294,7 @@ /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 9 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "xw" = ( /obj/structure/flora/ausbushes/lavendergrass{ @@ -311,34 +311,34 @@ pixel_y = 11; pixel_x = -8 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "zB" = ( /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 8 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "Ci" = ( /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 10 }, /obj/structure/stone_tile/surrounding_tile/cracked, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "Co" = ( /obj/structure/stone_tile/cracked, /obj/structure/stone_tile/burnt{ dir = 1 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "Du" = ( /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 1 }, /obj/structure/stone_tile/surrounding_tile/burnt, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "Dz" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -347,32 +347,32 @@ /obj/structure/stone_tile/surrounding_tile{ dir = 1 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "DD" = ( /obj/structure/stone_tile/block{ dir = 1 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "Ek" = ( /obj/structure/stone_tile/cracked, /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 1 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "Es" = ( /obj/structure/stone_tile/block{ dir = 4 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "Fu" = ( /obj/structure/stone_tile/surrounding_tile/burnt{ dir = 1 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "FX" = ( /obj/structure/stone_tile/slab/cracked{ @@ -385,7 +385,7 @@ /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 8 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "Hc" = ( /obj/structure/stone_tile/slab/cracked{ @@ -402,7 +402,7 @@ dir = 10 }, /obj/structure/stone_tile/center/burnt, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "Hd" = ( /mob/living/simple_animal/hostile/tar/shade, @@ -413,11 +413,11 @@ /obj/structure/stone_tile/surrounding_tile/burnt{ dir = 1 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "Kv" = ( /obj/structure/stone_tile/slab/cracked, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "Lw" = ( /obj/structure/stone_tile/surrounding_tile/burnt{ @@ -428,7 +428,7 @@ pixel_x = -10; list_reagents = list(/datum/reagent/sulphur = 0.5, /datum/reagent/water = 0.5) }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "Nk" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -437,24 +437,24 @@ /obj/structure/stone_tile/surrounding_tile{ dir = 8 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "Og" = ( /obj/structure/stone_tile/slab/cracked{ dir = 6 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "RE" = ( /obj/item/flashlight/lantern, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/template_noop) "Tg" = ( /obj/structure/stone_tile/surrounding_tile, /obj/structure/stone_tile/surrounding_tile{ dir = 4 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "Uh" = ( /obj/structure/necropolis_gate{ @@ -477,18 +477,18 @@ /obj/structure/stone_tile/surrounding_tile/burnt{ dir = 4 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "Wl" = ( /obj/structure/stone_tile/block, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "WZ" = ( /obj/structure/stone_tile/surrounding_tile{ dir = 4 }, /obj/structure/stone_tile/surrounding_tile, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) (1,1,1) = {" diff --git a/_maps/RandomRuins/JungleRuins/miningbase.dmm b/_maps/RandomRuins/JungleRuins/miningbase.dmm index 223e0af279bd..a76174f98fcc 100644 --- a/_maps/RandomRuins/JungleRuins/miningbase.dmm +++ b/_maps/RandomRuins/JungleRuins/miningbase.dmm @@ -7,7 +7,7 @@ /obj/structure/sign/departments/minsky/supply/mining{ pixel_y = -32 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/mine/eva_secondary) "ak" = ( /turf/open/indestructible/grass/sand, @@ -845,7 +845,7 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/mine/eva) "hH" = ( /obj/machinery/door/airlock{ @@ -1183,7 +1183,7 @@ /turf/open/floor/plating, /area/mine/living_quarters) "lK" = ( -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/template_noop) "lM" = ( /obj/structure/disposalpipe/segment{ @@ -1342,7 +1342,7 @@ /turf/open/floor/plasteel, /area/mine/eva) "oU" = ( -/turf/open/floor/plating/dirt/jungleland/dying_forest, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) "pc" = ( /obj/machinery/space_heater, @@ -2017,7 +2017,7 @@ /turf/open/floor/plasteel/dark, /area/mine/infirmary) "Ap" = ( -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/jungleland/explored) "Ar" = ( /obj/machinery/vending/boozeomat, @@ -2248,7 +2248,7 @@ /area/mine/infirmary) "Cv" = ( /obj/structure/lattice/catwalk, -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/jungleland/explored) "CE" = ( /obj/effect/turf_decal/siding/wood/corner{ diff --git a/_maps/RandomRuins/JungleRuins/tar_altar.dmm b/_maps/RandomRuins/JungleRuins/tar_altar.dmm index 474ae4ddf464..46a0174af299 100644 --- a/_maps/RandomRuins/JungleRuins/tar_altar.dmm +++ b/_maps/RandomRuins/JungleRuins/tar_altar.dmm @@ -10,7 +10,7 @@ dir = 8 }, /obj/structure/stone_tile/center, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "i" = ( /obj/structure/stone_tile{ @@ -22,7 +22,7 @@ /obj/structure/stone_tile{ dir = 8 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "j" = ( /obj/structure/stone_tile, @@ -32,13 +32,13 @@ /obj/structure/stone_tile{ dir = 4 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "l" = ( /obj/structure/stone_tile/block{ dir = 1 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "o" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -46,7 +46,7 @@ }, /obj/structure/stone_tile/surrounding_tile, /obj/structure/stone_tile/center, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "q" = ( /obj/structure/stone_tile{ @@ -56,22 +56,22 @@ /obj/structure/stone_tile{ dir = 4 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "w" = ( /obj/structure/stone_tile/slab, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "x" = ( /obj/structure/tar_altar, /obj/structure/stone_tile/surrounding, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "F" = ( /obj/structure/stone_tile/block{ dir = 4 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "J" = ( /obj/structure/stone_tile{ @@ -81,7 +81,7 @@ dir = 8 }, /obj/structure/stone_tile, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "M" = ( /obj/structure/stone_tile/surrounding_tile, @@ -89,17 +89,17 @@ dir = 4 }, /obj/structure/stone_tile/center, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "P" = ( /obj/structure/stone_tile/block{ dir = 8 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "S" = ( /obj/structure/stone_tile/block, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "V" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -109,7 +109,7 @@ dir = 1 }, /obj/structure/stone_tile/center, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) "Z" = ( /obj/structure/stone_tile, @@ -119,7 +119,7 @@ /obj/structure/stone_tile{ dir = 8 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/ruin/unpowered/tar_temple) (1,1,1) = {" diff --git a/_maps/RandomRuins/JungleRuins/tar_assistant.dmm b/_maps/RandomRuins/JungleRuins/tar_assistant.dmm index c6037b501c30..21db38ddb07b 100644 --- a/_maps/RandomRuins/JungleRuins/tar_assistant.dmm +++ b/_maps/RandomRuins/JungleRuins/tar_assistant.dmm @@ -10,34 +10,34 @@ /obj/structure/stone_tile/surrounding_tile{ dir = 8 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/jungleland/explored) "j" = ( /obj/structure/stone_tile/block{ dir = 1 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/jungleland/explored) "p" = ( /obj/structure/stone_tile/block{ dir = 4 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/jungleland/explored) "x" = ( /obj/structure/stone_tile/block{ dir = 8 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/jungleland/explored) "y" = ( /obj/structure/stone_tile/surrounding, /obj/structure/tar_assistant_spawner, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/jungleland/explored) "z" = ( /obj/structure/stone_tile/block, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/jungleland/explored) "M" = ( /obj/structure/stone_tile{ @@ -49,7 +49,7 @@ /obj/structure/stone_tile/surrounding_tile{ dir = 4 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/jungleland/explored) "S" = ( /obj/structure/stone_tile{ @@ -59,7 +59,7 @@ dir = 8 }, /obj/structure/stone_tile/surrounding_tile, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/jungleland/explored) "U" = ( /obj/structure/stone_tile, @@ -69,7 +69,7 @@ /obj/structure/stone_tile/surrounding_tile{ dir = 1 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/jungleland/explored) (1,1,1) = {" diff --git a/_maps/RandomRuins/JungleRuins/tar_enchant.dmm b/_maps/RandomRuins/JungleRuins/tar_enchant.dmm index f7adf01beb8b..a8f11e949690 100644 --- a/_maps/RandomRuins/JungleRuins/tar_enchant.dmm +++ b/_maps/RandomRuins/JungleRuins/tar_enchant.dmm @@ -10,13 +10,13 @@ dir = 8 }, /obj/structure/stone_tile/surrounding_tile, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/jungleland/explored) "e" = ( /obj/structure/stone_tile/block{ dir = 1 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/jungleland/explored) "t" = ( /obj/structure/stone_tile{ @@ -28,22 +28,22 @@ /obj/structure/stone_tile/surrounding_tile{ dir = 4 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/jungleland/explored) "C" = ( /obj/structure/stone_tile/block{ dir = 8 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/jungleland/explored) "F" = ( /obj/structure/stone_tile/surrounding, /obj/structure/enchanting_table, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/jungleland/explored) "G" = ( /obj/structure/stone_tile/block, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/jungleland/explored) "K" = ( /obj/structure/stone_tile, @@ -53,7 +53,7 @@ /obj/structure/stone_tile/surrounding_tile{ dir = 8 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/jungleland/explored) "M" = ( /obj/structure/stone_tile, @@ -63,13 +63,13 @@ /obj/structure/stone_tile/surrounding_tile{ dir = 1 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/jungleland/explored) "P" = ( /obj/structure/stone_tile/block{ dir = 4 }, -/turf/open/water/tar_basin, +/turf/open/water/smooth/tar_basin, /area/jungleland/explored) (1,1,1) = {" diff --git a/_maps/map_files/mining/Jungleland.dmm b/_maps/map_files/mining/Jungleland.dmm index a0aa18255ed2..9a51679d7797 100644 --- a/_maps/map_files/mining/Jungleland.dmm +++ b/_maps/map_files/mining/Jungleland.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "at" = ( /obj/structure/flytrap, -/turf/open/floor/plating/dirt/jungleland/dry_swamp, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) "az" = ( /obj/docking_port/stationary{ @@ -49,7 +49,7 @@ /turf/open/floor/plasteel, /area/mine/laborcamp) "be" = ( -/turf/open/floor/plating/dirt/jungleland/dry_swamp, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) "bi" = ( /obj/machinery/conveyor{ @@ -163,7 +163,7 @@ /area/jungleland/explored) "di" = ( /obj/structure/flora/junglebush/b, -/turf/open/floor/plating/dirt/jungleland/dry_swamp, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) "dJ" = ( /turf/closed/wall, @@ -233,7 +233,7 @@ /turf/closed/wall, /area/mine/laborcamp) "gg" = ( -/turf/open/water/toxic_pit/deep, +/turf/open/water/smooth/toxic_pit/deep, /area/jungleland/explored) "gh" = ( /obj/machinery/door/airlock/security/glass{ @@ -466,7 +466,7 @@ /area/mine/laborcamp) "mx" = ( /obj/structure/flora/junglebush/large, -/turf/open/floor/plating/dirt/jungleland/dry_swamp, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) "mQ" = ( /obj/machinery/computer/security/labor{ @@ -539,7 +539,7 @@ /area/mine/laborcamp) "pA" = ( /obj/structure/flora/tree/jungle, -/turf/open/floor/plating/dirt/jungleland/dry_swamp, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) "pQ" = ( /obj/structure/chair/stool, @@ -741,7 +741,7 @@ /area/mine/laborcamp/security) "vR" = ( /obj/structure/flora/tree/jungle, -/turf/open/floor/plating/dirt/jungleland/dry_swamp1, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) "wK" = ( /obj/machinery/light/small, @@ -845,7 +845,7 @@ /area/mine/laborcamp) "zg" = ( /obj/structure/flora/junglebush, -/turf/open/floor/plating/dirt/jungleland/dry_swamp1, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) "zk" = ( /obj/machinery/power/smes{ @@ -909,11 +909,11 @@ /turf/open/floor/plating, /area/mine/laborcamp) "Dd" = ( -/turf/open/floor/plating/dirt/jungleland/dry_swamp1, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) "Dg" = ( /obj/structure/fence, -/turf/open/floor/plating/dirt/jungleland/dry_swamp1, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) "Dj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -1035,7 +1035,7 @@ /obj/structure/fence/corner{ dir = 5 }, -/turf/open/floor/plating/dirt/jungleland/dry_swamp1, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) "GM" = ( /obj/machinery/computer/shuttle/labor/one_way{ @@ -1059,7 +1059,7 @@ /area/mine/laborcamp) "Hw" = ( /obj/structure/flora/rock/pile, -/turf/open/floor/plating/dirt/jungleland/dry_swamp1, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) "HS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -1073,7 +1073,7 @@ /area/mine/laborcamp) "Ii" = ( /obj/structure/flora/tree/dead/jungle, -/turf/open/floor/plating/dirt/jungleland/dry_swamp1, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) "IC" = ( /obj/machinery/power/apc{ @@ -1159,10 +1159,10 @@ /area/mine/laborcamp/security) "Lv" = ( /obj/structure/flora/junglebush, -/turf/open/floor/plating/dirt/jungleland/dry_swamp, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) "LE" = ( -/turf/open/water/toxic_pit/deep, +/turf/open/water/smooth/toxic_pit/deep, /area/jungleland/ocean) "LM" = ( /obj/structure/ore_box, @@ -1214,11 +1214,11 @@ /area/mine/laborcamp) "NM" = ( /obj/structure/flora/tree/jungle/small, -/turf/open/floor/plating/dirt/jungleland/dry_swamp, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) "NV" = ( /obj/structure/flora/tree/jungle/small, -/turf/open/floor/plating/dirt/jungleland/dry_swamp1, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) "Oi" = ( /obj/effect/turf_decal/bot, @@ -1245,7 +1245,7 @@ "OJ" = ( /obj/structure/flora/tree/jungle, /obj/structure/flora/junglebush/large, -/turf/open/floor/plating/dirt/jungleland/dry_swamp1, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) "OL" = ( /obj/structure/window/reinforced{ @@ -1326,7 +1326,7 @@ /area/mine/laborcamp) "Tq" = ( /obj/structure/herb/liberal_hats, -/turf/open/floor/plating/dirt/jungleland/dry_swamp1, +/turf/open/floor/plating/dirt/jungleland/deep_sand, /area/jungleland/explored) "Ts" = ( /turf/closed/wall/r_wall, @@ -1361,7 +1361,7 @@ /turf/open/floor/plating, /area/mine/laborcamp) "UW" = ( -/turf/open/water/toxic_pit, +/turf/open/water/smooth/toxic_pit, /area/jungleland/ocean) "Vt" = ( /obj/machinery/washing_machine, diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm index 1275dd4b7180..22f5fac95ce3 100644 --- a/code/__DEFINES/icon_smoothing.dm +++ b/code/__DEFINES/icon_smoothing.dm @@ -136,8 +136,9 @@ DEFINE_BITFIELD(smoothing_junction, list( #define SMOOTH_GROUP_SURVIVAL_TITANIUM_WALLS S_TURF(62) ///turf/closed/wall/mineral/titanium/survival #define SMOOTH_GROUP_TURF_OPEN_CLIFF S_TURF(63) ///turf/open/cliff #define SMOOTH_GROUP_TURF_BALLPIT S_TURF(64) ///turf/open/floor/ballpit +#define SMOOTH_GROUP_TURF_WATER S_TURF(65) -#define MAX_S_TURF 64 //Always match this value with the one above it. +#define MAX_S_TURF 65 //Always match this value with the one above it. #define S_OBJ(num) ("-" + #num + ",") /* /obj included */ diff --git a/code/__DEFINES/{yogs_defines}/maps.dm b/code/__DEFINES/{yogs_defines}/maps.dm index 48477f779030..751253d8e688 100644 --- a/code/__DEFINES/{yogs_defines}/maps.dm +++ b/code/__DEFINES/{yogs_defines}/maps.dm @@ -6,5 +6,5 @@ ZTRAIT_BOMBCAP_MULTIPLIER = 2.5, \ ZTRAIT_ACIDRAIN = TRUE, \ ZTRAIT_JUNGLE_RUINS = TRUE, \ - ZTRAIT_BASETURF = /turf/open/water/toxic_pit) + ZTRAIT_BASETURF = /turf/open/water/smooth/toxic_pit) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index bdcf6de548f8..35b05f14ac97 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -29,8 +29,8 @@ SUBSYSTEM_DEF(mapping) var/list/jungleland_proper_ruins_templates = list() var/list/jungleland_dying_ruins_templates = list() var/list/jungleland_swamp_ruins_templates = list() - var/list/jungleland_barren_ruins_templates = list() var/list/jungleland_general_ruins_templates = list() + var/list/jungleland_tar_ruins_templates = list() //Yogs end var/list/shuttle_templates = list() @@ -149,7 +149,7 @@ SUBSYSTEM_DEF(mapping) seedRuins(jungle_ruins, CONFIG_GET(number/jungleland_budget), list(/area/jungleland/proper), jungleland_proper_ruins_templates, clear_below = TRUE) seedRuins(jungle_ruins, CONFIG_GET(number/jungleland_budget), list(/area/jungleland/dying_forest), jungleland_dying_ruins_templates, clear_below = TRUE) seedRuins(jungle_ruins, CONFIG_GET(number/jungleland_budget), list(/area/jungleland/toxic_pit), jungleland_swamp_ruins_templates, clear_below = TRUE) - seedRuins(jungle_ruins, CONFIG_GET(number/jungleland_budget), list(/area/jungleland/barren_rocks), jungleland_barren_ruins_templates, clear_below = TRUE) + seedRuins(jungle_ruins, CONFIG_GET(number/jungleland_budget), list(/area/jungleland/tar_wastes), jungleland_tar_ruins_templates, clear_below = TRUE) else run_map_generation() //YOGS EDIT @@ -638,10 +638,10 @@ GLOBAL_LIST_EMPTY(the_station_areas) jungleland_dying_ruins_templates[R.name] = R else if(istype(R,/datum/map_template/ruin/jungle/swamp)) jungleland_swamp_ruins_templates[R.name] = R - else if(istype(R,/datum/map_template/ruin/jungle/barren)) - jungleland_barren_ruins_templates[R.name] = R else if(istype(R,/datum/map_template/ruin/jungle/all)) jungleland_general_ruins_templates[R.name] = R + else if(istype(R,/datum/map_template/ruin/jungle/tar)) + jungleland_tar_ruins_templates[R.name] = R //Yogs end /datum/controller/subsystem/mapping/proc/preloadShuttleTemplates() diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm index b8f5d39b4570..469ea7312269 100644 --- a/code/game/turfs/open/water.dm +++ b/code/game/turfs/open/water.dm @@ -17,6 +17,17 @@ clawfootstep = FOOTSTEP_WATER heavyfootstep = FOOTSTEP_WATER +/turf/open/water/smooth + icon = MAP_SWITCH('yogstation/icons/turf/floors/smoothwater.dmi', 'icons/turf/floors.dmi') //uses smoothwater during gameplay and floors.dmi in mapping tools + icon_state = "riverwater_motion" + base_icon_state = "smoothwater" + layer = HIGH_TURF_LAYER //so it draws above other turf + transform = MAP_SWITCH(TRANSLATE_MATRIX(-6, -6), matrix()) //since smoothwater.dmi is a 44x44 size sprite, we shift it slightly down and to the left so it stays centered + + smoothing_groups = SMOOTH_GROUP_TURF_WATER + canSmoothWith = SMOOTH_GROUP_TURF_WATER //so it only smooths with other water + smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER + /turf/open/water/safe initial_gas_mix = OPENTURF_DEFAULT_ATMOS planetary_atmos = FALSE diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index a620f93d200e..7436c5a9e50a 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -228,9 +228,9 @@ /turf/closed, /turf/open/lava, /turf/open/indestructible, - /turf/open/water/toxic_pit, - /turf/open/water/toxic_pit/deep, - /turf/open/water/tar_basin, + /turf/open/water/smooth/toxic_pit, + /turf/open/water/smooth/toxic_pit/deep, + /turf/open/water/smooth/tar_basin, )) - typecacheof(list( /turf/closed/mineral, )) diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm index 3e9bd4ca7e7b..622164bacee6 100644 --- a/code/modules/mining/shelters.dm +++ b/code/modules/mining/shelters.dm @@ -8,7 +8,7 @@ /datum/map_template/shelter/New() . = ..() - blacklisted_turfs = typecacheof(/turf/closed, /turf/open/lava/smooth/lava_land_surface/no_shelter,/turf/open/water/toxic_pit/deep) + blacklisted_turfs = typecacheof(/turf/closed, /turf/open/lava/smooth/lava_land_surface/no_shelter,/turf/open/water/smooth/toxic_pit/deep) whitelisted_turfs = list() banned_areas = typecacheof(/area/shuttle) banned_objects = list() diff --git a/yogstation/code/datums/mapgen/JungleGen.dm b/yogstation/code/datums/mapgen/JungleGen.dm index 5e551840cbc7..ec259fa26b06 100644 --- a/yogstation/code/datums/mapgen/JungleGen.dm +++ b/yogstation/code/datums/mapgen/JungleGen.dm @@ -21,13 +21,17 @@ /datum/map_generator/jungleland var/list/possible_biomes = list( - BIOME_BARREN = list( LOW_HUMIDITY = /datum/biome/jungleland/barren_rocks, - MED_HUMIDITY = /datum/biome/jungleland/dry_swamp, - HIGH_HUMIDITY = /datum/biome/jungleland/dying_forest), - - BIOME_TOXIC = list( LOW_HUMIDITY = /datum/biome/jungleland/toxic_pit, + BIOME_BARREN = list( + LOW_HUMIDITY = /datum/biome/jungleland/tar_wastes, + MED_HUMIDITY = /datum/biome/jungleland/dry_swamp, + HIGH_HUMIDITY = /datum/biome/jungleland/dying_forest + ), + + BIOME_TOXIC = list( + LOW_HUMIDITY = /datum/biome/jungleland/toxic_pit, MED_HUMIDITY = /datum/biome/jungleland/toxic_pit, - HIGH_HUMIDITY = /datum/biome/jungleland/jungle) + HIGH_HUMIDITY = /datum/biome/jungleland/jungle + ) ) ///Used to select "zoom" level into the perlin noise, higher numbers result in slower transitions var/perlin_zoom = 65 diff --git a/yogstation/code/datums/mapgen/biomes/JungleBiomes.dm b/yogstation/code/datums/mapgen/biomes/JungleBiomes.dm index e89d6b4442df..5afc4d2939ea 100644 --- a/yogstation/code/datums/mapgen/biomes/JungleBiomes.dm +++ b/yogstation/code/datums/mapgen/biomes/JungleBiomes.dm @@ -1,10 +1,19 @@ /datum/biome/jungleland + /// how dense the closed turf is relative to the open turf var/cellular_noise_map_id = MED_DENSITY var/turf/closed_turf = /turf/closed/mineral/random + + /// Spawns on closed_turf var/list/dense_flora = list() - var/list/loose_flora = list() - var/loose_flora_density = 0 // from 0 to 100 + /// Probability of dense_flora var/dense_flora_density = 100 + + /// Spawns on turf_type + var/list/loose_flora = list() + /// Probability of loose flora + var/loose_flora_density = 0 + + /// If mobs can be spawned on closed_turf tiles var/spawn_fauna_on_closed = FALSE var/area/jungleland/this_area = /area/jungleland @@ -38,45 +47,112 @@ var/obj/structure/flora = pickweight(loose_flora) new flora(gen_turf) -/datum/biome/jungleland/barren_rocks - turf_type = /turf/open/floor/plating/dirt/jungleland/barren_rocks +/datum/biome/jungleland/tar_wastes + turf_type = /turf/open/floor/plating/dirt/jungleland/obsidian + closed_turf = /turf/open/water/smooth/tar_basin loose_flora = list(/obj/structure/flora/rock = 2,/obj/structure/flora/rock/pile = 2) loose_flora_density = 10 - cellular_noise_map_id = LOW_DENSITY fauna_density = 0.5 fauna_types = list(/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random = 33,/mob/living/simple_animal/hostile/asteroid/goliath/beast = 33,/mob/living/simple_animal/hostile/asteroid/goldgrub = 25,/mob/living/simple_animal/hostile/yog_jungle/skin_twister = 1, /mob/living/simple_animal/hostile/asteroid/marrowweaver = 7) - this_area = /area/jungleland/barren_rocks + this_area = /area/jungleland/tar_wastes /datum/biome/jungleland/dry_swamp - turf_type = /turf/open/floor/plating/dirt/jungleland/dry_swamp - closed_turf = /turf/open/floor/plating/dirt/jungleland/dry_swamp1 - dense_flora = list(/obj/structure/flora/rock = 2,/obj/structure/flora/rock/jungle = 1,/obj/structure/flora/rock/pile = 2) - loose_flora = list(/obj/structure/flora/ausbushes/stalkybush = 2,/obj/structure/flora/rock = 2,/obj/structure/flora/rock/jungle = 2,/obj/structure/flora/rock/pile = 2,/obj/structure/flora/stump=2,/obj/structure/flora/tree/jungle = 1,/obj/structure/herb/cinchona = 0.1, /obj/structure/flytrap = 0.1) + turf_type = /turf/open/floor/plating/dirt/jungleland/deep_sand + closed_turf = /turf/open/water/smooth/toxic_pit + cellular_noise_map_id = LOW_DENSITY + + dense_flora = list( + /obj/structure/flora/rock = 5, + /obj/structure/flora/rock/jungle = 5, + /obj/structure/flora/rock/pile = 5, + /obj/structure/flora/ausbushes/stalkybush = 3, + /obj/structure/herb/magnus_purpura = 1 + ) dense_flora_density = 10 + + loose_flora = list( + /obj/structure/flora/rock = 20, + /obj/structure/flora/rock/jungle = 20, + /obj/structure/flora/rock/pile = 20, + /obj/structure/flora/stump = 20, + /obj/structure/flora/tree/jungle = 10, + /obj/structure/herb/cinchona = 1, + /obj/structure/flytrap = 1 + ) loose_flora_density = 10 - fauna_types = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast = 39,/mob/living/simple_animal/hostile/asteroid/goldgrub = 31,/mob/living/simple_animal/hostile/yog_jungle/meduracha = 8,/mob/living/simple_animal/hostile/yog_jungle/skin_twister = 1,/mob/living/simple_animal/hostile/yog_jungle/mosquito = 13, /mob/living/simple_animal/hostile/yog_jungle/emeraldspider = 8) + + fauna_types = list( + /mob/living/simple_animal/hostile/yog_jungle/emeraldspider = 15, + /mob/living/simple_animal/hostile/yog_jungle/mosquito = 15, + /mob/living/simple_animal/hostile/yog_jungle/blobby = 10, + /mob/living/simple_animal/hostile/yog_jungle/meduracha = 10, + /mob/living/simple_animal/hostile/yog_jungle/skin_twister = 1 + ) fauna_density = 0.4 + spawn_fauna_on_closed = TRUE this_area = /area/jungleland/dry_swamp /datum/biome/jungleland/toxic_pit - turf_type = /turf/open/floor/plating/dirt/jungleland/toxic_pit - closed_turf = /turf/open/water/toxic_pit - loose_flora = list(/obj/structure/flora/ausbushes/stalkybush = 2,/obj/structure/flora/rock = 2,/obj/structure/flora/rock/jungle = 2,/obj/structure/flora/rock/pile = 2,/obj/structure/flora/stump=2,/obj/structure/flora/tree/jungle = 1,/obj/structure/herb/explosive_shrooms = 0.05,/obj/structure/herb/liberal_hats = 0.5,/obj/structure/herb/magnus_purpura = 0.5) - dense_flora = list(/obj/structure/flora/ausbushes/stalkybush = 1) - loose_flora_density = 20 + turf_type = /turf/open/floor/plating/dirt/jungleland/shallow_mud + closed_turf = /turf/open/water/smooth/toxic_pit + + dense_flora = list( + /obj/structure/flora/ausbushes/stalkybush = 10, + /obj/structure/flora/rock/pile = 3, + /obj/structure/herb/magnus_purpura = 1 + ) dense_flora_density = 10 - fauna_types = list(/mob/living/simple_animal/hostile/yog_jungle/blobby = 20,/mob/living/simple_animal/hostile/yog_jungle/meduracha = 50,/mob/living/simple_animal/hostile/yog_jungle/skin_twister = 2,/mob/living/simple_animal/hostile/yog_jungle/mosquito = 46, /mob/living/simple_animal/hostile/yog_jungle/emeraldspider = 2) + + loose_flora = list( + /obj/structure/flora/ausbushes/stalkybush = 40, + /obj/structure/flora/rock = 40, + /obj/structure/flora/rock/jungle = 40, + /obj/structure/flora/stump = 40, + /obj/structure/flora/tree/jungle = 20, + /obj/structure/herb/liberal_hats = 10, + /obj/structure/flytrap = 2, + /obj/structure/herb/explosive_shrooms = 1 + ) + loose_flora_density = 20 + + fauna_types = list( + /mob/living/simple_animal/hostile/yog_jungle/meduracha = 50, + /mob/living/simple_animal/hostile/yog_jungle/mosquito = 40, + /mob/living/simple_animal/hostile/yog_jungle/blobby = 25, + /mob/living/simple_animal/hostile/yog_jungle/emeraldspider = 2, + /mob/living/simple_animal/hostile/yog_jungle/skin_twister = 1 + ) fauna_density = 0.7 + spawn_fauna_on_closed = TRUE this_area = /area/jungleland/toxic_pit /datum/biome/jungleland/dying_forest - turf_type = /turf/open/floor/plating/dirt/jungleland/dying_forest - closed_turf = /turf/open/floor/plating/dirt/jungleland/dying_forest - dense_flora = list(/obj/structure/flora/stump=1,/obj/structure/flora/tree/dead/jungle = 2,/obj/structure/flora/rock/jungle = 2,/obj/structure/flora/rock/pile = 2,/obj/structure/flora/rock = 2,/obj/structure/flora/tree/jungle/small = 1,/obj/structure/herb/cinchona = 0.25) + turf_type = /turf/open/floor/plating/dirt/jungleland/deep_sand + closed_turf = /turf/open/floor/plating/dirt/jungleland/shallow_mud + + loose_flora = list( + /obj/structure/flora/rock/jungle = 1, + /obj/structure/flora/rock/pile = 1, + /obj/structure/flora/rock = 1, + ) + loose_flora_density = 50 + + dense_flora = list( + /obj/structure/flora/tree/dead/jungle = 8, + /obj/structure/flora/stump=4, + /obj/structure/flora/tree/jungle/small = 4, + /obj/structure/herb/cinchona = 1 + ) dense_flora_density = 50 - fauna_types = list(/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/magmawing = 39,/mob/living/simple_animal/hostile/yog_jungle/corrupted_dryad = 55,/mob/living/simple_animal/hostile/yog_jungle/skin_twister = 1,/mob/living/simple_animal/hostile/yog_jungle/mosquito = 5) + + fauna_types = list( + /mob/living/simple_animal/hostile/yog_jungle/corrupted_dryad = 60, + /mob/living/simple_animal/hostile/asteroid/goldgrub = 30, + /mob/living/simple_animal/hostile/yog_jungle/mosquito = 10, + /mob/living/simple_animal/hostile/yog_jungle/skin_twister = 1 + ) fauna_density = 0.8 this_area = /area/jungleland/dying_forest @@ -84,9 +160,38 @@ turf_type = /turf/open/floor/plating/dirt/jungleland/jungle closed_turf = /turf/open/floor/plating/dirt/jungleland/jungle cellular_noise_map_id = HIGH_DENSITY - dense_flora = list(/obj/structure/flora/tree/jungle/small = 2,/obj/structure/flora/tree/jungle = 2, /obj/structure/flora/rock/jungle = 1, /obj/structure/flora/junglebush = 1, /obj/structure/flora/junglebush/b = 1, /obj/structure/flora/junglebush/c = 1, /obj/structure/flora/junglebush/large = 1, /obj/structure/flora/rock/pile/largejungle = 1) - loose_flora = list(/obj/structure/flora/grass/jungle = 3,/obj/structure/flora/grass/jungle/b = 2,/obj/structure/flora/ausbushes = 2,/obj/structure/flora/ausbushes/leafybush = 1,/obj/structure/flora/ausbushes/sparsegrass = 1,/obj/structure/flora/ausbushes/fullgrass = 1,/obj/structure/herb/explosive_shrooms = 0.05,/obj/structure/flytrap = 0.1,/obj/structure/herb/fruit = 0.2) + + dense_flora = list( + /obj/structure/flora/tree/jungle/small = 3, + /obj/structure/flora/tree/jungle = 3, + /obj/structure/flora/junglebush/large = 2, + /obj/structure/flora/rock/pile/largejungle = 2, + /obj/structure/flora/rock/jungle = 1, + /obj/structure/flora/junglebush = 1, + /obj/structure/flora/junglebush/b = 1, + /obj/structure/flora/junglebush/c = 1 + ) + dense_flora_density = 90 + + loose_flora = list( + /obj/structure/flora/grass/jungle = 60, + /obj/structure/flora/grass/jungle/b = 40, + /obj/structure/flora/ausbushes = 40, + /obj/structure/flora/ausbushes/leafybush = 20, + /obj/structure/flora/ausbushes/sparsegrass = 20, + /obj/structure/flora/ausbushes/fullgrass = 20, + /obj/structure/herb/fruit = 4, + /obj/structure/flytrap = 2, + /obj/structure/herb/explosive_shrooms = 1 + ) loose_flora_density = 60 - fauna_types = list(/mob/living/simple_animal/hostile/yog_jungle/dryad = 65 ,/mob/living/simple_animal/hostile/yog_jungle/skin_twister = 1,/mob/living/simple_animal/hostile/yog_jungle/mosquito = 10, /mob/living/simple_animal/hostile/yog_jungle/yellowjacket = 10, /mob/living/simple_animal/hostile/yog_jungle/emeraldspider = 14) + + fauna_types = list( + /mob/living/simple_animal/hostile/yog_jungle/dryad = 65, + /mob/living/simple_animal/hostile/yog_jungle/emeraldspider = 15, + /mob/living/simple_animal/hostile/yog_jungle/mosquito = 10, + /mob/living/simple_animal/hostile/yog_jungle/yellowjacket = 10, + /mob/living/simple_animal/hostile/yog_jungle/skin_twister = 1, + ) fauna_density = 0.65 this_area = /area/jungleland/proper diff --git a/yogstation/code/datums/ruins/jungle.dm b/yogstation/code/datums/ruins/jungle.dm index 64c85a9e8fb6..8136518d9486 100644 --- a/yogstation/code/datums/ruins/jungle.dm +++ b/yogstation/code/datums/ruins/jungle.dm @@ -185,7 +185,7 @@ suffix = "jungleland_dead_bubblegum.dmm" always_place = TRUE -/datum/map_template/ruin/jungle/barren/drake +/datum/map_template/ruin/jungle/tar/drake name = "Ash Drake" id = "barren_drake" description = "Ash Drake" @@ -222,7 +222,7 @@ always_place = TRUE cost = 2 -/datum/map_template/ruin/jungle/barren/barren_nest +/datum/map_template/ruin/jungle/tar/barren_nest name = "Barren Nest" id = "jungle-barren-nest" description = "a nest" @@ -230,33 +230,30 @@ allow_duplicates = TRUE always_place = TRUE -// OBSIDIAN PILLARS - -/datum/map_template/ruin/jungle/dying/obsidian_pillar0 +/datum/map_template/ruin/jungle/tar/obsidian_pillar0 name = "Obsidian pillar" id = "jungle-dying-obsidian-pillar0" description = "obsidian pillar" suffix = "obsidian_pillar0.dmm" cost = 1 -/datum/map_template/ruin/jungle/dying/obsidian_pillar1 +/datum/map_template/ruin/jungle/tar/obsidian_pillar1 name = "Obsidian pillar" id = "jungle-dying-obsidian-pillar1" description = "obsidian pillar" suffix = "obsidian_pillar1.dmm" cost = 1 -/datum/map_template/ruin/jungle/dying/obsidian_pillar2 +/datum/map_template/ruin/jungle/tar/obsidian_pillar2 name = "Obsidian pillar" id = "jungle-dying-obsidian-pillar2" description = "obsidian pillar" suffix = "obsidian_pillar2.dmm" cost = 1 -/datum/map_template/ruin/jungle/dying/obsidian_pillar3 +/datum/map_template/ruin/jungle/tar/obsidian_pillar3 name = "Obsidian pillar" id = "jungle-dying-obsidian-pillar3" description = "obsidian pillar" suffix = "obsidian_pillar3.dmm" cost = 1 - diff --git a/yogstation/code/modules/jungleland/jungle_datums.dm b/yogstation/code/modules/jungleland/jungle_datums.dm index 19e5698d77b4..c4ffddeddbbe 100644 --- a/yogstation/code/modules/jungleland/jungle_datums.dm +++ b/yogstation/code/modules/jungleland/jungle_datums.dm @@ -256,7 +256,7 @@ description = "Yellowish liquid with potent anti-acidic properties" color = "#e0ea4e" taste_description = "sweet" - metabolization_rate = 0.1 + metabolization_rate = 0.2 var/alert_id = "magnus_purpura" /datum/reagent/magnus_purpura_enzyme/on_mob_metabolize(mob/living/L) @@ -278,7 +278,7 @@ description = "Yellowish liquid with VERY potent anti-acidic properties" color = "#eeff00" taste_description = "sweet" - metabolization_rate = 0.05 + metabolization_rate = 0.1 alert_id = "magnus_purpura_condensed" //i tried to base it off of actual malaria diff --git a/yogstation/code/modules/jungleland/jungle_items.dm b/yogstation/code/modules/jungleland/jungle_items.dm index e46f210de9c3..2fd0f6ac076f 100644 --- a/yogstation/code/modules/jungleland/jungle_items.dm +++ b/yogstation/code/modules/jungleland/jungle_items.dm @@ -183,6 +183,7 @@ icon_state = "magnus_purpura_flower" seed = /obj/item/seeds/jungleland/magnus_purpura distill_reagent = /datum/reagent/magnus_purpura_enzyme/condensed + bitesize = 10 //instantly consume the entire thing /obj/item/organ/regenerative_core/dryad name = "Dryad heart" diff --git a/yogstation/code/modules/jungleland/jungle_structures.dm b/yogstation/code/modules/jungleland/jungle_structures.dm index 2362ca888e32..34a05d18ce23 100644 --- a/yogstation/code/modules/jungleland/jungle_structures.dm +++ b/yogstation/code/modules/jungleland/jungle_structures.dm @@ -218,7 +218,7 @@ /obj/structure/herb/attack_hand(mob/user) . = ..() - if(!do_after(user,10 SECONDS,src)) + if(!do_after(user, 5 SECONDS, src)) return for(var/i in 1 to picked_amt) @@ -233,14 +233,15 @@ icon_state = "explosive_shrooms" picked_amt = 1 picked_result = /obj/item/explosive_shroom + var/delay = (2.5 SECONDS) /obj/structure/herb/explosive_shrooms/Cross(atom/movable/AM) . = ..() if(!isliving(AM) || ishostile(AM)) return - animate(src,time=2.49 SECONDS, color = "#e05a5a") - addtimer(CALLBACK(src,PROC_REF(explode)),2.5 SECONDS) + animate(src,time= delay, color = "#e05a5a") + addtimer(CALLBACK(src,PROC_REF(explode)), delay) /obj/structure/herb/explosive_shrooms/proc/explode() dyn_explosion(get_turf(src),4) @@ -308,8 +309,7 @@ /obj/structure/flytrap/Initialize() . = ..() - var/outcome = rand(1,3) - switch(outcome) + switch(rand(1,3)) if(1) craving = /obj/item/stack/sheet/meduracha desc = "The mouth doesn't look big enough to hurt you, but it does look very hungry. It seems peckish for some meduracha tentacles." @@ -324,8 +324,7 @@ if(istype(W, craving) && full == FALSE ) user.visible_message(span_notice("[user] feeds the [src], and watches as it spews out materials!"),span_notice("You place the [W] inside the mouth of the [src], watching as it devours it and shoots out minerals!")) full = TRUE - var/lootoutcome = rand(1,25) - switch(lootoutcome) + switch(rand(1,25)) if(1 to 8) for(var/i in 1 to 5) new /obj/item/stack/ore/dilithium_crystal(get_turf(src)) diff --git a/yogstation/code/modules/jungleland/jungle_turfs.dm b/yogstation/code/modules/jungleland/jungle_turfs.dm index 4fb57a6b7958..a7870d59bd74 100644 --- a/yogstation/code/modules/jungleland/jungle_turfs.dm +++ b/yogstation/code/modules/jungleland/jungle_turfs.dm @@ -46,8 +46,8 @@ Temperature: 126.85 °C (400 K) /area/jungleland/toxic_pit name = "Toxic Pit" -/area/jungleland/barren_rocks - name = "Barren Rocks" +/area/jungleland/tar_wastes + name = "Tar Wastes" /area/jungleland/dry_swamp name = "Rocky Beach" @@ -66,7 +66,7 @@ Temperature: 126.85 °C (400 K) icon_state = "jungle" initial_gas_mix = JUNGLELAND_DEFAULT_ATMOS planetary_atmos = TRUE - baseturfs = /turf/open/water/toxic_pit + baseturfs = /turf/open/water/smooth/toxic_pit icon_state_regular_floor = "jungle" //used to remember what icon state the tile should have by default icon_regular_floor = 'yogstation/icons/turf/floors/jungle.dmi' //used to remember what icon the tile should have by default icon_plating = "jungle" @@ -74,6 +74,8 @@ Temperature: 126.85 °C (400 K) var/ore_present = ORE_EMPTY var/spawn_overlay = TRUE var/can_mine = TRUE + light_power = 2 + light_range = 2 // fullbright it for proper shadows and darkspawn interaction /turf/open/floor/plating/dirt/jungleland/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill) if(drill.do_after_mecha(src, 10 / drill.drill_level)) @@ -126,36 +128,17 @@ Temperature: 126.85 °C (400 K) icon_state = "barren_rocks" icon_plating = "barren_rocks" icon_state_regular_floor = "barren_rocks" + light_power = 0 + light_range = 0 -/turf/open/floor/plating/dirt/jungleland/toxic_rocks - name = "mud" - desc = "Liquid mixed with dirt." - icon_state = "toxic_rocks" - icon_plating = "toxic_rocks" - icon_state_regular_floor = "toxic_rocks" - -/turf/open/floor/plating/dirt/jungleland/dry_swamp - name = "sand" - desc = "Mounds upon mounds of sand." - icon_state = "dry_swamp" - icon_plating = "dry_swamp" - icon_state_regular_floor = "dry_swamp" - -/turf/open/floor/plating/dirt/jungleland/toxic_pit +/turf/open/floor/plating/dirt/jungleland/shallow_mud name = "shallow mud" desc = "Pit of shallow mud." icon_state = "toxic_pit" icon_plating = "toxic_pit" icon_state_regular_floor = "toxic_pit" -/turf/open/floor/plating/dirt/jungleland/dry_swamp1 - name = "dried surface" - desc = "It used to be a riverbed." - icon_state = "dry_swamp1" - icon_plating = "dry_swamp1" - icon_state_regular_floor = "dry_swamp1" - -/turf/open/floor/plating/dirt/jungleland/dying_forest +/turf/open/floor/plating/dirt/jungleland/deep_sand name = "deep sand" desc = "This sand runs deep into the earth." icon_state = "dying_forest" @@ -190,22 +173,27 @@ Temperature: 126.85 °C (400 K) ore_present = pick(GLOB.quarry_ores) can_spawn_ore = TRUE -/turf/open/water/toxic_pit +/turf/open/water/smooth/toxic_pit name = "sulphuric pit" desc = "Very toxic." color = "#00c167" + slowdown = 2 initial_gas_mix = JUNGLELAND_DEFAULT_ATMOS planetary_atmos = TRUE - baseturfs = /turf/open/water/toxic_pit + baseturfs = /turf/open/water/smooth/toxic_pit + + light_power = 2 + light_range = 2 // fullbright it for proper shadows and darkspawn interaction + ///multiplier for the strength of the toxicity, multiplies basically every damage value and damage probability var/acid_strength = 1 -/turf/open/water/toxic_pit/Initialize(mapload) +/turf/open/water/smooth/toxic_pit/Initialize(mapload) . = ..() AddComponent(/datum/component/lingering, CALLBACK(src, PROC_REF(toxic_stuff)), GLOB.lavasafeties) -/turf/open/water/toxic_pit/proc/toxic_stuff(thing, delta_time) +/turf/open/water/smooth/toxic_pit/proc/toxic_stuff(thing, delta_time) if(isobj(thing)) var/obj/O = thing if((O.resistance_flags & (UNACIDABLE|INDESTRUCTIBLE)) || O.throwing) @@ -260,13 +248,13 @@ Temperature: 126.85 °C (400 K) else if(prob(25 * acid_strength)) L.acid_act(5 * acid_strength, 7.5 * acid_strength) -/turf/open/water/toxic_pit/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) +/turf/open/water/smooth/toxic_pit/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) switch(the_rcd.construction_mode) if(RCD_FLOORWALL) return list("mode" = RCD_FLOORWALL, "delay" = 0, "cost" = 3) return FALSE -/turf/open/water/toxic_pit/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) +/turf/open/water/smooth/toxic_pit/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_FLOORWALL) to_chat(user, span_notice("You build a floor.")) @@ -277,12 +265,12 @@ Temperature: 126.85 °C (400 K) /turf/open/water/safe/jungle initial_gas_mix = JUNGLELAND_DEFAULT_ATMOS -/turf/open/water/toxic_pit/deep +/turf/open/water/smooth/toxic_pit/deep name = "deep sulphuric pit" desc = "Extraordinarily toxic." color = "#004700" - slowdown = 4 - baseturfs = /turf/open/water/toxic_pit/deep + slowdown = 5 + baseturfs = /turf/open/water/smooth/toxic_pit/deep acid_strength = 2 /turf/open/floor/wood/jungle @@ -296,7 +284,7 @@ Temperature: 126.85 °C (400 K) initial_gas_mix = JUNGLELAND_DEFAULT_ATMOS /turf/open/floor/plating/jungle_baseturf/dying - baseturfs = /turf/open/floor/plating/dirt/jungleland/dying_forest + baseturfs = /turf/open/floor/plating/dirt/jungleland/deep_sand /turf/open/indestructible/grass/jungle initial_gas_mix = JUNGLELAND_DEFAULT_ATMOS @@ -314,28 +302,30 @@ Temperature: 126.85 °C (400 K) baseturfs = /turf/open/floor/plating/dirt/jungleland/jungle /turf/closed/mineral/ash_rock/jungle/swamp - turf_type = /turf/open/floor/plating/dirt/jungleland/toxic_pit - baseturfs = /turf/open/floor/plating/dirt/jungleland/toxic_pit + turf_type = /turf/open/floor/plating/dirt/jungleland/shallow_mud + baseturfs = /turf/open/floor/plating/dirt/jungleland/shallow_mud -/turf/open/water/tar_basin +/turf/open/water/smooth/tar_basin name = "tar basin" color = "#680047" slowdown = 4 initial_gas_mix = JUNGLELAND_DEFAULT_ATMOS planetary_atmos = TRUE - baseturfs = /turf/open/water/tar_basin + baseturfs = /turf/open/water/smooth/tar_basin /turf/open/floor/plating/dirt/jungleland/obsidian name = "obsidian ground" desc = "Dark crystaline flooring." icon_state = "obsidian" + light_range = 0 /turf/closed/obsidian name = "obsidian wall" desc = "Obsidian wall tearing out of the earth, it reflects light in all the colours you could ever imagine, and you can see something shining brightly within it. You can't quite seem to destroy it with a pickaxe, but maybe an explosion may suffice?" icon = 'yogstation/icons/turf/walls/obsidian.dmi' icon_state = "wall" + base_icon_state = "wall" smoothing_groups = SMOOTH_GROUP_CLOSED_TURFS + SMOOTH_GROUP_MINERAL_WALLS canSmoothWith = SMOOTH_GROUP_MINERAL_WALLS smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER diff --git a/yogstation/icons/turf/floors/jungle.dmi b/yogstation/icons/turf/floors/jungle.dmi index fe2d06d77ae7..5a818bae75ab 100644 Binary files a/yogstation/icons/turf/floors/jungle.dmi and b/yogstation/icons/turf/floors/jungle.dmi differ diff --git a/yogstation/icons/turf/floors/smoothwater.dmi b/yogstation/icons/turf/floors/smoothwater.dmi new file mode 100644 index 000000000000..94adf7506a50 Binary files /dev/null and b/yogstation/icons/turf/floors/smoothwater.dmi differ diff --git a/yogstation/icons/turf/walls/obsidian.dmi b/yogstation/icons/turf/walls/obsidian.dmi index bc64d28683f5..45eb30cc052e 100644 Binary files a/yogstation/icons/turf/walls/obsidian.dmi and b/yogstation/icons/turf/walls/obsidian.dmi differ diff --git a/yogstation/icons/turf/walls/obsidian_hard.dmi b/yogstation/icons/turf/walls/obsidian_hard.dmi index fd54fd5cd09a..15e4c3f3eb8e 100644 Binary files a/yogstation/icons/turf/walls/obsidian_hard.dmi and b/yogstation/icons/turf/walls/obsidian_hard.dmi differ