But wait, there is more!

No...
2020-01-24 04:33:55 +01:00
parent 1ba4c19c64
commit bd6e364612
3 changed files with 16 additions and 7 deletions
@@ -108,10 +108,12 @@

 /obj/item/reagent_containers/proc/bartender_check(atom/target)
 	. = FALSE
-	if(target.CanPass(src, get_turf(src)) && thrownby && thrownby.actions)
-		for(var/datum/action/innate/drink_fling/D in thrownby.actions)
-			if(D.active)
-				return TRUE
+	var/turf/T = get_turf(src)
+	if(!T || target.CanPass(src, T) || !thrownby || !thrownby.actions)
+		return
+	for(var/datum/action/innate/drink_fling/D in thrownby.actions)
+		if(D.active)
+			return TRUE

 /obj/item/reagent_containers/proc/ForceResetRotation()
 	transform = initial(transform)