From b0a324da4bb45693780012958a529470acd074fe Mon Sep 17 00:00:00 2001 From: matttheficus <57759731+matttheficus@users.noreply.github.com> Date: Wed, 21 Oct 2020 00:24:13 -0400 Subject: [PATCH] Reduce Water Stun/Weaken Time (#14514) * change water slips to be less painful * change weaken to 1 * half'd original stun/weken time * stun/weaken chaged to defines --- code/game/turfs/simulated.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index def0142a481..80325022e05 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -1,3 +1,5 @@ +#define WATER_STUN_TIME 2 //Stun time for water, to edit/find easier +#define WATER_WEAKEN_TIME 1 //Weaken time for water, to edit/find easier /turf/simulated name = "station" var/wet = 0 @@ -81,7 +83,7 @@ switch(src.wet) if(TURF_WET_WATER) - if(!(M.slip("the wet floor", 4, 2, tilesSlipped = 0, walkSafely = 1))) + if(!(M.slip("the wet floor", WATER_STUN_TIME, WATER_WEAKEN_TIME, tilesSlipped = 0, walkSafely = 1))) M.inertia_dir = 0 return @@ -107,3 +109,6 @@ queue_smooth_neighbors(src) /turf/simulated/proc/is_shielded() + +#undef WATER_STUN_TIME +#undef WATER_WEAKEN_TIME