Skip to content

Commit

Permalink
Fixed krav maga disarm not respecting NODROP. (tgstation#20975)
Browse files Browse the repository at this point in the history
* Fixed krav maga disarm not respecting NODROP.

* Reverted change to krav maga disarm not giving the successful disarm message if the item it was disarming did not exists.
  • Loading branch information
Cruix authored and KorPhaeron committed Oct 16, 2016
1 parent f14230b commit 573ec3f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/datums/martial/krav_maga.dm
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ datum/martial_art/krav_maga/grab_act(var/mob/living/carbon/human/A, var/mob/livi
if(prob(60))
var/obj/item/I = D.get_active_held_item()
if(I)
D.drop_item()
A.put_in_hands(I)
if(D.drop_item())
A.put_in_hands(I)
D.visible_message("<span class='danger'>[A] has disarmed [D]!</span>", \
"<span class='userdanger'>[A] has disarmed [D]!</span>")
playsound(D, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
Expand Down

0 comments on commit 573ec3f

Please sign in to comment.