Merge pull request #6200 from Citadel-Station-13/upstream-merge-36826

[MIRROR] fixes a drinking glass smash runtime
This commit is contained in:
LetterJay
2018-03-31 19:03:44 -05:00
committed by GitHub
@@ -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)