From 22c0c9baecbf1e06d5be11d828d2bfe7d320a9d8 Mon Sep 17 00:00:00 2001 From: BurgerLua Date: Tue, 30 Apr 2019 21:29:28 -0700 Subject: [PATCH 1/3] Slurring Fix --- code/modules/mob/living/carbon/life.dm | 2 +- code/modules/mob/mob_helpers.dm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 6111a92e99..e757e6dcf4 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -531,7 +531,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put if(stuttering) stuttering = max(stuttering-1, 0) - if(slurring) + if(slurring || drunkenness) slurring = max(slurring-1,0,drunkenness) if(cultslurring) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 3d4e356464..288ed4e19c 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -72,7 +72,7 @@ var/newletter="" while(counter>=1) newletter=copytext(phrase,(leng-counter)+1,(leng-counter)+2) - if(rand(1,100)<=strength) + if(rand(1,100)<=strength*0.5) if(lowertext(newletter)=="o") newletter="u" if(lowertext(newletter)=="s") @@ -83,12 +83,12 @@ newletter="oo" if(lowertext(newletter)=="c") newletter="k" - if(rand(1,100) <= strength*0.5) + if(rand(1,100) <= strength*0.25) if(newletter==" ") newletter="...huuuhhh..." if(newletter==".") newletter=" *BURP*." - if(rand(1,100) <= strength) + if(rand(1,100) <= strength*0.5) if(rand(1,5) == 1) newletter+="'" if(rand(1,5) == 1) From d3b856d95f44ed486623bdbec36d40eb72539252 Mon Sep 17 00:00:00 2001 From: BurgerLua Date: Tue, 30 Apr 2019 22:00:27 -0700 Subject: [PATCH 2/3] slurring reduction --- code/modules/mob/mob_helpers.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 288ed4e19c..776bd04935 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -65,6 +65,7 @@ return sanitize(t) /proc/slur(n,var/strength=50) + strength = min(strength,50) var/phrase = html_decode(n) var/leng = lentext(phrase) var/counter=lentext(phrase) From b31127bcca2bb2fa56f9e7b9dc1f4ba355f9228f Mon Sep 17 00:00:00 2001 From: BurgerLua Date: Tue, 30 Apr 2019 22:26:44 -0700 Subject: [PATCH 3/3] Forgot this --- code/modules/mob/living/carbon/human/say.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index dc35e65c47..7ce3f78da0 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -1,11 +1,11 @@ /mob/living/carbon/human/say_mod(input, message_mode) verb_say = dna.species.say_mod switch(slurring) - if(25 to 50) + if(10 to 25) return "jumbles" - if(50 to 75) + if(25 to 50) return "slurs" - if(75 to INFINITY) + if(50 to INFINITY) return "garbles" else . = ..()