From 1d291fff11b05109f73fac3c47b56c693d46dd0c Mon Sep 17 00:00:00 2001
From: Ater Ignis <aterdragon@gmail.com>
Date: Wed, 6 Feb 2013 13:35:01 +0400
Subject: [PATCH] load alien whitelist on startup, all races available if not
 using WL

---
 code/game/jobs/whitelist.dm | 2 ++
 code/world.dm               | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm
index dcfa843d4a..f28de56dc4 100644
--- a/code/game/jobs/whitelist.dm
+++ b/code/game/jobs/whitelist.dm
@@ -22,6 +22,8 @@ proc/load_alienwhitelist()
 
 //todo: admin aliens
 /proc/is_alien_whitelisted(mob/M, var/species)
+	if(!config.usealienwhitelist)
+		return 1
 	if(species == "human" || species == "Human")
 		return 1
 	if(check_rights(R_ADMIN, 0))
diff --git a/code/world.dm b/code/world.dm
index 5c572892e2..2efd352dcf 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -32,6 +32,8 @@
 	LoadBansjob()
 	if(config.usewhitelist)
 		load_whitelist()
+	if(config.usealienwhitelist)
+		load_alienwhitelist()
 	jobban_loadbanfile()
 	jobban_updatelegacybans()
 	LoadBans()