Merge branch 'master' into upstream-merge-27344

2017-05-20 23:26:28 -05:00
parent a430e24555 64192be7a5
commit 45ba084c6a
95 changed files with 3681 additions and 1609 deletions
@@ -17,4 +17,4 @@
 /mob/living/carbon/alien/AdjustStunned(amount, updating = 1, ignore_canstun = 0)
 	. = ..()
 	if(!.)
-		move_delay_add = min(move_delay_add + round(amount / 2), 10)
+		move_delay_add = Clamp(move_delay_add + round(amount/2), 0, 10)