From 577bc7f1d9b408d12ec780df9f36697663b9d35c Mon Sep 17 00:00:00 2001 From: killer653 Date: Tue, 12 Sep 2017 22:25:42 -0400 Subject: [PATCH] Allows dumping the contents out of bar glasses --- .../reagent_containers/drinkingglass/drinkingglass.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/modules/reagents/reagent_containers/drinkingglass/drinkingglass.dm b/code/modules/reagents/reagent_containers/drinkingglass/drinkingglass.dm index 8d19e49330..44ad9fee0e 100644 --- a/code/modules/reagents/reagent_containers/drinkingglass/drinkingglass.dm +++ b/code/modules/reagents/reagent_containers/drinkingglass/drinkingglass.dm @@ -146,3 +146,14 @@ underlays += I else continue side = "right" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/afterattack(var/obj/target, var/mob/user, var/proximity) + if(user.a_intent == I_HURT) //We only want splashing to be done if they are on harm intent. + if(!is_open_container() || !proximity) + return + if(standard_splash_mob(user, target)) + return + if(reagents && reagents.total_volume) //They are on harm intent, aka wanting to spill it. + user << "You splash the solution onto [target]." + reagents.splash(target, reagents.total_volume) + return \ No newline at end of file