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)