diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 854950c2fc..fe440c0c53 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -108,16 +108,13 @@ if(istype(I, /obj/item/weapon/material/ashtray)) var/obj/item/weapon/material/ashtray/A = I - if(A.contents.len == 0) - user.visible_message("\The [user] places \the [A.name] into [src].") - I.forceMove(src) - else + if(A.contents.len > 0) user.visible_message("\The [user] empties \the [A.name] into [src].") for(var/obj/item/O in A.contents) O.forceMove(src) - A.update_icon() - update() - return + A.update_icon() + update() + return var/obj/item/weapon/grab/G = I if(istype(G)) // handle grabbed mob