cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 06:28:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2831 from Anewbe/singlang_again

Browse Source 
Signlang should now work while muzzled.
This commit is contained in:
MagmaRam
2016-11-27 17:45:27 -06:00
committed by GitHub
parent e25a060650 f725bbcaad
commit 77cbab5704
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/say.dm
+2 -2
View File
@@ -177,7 +177,7 @@ proc/get_radio_key_from_channel(var/channel)
return 1
//Self explanatory.
if(is_muzzled())
if(is_muzzled() && !(speaking && (speaking.flags & SIGNLANG)))
src << "<span class='danger'>You're muzzled and cannot speak!</span>"
return
@@ -204,7 +204,7 @@ proc/get_radio_key_from_channel(var/channel)
w_not_heard = "[speaking.speech_verb] something [w_adverb]"
//For speech disorders (hulk, slurring, stuttering)
if(!(speaking && (speaking.flags & NO_STUTTER)))
if(!(speaking && (speaking.flags & NO_STUTTER || speaking.flags & SIGNLANG)))
var/list/message_data = list(message, verb, whispering)
if(handle_speech_problems(message_data))
message = message_data[1]