From 1a80824a806adcac1918f33608b626dc92dbef6c Mon Sep 17 00:00:00 2001 From: Will <7099514+Willburd@users.noreply.github.com> Date: Thu, 14 Aug 2025 18:44:23 -0400 Subject: [PATCH] POI fixes (#11393) --- .../maps/southern_cross/southern_cross-10.dmm | 212 ++++++++---------- .../surface_submaps/wilderness/Boombase.dmm | 118 ++++------ .../surface_submaps/wilderness/deathden.dmm | 89 ++++---- .../wilderness/deathdenAlt.dmm | 212 ++++++------------ 4 files changed, 243 insertions(+), 388 deletions(-) diff --git a/modular_chomp/maps/southern_cross/southern_cross-10.dmm b/modular_chomp/maps/southern_cross/southern_cross-10.dmm index 03b6155ea5..c32c17d999 100644 --- a/modular_chomp/maps/southern_cross/southern_cross-10.dmm +++ b/modular_chomp/maps/southern_cross/southern_cross-10.dmm @@ -46,9 +46,6 @@ "an" = ( /turf/simulated/floor/water/deep, /area/surface/outside/river/svartan) -"ao" = ( -/turf/simulated/floor/outdoors/dirt, -/area/surface/outside/path/wilderness) "ap" = ( /turf/simulated/floor/outdoors/dirt/sif/planetuse, /area/surface/outside/wilderness/normal) @@ -56,7 +53,7 @@ /turf/simulated/floor/plating/sif/planetuse, /area/surface/outside/path/wilderness) "as" = ( -/turf/simulated/wall/wood, +/turf/simulated/wall/wood/turfpack/sif, /area/surface/outside/path/wilderness) "at" = ( /turf/simulated/floor/outdoors/grass/sif/forest/planetuse, @@ -106,7 +103,7 @@ icon_state = "wilderness2"; pixel_y = -5 }, -/turf/simulated/wall/wood, +/turf/simulated/wall/wood/turfpack/sif, /area/surface/outside/path/wilderness) "aD" = ( /obj/effect/zone_divider, @@ -133,9 +130,6 @@ /obj/effect/zone_divider, /turf/simulated/floor/outdoors/grass/sif/planetuse, /area/surface/outside/wilderness/normal) -"aI" = ( -/turf/simulated/floor/outdoors/dirt, -/area/surface/outside/wilderness/normal) "aJ" = ( /turf/simulated/floor/outdoors/rocks/sif/planetuse, /area/surface/outside/wilderness/deep) @@ -167,12 +161,7 @@ /turf/simulated/floor/water, /area/surface/outside/river/svartan) "aS" = ( -/turf/simulated/floor/wood{ - nitrogen = 93.7835; - outdoors = 1; - oxygen = 20.7263; - temperature = 243.15 - }, +/turf/simulated/floor/wood/turfpack/sif, /area/surface/outside/path/wilderness) "aT" = ( /turf/simulated/floor/outdoors/dirt/sif/planetuse, @@ -876,10 +865,6 @@ /obj/effect/zone_divider, /turf/simulated/floor/outdoors/dirt/sif/planetuse, /area/surface/outside/path/wilderness) -"qT" = ( -/obj/effect/zone_divider, -/turf/simulated/floor/outdoors/dirt, -/area/surface/outside/landing/wilderness) "qW" = ( /turf/unsimulated/wall/planetary/sif, /area/surface/outside/wilderness/mountains) @@ -1073,10 +1058,6 @@ }, /turf/simulated/floor/wood/sif, /area/surface/outpost/shelter) -"xt" = ( -/obj/effect/zone_divider, -/turf/simulated/floor/outdoors/dirt, -/area/surface/outside/path/wilderness) "xA" = ( /obj/machinery/light/bigfloorlamp, /turf/simulated/floor/outdoors/grass/sif/planetuse, @@ -1145,12 +1126,7 @@ /turf/simulated/floor/wood/sif, /area/surface/outpost/shelter/utilityroom) "As" = ( -/turf/simulated/floor/wood{ - nitrogen = 93.7835; - outdoors = 1; - oxygen = 20.7263; - temperature = 243.15 - }, +/turf/simulated/floor/wood/turfpack/sif, /area/surface/outside/river/svartan) "AB" = ( /obj/effect/zone_divider, @@ -1424,12 +1400,7 @@ /area/surface/outpost/shelter/dorms) "LI" = ( /obj/structure/boulder, -/turf/simulated/floor/wood{ - nitrogen = 93.7835; - outdoors = 1; - oxygen = 20.7263; - temperature = 243.15 - }, +/turf/simulated/floor/wood/turfpack/sif, /area/surface/outside/river/svartan) "Mg" = ( /turf/simulated/wall/solidrock, @@ -1600,11 +1571,8 @@ /area/surface/outpost/shelter/utilityroom) "ST" = ( /obj/effect/zone_divider, -/turf/simulated/wall/wood, +/turf/simulated/wall/wood/turfpack/sif, /area/surface/outside/path/wilderness) -"Ud" = ( -/turf/simulated/floor/outdoors/dirt, -/area/surface/outside/landing/wilderness) "Uj" = ( /obj/structure/table/sifwooden_reinforced, /obj/item/radio/off{ @@ -1830,7 +1798,7 @@ pixel_y = -5 }, /obj/effect/zone_divider, -/turf/simulated/wall/wood, +/turf/simulated/wall/wood/turfpack/sif, /area/surface/outside/path/wilderness) "ZO" = ( /obj/effect/zone_divider, @@ -17201,8 +17169,8 @@ ae ae ae ae -ao -ao +aW +aW ae am an @@ -17459,7 +17427,7 @@ ae ae ae ae -ao +aW aq au au @@ -17715,9 +17683,9 @@ ae ae ae ae -ai +ah ae -ao +aW aS aS aS @@ -17726,8 +17694,8 @@ aB aS aS aS -ao -ao +aW +aW at at at @@ -17985,9 +17953,9 @@ aS aS aS at -ao -ao -ao +aW +aW +aW at at at @@ -27665,7 +27633,7 @@ Ih Ih Gq Gq -Ud +Ih Gq Gq Gq @@ -33078,7 +33046,7 @@ Gq kd kd kd -Ud +Ih Ih Ih kd @@ -33336,7 +33304,7 @@ Gq kd kd kd -Ud +Ih Ih Ih kd @@ -33852,7 +33820,7 @@ Gq Gq Gq Gq -Ud +Ih Ih Ih Gq @@ -34110,8 +34078,8 @@ Gq Gq Gq Gq -Ud -Ud +Ih +Ih Gq Gq Gq @@ -34368,8 +34336,8 @@ Gq Gq Gq Gq -Ud -Ud +Ih +Ih Gq Gq Gq @@ -34626,8 +34594,8 @@ dD dD dD dD -qT -qT +ZO +ZO dD dD dD @@ -34884,9 +34852,9 @@ Gq Gq Gq Gq -Ud -Ud -Ud +Ih +Ih +Ih Gq Gq Gq @@ -35144,7 +35112,7 @@ ae ae ae ae -ai +ah ae ae ae @@ -37981,7 +37949,7 @@ ae ae ae ae -ai +ah ae ae ae @@ -38239,8 +38207,8 @@ ae ae ae ae -ai -ai +ah +ah ae ae ae @@ -38492,13 +38460,13 @@ ae ae ae ae -ai -ai -ai -ai -ai -ai -ai +ah +ah +ah +ah +ah +ah +ah ae ae ae @@ -38752,11 +38720,11 @@ ae ae ae ae -ai -ai -ai -ai -ai +ah +ah +ah +ah +ah ae ae ae @@ -39011,11 +38979,11 @@ ae ae ae ae -ai -ai -ai -ai -ai +ah +ah +ah +ah +ah ae ae ae @@ -39270,10 +39238,10 @@ ae ae ae ae -ai -ai -ai -ai +ah +ah +ah +ah ae ae ae @@ -39530,8 +39498,8 @@ ae ae ae ae -ai -ai +ah +ah ae ae ae @@ -40820,7 +40788,7 @@ ae ae ah ah -ai +ah ae ae ae @@ -52033,10 +52001,10 @@ aj aj aj aj -ai +ah aj aj -ai +ah aj aj aj @@ -52257,8 +52225,8 @@ ae ae ae ae -ai -ai +ah +ah ae ae ae @@ -52297,11 +52265,11 @@ aj aj aj aj -ao +aW aj aj -ao -ao +aW +aW aS aS aS @@ -52311,8 +52279,8 @@ aS aS aS aS -ao -xt +aW +qr aG aG aG @@ -52515,11 +52483,11 @@ ae ae ae ae -ai -ai -ai -ai -ai +ah +ah +ah +ah +ah ae ae ae @@ -52555,11 +52523,11 @@ aj aj aj aj -ao +aW aj aj -ao -ao +aW +aW aS aS aS @@ -52569,11 +52537,11 @@ aS aS aS aS -ao -xt -ao -ao -ao +aW +qr +aW +aW +aW aG aG aG @@ -52775,12 +52743,12 @@ ae ae ae ae -ai -ai -ai +ah +ah +ah ae ae -ai +ah ae ae aj @@ -52829,12 +52797,12 @@ av as aG aH -ao -ao -ao +aW +aW +aW aG aG -aI +ap aG aG aG @@ -53095,7 +53063,7 @@ aG aG aG aG -aI +ap aG aG aG @@ -53615,7 +53583,7 @@ aG aG aG aG -aI +ap aG aG aG diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Boombase.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Boombase.dmm index 1eb32e6846..25df9df746 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Boombase.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Boombase.dmm @@ -14,187 +14,163 @@ /turf/template_noop, /area/submap/BoomBase) "ae" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/turfpack/sif, /area/submap/BoomBase) "af" = ( /obj/structure/girder, -/turf/simulated/floor/plating/sif/planetuse, +/turf/simulated/floor/plating/turfpack/sif, /area/submap/BoomBase) "ag" = ( /obj/structure/girder, /obj/item/stack/rods, -/turf/simulated/floor/plating/sif/planetuse, +/turf/simulated/floor/plating/turfpack/sif, /area/submap/BoomBase) "ah" = ( /obj/item/stack/rods, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/turfpack/sif, /area/submap/BoomBase) "ai" = ( /obj/structure/closet/crate/secure/phoron, /obj/fiftyspawner/phoron, -/turf/simulated/floor/plating/sif/planetuse, +/turf/simulated/floor/plating/turfpack/sif, /area/submap/BoomBase) "aj" = ( /obj/structure/closet/crate/secure/phoron, /obj/fiftyspawner/phoron, -/turf/simulated/floor/tiled/steel/sif/planetuse, -/area/submap/BoomBase) -"ak" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel/sif/planetuse{ - icon_state = "burned1" - }, +/turf/simulated/floor/tiled/steel/turfpack/sif, /area/submap/BoomBase) "al" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/ash, -/turf/simulated/floor/tiled/steel/sif/planetuse, +/turf/simulated/floor/tiled/steel/turfpack/sif, /area/submap/BoomBase) "am" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel/sif/planetuse, +/turf/simulated/floor/tiled/steel/turfpack/sif, /area/submap/BoomBase) "an" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spider, /obj/item/material/shard, -/turf/simulated/floor/tiled/steel/sif/planetuse, +/turf/simulated/floor/tiled/steel/turfpack/sif, /area/submap/BoomBase) "ao" = ( -/turf/simulated/floor/tiled/steel/sif/planetuse, +/turf/simulated/floor/tiled/steel/turfpack/sif, /area/submap/BoomBase) "ap" = ( /mob/living/simple_mob/animal/giant_spider/phorogenic, -/turf/simulated/floor/tiled/steel/sif/planetuse, +/turf/simulated/floor/tiled/steel/turfpack/sif, /area/submap/BoomBase) "aq" = ( /obj/machinery/portable_atmospherics/canister/empty/phoron, -/turf/simulated/floor/tiled/steel/sif/planetuse{ - icon_state = "steel_dirty" - }, +/turf/simulated/floor/tiled/steel/turfpack/sif, /area/submap/BoomBase) "ar" = ( /obj/machinery/portable_atmospherics/canister/empty/phoron, /obj/item/material/shard, -/turf/simulated/floor/tiled/steel/sif/planetuse{ - icon_state = "steel_dirty" - }, +/turf/simulated/floor/tiled/steel/turfpack/sif, /area/submap/BoomBase) "as" = ( /obj/item/material/shard, -/turf/simulated/floor/plating/sif/planetuse, +/turf/simulated/floor/plating/turfpack/sif, /area/submap/BoomBase) "at" = ( /obj/effect/spider/stickyweb, -/turf/simulated/floor/plating/sif/planetuse, +/turf/simulated/floor/plating/turfpack/sif, /area/submap/BoomBase) "au" = ( -/turf/simulated/floor/outdoors/dirt, +/turf/simulated/floor/outdoors/dirt/turfpack/sif, /area/submap/BoomBase) "av" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating/sif/planetuse, +/turf/simulated/floor/plating/turfpack/sif, /area/submap/BoomBase) "aw" = ( /obj/effect/decal/cleanable/dirt, /obj/random/mob/spider/mutant, -/turf/simulated/floor/tiled/steel/sif/planetuse, -/area/submap/BoomBase) -"ax" = ( -/turf/simulated/floor/tiled/steel/sif/planetuse{ - icon_state = "burned1" - }, +/turf/simulated/floor/tiled/steel/turfpack/sif, /area/submap/BoomBase) "ay" = ( /obj/effect/decal/remains/human, -/turf/simulated/floor/tiled/steel/sif/planetuse, -/area/submap/BoomBase) -"az" = ( -/turf/simulated/floor/tiled/steel/sif/planetuse{ - icon_state = "steel_dirty" - }, +/turf/simulated/floor/tiled/steel/turfpack/sif, /area/submap/BoomBase) "aA" = ( -/turf/simulated/floor/tiled/steel/sif/planetuse{ +/turf/simulated/floor/tiled/steel/turfpack/sif{ icon_state = "broken0" }, /area/submap/BoomBase) "aB" = ( -/turf/simulated/floor/plating/sif/planetuse, +/turf/simulated/floor/plating/turfpack/sif, /area/submap/BoomBase) "aC" = ( /obj/structure/flora/tree/dead, -/turf/simulated/floor/outdoors/dirt, +/turf/simulated/floor/outdoors/dirt/turfpack/sif, /area/submap/BoomBase) "aD" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/outdoors/dirt, +/turf/simulated/floor/outdoors/dirt/turfpack/sif, /area/submap/BoomBase) "aE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spider/stickyweb, -/turf/simulated/floor/tiled/steel/sif/planetuse, +/turf/simulated/floor/tiled/steel/turfpack/sif, /area/submap/BoomBase) "aF" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel/sif/planetuse{ +/turf/simulated/floor/tiled/steel/turfpack/sif{ icon_state = "broken1" }, /area/submap/BoomBase) "aG" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel/sif/planetuse{ - icon_state = "burned2" +/turf/simulated/floor/tiled/steel/turfpack/sif{ + icon_state = "burned1" }, /area/submap/BoomBase) "aH" = ( /obj/effect/decal/cleanable/ash, -/turf/simulated/floor/outdoors/dirt, +/turf/simulated/floor/outdoors/dirt/turfpack/sif, /area/submap/BoomBase) "aI" = ( /obj/random/mob/spider/mutant, -/turf/simulated/floor/outdoors/dirt, +/turf/simulated/floor/outdoors/dirt/turfpack/sif, /area/submap/BoomBase) "aJ" = ( /obj/structure/table, -/turf/simulated/floor/tiled/steel/sif/planetuse, +/turf/simulated/floor/tiled/steel/turfpack/sif, /area/submap/BoomBase) "aK" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_mob/animal/giant_spider/phorogenic, -/turf/simulated/floor/tiled/steel/sif/planetuse, +/turf/simulated/floor/tiled/steel/turfpack/sif, /area/submap/BoomBase) "aL" = ( -/turf/simulated/floor/tiled/steel/sif/planetuse{ - icon_state = "burned2" +/turf/simulated/floor/tiled/steel/turfpack/sif{ + icon_state = "burned1" }, /area/submap/BoomBase) "aM" = ( -/turf/simulated/floor/outdoors/rocks, +/turf/simulated/floor/outdoors/rocks/sif/turfpack/sif, /area/submap/BoomBase) "aN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/standard, /obj/item/tank/phoron, /obj/item/fuel_assembly/phoron, -/turf/simulated/floor/tiled/steel/sif/planetuse, +/turf/simulated/floor/tiled/steel/turfpack/sif, /area/submap/BoomBase) "aO" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/ash, -/turf/simulated/floor/tiled/steel/sif/planetuse{ - icon_state = "steel_dirty" - }, +/turf/simulated/floor/tiled/steel/turfpack/sif, /area/submap/BoomBase) "aP" = ( /obj/item/material/shard, -/turf/simulated/floor/tiled/steel/sif/planetuse{ - icon_state = "steel_dirty" - }, +/turf/simulated/floor/tiled/steel/turfpack/sif, /area/submap/BoomBase) "aQ" = ( /obj/item/transfer_valve, -/turf/simulated/floor/outdoors/rocks, +/turf/simulated/floor/outdoors/rocks/sif/turfpack/sif, /area/submap/BoomBase) "aR" = ( /obj/item/material/shard, @@ -202,26 +178,26 @@ /area/submap/BoomBase) "aS" = ( /obj/effect/decal/cleanable/ash, -/turf/simulated/floor/plating/sif/planetuse, +/turf/simulated/floor/plating/turfpack/sif, /area/submap/BoomBase) "aT" = ( /obj/effect/decal/cleanable/ash, -/turf/simulated/floor/tiled/steel/sif/planetuse, +/turf/simulated/floor/tiled/steel/turfpack/sif, /area/submap/BoomBase) "aU" = ( /obj/effect/spider/stickyweb, /obj/item/material/shard, -/turf/simulated/floor/tiled/steel/sif/planetuse, +/turf/simulated/floor/tiled/steel/turfpack/sif, /area/submap/BoomBase) "aV" = ( /obj/effect/spider/stickyweb, /obj/random/mob/spider/mutant, -/turf/simulated/floor/tiled/steel/sif/planetuse, +/turf/simulated/floor/tiled/steel/turfpack/sif, /area/submap/BoomBase) "aW" = ( /obj/effect/spider/stickyweb, /obj/effect/decal/cleanable/ash, -/turf/simulated/floor/tiled/steel/sif/planetuse{ +/turf/simulated/floor/tiled/steel/turfpack/sif{ icon_state = "burned1" }, /area/submap/BoomBase) @@ -403,7 +379,7 @@ aK aO aP aA -az +ao ag aB af @@ -437,7 +413,7 @@ aa aa ab ae -ak +aG aw am av @@ -526,7 +502,7 @@ aa ab ae ao -ax +aL au au au @@ -570,7 +546,7 @@ aa ad ae aq -az +ao au au au diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/deathden.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/deathden.dmm index 06d7446548..50fae6f602 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/deathden.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/deathden.dmm @@ -1,4 +1,10 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/structure/window/plastitanium/full, +/obj/structure/grille/rustic, +/obj/structure/barricade, +/turf/simulated/floor/tiled/asteroid_steel/turfpack/sif, +/area/submap/DeathDen) "au" = ( /mob/living/simple_mob/vore/aggressive/deathclaw{ health = 100; @@ -7,9 +13,7 @@ name = "young deathclaw" }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/outdoors/dirt{ - outdoors = 0 - }, +/turf/simulated/floor/outdoors/dirt/turfpack/sif, /area/submap/DeathDen) "aJ" = ( /obj/structure/sink{ @@ -17,7 +21,7 @@ pixel_x = -12; pixel_y = 2 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/freezer/turfpack/sif, /area/submap/DeathDen) "aL" = ( /obj/structure/table/bench/wooden, @@ -80,7 +84,7 @@ pixel_x = 1; pixel_y = 6 }, -/turf/simulated/floor/tiled/asteroid_steel, +/turf/simulated/floor/tiled/asteroid_steel/turfpack/sif, /area/submap/DeathDen) "fg" = ( /obj/effect/decal/cleanable/dirt, @@ -122,13 +126,13 @@ /area/submap/DeathDen) "gB" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/outdoors/dirt, +/turf/simulated/floor/outdoors/dirt/turfpack/sif, /area/template_noop) "hq" = ( /obj/structure/window/plastitanium/full, /obj/structure/grille/rustic, /obj/structure/barricade, -/turf/simulated/floor/tiled/asteroid_steel, +/turf/simulated/floor/plating/turfpack/sif, /area/submap/DeathDen) "hr" = ( /obj/random/trash, @@ -156,7 +160,7 @@ "is" = ( /obj/random/soap, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/freezer/turfpack/sif, /area/submap/DeathDen) "ix" = ( /obj/effect/gibspawner/human, @@ -172,7 +176,7 @@ /turf/template_noop, /area/template_noop) "jg" = ( -/turf/simulated/wall/cult, +/turf/simulated/wall/cult/turfpack/sif, /area/submap/DeathDen) "ji" = ( /obj/item/reagent_containers/food/snacks/candy_corn{ @@ -256,10 +260,10 @@ /obj/structure/toilet{ dir = 4 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/freezer/turfpack/sif, /area/submap/DeathDen) "nr" = ( -/turf/simulated/floor/outdoors/dirt, +/turf/simulated/floor/outdoors/dirt/turfpack/sif, /area/submap/DeathDen) "nK" = ( /obj/structure/table/bench/wooden, @@ -336,7 +340,7 @@ pixel_x = -5; pixel_y = -6 }, -/turf/simulated/floor/tiled/asteroid_steel, +/turf/simulated/floor/tiled/asteroid_steel/turfpack/sif, /area/submap/DeathDen) "ph" = ( /obj/effect/decal/cleanable/dirt, @@ -353,7 +357,7 @@ pixel_x = 7; pixel_y = 8 }, -/turf/simulated/floor/tiled/asteroid_steel, +/turf/simulated/floor/tiled/asteroid_steel/turfpack/sif, /area/submap/DeathDen) "qc" = ( /turf/simulated/floor/wood/sif/broken/turfpack/sif, @@ -370,7 +374,7 @@ /turf/simulated/floor/carpet/turcarpet/turfpack/sif, /area/submap/DeathDen) "rI" = ( -/turf/simulated/wall/cult, +/turf/simulated/wall/cult/turfpack/sif, /area/template_noop) "rQ" = ( /obj/structure/barricade, @@ -396,9 +400,7 @@ /area/submap/DeathDen) "tr" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/outdoors/dirt{ - outdoors = 0 - }, +/turf/simulated/floor/outdoors/dirt/turfpack/sif, /area/submap/DeathDen) "tN" = ( /obj/effect/decal/cleanable/dirt, @@ -442,10 +444,6 @@ }, /turf/template_noop, /area/submap/DeathDen) -"vr" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/outdoors/dirt, -/area/submap/DeathDen) "vu" = ( /mob/living/simple_mob/vore/aggressive/deathclaw, /turf/simulated/floor/wood/sif/turfpack/sif, @@ -494,7 +492,7 @@ /obj/structure/table/wooden_reinforced, /obj/random/soap, /obj/item/flame/candle/everburn, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/freezer/turfpack/sif, /area/submap/DeathDen) "xN" = ( /obj/item/material/shard/plastitaniumglass, @@ -514,7 +512,7 @@ /turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "yn" = ( -/turf/simulated/floor/outdoors/dirt, +/turf/simulated/floor/outdoors/dirt/turfpack/sif, /area/template_noop) "yL" = ( /obj/structure/table/wooden_reinforced, @@ -552,12 +550,12 @@ "An" = ( /obj/structure/simple_door/iron, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating/sif/planetuse, +/turf/simulated/floor/plating/turfpack/sif, /area/submap/DeathDen) "Aw" = ( /obj/structure/simple_door/sifwood, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating/sif/planetuse, +/turf/simulated/floor/plating/turfpack/sif, /area/submap/DeathDen) "Bf" = ( /obj/item/clothing/head/psy_crown/gluttony, @@ -581,7 +579,7 @@ /obj/structure/window/reinforced/tinted/frosted{ dir = 8 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/freezer/turfpack/sif, /area/submap/DeathDen) "DH" = ( /obj/item/reagent_containers/food/snacks/candy_corn{ @@ -613,7 +611,7 @@ /area/submap/DeathDen) "ER" = ( /mob/living/simple_mob/vore/aggressive/deathclaw, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/freezer/turfpack/sif, /area/submap/DeathDen) "FR" = ( /obj/item/reagent_containers/food/snacks/candy_corn{ @@ -652,7 +650,7 @@ /area/submap/DeathDen) "HZ" = ( /obj/structure/girder, -/turf/simulated/floor/plating/sif/planetuse, +/turf/simulated/floor/plating/turfpack/sif, /area/submap/DeathDen) "Ic" = ( /obj/item/material/shard/plastitaniumglass, @@ -667,7 +665,7 @@ "Kj" = ( /obj/structure/windoor_assembly, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/freezer/turfpack/sif, /area/submap/DeathDen) "Kn" = ( /obj/effect/floor_decal/carpet{ @@ -687,10 +685,10 @@ "KG" = ( /mob/living/simple_mob/humanoid/clown, /obj/effect/gibspawner/human, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/freezer/turfpack/sif, /area/submap/DeathDen) "MO" = ( -/turf/simulated/mineral/ignore_mapgen, +/turf/simulated/mineral/ignore_mapgen/sif, /area/submap/DeathDen) "Nu" = ( /obj/structure/bed/chair/wood{ @@ -718,11 +716,6 @@ /obj/item/gun/projectile/shotgun/pump/rifle/ceremonial, /turf/template_noop, /area/submap/DeathDen) -"OZ" = ( -/turf/simulated/floor/outdoors/dirt{ - outdoors = 0 - }, -/area/submap/DeathDen) "Ph" = ( /obj/structure/barricade, /turf/template_noop, @@ -733,7 +726,7 @@ /turf/simulated/floor/wood/sif/broken/turfpack/sif, /area/submap/DeathDen) "Qe" = ( -/turf/simulated/mineral/ignore_mapgen, +/turf/simulated/mineral/ignore_mapgen/sif, /area/template_noop) "QK" = ( /obj/structure/closet/cabinet, @@ -760,7 +753,7 @@ /turf/simulated/floor/carpet/turcarpet/turfpack/sif, /area/submap/DeathDen) "Th" = ( -/turf/simulated/wall/sifwood, +/turf/simulated/wall/sifwood/turfpack/sif, /area/submap/DeathDen) "TL" = ( /obj/item/material/shard/plastitaniumglass{ @@ -779,7 +772,7 @@ "Up" = ( /obj/structure/windoor_assembly, /obj/random/trash, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/freezer/turfpack/sif, /area/submap/DeathDen) "UR" = ( /obj/item/stool/padded, @@ -854,7 +847,7 @@ Qe cf HZ Th -hq +aa pu Th Th @@ -865,7 +858,7 @@ oX hq HZ nr -vr +tr tr MO Qe @@ -885,7 +878,7 @@ sX dV Th MO -OZ +nr tr au Qe @@ -912,7 +905,7 @@ gB "} (6,1,1) = {" cf -hq +aa yL Qb WH @@ -926,7 +919,7 @@ wv Th MO MO -OZ +nr nr cf "} @@ -1055,7 +1048,7 @@ cf cf nr tr -OZ +nr MO Th Th @@ -1074,7 +1067,7 @@ Qe cf nr nr -OZ +nr tr MO MO @@ -1115,7 +1108,7 @@ cf Qe Qe Qe -OZ +nr tr Qe Qe @@ -1135,7 +1128,7 @@ cf Qe Qe Qe -OZ +nr nr yn Qe diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/deathdenAlt.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/deathdenAlt.dmm index 0b55a1dd39..eef0653db3 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/deathdenAlt.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/deathdenAlt.dmm @@ -6,18 +6,14 @@ "aj" = ( /obj/item/stool/padded, /obj/item/clothing/suit/storage/fluff/techpriestrobes, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "as" = ( /obj/structure/table/bench/wooden, /obj/effect/floor_decal/carpet{ dir = 1 }, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "av" = ( /obj/structure/table/fancyblack, @@ -30,13 +26,11 @@ /obj/effect/floor_decal/carpet{ dir = 6 }, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "bK" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/wall/sifwood, +/turf/simulated/wall/sifwood/turfpack/sif, /area/submap/DeathDen) "cQ" = ( /mob/living/simple_mob/vore/aggressive/deathclaw{ @@ -50,9 +44,7 @@ "dx" = ( /obj/item/ammo_magazine/ammo_box/b12g/pellet, /obj/item/ammo_magazine/ammo_box/b12g/pellet, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "ex" = ( /obj/item/reagent_containers/food/snacks/candy_corn{ @@ -70,14 +62,12 @@ /area/submap/DeathDen) "he" = ( /obj/effect/gibspawner/human, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "hq" = ( /obj/structure/window/plastitanium/full, /obj/structure/grille/rustic, -/turf/simulated/floor/tiled/asteroid_steel, +/turf/simulated/floor/tiled/asteroid_steel/turfpack/sif, /area/submap/DeathDen) "hz" = ( /obj/effect/decal/cleanable/dirt, @@ -87,7 +77,7 @@ "hJ" = ( /mob/living/simple_mob/humanoid/clown, /obj/effect/gibspawner/human, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/freezer/turfpack/sif, /area/submap/DeathDen) "hL" = ( /obj/structure/table/wooden_reinforced, @@ -120,17 +110,13 @@ /obj/effect/floor_decal/carpet{ dir = 10 }, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "jW" = ( /obj/effect/floor_decal/carpet{ dir = 1 }, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "lx" = ( /obj/structure/sink{ @@ -138,7 +124,7 @@ pixel_x = -12; pixel_y = 2 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/freezer/turfpack/sif, /area/submap/DeathDen) "mC" = ( /obj/structure/table/fancyblack, @@ -155,9 +141,7 @@ dir = 5 }, /obj/item/storage/bible, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "nl" = ( /obj/effect/decal/cleanable/dirt, @@ -175,23 +159,19 @@ dir = 9 }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "nG" = ( /obj/structure/windoor_assembly, /obj/random/trash, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/freezer/turfpack/sif, /area/submap/DeathDen) "pz" = ( /obj/item/reagent_containers/food/snacks/candy_corn{ pixel_x = 6; pixel_y = 4 }, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "pE" = ( /obj/effect/decal/cleanable/dirt, @@ -202,20 +182,8 @@ /obj/random/maintenance/medical, /turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) -"rn" = ( -/obj/structure/simple_door/sifwood, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, -/area/submap/DeathDen) -"rO" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/outdoors/dirt{ - outdoors = 0 - }, -/area/template_noop) "si" = ( -/turf/simulated/floor/outdoors/dirt, +/turf/simulated/floor/outdoors/dirt/turfpack/sif, /area/template_noop) "td" = ( /obj/structure/gravemarker, @@ -267,9 +235,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "xh" = ( /mob/living/simple_mob/vore/aggressive/deathclaw{ @@ -279,9 +245,7 @@ name = "young deathclaw" }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/outdoors/dirt{ - outdoors = 0 - }, +/turf/simulated/floor/outdoors/dirt/turfpack/sif, /area/template_noop) "xw" = ( /obj/structure/table/wooden_reinforced, @@ -295,7 +259,7 @@ /obj/structure/table/wooden_reinforced, /obj/random/soap, /obj/item/flame/candle/everburn, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/freezer/turfpack/sif, /area/submap/DeathDen) "yA" = ( /obj/item/reagent_containers/food/snacks/candy_corn, @@ -305,9 +269,7 @@ /obj/effect/floor_decal/carpet, /obj/effect/gibspawner/human, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "zd" = ( /turf/simulated/floor/wood/sif/turfpack/sif, @@ -315,7 +277,7 @@ "zS" = ( /obj/random/soap, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/freezer/turfpack/sif, /area/submap/DeathDen) "Ay" = ( /obj/structure/table/wooden_reinforced, @@ -331,15 +293,11 @@ pixel_x = -6; pixel_y = 6 }, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "AS" = ( /obj/item/reagent_containers/food/snacks/candy_corn, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "Bx" = ( /obj/effect/decal/cleanable/dirt, @@ -352,7 +310,7 @@ /turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "Ct" = ( -/turf/simulated/mineral/ignore_mapgen, +/turf/simulated/mineral/ignore_mapgen/sif, /area/template_noop) "Cv" = ( /obj/structure/table/bench/wooden, @@ -360,9 +318,7 @@ /obj/random/maintenance/engineering, /obj/random/junk, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "CJ" = ( /obj/random/junk, @@ -371,18 +327,11 @@ /turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "CZ" = ( -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/freezer/turfpack/sif, /area/submap/DeathDen) "Dt" = ( /obj/structure/grille/broken/rustic, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, -/area/submap/DeathDen) -"EJ" = ( -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "Fe" = ( /obj/item/reagent_containers/food/snacks/candy_corn{ @@ -394,27 +343,21 @@ }, /obj/random/maintenance/engineering, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "FN" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/outdoors/dirt, +/turf/simulated/floor/outdoors/dirt/turfpack/sif, /area/template_noop) "Gc" = ( /obj/structure/table/bench/wooden, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "Gr" = ( /obj/item/clothing/head/psy_crown/gluttony, /obj/random/junk, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "GT" = ( /obj/effect/decal/cleanable/dirt, @@ -442,9 +385,7 @@ "IE" = ( /obj/effect/floor_decal/carpet, /obj/random/maintenance/engineering, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "JE" = ( /obj/random/trash, @@ -466,24 +407,15 @@ }, /obj/random/trash, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) -"KP" = ( -/turf/simulated/floor/outdoors/dirt{ - outdoors = 0 - }, -/area/template_noop) "KS" = ( /obj/structure/table/fancyblack, /obj/effect/floor_decal/carpet{ dir = 4 }, /obj/item/scrying, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "Lb" = ( /obj/structure/table/wooden_reinforced, @@ -502,28 +434,26 @@ /obj/structure/window/reinforced/tinted/frosted{ dir = 8 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/freezer/turfpack/sif, /area/submap/DeathDen) "MI" = ( /obj/structure/windoor_assembly, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/freezer/turfpack/sif, /area/submap/DeathDen) "MV" = ( -/turf/simulated/wall/sifwood, +/turf/simulated/wall/sifwood/turfpack/sif, /area/submap/DeathDen) "OB" = ( /obj/item/flame/lighter/zippo/gonzo, /obj/random/trash, /obj/random/junk, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "Pj" = ( /obj/structure/simple_door/sifwood, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating/sif/planetuse, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "Ps" = ( /obj/effect/decal/cleanable/dirt, @@ -535,9 +465,7 @@ /area/submap/DeathDen) "Qa" = ( /obj/structure/table/bench/wooden, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "QF" = ( /obj/structure/gravemarker, @@ -581,12 +509,6 @@ /obj/item/storage/box/donut, /turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) -"RZ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, -/area/submap/DeathDen) "Sf" = ( /obj/structure/table/wooden_reinforced, /obj/item/flame/candle/everburn, @@ -609,16 +531,14 @@ /obj/structure/toilet{ dir = 4 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/freezer/turfpack/sif, /area/submap/DeathDen) "Tm" = ( -/turf/simulated/wall/cult, +/turf/simulated/wall/cult/turfpack/sif, /area/submap/DeathDen) "Tx" = ( /obj/machinery/power/supermatter/shard, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) "Xy" = ( /obj/effect/decal/cleanable/dirt, @@ -643,9 +563,7 @@ pixel_y = 4 }, /obj/item/gun/projectile/deagle, -/turf/simulated/floor/wood/sif{ - oxygen = 0 - }, +/turf/simulated/floor/wood/sif/turfpack/sif, /area/submap/DeathDen) (1,1,1) = {" @@ -704,7 +622,7 @@ Sy QF si FN -rO +FN Ct Ct "} @@ -723,8 +641,8 @@ MV MV MV Ct -KP -rO +si +FN xh Ct "} @@ -744,8 +662,8 @@ lx MV Ct Ct -rO -rO +FN +FN FN "} (6,1,1) = {" @@ -764,7 +682,7 @@ hJ MV Ct Ct -KP +si si Is "} @@ -799,7 +717,7 @@ aa MV MV MV -rn +aa MV MV MV @@ -821,7 +739,7 @@ YA MV pz Kg -RZ +YA pz AQ MV @@ -861,7 +779,7 @@ YA MV OB wa -RZ +YA yA AS MV @@ -892,8 +810,8 @@ Ct Is Is si -rO -KP +FN +si Ct MV MV @@ -901,7 +819,7 @@ MV MV he jW -EJ +zd IE dx MV @@ -912,18 +830,18 @@ Ct Is si si -KP -rO +si +FN Ct Ct Ct Ct MV -EJ +zd mC KS av -EJ +zd MV Ct Ct @@ -933,7 +851,7 @@ Is Is Ct Ct -rO +FN xh Ct Ct @@ -943,7 +861,7 @@ ZG AS aj Gr -EJ +zd MV Ct Ct @@ -953,8 +871,8 @@ Is Ct Ct Ct -KP -rO +si +FN Ct Ct Ct @@ -973,7 +891,7 @@ Is Ct Ct Ct -KP +si si si Ct