Fixed a duplicate definition bug with WHITELISTED.

Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/new_player/new_player.dm
	code/setup.dm
This commit is contained in:
Zuhayr
2014-01-06 23:59:21 -05:00
committed by ZomgPonies
parent f66b5a3ccc
commit e09a00fe0e
4 changed files with 19 additions and 10 deletions
+1 -1
View File
@@ -957,7 +957,7 @@ datum/preferences
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 & IS_WHITELISTED ))))
new_languages += lang
languages_available = 1