From 573ec3f9ba7ef9d11dcffee2d535bb3da5c60478 Mon Sep 17 00:00:00 2001
From: Cruix <ianjturk@gmail.com>
Date: Sat, 15 Oct 2016 21:12:16 -0600
Subject: [PATCH] Fixed krav maga disarm not respecting NODROP. (#20975)

* 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.
---
 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 ccd36422e68..eb74f98550d 100644
--- a/code/datums/martial/krav_maga.dm
+++ b/code/datums/martial/krav_maga.dm
@@ -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)