[MIRROR] Bartender Drink Sliding: Intrinsic to Extrinsic (#5297)

* Bartender Drink Sliding: Intrinsic to Extrinsic

* Update packs.dm

code/modules/cargo/packs.dm

@@ -1212,7 +1212,8 @@
 					/obj/item/vending_refill/boozeomat,
 					/obj/item/vending_refill/coffee,
 					/obj/item/vending_refill/coffee,
-					/obj/item/vending_refill/coffee)
+					/obj/item/vending_refill/coffee,
+					/obj/item/book/action_granting/drink_fling)
 	crate_name = "bartending supply crate"
 
 /datum/supply_pack/organic/vending/snack

code/modules/jobs/job_types/cargo_service.dm

@@ -163,7 +163,7 @@ Bartender
 	ears = /obj/item/device/radio/headset/headset_srv
 	uniform = /obj/item/clothing/under/rank/bartender
 	suit = /obj/item/clothing/suit/armor/vest
-	backpack_contents = list(/obj/item/storage/box/beanbag=1)
+	backpack_contents = list(/obj/item/storage/box/beanbag=1,/obj/item/book/action_granting/drink_fling=1)
 	shoes = /obj/item/clothing/shoes/laceup
 
 /*

code/modules/reagents/reagent_containers.dm

@@ -79,7 +79,11 @@
 	SplashReagents(target, TRUE)
 
 /obj/item/reagent_containers/proc/bartender_check(atom/target)
-	return (target.CanPass(src, get_turf(src)) && thrownby && thrownby.mind && thrownby.mind.assigned_role == "Bartender")
+	. = 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
 
 /obj/item/reagent_containers/proc/SplashReagents(atom/target, thrown = FALSE)
 	if(!reagents || !reagents.total_volume || !spillable)