cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added a new slurring variable, and set it up in the right places

Browse Source
This commit is contained in:
Albert Iordache
2011-12-10 14:25:49 +02:00
parent c68a22f497
commit e72ae5e8f6
17 changed files with 172 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
+1
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--
code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
+1
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--
code/modules/mob/living/carbon/alien/humanoid/life.dm
+1
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--
code/modules/mob/living/carbon/alien/humanoid/queen.dm
+1
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--
code/modules/mob/living/carbon/alien/larva/life.dm
+1
View File
@@ -379,6 +379,7 @@
stat = 2
if (stuttering) stuttering--
if (slurring) slurring--
if (eye_blind)
eye_blind--
code/modules/mob/living/carbon/brain/life.dm
+1
View File
@@ -198,6 +198,7 @@
stat = 2
if (stuttering) stuttering--
if (slurring) slurring--
if (eye_blind)
eye_blind--
code/modules/mob/living/carbon/human/life.dm
+1
View File
@@ -715,6 +715,7 @@
silent = 0
if (stuttering) stuttering--
if (slurring) slurring--
if (eye_blind)
eye_blind--
code/modules/mob/living/carbon/human/whisper.dm
+2
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)
code/modules/mob/living/carbon/monkey/life.dm
+1
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--
code/modules/mob/living/damage_procs.dm
+4 -1
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, (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
code/modules/mob/living/say.dm
+2
View File
@@ -140,6 +140,8 @@
if (stuttering)
message = stutter(message)
if (slurring)
message = slur(message)
/* //qw do not have beesease atm.
if(virus)
code/modules/mob/living/silicon/robot/life.dm
+1
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--
code/modules/mob/living/silicon/silicon.dm
+2
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)
code/modules/mob/say.dm
+2
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 == "?")