From 91726f340ac6069a72936efaee2201eb750c7caf Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Fri, 10 Apr 2020 14:08:16 -0400 Subject: [PATCH 1/2] Update krav_maga.dm --- 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 8ea1c2efca..00781fbf58 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -145,7 +145,7 @@ log_combat(A, D, "punched") var/picked_hit_type = pick("punches", "kicks") var/bonus_damage = damage_roll(A,D) - if(CHECK_MOBILITY(D, MOBILITY_STAND)) + if(!CHECK_MOBILITY(D, MOBILITY_STAND)) bonus_damage += 10 picked_hit_type = "stomps on" D.apply_damage(bonus_damage, BRUTE, affecting, armor_block) @@ -165,7 +165,7 @@ return TRUE var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected)) var/armor_block = D.run_armor_check(affecting, "melee") - var/damage = damage_roll(A,D) + var/damage = damage_roll(A,D)*2 if(D.mobility_flags & MOBILITY_STAND) D.visible_message("[A] reprimands [D]!", \ "You're slapped by [A]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) From 2afda4c216eed8bc91cd376b88c7ecdb78e55de7 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Fri, 10 Apr 2020 14:24:20 -0400 Subject: [PATCH 2/2] forgot oop --- 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 00781fbf58..df42fba07d 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -165,7 +165,7 @@ return TRUE var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected)) var/armor_block = D.run_armor_check(affecting, "melee") - var/damage = damage_roll(A,D)*2 + var/damage = (damage_roll(A,D)*2) if(D.mobility_flags & MOBILITY_STAND) D.visible_message("[A] reprimands [D]!", \ "You're slapped by [A]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A)