From 9031a1b6710ea80068169074897ae2c2a6de3db1 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 13 Sep 2017 21:29:50 -0500 Subject: [PATCH] [MIRROR] Soft crit slowdown for all carbons (#2743) * Soft crit slowdown for all carbons * Update carbon_movement.dm * Update carbon_movement.dm * Update species.dm * actually pay attention to spacings --- code/__DEFINES/combat.dm | 1 - code/modules/mob/living/carbon/carbon_movement.dm | 3 +++ code/modules/mob/living/carbon/human/species.dm | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 3f45fb170b..7fa8c2db77 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -75,7 +75,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 diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm index 2bacece28d..aa37315b13 100644 --- a/code/modules/mob/living/carbon/carbon_movement.dm +++ b/code/modules/mob/living/carbon/carbon_movement.dm @@ -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 diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 7b83347953..821ed9d7a6 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1198,8 +1198,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 . //////////////////