Adds secondary languages for species

This commit is contained in:
mwerezak
2014-05-22 16:17:52 -04:00
parent ca264a8636
commit 87dfeab0f3
3 changed files with 5 additions and 2 deletions
+2 -1
View File
@@ -952,11 +952,12 @@ datum/preferences
if("language")
var/languages_available
var/list/new_languages = list("None")
var/datum/species/S = all_species[species]
if(config.usealienwhitelist)
for(var/L in all_languages)
var/datum/language/lang = all_languages[L]
if((!(lang.flags & RESTRICTED)) && (is_alien_whitelisted(user, L)||(!( lang.flags & WHITELISTED ))))
if((!(lang.flags & RESTRICTED)) && (is_alien_whitelisted(user, L)||(!( lang.flags & WHITELISTED ))||(S && (L in S.secondary_langs))))
new_languages += lang
languages_available = 1
@@ -12,6 +12,7 @@
var/primitive // Lesser form, if any (ie. monkey for humans)
var/tail // Name of tail image in species effects icon file.
var/language // Default racial language, if any.
var/secondary_langs = list() // The names of secondary languages that are available to this species.
var/attack_verb = "punch" // Empty hand hurt intent verb.
var/punch_damage = 0 // Extra empty hand attack damage.
var/mutantrace // Safeguard due to old code.
@@ -155,6 +156,7 @@
icobase = 'icons/mob/human_races/r_tajaran.dmi'
deform = 'icons/mob/human_races/r_def_tajaran.dmi'
language = "Siik'maas"
secondary_langs = list("Siik'tajr")
tail = "tajtail"
attack_verb = "scratch"
punch_damage = 5
+1 -1
View File
@@ -367,7 +367,7 @@
if(client.prefs.language)
chosen_language = all_languages["[client.prefs.language]"]
if(chosen_language)
if(is_alien_whitelisted(src, client.prefs.language) || !config.usealienwhitelist || !(chosen_language.flags & WHITELISTED))
if(is_alien_whitelisted(src, client.prefs.language) || !config.usealienwhitelist || !(chosen_language.flags & WHITELISTED) || (new_character.species && (chosen_language.name in new_character.species.secondary_langs)))
new_character.add_language("[client.prefs.language]")
if(ticker.random_players)