Merge pull request #10016 from deathride58/mousedropfixes

Mousedrop fixes - Adds return value to item mousedrop and fixes bugs with the few things that override it
2019-11-30 22:51:42 -08:00
parent 953ef607e2 6b3f992d8e
commit 1d91e1acf4
8 changed files with 18 additions and 11 deletions
@@ -104,7 +104,7 @@

 /obj/item/defibrillator/MouseDrop(obj/over_object)
 	. = ..()
-	if(ismob(loc))
+	if(!. && ismob(loc) && loc == usr)
 		var/mob/M = loc
 		if(!M.incapacitated() && istype(over_object, /obj/screen/inventory/hand))
 			var/obj/screen/inventory/hand/H = over_object