diff --git a/code/defines/mob/mob.dm b/code/defines/mob/mob.dm index a2220baa62c..842dd1c1571 100644 --- a/code/defines/mob/mob.dm +++ b/code/defines/mob/mob.dm @@ -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 diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index 4e7d7deca5e..d96a7af2ae8 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -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) @@ -2323,8 +2325,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 +2389,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 +2410,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 +2429,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 +2449,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 +2468,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 +2487,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 +2529,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 +2548,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 +2567,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 +2620,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 +2639,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 +2658,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 +2712,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 +2731,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 +2754,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 +2773,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 +2792,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 +2811,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 +2830,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 +2849,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 +2868,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 +2887,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 +2906,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 +2925,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 +2944,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 +2963,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 +2982,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 +3003,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 +3022,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 +3043,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 +3063,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 +3100,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 +3119,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 +3138,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 +3157,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 +3176,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 +3195,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 +3214,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 +3233,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 +3252,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 +3272,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 +3291,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 +3310,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 +3329,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 +3348,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 +3367,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 +3386,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 +3405,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 +3424,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 +3445,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 +3468,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 +3487,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 +3506,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 +3527,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:sluring) M:sluring = 1 + M:sluring += 3 if(data >= 40 && prob(33)) if (!M:confused) M:confused = 1 M:confused += 2 @@ -3550,8 +3552,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:sluring) M:sluring = 1 + M:sluring += 3 if(data >= 40 && prob(33)) if (!M:confused) M:confused = 1 M:confused += 2 @@ -3571,8 +3573,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 +3592,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 +3611,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 +3630,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 +3689,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 +3709,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 +3733,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 +3793,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 +3804,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 +3827,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 +3848,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 +3867,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 +3886,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 +3905,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) ..() diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm index 08cfe1e70a9..ef73a345164 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm @@ -136,6 +136,7 @@ src.stat = 2 if (src.stuttering) src.stuttering-- + if (src.slurring) src.slurring-- if (src.eye_blind) src.eye_blind-- diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm index e11df6b5f85..dc88ba15357 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm @@ -137,6 +137,7 @@ src.stat = 2 if (src.stuttering) src.stuttering-- + if (src.slurring) src.slurring-- if (src.eye_blind) src.eye_blind-- diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index f8d93348198..8624774bf8e 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -452,6 +452,7 @@ src.stat = 2 if (src.stuttering) src.stuttering-- + if (src.slurring) src.slurring-- if (src.eye_blind) src.eye_blind-- diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index e6d5f3bbcae..d436f718aee 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -138,6 +138,7 @@ src.stat = 2 if (src.stuttering) src.stuttering-- + if (src.slurring) src.slurring-- if (src.eye_blind) src.eye_blind-- diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index 68c79ed6ca7..9be8835e7f9 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -379,6 +379,7 @@ stat = 2 if (stuttering) stuttering-- + if (slurring) slurring-- if (eye_blind) eye_blind-- diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index 43b5b6b2cca..2fe670bec49 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -198,6 +198,7 @@ stat = 2 if (stuttering) stuttering-- + if (slurring) slurring-- if (eye_blind) eye_blind-- diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 569e2e9ebae..02e0c2785da 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -715,6 +715,7 @@ silent = 0 if (stuttering) stuttering-- + if (slurring) slurring-- if (eye_blind) eye_blind-- diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm index 2a89031db5f..a1d4db99638 100644 --- a/code/modules/mob/living/carbon/human/whisper.dm +++ b/code/modules/mob/living/carbon/human/whisper.dm @@ -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) diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index e2fd09306ad..77968bcaabd 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -451,6 +451,7 @@ src.stat = 2 if (src.stuttering) src.stuttering-- + if (src.slurring) src.slurring-- if (src.eye_blind) src.eye_blind-- diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 9c799ef8246..69b8b39bf9e 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -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, (effefct/(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 \ No newline at end of file diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 962800892f4..4fbf6a1e051 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -140,6 +140,8 @@ if (stuttering) message = stutter(message) + if (slurring) + message = slur(message) /* //qw do not have beesease atm. if(virus) diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 5458f23b267..4e56f6d66f0 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -123,6 +123,7 @@ src.stat = 2 if (src.stuttering) src.stuttering-- + if (src.slurring) src.slurring-- if (src.eye_blind) src.eye_blind-- diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 633dd78baa3..4812e39a98a 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -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) diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index f584b312272..21fdf1f866d 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -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 == "?") diff --git a/code/setup.dm b/code/setup.dm index 71258f4ea0a..b062f20ce95 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -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