From 85307ce58273e2359e3e3ecc60e4e0f4fd5e5a20 Mon Sep 17 00:00:00 2001 From: Mek Date: Tue, 21 Jun 2022 15:13:42 -0400 Subject: [PATCH 1/3] Krav Maga Nerfs --- code/datums/martial/krav_maga.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index 8b16f029f822..790a38638a90 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -93,7 +93,7 @@ span_userdanger("[A] leg sweeps you!")) playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1) D.apply_damage(A.dna.species.punchdamagehigh / 2, BRUTE) //5 damage - D.Paralyze(40) + D.knockdown(40) log_combat(A, D, "leg sweeped") return 1 @@ -102,7 +102,7 @@ span_userdanger("[A] slams your chest! You can't breathe!")) playsound(get_turf(A), 'sound/effects/hit_punch.ogg', 50, 1, -1) if(D.losebreath <= 10) - D.losebreath = clamp(D.losebreath + 5, 0, 10) + D.losebreath = clamp(D.losebreath + 3, 0, 6) D.adjustOxyLoss(10) log_combat(A, D, "quickchoked") return 1 From 1672fa0e27e3ade95e4f64c0994da6d5a1e8e45e Mon Sep 17 00:00:00 2001 From: Mek Date: Sun, 26 Jun 2022 00:37:09 -0400 Subject: [PATCH 2/3] capital K --- code/datums/martial/krav_maga.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index 790a38638a90..409aa1e67157 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -93,7 +93,7 @@ span_userdanger("[A] leg sweeps you!")) playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1) D.apply_damage(A.dna.species.punchdamagehigh / 2, BRUTE) //5 damage - D.knockdown(40) + D.Knockdown(40) log_combat(A, D, "leg sweeped") return 1 From 56d85d355e0d5623631e07ea1839534ab1e99156 Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sun, 26 Jun 2022 14:03:28 +0100 Subject: [PATCH 3/3] Update code/datums/martial/krav_maga.dm --- code/datums/martial/krav_maga.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index 409aa1e67157..f73c5c0ca87a 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -93,7 +93,7 @@ span_userdanger("[A] leg sweeps you!")) playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1) D.apply_damage(A.dna.species.punchdamagehigh / 2, BRUTE) //5 damage - D.Knockdown(40) + D.Paralyze(40) log_combat(A, D, "leg sweeped") return 1