shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prefixed all disability defines with DISABILITY_ to fix a name collision

Browse Source
This commit is contained in:
Jordan Brown
2017-12-24 15:03:30 -06:00
committed by CitadelStationBot
parent 2378235f51
commit 164db7ae9b
83 changed files with 957 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/say.dm
+10
View File
@@ -135,11 +135,17 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
// AIs use inherent channels for the holopad. Most inherent channels
// ignore the language argument however.
<<<<<<< HEAD
var/datum/saymode/SM = SSradio.saymodes[key]
if(key && SM)
if(!SM.handle_message(src, message, language) && !message_mode)
return
=======
var/datum/saymode/SM = SSradio.saymodes[talk_key]
if(SM && !SM.handle_message(src, message, language))
return
>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
if(!can_speak_vocal(message))
to_chat(src, "<span class='warning'>You find yourself unable to speak!</span>")
@@ -285,7 +291,11 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
return 1
/mob/living/proc/can_speak_vocal(message) //Check AFTER handling of xeno and ling channels
<<<<<<< HEAD
if(disabilities & MUTE)
=======
if(has_disability(DISABILITY_MUTE))
>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
return 0
if(is_muzzled())