From 567e9eac9f9b47df4d8ce2b2cb31712df48eb504 Mon Sep 17 00:00:00 2001
From: ShizCalev <ShizCalev@users.noreply.github.com>
Date: Tue, 9 Oct 2018 14:40:09 -0400
Subject: [PATCH] Fix delivery chute runtime (#40723)

* Fixes delivery chute runtime
* Broken glass fix
---
 code/modules/food_and_drinks/drinks/drinks.dm        | 5 ++++-
 code/modules/food_and_drinks/drinks/drinks/bottle.dm | 4 +++-
 code/modules/recycling/disposal/bin.dm               | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 1190ceacb4f..e0a8b14530e 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 e496724da0c..878296f9bc7 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 badc65be491..9ed074831ff 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)