From 9fb70f22d845d6b4218d664e173ca0a23f5854b0 Mon Sep 17 00:00:00 2001 From: Ergovisavi <4465459+Ergovisavi@users.noreply.github.com> Date: Mon, 21 Aug 2017 19:30:23 -0700 Subject: [PATCH] ATMOS Resin removes iciness from floors (#29967) * atmos resin now makes the floor non-slippery, increased the turf coverage of resin by one unit * Atmos resin removes wetness on floor tiles upon generation --- code/game/objects/effects/effect_system/effects_foam.dm | 1 + code/game/objects/items/tanks/watertank.dm | 2 +- code/game/turfs/open.dm | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index 5dfe5ece0555..526aaedcf239 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -271,6 +271,7 @@ . = ..() if(isopenturf(loc)) var/turf/open/O = loc + O.ClearWet() if(O.air) var/datum/gas_mixture/G = O.air G.temperature = 293.15 diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm index 38a9555f837d..1d402a1ad3ad 100644 --- a/code/game/objects/items/tanks/watertank.dm +++ b/code/game/objects/items/tanks/watertank.dm @@ -324,7 +324,7 @@ /obj/effect/resin_container/proc/Smoke() var/obj/effect/particle_effect/foam/metal/resin/S = new /obj/effect/particle_effect/foam/metal/resin(get_turf(loc)) - S.amount = 3 + S.amount = 4 playsound(src,'sound/effects/bamf.ogg',100,1) qdel(src) diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index e3c4b57ea712..042fce59ce00 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -299,3 +299,9 @@ wet_time = 0 if(wet) addtimer(CALLBACK(src, .proc/HandleWet), 15, TIMER_UNIQUE) + +/turf/open/proc/ClearWet()//Nuclear option of immediately removing slipperyness from the tile instead of the natural drying over time + wet = TURF_DRY + UpdateSlip() + if(wet_overlay) + cut_overlay(wet_overlay) \ No newline at end of file