tiny bit of cleanup

This commit is contained in:
DragonTrance
2020-12-27 12:19:54 -07:00
parent 76b0b45a0b
commit e57ba1502e
2 changed files with 3 additions and 1 deletions
@@ -109,6 +109,8 @@
/obj/item/reagent_containers/food/drinks/after_throw(datum/callback/callback)
. = ..()
if (!isGlass)
return
if (!QDELETED(src) || !QDELING(src)) //If we didn't get qdeleted by smash(), assume we got flung by a bartender
transform = initial(transform)
to_chat(viewers(8, get_turf(src)), "<span class='notice'>\The [src] lands upright without spilling a drop!</span>")
+1 -1
View File
@@ -85,7 +85,7 @@
/obj/item/reagent_containers/proc/bartender_check(atom/target)
. = FALSE
var/turf/T = get_turf(src)
if(!T || !thrownby || !thrownby.actions) //|| target.CanPass(src, T) || !thrownby || !thrownby.actions)
if(!T || !thrownby || !thrownby.actions)
return
for(var/datum/action/innate/D in thrownby.actions)
if(D.active && istype(D, /datum/action/innate/drink_fling))