diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm index 0bcddfcbe7..7d79949f41 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm @@ -6,13 +6,13 @@ /obj/structure/stone_tile/surrounding_tile{ dir = 4 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "ac" = ( /obj/structure/stone_tile/block{ dir = 1 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "ad" = ( /obj/structure/stone_tile/block{ @@ -21,13 +21,13 @@ /obj/structure/stone_tile/cracked{ dir = 8 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "ae" = ( /obj/structure/stone_tile/block/cracked{ dir = 1 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "af" = ( /obj/structure/stone_tile/block{ @@ -36,26 +36,26 @@ /obj/structure/stone_tile{ dir = 8 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "ag" = ( /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 1 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "ah" = ( -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "ai" = ( /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 4 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "aj" = ( /obj/structure/stone_tile/slab, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "ak" = ( /turf/closed/indestructible/riveted/boss, @@ -64,7 +64,7 @@ /obj/structure/stone_tile/surrounding_tile{ dir = 1 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "aq" = ( /obj/structure/stone_tile/block/cracked{ @@ -73,7 +73,7 @@ /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 1 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "ar" = ( /obj/structure/stone_tile/block/cracked{ @@ -82,7 +82,7 @@ /obj/structure/stone_tile{ dir = 4 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "as" = ( /turf/closed/wall/mineral/wood, @@ -94,7 +94,7 @@ /obj/structure/stone_tile/block{ dir = 4 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "au" = ( /obj/structure/stone_tile, @@ -159,7 +159,7 @@ /obj/structure/stone_tile/block{ dir = 4 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "aA" = ( /obj/structure/stone_tile/cracked{ @@ -196,7 +196,7 @@ /obj/structure/stone_tile/block{ dir = 8 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "aG" = ( /obj/structure/stone_tile/block/cracked{ @@ -286,7 +286,7 @@ /obj/structure/stone_tile/block/cracked{ dir = 4 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "aS" = ( /obj/structure/stone_tile/block{ @@ -422,13 +422,13 @@ /obj/structure/stone_tile{ dir = 8 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "bi" = ( /obj/structure/stone_tile/block/cracked{ dir = 8 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "bj" = ( /obj/structure/stone_tile/block/cracked{ @@ -630,7 +630,7 @@ /obj/structure/stone_tile/block/cracked{ dir = 4 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "bD" = ( /obj/structure/stone_tile/block{ @@ -668,11 +668,11 @@ /area/ruin/unpowered/ash_walkers) "bI" = ( /obj/structure/stone_tile/slab/cracked, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "bJ" = ( /obj/structure/stone_tile/surrounding_tile, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "bL" = ( /obj/structure/stone_tile{ @@ -915,7 +915,7 @@ /obj/structure/stone_tile/block{ dir = 1 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "cq" = ( /obj/structure/stone_tile/cracked{ @@ -1109,33 +1109,33 @@ /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 8 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "cP" = ( /obj/structure/stone_tile/block, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "cQ" = ( /obj/structure/stone_tile/block/cracked, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "cR" = ( /obj/structure/stone_tile/surrounding_tile/cracked, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "cT" = ( /obj/structure/stone_tile, /obj/structure/stone_tile/block{ dir = 1 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "cV" = ( /obj/structure/stone_tile/cracked, /obj/structure/stone_tile/block{ dir = 8 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "cW" = ( /obj/structure/table/optable, @@ -1307,7 +1307,7 @@ /obj/structure/stone_tile/cracked{ dir = 1 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "dv" = ( /obj/structure/stone_tile/cracked{ @@ -1347,7 +1347,7 @@ dir = 1 }, /obj/structure/stone_tile/cracked, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "dA" = ( /obj/machinery/hydroponics/soil, @@ -1373,24 +1373,24 @@ dir = 8 }, /obj/structure/stone_tile/center/cracked, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "dC" = ( /obj/structure/stone_tile, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "dD" = ( /obj/structure/stone_tile/cracked{ dir = 8 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "dE" = ( /obj/structure/stone_tile, /obj/structure/stone_tile/cracked{ dir = 8 }, -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) (1,1,1) = {" diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm index 430c211c87..971f28b965 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/template_noop) "b" = ( -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "c" = ( /turf/open/floor/plating/asteroid/basalt/lava_land_surface, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm index 82fc034946..cde7f9bee6 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/template_noop) "b" = ( -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "c" = ( /obj/structure/stone_tile/surrounding_tile{ diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm index 138cefc338..e3b9b291e5 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/template_noop) "b" = ( -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "c" = ( /turf/open/floor/plating/asteroid/basalt/lava_land_surface, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm index d6bb476f32..d8713fd40a 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm @@ -20,7 +20,7 @@ }, /area/lavaland/surface/outdoors/unexplored) "f" = ( -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors/unexplored) "g" = ( /obj/item/clockwork/alloy_shards/medium/gear_bit, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm index 809e520279..67a4ed46cd 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/lavaland/surface/outdoors) "b" = ( -/turf/closed/mineral/volcanic, +/turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "c" = ( /turf/open/floor/plating/asteroid/basalt/lava_land_surface, diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index 5393df669b..8c907573d8 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -6,7 +6,7 @@ icon_state = "rock" var/smooth_icon = 'icons/turf/smoothrocks.dmi' smooth = SMOOTH_MORE|SMOOTH_BORDER - canSmoothWith + canSmoothWith = null baseturfs = /turf/open/floor/plating/asteroid/airless initial_gas_mix = "TEMP=2.7" opacity = 1