From c932f3ae522b80f9fea0eb9fee608f085b7d8aa3 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sat, 31 Mar 2018 05:12:36 -0700
Subject: [PATCH] fixes a drinking glass smash runtime (#36826)

* smash runtime

* qdeling
---
 code/modules/food_and_drinks/drinks/drinks.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index d6426cf20d..7a0a8f5f5a 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -110,6 +110,8 @@
 /obj/item/reagent_containers/food/drinks/proc/smash(atom/target, mob/thrower, ranged = FALSE)
 	if(!isGlass)
 		return
+	if(QDELING(src) || !target)		//Invalid loc
+		return
 	if(bartender_check(target) && ranged)
 		return
 	var/obj/item/broken_bottle/B = new (loc)