From 42083d72065765a35b0143562a7fc7d9b56963f4 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 3 Aug 2018 22:29:44 -0400 Subject: [PATCH] Removes combat rework training wheels, and nerfs myself by increasing the minimum stamloss required to throw a knockout punch with boxing gloves (#7405) --- code/datums/martial/boxing.dm | 4 ++-- modular_citadel/code/datums/status_effects/debuffs.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm index 68b021bc7d..20c3570bc1 100644 --- a/code/datums/martial/boxing.dm +++ b/code/datums/martial/boxing.dm @@ -34,8 +34,8 @@ D.apply_damage(damage, STAMINA, affecting, armor_block) add_logs(A, D, "punched (boxing) ") - if(D.getStaminaLoss() > 50) - var/knockout_prob = D.getStaminaLoss() + rand(-15,15) + if(D.getStaminaLoss() > 100) + var/knockout_prob = (D.getStaminaLoss() + rand(-15,15))*0.75 if((D.stat != DEAD) && prob(knockout_prob)) D.visible_message("[A] has knocked [D] out with a haymaker!", \ "[A] has knocked [D] out with a haymaker!") diff --git a/modular_citadel/code/datums/status_effects/debuffs.dm b/modular_citadel/code/datums/status_effects/debuffs.dm index 4c201861a2..a57902d0cf 100644 --- a/modular_citadel/code/datums/status_effects/debuffs.dm +++ b/modular_citadel/code/datums/status_effects/debuffs.dm @@ -3,7 +3,7 @@ new_owner.resting = TRUE new_owner.adjustStaminaLoss(isnull(override_stam)? set_duration*0.25 : override_stam) if(isnull(override_duration) && (set_duration > 80)) - set_duration = set_duration*0.15 + set_duration = set_duration*0.01 return ..() else if(!isnull(override_duration)) set_duration = override_duration