fixes paperbins and papercutters proper

2019-11-29 23:11:27 -05:00
parent b1fca2b74b
commit 6b3f992d8e
2 changed files with 7 additions and 6 deletions
@@ -91,9 +91,6 @@
 		update_icon()

 /obj/item/papercutter/MouseDrop(atom/over_object)
-	. = ..()
-	if(.)
-		return
 	var/mob/M = usr
 	if(M.incapacitated() || !Adjacent(M))
 		return
@@ -104,6 +101,10 @@
 	else if(istype(over_object, /obj/screen/inventory/hand))
 		var/obj/screen/inventory/hand/H = over_object
 		M.putItemFromInventoryInHandIfPossible(src, H.held_index)
+
+	else
+	 . = ..()
+
 	add_fingerprint(M)

 /obj/item/paperslip
@@ -41,9 +41,6 @@
 	..()

 /obj/item/paper_bin/MouseDrop(atom/over_object)
-	. = ..()
-	if(.)
-		return
 	var/mob/living/M = usr
 	if(!istype(M) || M.incapacitated() || !Adjacent(M))
 		return
@@ -54,6 +51,9 @@
 	else if(istype(over_object, /obj/screen/inventory/hand))
 		var/obj/screen/inventory/hand/H = over_object
 		M.putItemFromInventoryInHandIfPossible(src, H.held_index)
+		
+	else
+		. = ..()

 	add_fingerprint(M)