Merge pull request #30621

This commit is contained in:
Jordan Brown
2017-09-13 14:08:59 -04:00
3 changed files with 3 additions and 3 deletions
-1
View File
@@ -69,7 +69,6 @@
#define GRAB_KILL 3
//slowdown when in softcrit
#define SOFTCRIT_MIN_SLOWDOWN 8
#define SOFTCRIT_ADD_SLOWDOWN 6
//Attack types for checking shields/hit reactions
@@ -17,6 +17,9 @@
if(legcuffed)
. += legcuffed.slowdown
if(stat == SOFT_CRIT)
. += SOFTCRIT_ADD_SLOWDOWN
/mob/living/carbon/slip(knockdown_amount, obj/O, lube)
if(movement_type & FLYING)
return 0
@@ -1036,8 +1036,6 @@
. += (1.5 - flight)
if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT)
. += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR
if(H.stat == SOFT_CRIT)
. = max(SOFTCRIT_MIN_SLOWDOWN, . + SOFTCRIT_ADD_SLOWDOWN) //regardless of how fast you are, you move at a maximum of SOFTCRIT_MIN_SLOWDOWN while in softcrit
return .
//////////////////