cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-28 11:02:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39 from skull132/master

Browse Source 
Fixing Whitelist
This commit is contained in:
skull132
2016-02-02 00:46:34 +02:00
parent 0fa52eb9b7 ec03d4ecc2
commit 65a40bfa96
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/jobs/whitelist.dm
View File

@@ -75,7 +75,7 @@ var/list/whitelist = list()
if (lowertext(species) == "human")
return 1
if(!alien_whitelist)
if (!alien_whitelist && !config.sql_whitelists)
return 0
if (config.sql_whitelists)

4
code/modules/client/preferences.dm
View File

@@ -649,7 +649,7 @@ datum/preferences
if(config.usealienwhitelist) //If we're using the whitelist, make sure to check it!
if(!(current_species.flags & CAN_JOIN))
restricted = 2
else if((current_species.flags & IS_WHITELISTED) && !is_alien_whitelisted(user,current_species))
else if((current_species.flags & IS_WHITELISTED) && !is_alien_whitelisted(user,current_species.name))
restricted = 1
if(restricted)
@@ -657,7 +657,7 @@ datum/preferences
dat += "<font color='red'><b>You cannot play as this species.</br><small>If you wish to be whitelisted, you can make an application post on <a href='?src=\ref[user];preference=open_whitelist_forum'>the forums</a>.</small></b></font></br>"
else if(restricted == 2)
dat += "<font color='red'><b>You cannot play as this species.</br><small>This species is not available for play as a station race..</small></b></font></br>"
if(!restricted || check_rights(R_ADMIN, 0))
if(!restricted)
dat += "\[<a href='?src=\ref[user];preference=species;task=input;newspecies=[species_preview]'>select</a>\]"
dat += "</center></body>"