From 81b638afc544f28230884e8e4912391ea1a86b85 Mon Sep 17 00:00:00 2001 From: Datraen Date: Sun, 1 May 2016 15:08:27 -0400 Subject: [PATCH 1/2] Adds a check for can_speak to prevent a null language from being spoken. --- code/modules/mob/language/language.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm index cc0a1d2016..43991810a7 100644 --- a/code/modules/mob/language/language.dm +++ b/code/modules/mob/language/language.dm @@ -158,7 +158,12 @@ // Can we speak this language, as opposed to just understanding it? /mob/proc/can_speak(datum/language/speaking) - return (speaking.can_speak_special(src) && (universal_speak || (speaking && speaking.flags & INNATE) || speaking in src.languages)) +//Prevents someone from speaking a null language. + if(speaking) + return (speaking.can_speak_special(src) && (universal_speak || (speaking && speaking.flags & INNATE) || speaking in src.languages)) + else + log_debug("[src] attempted to speak a null language.") + return 0 /mob/proc/get_language_prefix() if(client && client.prefs.language_prefixes && client.prefs.language_prefixes.len) From 7a92283cac90bfc1734d3218d5831ad16f63d898 Mon Sep 17 00:00:00 2001 From: Datraen Date: Sun, 1 May 2016 15:34:25 -0400 Subject: [PATCH 2/2] Fixes an OOP issue. --- code/modules/mob/language/language.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm index 43991810a7..223b01e110 100644 --- a/code/modules/mob/language/language.dm +++ b/code/modules/mob/language/language.dm @@ -160,7 +160,7 @@ /mob/proc/can_speak(datum/language/speaking) //Prevents someone from speaking a null language. if(speaking) - return (speaking.can_speak_special(src) && (universal_speak || (speaking && speaking.flags & INNATE) || speaking in src.languages)) + return (speaking.can_speak_special(src) && (universal_speak || (speaking && (speaking.flags & INNATE)) || speaking in src.languages)) else log_debug("[src] attempted to speak a null language.") return 0