From 30a8a5feb31b23380f609a9160edcc1ffb00ed78 Mon Sep 17 00:00:00 2001 From: KasparoVy Date: Tue, 22 Nov 2016 00:59:31 -0500 Subject: [PATCH] Fixes Disability/Shock Stuttering, Resolves #5899 (#5900) * Fixes Stutteing. The 0 argument was busting this proc because it meant that the current value of stuttering would be the only one stuttering would ever get set to through SetStuttering. It didn't even use the 'amount' value. This fixes it as per the way it used to be https://github.com/ParadiseSS13/Paradise/commit/6a7f7394a807cd8a028d5bb2a1608927c8e4474f#diff-2de2df982739a4fbdb54a4b2715d6f92L114. --- code/modules/mob/living/status_procs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index bc12dfdeb87..45207fd5426 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -411,7 +411,7 @@ /mob/living/SetStuttering(amount, force = 0) //From mob/living/apply_effect: "Stuttering is often associated with Stun" if(status_flags & CANSTUN || force) - stuttering = max(stuttering, 0) + stuttering = max(amount, 0) /mob/living/AdjustStuttering(amount, bound_lower = 0, bound_upper = INFINITY, force = 0) var/new_value = directional_bounded_sum(stuttering, amount, bound_lower, bound_upper)