Mousedrop fixes - Adds return value to item mousedrop and fixes current bugs with the few things that make use of it

This commit is contained in:
deathride58
2019-11-29 22:59:37 -05:00
parent 6cce995f77
commit b1fca2b74b
8 changed files with 15 additions and 9 deletions
+1 -1
View File
@@ -62,7 +62,7 @@
if(ismecha(M.loc)) // stops inventory actions in a mech
return
if(!M.incapacitated() && loc == M && istype(over_object, /obj/screen/inventory/hand))
if(!. && !M.incapacitated() && loc == M && istype(over_object, /obj/screen/inventory/hand))
var/obj/screen/inventory/hand/H = over_object
if(M.putItemFromInventoryInHandIfPossible(src, H.held_index))
add_fingerprint(usr)
+2
View File
@@ -92,6 +92,8 @@
/obj/item/papercutter/MouseDrop(atom/over_object)
. = ..()
if(.)
return
var/mob/M = usr
if(M.incapacitated() || !Adjacent(M))
return
+2
View File
@@ -42,6 +42,8 @@
/obj/item/paper_bin/MouseDrop(atom/over_object)
. = ..()
if(.)
return
var/mob/living/M = usr
if(!istype(M) || M.incapacitated() || !Adjacent(M))
return