diff --git a/code/datums/action.dm b/code/datums/action.dm
index a193a89516..4ed3a1d904 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -763,12 +763,4 @@
 	for(var/datum/action/A in M.actions)
 		if(istype(A, action_type))
 			return A
-	return
-
-/proc/find_active_innate_action(mob/M, var/action_type)
-	var/datum/action/innate/A = get_action_of_type(M, action_type)
-	if(!istype(A))
-		return FALSE
-	if(A.active)
-		return TRUE
-	return FALSE
\ No newline at end of file
+	return
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 3cbaa01b65..ce1fec334e 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -111,7 +111,7 @@
 		return
 	if(QDELING(src) || (ranged && !target))
 		return
-	if(ranged && bartender_check(target))
+	if(bartender_check(target) && ranged)
 		return
 	var/obj/item/broken_bottle/B = new (loc)
 	B.icon_state = icon_state
@@ -127,13 +127,13 @@
 		B.pixel_x = rand(-12, 12)
 		B.pixel_y = rand(-12, 12)
 	if(isGlass)
+		playsound(src, "shatter", 70, 1)
 		if(prob(33))
 			new/obj/item/shard(drop_location())
 	else
 		B.force = 0
 		B.throwforce = 0
 		B.desc = "A carton with the bottom half burst open. Might give you a papercut."
-	playsound(src, "shatter", 70, 1)
 	transfer_fingerprints_to(B)
 	qdel(src)
 
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 0687bd2d95..121999cfae 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -107,8 +107,9 @@
 	var/turf/T = get_turf(src)
 	if(!T || target.CanPass(src, T) || !thrownby || !thrownby.actions)
 		return
-	if(find_active_innate_action(thrownby, /datum/action/innate/drink_fling))
-		return TRUE
+	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)
@@ -130,7 +131,7 @@
 		if(thrownby)
 			log_combat(thrownby, M, "splashed", R)
 		reagents.reaction(target, TOUCH)
-
+		
 	else if(bartender_check(target) && thrown)
 		visible_message("<span class='notice'>[src] lands onto the [target.name] without spilling a single drop.</span>")
 		transform = initial(transform)