From 894b0d28e2c77dd8d3c233869dfa09ee00013bb8 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Wed, 29 May 2019 08:45:45 +0200 Subject: [PATCH 1/6] Krav maga leg sweep buff. --- 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 8a5f0f9439..765567205f 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -86,13 +86,13 @@ return 0 /datum/martial_art/krav_maga/proc/leg_sweep(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) - if(D.stat || D.IsKnockdown()) + if(D.lying || D.resting) return 0 D.visible_message("[A] leg sweeps [D]!", \ "[A] leg sweeps you!") playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1) D.apply_damage(5, BRUTE) - D.Knockdown(40) + D.Knockdown(40, override_duration = 10, 25) log_combat(A, D, "leg sweeped") return 1 From fe5ac5e6e9d7b579466d19bb6abe83bf5a10fa68 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Wed, 29 May 2019 09:24:12 +0200 Subject: [PATCH 2/6] On the other hand, vehicle memes. --- 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 765567205f..0713b6ed18 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -86,7 +86,7 @@ return 0 /datum/martial_art/krav_maga/proc/leg_sweep(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) - if(D.lying || D.resting) + if(D.lying || D.IsKnockdown()) return 0 D.visible_message("[A] leg sweeps [D]!", \ "[A] leg sweeps you!") From 12648720dca56f47c8e78b18a52ff2d929f46ef7 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Wed, 29 May 2019 10:41:43 +0200 Subject: [PATCH 3/6] tweakin. --- code/datums/martial/krav_maga.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index 0713b6ed18..4faa0619cf 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -88,11 +88,12 @@ /datum/martial_art/krav_maga/proc/leg_sweep(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) if(D.lying || D.IsKnockdown()) return 0 + var/hardstun = D.resting ? null : 10 D.visible_message("[A] leg sweeps [D]!", \ "[A] leg sweeps you!") playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1) D.apply_damage(5, BRUTE) - D.Knockdown(40, override_duration = 10, 25) + D.Knockdown(40, override_duration = hardstun, 25) log_combat(A, D, "leg sweeped") return 1 From 5309eafb595ed9aa35f0f76eb6e7b85772ad5f57 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Wed, 29 May 2019 11:24:27 +0200 Subject: [PATCH 4/6] Fine and be it, man. --- code/datums/martial/krav_maga.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index 4faa0619cf..40bf5b055f 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -88,12 +88,11 @@ /datum/martial_art/krav_maga/proc/leg_sweep(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) if(D.lying || D.IsKnockdown()) return 0 - var/hardstun = D.resting ? null : 10 D.visible_message("[A] leg sweeps [D]!", \ "[A] leg sweeps you!") playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1) D.apply_damage(5, BRUTE) - D.Knockdown(40, override_duration = hardstun, 25) + D.Knockdown(40, override_stam = 45) log_combat(A, D, "leg sweeped") return 1 From ec2da508b8336f431f94fabbdf1a764687bf6647 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Sat, 8 Jun 2019 15:05:26 +0200 Subject: [PATCH 5/6] Gonna go with 25 since it won't be usable on lying people. --- 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 40bf5b055f..3dcb785a90 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -92,7 +92,7 @@ "[A] leg sweeps you!") playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1) D.apply_damage(5, BRUTE) - D.Knockdown(40, override_stam = 45) + D.Knockdown(40, override_hardstun = 0.01, override_stam = 25) log_combat(A, D, "leg sweeped") return 1 From e1c94ef8aff4c6f7d773c0bcfcf6c574c755f632 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Sat, 8 Jun 2019 15:06:07 +0200 Subject: [PATCH 6/6] named arguments. --- 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 3dcb785a90..f92c0dbd0d 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -92,7 +92,7 @@ "[A] leg sweeps you!") playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1) D.apply_damage(5, BRUTE) - D.Knockdown(40, override_hardstun = 0.01, override_stam = 25) + D.Knockdown(40, override_hardstun = 0.01, 25) log_combat(A, D, "leg sweeped") return 1