Merge pull request #3695 from Citadel-Station-13/upstream-merge-32215

[MIRROR] fixes sinks applying baton stunforce to stutter without proper conversion between tick and mob life counting.
2017-10-31 02:59:14 -04:00
parent 32fb136bf0 800311c238
commit 98874b1f05
1 changed files with 1 additions and 1 deletions
@@ -498,7 +498,7 @@
 				flick("baton_active", src)
 				var/stunforce = B.stunforce
 				user.Knockdown(stunforce)
-				user.stuttering = stunforce
+				user.stuttering = stunforce/20
 				B.deductcharge(B.hitcost)
 				user.visible_message("<span class='warning'>[user] shocks themself while attempting to wash the active [B.name]!</span>", \
 									"<span class='userdanger'>You unwisely attempt to wash [B] while it's still on.</span>")