From 9a04270bc83c691ecf1028b9a152ed30ca80d881 Mon Sep 17 00:00:00 2001
From: Xhuis <ashe.f.higgs@gmail.com>
Date: Fri, 7 Jul 2017 12:42:20 -0400
Subject: [PATCH] Refactors catching

---
 code/modules/mob/living/carbon/carbon_defense.dm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index e1a538a0c7f..b4f574d82b8 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -59,10 +59,11 @@
 				if(istype(AM, /obj/item))
 					var/obj/item/I = AM
 					if(isturf(I.loc))
-						put_in_active_hand(I)
-						visible_message("<span class='warning'>[src] catches [I]!</span>")
-						throw_mode_off()
-						return 1
+						I.attack_hand(src)
+						if(get_active_held_item() == I) //if our attack_hand() picks up the item...
+							visible_message("<span class='warning'>[src] catches [I]!</span>") //catch that sucker!
+							throw_mode_off()
+							return 1
 	..()