diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index f053c64dc05..0a9fea43f5f 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -186,7 +186,6 @@ return MARTIAL_ATTACK_FAIL if(check_streak(attacker, defender)) return MARTIAL_ATTACK_SUCCESS - attacker.do_attack_animation(defender, ATTACK_EFFECT_DISARM) var/obj/item/stuff_in_hand = defender.get_active_held_item() if(prob(60) && stuff_in_hand && defender.temporarilyRemoveItemFromInventory(stuff_in_hand)) attacker.put_in_hands(stuff_in_hand) @@ -200,19 +199,7 @@ to_chat(attacker, span_danger("You disarm [defender]!")) playsound(defender, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) log_combat(attacker, defender, "disarmed (Krav Maga)", addition = "(disarmed of [stuff_in_hand])") - return MARTIAL_ATTACK_SUCCESS - - defender.visible_message( - span_danger("[attacker] fails to disarm [defender]!"), \ - span_userdanger("You're nearly disarmed by [attacker]!"), - span_hear("You hear a swoosh!"), - COMBAT_MESSAGE_RANGE, - attacker, - ) - to_chat(attacker, span_warning("You fail to disarm [defender]!")) - playsound(defender, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1) - log_combat(attacker, defender, "failed to disarm (Krav Maga)") - return MARTIAL_ATTACK_FAIL + return MARTIAL_ATTACK_INVALID // normal shove //Krav Maga Gloves