cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Puts in a check so you don't drink & splash

Browse Source
This commit is contained in:
killer653
2017-09-12 23:26:39 -04:00
parent 577bc7f1d9
commit 2fa9a55360
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/reagents/reagent_containers/drinkingglass/drinkingglass.dm
View File

@@ -150,10 +150,18 @@
/obj/item/weapon/reagent_containers/food/drinks/glass2/afterattack(var/obj/target, var/mob/user, var/proximity) /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(user.a_intent == I_HURT) //We only want splashing to be done if they are on harm intent.
if(!is_open_container() || !proximity) if(!is_open_container() || !proximity)
return return 1
if(standard_splash_mob(user, target)) if(standard_splash_mob(user, target))
return return 1
if(reagents && reagents.total_volume) //They are on harm intent, aka wanting to spill it. if(reagents && reagents.total_volume) //They are on harm intent, aka wanting to spill it.
user << "<span class='notice'>You splash the solution onto [target].</span>" user << "<span class='notice'>You splash the solution onto [target].</span>"
reagents.splash(target, reagents.total_volume) reagents.splash(target, reagents.total_volume)
return return 1
else
return
/obj/item/weapon/reagent_containers/food/drinks/glass2/standard_feed_mob(var/mob/user, var/mob/target)
if(afterattack()) //Check to see if harm intent & splash.
return
else
..() //If they're splashed, no need to do anything else.