cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9989 from PsiOmegaDelta/150702-St-St-StutteringFi-Fi-Fix

Browse Source 
Speech impediment fixes.
This commit is contained in:
GinjaNinja32
2015-07-02 13:54:16 +01:00
parent 2a32150658 a98c4a2c8e
commit a2e66b4095
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/mob/living/carbon/human/say.dm
View File

@@ -129,18 +129,12 @@
return verb return verb
/mob/living/carbon/human/handle_speech_problems(var/message, var/verb) /mob/living/carbon/human/handle_speech_problems(var/message, var/verb)
if(!speech_problem_flag)
return ..()
var/list/returns[3]
speech_problem_flag = 0
if(silent || (sdisabilities & MUTE)) if(silent || (sdisabilities & MUTE))
message = "" message = ""
speech_problem_flag = 1 speech_problem_flag = 1
if(istype(wear_mask, /obj/item/clothing/mask/horsehead)) else if(istype(wear_mask, /obj/item/clothing/mask/horsehead))
var/obj/item/clothing/mask/horsehead/hoers = wear_mask var/obj/item/clothing/mask/horsehead/hoers = wear_mask
if(hoers.voicechange) if(hoers.voicechange)
if(mind && mind.changeling && department_radio_keys[copytext(message, 1, 3)] != "changeling")
message = pick("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!") message = pick("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!")
verb = pick("whinnies","neighs", "says") verb = pick("whinnies","neighs", "says")
speech_problem_flag = 1 speech_problem_flag = 1
@@ -162,6 +156,7 @@
message = uppertext(message) message = uppertext(message)
verb = "yells loudly" verb = "yells loudly"
var/list/returns[3]
returns[1] = message returns[1] = message
returns[2] = verb returns[2] = verb
returns[3] = speech_problem_flag returns[3] = speech_problem_flag