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

Merge branch 'dev' into mutiny

Browse Source
This commit is contained in:
Jeremy Liberman
2014-05-25 14:22:16 -05:00
parent c607872b80 6a87d33f7a
commit d3541d1e08
31 changed files with 610 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+3 -2
View File
@@ -562,7 +562,7 @@ datum/preferences
return
proc/SetAntagoptions(mob/user)
if(uplinklocation == "")
if(uplinklocation == "" || !uplinklocation)
uplinklocation = "PDA"
var/HTML = "<body>"
HTML += "<tt><center>"
@@ -953,11 +953,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