Skip to content

Commit

Permalink
Removes Drunkslurring at low drunkenness (#3740)
Browse files Browse the repository at this point in the history
## About The Pull Request

You no longer slur your speech randomly at >6 drunkenness and no longer
get guaranteed speech slurring at >11 drunkenness, which was raised to
31.

Getting "drunk" itself is raised to 11 from 6.

If you do get your speech slurred, its lessened, and "huuughhhhh" and
burping was removed from your speech entirely.

## Why It's Good For The Game

(takes one sip of whiskey) Huuuughhhhh.....h hurhhghhhhhhh......
C'aph'tian said't a getm back,.. ... .hurheuhghhhhh.... the ship....
*BURP* *BURP* hurhghhhhhhh......


## Changelog

:cl:
del: You no longer slur your speech at low drunkenness.
balance: Thresholds for slurred speech increased as well as the
threshold for getting drunk.
del: Making weird groaning sounds and burping loudly at random was
removed from slurred speech.
/:cl:
  • Loading branch information
generalthrax authored Nov 23, 2024
1 parent 181aee7 commit 2b87a73
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
8 changes: 3 additions & 5 deletions code/modules/mob/living/carbon/life.dm
Original file line number Diff line number Diff line change
Expand Up @@ -472,10 +472,8 @@ All effects don't start immediately, but rather get worse over time; the rate is

if(drunkenness)
drunkenness = max(drunkenness - (drunkenness * 0.04) - 0.01, 0)
if(drunkenness >= 6)
if(drunkenness >= 11)
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "drunk", /datum/mood_event/drunk)
if(prob(25))
slurring += 2
jitteriness = max(jitteriness - 3, 0)
throw_alert("drunk", /atom/movable/screen/alert/drunk)
sound_environment_override = SOUND_ENVIRONMENT_PSYCHOTIC
Expand All @@ -484,8 +482,8 @@ All effects don't start immediately, but rather get worse over time; the rate is
clear_alert("drunk")
sound_environment_override = SOUND_ENVIRONMENT_NONE

if(drunkenness >= 11 && slurring < 5)
slurring += 1.2
if(drunkenness >= 31 && slurring < 5)
slurring += 0.5

if(drunkenness >= 41)
if(prob(25))
Expand Down
5 changes: 0 additions & 5 deletions code/modules/mob/mob_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,6 @@
newletter = "oo"
else if(lowerletter == "c")
newletter = "k"
if(rand(1, 20) == 20)
if(newletter == " ")
newletter = "...huuuhhh..."
else if(newletter == ".")
newletter = " *BURP*."
switch(rand(1, 20))
if(1)
newletter += "'"
Expand Down

0 comments on commit 2b87a73

Please sign in to comment.