diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 1190ceacb4f1..e0a8b14530e2 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -121,10 +121,12 @@ B.icon = I B.name = "broken [name]" if(prob(33)) - new/obj/item/shard(drop_location()) + var/obj/item/shard/S = new(drop_location()) + target.Bumped(S) playsound(src, "shatter", 70, 1) transfer_fingerprints_to(B) qdel(src) + target.Bumped(B) @@ -303,6 +305,7 @@ B.desc = "A carton with the bottom half burst open. Might give you a papercut." transfer_fingerprints_to(B) qdel(src) + target.Bumped(B) /obj/item/reagent_containers/food/drinks/sillycup/smallcarton/on_reagent_change(changetype) if (reagents.reagent_list.len) diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index e496724da0ce..878296f9bc75 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -32,7 +32,8 @@ if(isGlass) if(prob(33)) - new/obj/item/shard(drop_location()) + var/obj/item/shard/S = new(drop_location()) + target.Bumped(S) playsound(src, "shatter", 70, 1) else B.force = 0 @@ -42,6 +43,7 @@ transfer_fingerprints_to(B) qdel(src) + target.Bumped(B) /obj/item/reagent_containers/food/drinks/bottle/attack(mob/living/target, mob/living/user) diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index badc65be491d..9ed074831fff 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -456,7 +456,7 @@ flush() /obj/machinery/disposal/deliveryChute/Bumped(atom/movable/AM) //Go straight into the chute - if(!AM.CanEnterDisposals()) + if(QDELETED(AM) || !AM.CanEnterDisposals()) return switch(dir) if(NORTH)