Merge pull request #17005 from paulo-e/fix/17003

Can't dispose abstract items #17003
This commit is contained in:
Fox McCloud
2021-11-01 18:01:37 -04:00
committed by GitHub
+4 -13
View File
@@ -95,7 +95,7 @@
// attack by item places it in to disposal
/obj/machinery/disposal/attackby(obj/item/I, mob/user, params)
if(stat & BROKEN || !I || !user)
if(stat & BROKEN || !user || I.flags & ABSTRACT)
return
src.add_fingerprint(user)
@@ -129,20 +129,11 @@
add_attack_logs(usr, GM, "Disposal'ed", !!GM.ckey ? null : ATKLOG_ALL)
return
if(!I)
if(!user.drop_item() || QDELETED(I))
return
if(!user.drop_item())
return
if(I)
I.forceMove(src)
to_chat(user, "You place [I] into [src].")
for(var/mob/M in viewers(src))
if(M == user)
continue
M.show_message("[user.name] places [I] into [src].", 3)
I.forceMove(src)
user.visible_message("[user] places [I] into [src].", "You place [I] into [src].")
update()