From aa79311dff64e365423b479c6bd91c11eb9f6be0 Mon Sep 17 00:00:00 2001
From: AnturK <why@so.serious>
Date: Mon, 29 Dec 2014 14:21:08 +0100
Subject: [PATCH] Fixes janiborg trashbag emptying

---
 code/modules/recycling/disposal.dm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 36fdf7de1ec..765e7050774 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -63,11 +63,16 @@
 
 	// attack by item places it in to disposal
 /obj/machinery/disposal/attackby(var/obj/item/I, var/mob/user)
-	if(stat & BROKEN || !I || !user || (I.flags & NODROP))
+	if(stat & BROKEN || !I || !user)
 		return
 
-	if(isrobot(user) && !istype(I, /obj/item/weapon/storage/bag/trash))
-		return
+	if(isrobot(user))
+		if(!istype(I, /obj/item/weapon/storage/bag/trash))
+			return
+	else
+		if(I.flags & NODROP)
+			return
+
 	src.add_fingerprint(user)
 	if(mode<=0) // It's off
 		if(istype(I, /obj/item/weapon/screwdriver))