[MIRROR] Fixes language code ignoring holder restrictions (#858)

* Fixes language code ignoring holder restrictions

* resolve .rej file.
This commit is contained in:
CitadelStationBot
2017-05-18 04:13:57 -05:00
committed by Poojawa
parent e84191b5c3
commit 8bcaa54cbe
30 changed files with 7396 additions and 7396 deletions

View File

@@ -615,7 +615,9 @@
if(!H.has_language(dt))
return FALSE
else if(H.omnitongue || could_speak_in_language(dt))
else if(H.omnitongue)
return TRUE
else if(could_speak_in_language(dt) && (!H.only_speaks_language || H.only_speaks_language == dt))
return TRUE
else
return FALSE
@@ -631,8 +633,6 @@
else
H.selected_default_language = null
var/datum/language/chosen_langtype
var/highest_priority