Merge pull request #1950 from Citadel-Station-13/upstream-merge-29123

[MIRROR] Refactors catching to use attack_hand
2017-07-08 14:32:51 -05:00
parent 26fbf67846 2d4604c94b
commit bef2941681
1 changed files with 5 additions and 4 deletions
@@ -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
 	..()