Skip to content

Commit

Permalink
[MIRROR] Fix Krav Maga not shoving (#848)
Browse files Browse the repository at this point in the history
* Fix Krav Maga not shoving (#81340)

## About The Pull Request

I thought it was normal for Krav to not shove but apparently it was
reverted

## Changelog

:cl: Melbert
fix: Krav Maga users can shove again
/:cl:

* Fix Krav Maga not shoving

---------

Co-authored-by: MrMelbert <[email protected]>
  • Loading branch information
2 people authored and FFMirrorBot committed Feb 8, 2024
1 parent 107a5d8 commit b92d217
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions code/datums/martial/krav_maga.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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

Expand Down

0 comments on commit b92d217

Please sign in to comment.