From 009fbac70b399c1c4ea52f16bea77a5ea478a53d Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Sat, 1 Apr 2017 19:28:05 -0400 Subject: [PATCH] Fixes putting items in incapacited mob's hands --- code/modules/mob/living/living.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index abad6b4084e..ef46c933e39 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -665,7 +665,8 @@ if(what && Adjacent(who) && what.mob_can_equip(who, src, final_where, TRUE)) if(temporarilyRemoveItemFromInventory(what)) if(where_list) - who.put_in_hand(what, where_list[2]) + if(!who.put_in_hand(what, where_list[2])) + what.forceMove(get_turf(who)) else who.equip_to_slot(what, where, TRUE)