Merge pull request #1791 from Markolie/disposal

Disposal trash bag fix
This commit is contained in:
Fox-McCloud
2015-08-18 18:15:54 -04:00
+1 -3
View File
@@ -50,11 +50,9 @@
// attack by item places it in to disposal
/obj/machinery/disposal/attackby(var/obj/item/I, var/mob/user, params)
if(stat & BROKEN || !I || !user || (I.flags & NODROP))
if(stat & BROKEN || !I || !user || ((I.flags & NODROP) && !istype(I, /obj/item/weapon/storage/bag/trash/cyborg)))
return
if(isrobot(user) && !istype(I, /obj/item/weapon/storage/bag/trash))
return
src.add_fingerprint(user)
if(mode<=0) // It's off
if(istype(I, /obj/item/weapon/screwdriver))