From 489409317c0b4ce53c7b96c5bb688a91575145ab Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Mon, 11 Sep 2017 11:23:28 -0500 Subject: [PATCH 1/2] Soft crit slowdown for all carbons --- code/modules/mob/living/carbon/carbon_movement.dm | 3 +++ code/modules/mob/living/carbon/human/species.dm | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm index 2bacece28d7..1b0daefe52f 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) + . = 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 + /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 e6e437f869b..49793a13b6b 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -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 . ////////////////// From 7585870a1236c50cd628563e029263e3d040c48a Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Wed, 13 Sep 2017 11:41:45 -0500 Subject: [PATCH 2/2] Removes the slowdown cap --- code/__DEFINES/combat.dm | 1 - code/modules/mob/living/carbon/carbon_movement.dm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 91e28b869ff..269adc0853d 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -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 diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm index 1b0daefe52f..ccff7e3fc36 100644 --- a/code/modules/mob/living/carbon/carbon_movement.dm +++ b/code/modules/mob/living/carbon/carbon_movement.dm @@ -18,7 +18,7 @@ . += legcuffed.slowdown if(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 + . += SOFTCRIT_ADD_SLOWDOWN /mob/living/carbon/slip(knockdown_amount, obj/O, lube) if(movement_type & FLYING)