cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-28 19:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preventing Bottle-Based Face Injuries (#7601)

Browse Source 
Currently, if you harm intent click yourself with a bottle, thinking that you might get a refreshing drink after securing your valids, you instead smash it over your stupid head like an animal.

Funny as hell OOCly. Not so great ICly.

Now there's a prompt asking you to confirm if you really wanted to do that. This is ONLY for clicking yourself, so there's no interrupting flow during your barfight. Since harm intent is also linked to splashing reagents, "splash reagents" is also an option if for whatever reason you wanted to pour the reagents on yourself without smashing your face open.
This commit is contained in:
Doxxmedearly
2019-12-08 05:25:50 -06:00
committed by Erki
parent 91e706bf70
commit 9484b98e93
2 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
View File

@@ -126,6 +126,12 @@
if(user.a_intent != I_HURT)
return
if(target == user) //A check so you don't accidentally smash your brains out while trying to get your drink on.
var/confirm = alert("Do you want to smash the bottle on yourself?","Hit yourself?","No", "Yeah!", "Splash Reagents")
if(confirm == "No")
return 1 //prevents standard_splash_mob on return
if(confirm == "Splash Reagents")
return //standard_splash_mob will still play on return, in case we want to douse ourselves in reagents.
if(!smash_check(1))
return //won't always break on the first hit