shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* Bartender Drink Sliding: Intrinsic to Extrinsic

* Update packs.dm
This commit is contained in:
CitadelStationBot
2018-02-05 04:42:13 -06:00
committed by Poojawa
parent fd919986f5
commit e16db54c67
5 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers.dm
+5 -1
View File
@@ -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)