cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-29 19:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #92 from Abi79/master

Browse Source 
Slurring from Alcohol, btw. Aryn wrote the slur proc
This commit is contained in:
CIB
2011-12-10 12:54:45 -08:00
parent 9dbe06b22b 9d774ed3c9
commit 985112f052
18 changed files with 199 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/defines/mob/mob.dm
View File

@@ -80,6 +80,7 @@
var/ear_deaf = null//Carbon
var/ear_damage = null//Carbon
var/stuttering = null//Carbon
var/slurring = null
var/real_name = null
var/flavor_text = ""
var/blinded = null

299
code/modules/chemical/Chemistry-Reagents.dm
View File

@@ -406,6 +406,7 @@ datum
M.dizziness = 0
M:drowsyness = 0
M:stuttering = 0
M:slurring = 0
M:confused = 0
M:jitteriness = 0
..()
@@ -1261,6 +1262,7 @@ datum
M.dizziness = 0
M:drowsyness = 0
M:stuttering = 0
M:slurring = 0
M:confused = 0
if(!M:sleeping_willingly)
M:sleeping = 0
@@ -1536,8 +1538,8 @@ datum
M.make_dizzy(5)
M:jitteriness = max(M:jitteriness-5,0)
if(data >= 25)
if (!M:stuttering) M:stuttering = 1
M:stuttering += 4
if (!M:slurring) M:slurring = 1
M:slurring += 4
if(data >= 40 && prob(33))
if (!M:confused) M:confused = 1
M:confused += 3
@@ -1569,7 +1571,7 @@ datum
if(!M) M = holder.my_atom
M.dizziness = 0
M:drowsyness = 0
M:stuttering = 0
M:slurring = 0
M:confused = 0
..()
return
@@ -1806,17 +1808,17 @@ datum
if(!data) data = 1
switch(data)
if(1 to 5)
if (!M:stuttering) M:stuttering = 1
if (!M:slurring) M:slurring = 1
M.make_dizzy(5)
if(prob(10)) M:emote(pick("twitch","giggle"))
if(5 to 10)
if (!M:stuttering) M:stuttering = 1
if (!M:slurring) M:slurring = 1
M.make_jittery(10)
M.make_dizzy(10)
M.druggy = max(M.druggy, 35)
if(prob(20)) M:emote(pick("twitch","giggle"))
if (10 to INFINITY)
if (!M:stuttering) M:stuttering = 1
if (!M:slurring) M:slurring = 1
M.make_jittery(20)
M.make_dizzy(20)
M.druggy = max(M.druggy, 40)
@@ -2184,6 +2186,7 @@ datum
..()
M.dizziness = max(0,M.dizziness-5)
M:drowsyness = max(0,M:drowsyness-3)
M:slurring = max(0, M:slurring-3)
if(!M:sleeping_willingly)
M:sleeping = 0
if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
@@ -2204,6 +2207,7 @@ datum
M.dizziness = max(0,M.dizziness-2)
M:drowsyness = max(0,M:drowsyness-1)
M:jitteriness = max(0,M:jitteriness-3)
M:slurring = max(0, M:slurring-3)
if(!M:sleeping_willingly)
M:sleeping = 0
if(M:getToxLoss() && prob(20))
@@ -2224,6 +2228,7 @@ datum
..()
M.dizziness = max(0,M.dizziness-5)
M:drowsyness = max(0,M:drowsyness-3)
M:slurring = max(0, M:slurring-3)
if(!M:sleeping_willingly)
M:sleeping = 0
if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
@@ -2235,7 +2240,7 @@ datum
icetea
name = "Iced Tea"
id = "icetea"
description = "No relation to a certain rap artist/ actor."
description = "No relation to a certain rap artist/actor."
reagent_state = LIQUID
color = "#104038" // rgb: 16, 64, 56
@@ -2323,8 +2328,8 @@ datum
data++
M.dizziness +=4
if(data >= 45 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2387,8 +2392,8 @@ datum
M:jitteriness = max(M:jitteriness-3,0)
M:nutrition += 2
if(data >= 25)
if (!M:stuttering) M:stuttering = 1
M:stuttering += 3
if (!M:slurring) M:slurring = 1
M:slurring += 3
if(data >= 40 && prob(33))
if (!M:confused) M:confused = 1
M:confused += 2
@@ -2408,8 +2413,8 @@ datum
data++
M.dizziness +=4
if(data >= 45 && data <125)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2427,8 +2432,8 @@ datum
data++
M.dizziness +=3
if(data >= 45 && data <125)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2447,8 +2452,8 @@ datum
data++
M.dizziness +=3
if(data >= 45 && data <125)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2466,8 +2471,8 @@ datum
data++
M.dizziness +=3
if(data >= 45 && data <125)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2485,8 +2490,8 @@ datum
data++
M.dizziness +=3
if(data >= 45 && data <125)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2527,8 +2532,8 @@ datum
data++
M.dizziness +=3
if(data >= 45 && data <125)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2546,8 +2551,8 @@ datum
data++
M.dizziness +=3
if(data >= 45 && data <125)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2565,8 +2570,8 @@ datum
data++
M.dizziness +=2
if(data >= 65 && data <125)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 145 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2618,8 +2623,8 @@ datum
data++
M.dizziness +=4
if(data >= 45 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 115 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2637,8 +2642,8 @@ datum
data++
M.dizziness +=6
if(data >= 35 && data <90)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 5
if (!M.slurring) M.slurring = 1
M.slurring += 5
else if(data >= 90 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2656,8 +2661,8 @@ datum
data++
M.dizziness +=3
if(data >= 45 && data <125)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2710,8 +2715,8 @@ datum
M.make_dizzy(3)
M:jitteriness = max(M:jitteriness-3,0)
if(data >= 25)
if (!M:stuttering) M:stuttering = 1
M:stuttering += 3
if (!M:slurring) M:slurring = 1
M:slurring += 3
if(data >= 40 && prob(33))
if (!M:confused) M:confused = 1
M:confused += 2
@@ -2729,8 +2734,8 @@ datum
M.druggy = max(M.druggy, 50)
M.confused = max(M:confused+2,0)
M.make_dizzy(10)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
if(!data) data = 1
data++
switch(data)
@@ -2752,8 +2757,8 @@ datum
M.dizziness +=3
M.druggy = max(M.druggy, 50)
if(data >= 35 && data <90)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 90)
M.confused = max(M:confused+2,0)
..()
@@ -2771,8 +2776,8 @@ datum
data++
M.dizziness +=3
if(data >= 45 && data <125)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2790,8 +2795,8 @@ datum
data++
M.dizziness +=3
if(data >= 45 && data <125)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2809,8 +2814,8 @@ datum
data++
M.dizziness +=3
if(data >= 45 && data <135)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 135 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2828,8 +2833,8 @@ datum
data++
M.dizziness +=3
if(data >= 45 && data <135)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 135 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2847,8 +2852,8 @@ datum
data++
M.dizziness +=3
if(data >= 55 && data <125)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2866,8 +2871,8 @@ datum
data++
M.dizziness +=3
if(data >= 45 && data <165)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 135 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2885,8 +2890,8 @@ datum
data++
M.dizziness +=3
if(data >= 45 && data <165)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 135 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2904,8 +2909,8 @@ datum
data++
M.dizziness +=3
if(data >= 55 && data <165)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 165 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2923,8 +2928,8 @@ datum
data++
M.dizziness +=3
if(data >= 55 && data <165)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 165 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2942,8 +2947,8 @@ datum
data++
M.dizziness +=4
if(data >= 55 && data <165)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 4
if (!M.slurring) M.slurring = 1
M.slurring += 4
else if(data >= 165 && prob(33))
M.confused = max(M:confused+4,0)
..()
@@ -2961,8 +2966,8 @@ datum
data++
M.dizziness +=3
if(data >= 55 && data <165)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 165 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -2980,8 +2985,8 @@ datum
data++
M.dizziness +=6
if(data >= 15 && data <45)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 45 && prob(50) && data <55)
M.confused = max(M:confused+3,0)
else if(data >=55)
@@ -3001,8 +3006,8 @@ datum
data++
M.dizziness +=3
if(data >= 45 && data <145)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 145 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -3020,8 +3025,8 @@ datum
data++
M.dizziness +=3
if(data >= 55 && data <165)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 165 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -3041,8 +3046,8 @@ datum
data++
M.dizziness +=3
if(data >= 55 && data <165)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 165 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -3061,8 +3066,8 @@ datum
data++
M.dizziness +=3
if(data >= 55 && data <165)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 165 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -3098,8 +3103,8 @@ datum
data++
M.dizziness +=3
if(data >= 45 && data <145)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 145 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -3117,8 +3122,8 @@ datum
data++
M.dizziness +=5
if(data >= 35 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 115 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -3136,8 +3141,8 @@ datum
data++
M.dizziness +=3
if(data >= 55 && data <165)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 165 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -3155,8 +3160,8 @@ datum
data++
M.dizziness +=5
if(data >= 30 && data <60)
if (!M.stuttering) M:stuttering = 1
M.stuttering += 4
if (!M.slurring) M:slurring = 1
M.slurring += 4
else if(data >= 60 && prob(40))
M.confused = max(M:confused+5,0)
..()
@@ -3174,8 +3179,8 @@ datum
data++
M.dizziness +=3
if(data >= 25 && data <90)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 4
else if(data >= 90 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -3193,8 +3198,8 @@ datum
data++
M.dizziness +=3
if(data >= 55 && data <150)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 150 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -3212,8 +3217,8 @@ datum
data++
M.dizziness +=4
if(data >= 55 && data <150)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 150 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -3231,8 +3236,8 @@ datum
data++
M.dizziness +=4
if(data >= 55 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 115 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -3250,8 +3255,8 @@ datum
data++
M.dizziness +=4
if(data >= 55 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 115 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -3270,8 +3275,8 @@ datum
M.dizziness +=4
M.druggy = max(M.druggy, 30)
if(data >= 55 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 115 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -3289,8 +3294,8 @@ datum
data++
M.dizziness +=4
if(data >= 55 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 115 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -3308,8 +3313,8 @@ datum
data++
M.dizziness +=5
if(data >= 55 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 5
if (!M.slurring) M.slurring = 1
M.slurring += 5
else if(data >= 115 && prob(33))
M.confused = max(M:confused+5,0)
..()
@@ -3327,8 +3332,8 @@ datum
data++
M.dizziness +=5
if(data >= 55 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 5
if (!M.slurring) M.slurring = 1
M.slurring += 5
else if(data >= 115 && prob(33))
M.confused = max(M:confused+5,0)
..()
@@ -3346,8 +3351,8 @@ datum
data++
M.dizziness +=4
if(data >= 55 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 4
if (!M.slurring) M.slurring = 1
M.slurring += 4
else if(data >= 115 && prob(30))
M.confused = max(M:confused+4,0)
..()
@@ -3365,8 +3370,8 @@ datum
data++
M.dizziness +=10
if(data >= 55 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 10
if (!M.slurring) M.slurring = 1
M.slurring += 10
else if(data >= 115 && prob(90))
M.confused = max(M:confused+10,10)
..()
@@ -3384,8 +3389,8 @@ datum
data++
M.dizziness +=4
if(data >= 55 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 115 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -3403,8 +3408,8 @@ datum
data++
M.dizziness +=4
if(data >= 45 && data <125)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -3422,8 +3427,8 @@ datum
data++
M.dizziness +=3
if(data >= 55 && data <165)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 165 && prob(33))
M.confused = max(M:confused+2,0)
if (M.bodytemperature > 310)
@@ -3443,8 +3448,8 @@ datum
data++
M.dizziness +=15
if(data >= 55 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 15
if (!M.slurring) M.slurring = 1
M.slurring += 15
else if(data >= 115 && prob(33))
M.confused = max(M:confused+15,15)
..()
@@ -3466,8 +3471,8 @@ datum
data++
M.dizziness +=6
if(data >= 45 && data <125)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 6
if (!M.slurring) M.slurring = 1
M.slurring += 6
else if(data >= 125 && prob(33))
M.confused = max(M:confused+5,5)
..()
@@ -3485,8 +3490,8 @@ datum
data++
M.dizziness +=4
if(data >= 55 && data <165)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 4
if (!M.slurring) M.slurring = 1
M.slurring += 4
else if(data >= 165 && prob(33))
M.confused = max(M:confused+4,0)
..()
@@ -3504,8 +3509,8 @@ datum
data++
M.dizziness +=5
if(data >= 55 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 4
if (!M.slurring) M.slurring = 1
M.slurring += 4
else if(data >= 115 && prob(33))
M.confused = max(M:confused+4,4)
..()
@@ -3525,8 +3530,8 @@ datum
M:jitteriness = max(M:jitteriness-3,0)
M:nutrition += 2
if(data >= 25)
if (!M:stuttering) M:stuttering = 1
M:stuttering += 3
if (!M:slurring) M:slurring = 1
M:slurring += 3
if(data >= 40 && prob(33))
if (!M:confused) M:confused = 1
M:confused += 2
@@ -3550,8 +3555,8 @@ datum
M:jitteriness = max(M:jitteriness-3,0)
M:nutrition += 2
if(data >= 25)
if (!M:stuttering) M:stuttering = 1
M:stuttering += 3
if (!M:slurring) M:slurring = 1
M:slurring += 3
if(data >= 40 && prob(33))
if (!M:confused) M:confused = 1
M:confused += 2
@@ -3571,8 +3576,8 @@ datum
data++
M.dizziness +=2
if(data >= 90 && data <250)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 2
if (!M.slurring) M.slurring = 1
M.slurring += 2
else if(data >= 250 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -3590,8 +3595,8 @@ datum
data++
M.dizziness +=2
if(data >= 90 && data <250)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 2
if (!M.slurring) M.slurring = 1
M.slurring += 2
else if(data >= 250 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -3609,8 +3614,8 @@ datum
data++
M.dizziness +=8
if(data >= 90 && data <250)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 1
if (!M.slurring) M.slurring = 1
M.slurring += 1
else if(data >= 250 && prob(33))
M.confused = max(M:confused+2,0)
..()
@@ -3628,8 +3633,8 @@ datum
data++
M.dizziness +=4
if(data >= 90 && data <250)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 7
if (!M.slurring) M.slurring = 1
M.slurring += 7
else if(data >= 250 && prob(60))
M.confused = max(M:confused+8,0)
..()
@@ -3687,8 +3692,8 @@ datum
data++
M.dizziness +=10
if(data >= 55 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 10
if (!M.slurring) M.slurring = 1
M.slurring += 10
else if(data >= 115 && prob(33))
M.confused = max(M:confused+10,0)
..()
@@ -3707,8 +3712,8 @@ datum
data++
M.dizziness +=4
if(data >= 55 && data <165)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 4
if (!M.slurring) M.slurring = 1
M.slurring += 4
else if(data >= 165 && prob(33))
M.confused = max(M:confused+5,0)
..()
@@ -3731,8 +3736,8 @@ datum
data++
M.dizziness +=6
if(data >= 15 && data <45)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
if (!M.slurring) M.slurring = 1
M.slurring += 3
else if(data >= 45 && prob(50) && data <55)
M.confused = max(M:confused+3,0)
else if(data >=55)
@@ -3791,8 +3796,8 @@ datum
M:heal_organ_damage(1,1)
M.dizziness +=5
if(data >= 55 && data <165)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 5
if (!M.slurring) M.slurring = 1
M.slurring += 5
else if(data >= 165 && prob(33))
M.confused = max(M:confused+5,0)
..()
@@ -3802,8 +3807,8 @@ datum
M:heal_organ_damage(1,1)
M.dizziness +=5
if(data >= 55 && data <165)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 5
if (!M.slurring) M.slurring = 1
M.slurring += 5
else if(data >= 165 && prob(33))
M.confused = max(M:confused+5,0)
..()
@@ -3825,8 +3830,8 @@ datum
M:heal_organ_damage(1,1)
M.dizziness +=5
if(data >= 55 && data <165)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 5
if (!M.slurring) M.slurring = 1
M.slurring += 5
else if(data >= 165 && prob(33))
M.confused = max(M:confused+5,0)
..()
@@ -3846,8 +3851,8 @@ datum
data++
M.dizziness +=5
if(data >= 55 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 5
if (!M.slurring) M.slurring = 1
M.slurring += 5
else if(data >= 115 && prob(33))
M.confused = max(M:confused+15,15)
..()
@@ -3865,8 +3870,8 @@ datum
data++
M.dizziness +=5
if(data >= 55 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 5
if (!M.slurring) M.slurring = 1
M.slurring += 5
else if(data >= 115 && prob(33))
M.confused = max(M:confused+15,15)
..()
@@ -3884,8 +3889,8 @@ datum
data++
M.dizziness +=10
if(data >= 55 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 10
if (!M.slurring) M.slurring = 1
M.slurring += 10
else if(data >= 115 && prob(33))
M.confused = max(M:confused+15,15)
..()
@@ -3903,8 +3908,8 @@ datum
data++
M.dizziness +=30
if(data >= 55 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 30
if (!M.slurring) M.slurring = 1
M.slurring += 30
else if(data >= 115 && prob(60))
M.confused = max(M:confused+15,15)
..()

1
code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
View File

@@ -136,6 +136,7 @@
src.stat = 2
if (src.stuttering) src.stuttering--
if (src.slurring) src.slurring--
if (src.eye_blind)
src.eye_blind--

1
code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
View File

@@ -137,6 +137,7 @@
src.stat = 2
if (src.stuttering) src.stuttering--
if (src.slurring) src.slurring--
if (src.eye_blind)
src.eye_blind--

1
code/modules/mob/living/carbon/alien/humanoid/life.dm
View File

@@ -452,6 +452,7 @@
src.stat = 2
if (src.stuttering) src.stuttering--
if (src.slurring) src.slurring--
if (src.eye_blind)
src.eye_blind--

1
code/modules/mob/living/carbon/alien/humanoid/queen.dm
View File

@@ -138,6 +138,7 @@
src.stat = 2
if (src.stuttering) src.stuttering--
if (src.slurring) src.slurring--
if (src.eye_blind)
src.eye_blind--

1
code/modules/mob/living/carbon/alien/larva/life.dm
View File

@@ -379,6 +379,7 @@
stat = 2
if (stuttering) stuttering--
if (slurring) slurring--
if (eye_blind)
eye_blind--

1
code/modules/mob/living/carbon/brain/life.dm
View File

@@ -198,6 +198,7 @@
stat = 2
if (stuttering) stuttering--
if (slurring) slurring--
if (eye_blind)
eye_blind--

1
code/modules/mob/living/carbon/human/life.dm
View File

@@ -715,6 +715,7 @@
silent = 0
if (stuttering) stuttering--
if (slurring) slurring--
if (eye_blind)
eye_blind--

2
code/modules/mob/living/carbon/human/whisper.dm
View File

@@ -52,6 +52,8 @@
if (src.stuttering)
message = stutter(message)
if (src.slurring)
message = slur(message)
for (var/obj/O in view(message_range, src))
spawn (0)

1
code/modules/mob/living/carbon/monkey/life.dm
View File

@@ -451,6 +451,7 @@
src.stat = 2
if (src.stuttering) src.stuttering--
if (src.slurring) src.slurring--
if (src.eye_blind)
src.eye_blind--

5
code/modules/mob/living/damage_procs.dm
View File

@@ -51,6 +51,8 @@
radiation += min((effect - (effect*getarmor(null, "rad"))), 0)//Rads auto check armor
if(STUTTER)
stuttering = max(stuttering,(effect/(blocked+1)))
if(SLUR)
slurring = max(slurring, (effect/(blocked+1)))
if(EYE_BLUR)
eye_blurry = max(eye_blurry,(effect/(blocked+1)))
if(DROWSY)
@@ -60,13 +62,14 @@
return 1
/mob/living/proc/apply_effects(var/stun = 0, var/weaken = 0, var/paralyze = 0, var/irradiate = 0, var/stutter = 0, var/eyeblur = 0, var/drowsy = 0, var/blocked = 0)
/mob/living/proc/apply_effects(var/stun = 0, var/weaken = 0, var/paralyze = 0, var/irradiate = 0, var/stutter = 0, var/slur = 0, var/eyeblur = 0, var/drowsy = 0, var/blocked = 0)
if(blocked >= 2) return 0
if(stun) apply_effect(stun, STUN, blocked)
if(weaken) apply_effect(weaken, WEAKEN, blocked)
if(paralyze) apply_effect(paralyze, PARALYZE, blocked)
if(irradiate) apply_effect(irradiate, IRRADIATE, blocked)
if(stutter) apply_effect(stutter, STUTTER, blocked)
if(slur) apply_effect(slur, SLUR, blocked)
if(eyeblur) apply_effect(eyeblur, EYE_BLUR, blocked)
if(drowsy) apply_effect(drowsy, DROWSY, blocked)
return 1

2
code/modules/mob/living/say.dm
View File

@@ -140,6 +140,8 @@
if (stuttering)
message = stutter(message)
if (slurring)
message = slur(message)
/* //qw do not have beesease atm.
if(virus)

1
code/modules/mob/living/silicon/robot/life.dm
View File

@@ -123,6 +123,7 @@
src.stat = 2
if (src.stuttering) src.stuttering--
if (src.slurring) src.slurring--
if (src.eye_blind)
src.eye_blind--

2
code/modules/mob/living/silicon/silicon.dm
View File

@@ -46,6 +46,8 @@
radiation += min((effect - (effect*getarmor(null, "rad"))), 0)//Rads auto check armor
if(STUTTER)
stuttering = max(stuttering,(effect/(blocked+1)))
if(SLUR)
slurring = max(slurring, (effefct/(blocked+1)))
if(EYE_BLUR)
eye_blurry = max(eye_blurry,(effect/(blocked+1)))
if(DROWSY)

23
code/modules/mob/mob_helpers.dm
View File

@@ -158,6 +158,29 @@ proc/isorgan(A)
return t
proc/slur(phrase)
phrase = html_decode(phrase)
var
leng=lentext(phrase)
counter=lentext(phrase)
newphrase="";newletter=""
while(counter>=1)
newletter=copytext(phrase,(leng-counter)+1,(leng-counter)+2)
if(rand(1,3)==3)
if(lowertext(newletter)=="o") newletter="u"
if(lowertext(newletter)=="s") newletter="ch"
if(lowertext(newletter)=="a") newletter="ah"
if(lowertext(newletter)=="c") newletter="k"
switch(rand(1,15))
if(1,3,5,8) newletter="[lowertext(newletter)]"
if(2,4,6,15) newletter="[uppertext(newletter)]"
if(7) newletter+="'"
if(9,10) newletter="<b>[newletter]</b>"
if(11,12) newletter="<big>[newletter]</big>"
if(13) newletter="<small>[newletter]</small>"
newphrase+="[newletter]";counter-=1
return newphrase
/proc/stutter(n)
var/te = html_decode(n)
var/t = ""//placed before the message. Not really sure what it's for.

2
code/modules/mob/say.dm
View File

@@ -56,6 +56,8 @@
var/ending = copytext(text, length(text))
if (src.stuttering)
return "stammers, \"[text]\"";
if (src.slurring)
return "slurrs, \"[text]\"";
if (src.brainloss >= 60)
return "gibbers, \"[text]\"";
if (ending == "?")

3
code/setup.dm
View File

@@ -221,6 +221,7 @@ var/list/global_mutations = list() // list of hidden mutation things
#define PARALYZE "paralize"
#define IRRADIATE "irradiate"
#define STUTTER "stutter"
#define SLUR "slur"
#define EYE_BLUR "eye_blur"
#define DROWSY "drowsy"
@@ -230,4 +231,4 @@ var/static/list/scarySounds = list('thudswoosh.ogg','Taser.ogg','armbomb.ogg','h
#define SEC_LEVEL_GREEN 0
#define SEC_LEVEL_BLUE 1
#define SEC_LEVEL_RED 2
#define SEC_LEVEL_DELTA 3
#define SEC_LEVEL_DELTA 3