cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-15 00:53:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pr/2'

Browse Source 
Conflicts:
	baystation12.dme
	config/example/dbconfig.txt
This commit is contained in:
ZomgPonies
2013-08-17 15:22:49 -04:00
parent 6ce59ec74b 02b5cdaca3
commit ebfa0a0fd2
56 changed files with 255 additions and 64416 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+13 -9
View File
@@ -807,7 +807,7 @@ datum/preferences
if(config.usealienwhitelist) //If we're using the whitelist, make sure to check it!
for(var/S in whitelisted_species)
if(is_alien_whitelisted(user,S) || (S == "Unathi" && is_alien_whitelisted(user,"Soghun")))
if(is_alien_whitelisted(user,S))
new_species += S
whitelisted = 1
if(!whitelisted)
@@ -863,19 +863,23 @@ datum/preferences
s_tone = 0
if("language")
var/languages_available
var/list/new_languages = list("None")
var/language_whitelisted = 0
if(config.usealienwhitelist)
for(var/L in all_languages)
if(is_alien_whitelisted(user, L))
new_languages += L
language_whitelisted = 1
var/datum/language/lang = all_languages[L]
if((!(lang.flags & RESTRICTED)) && (is_alien_whitelisted(user, L)||(!( lang.flags & WHITELISTED ))))
new_languages += lang
languages_available = 1
if(!(languages_available))
alert(user, "There are not currently any available secondary languages.")
else
for(var/L in all_languages)
new_languages += L
if(!language_whitelisted)
alert(user, "You cannot select a secondary language as you need to be whitelisted. If you wish to enable a language, post in the Alien Whitelist forums.")
var/datum/language/lang = all_languages[L]
if(!(lang.flags & RESTRICTED))
new_languages += lang
language = input("Please select a secondary language", "Character Generation", null) in new_languages