Merge pull request #5277 from Crazylemon64/robojanitor_disposal_fix

No more throwing away janiborg garbage bags
This commit is contained in:
Fox McCloud
2016-08-01 20:15:09 -04:00
committed by GitHub
+3 -2
View File
@@ -64,7 +64,7 @@
// 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) && !istype(I, /obj/item/weapon/storage/bag/trash/cyborg)))
if(stat & BROKEN || !I || !user)
return
src.add_fingerprint(user)
@@ -144,7 +144,8 @@
if(!I) return
user.drop_item()
if(!user.drop_item())
return
if(I)
I.loc = src