From 4a5a80f3bba48fe565735d660ee38c88dcefbe28 Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Sat, 3 Nov 2012 16:57:59 +1000 Subject: [PATCH] fixed alien whitelist (wasn't being loaded at round start), removed myself from admins Signed-off-by: Cael_Aislinn --- code/game/jobs/whitelist.dm | 4 +--- code/world.dm | 2 ++ config/admins.txt | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm index e1897af506f..35f5279155b 100644 --- a/code/game/jobs/whitelist.dm +++ b/code/game/jobs/whitelist.dm @@ -1,6 +1,6 @@ #define WHITELISTFILE "data/whitelist.txt" -var/list/whitelist +var/list/whitelist = list() /proc/load_whitelist() var/text = file2text(WHITELISTFILE) @@ -25,10 +25,8 @@ proc/load_alienwhitelist() /proc/is_alien_whitelisted(mob/M, var/species) if(!alien_whitelist) - world << "no alien whitelist" return 0 if((M.client) && (M.client.holder) && (M.client.holder.level) && (M.client.holder.level >= 5)) - world << "admin alien whitelisted" return 1 if(M && species) for (var/s in alien_whitelist) diff --git a/code/world.dm b/code/world.dm index e3a9e76ad5c..917ccc1d3cc 100644 --- a/code/world.dm +++ b/code/world.dm @@ -23,6 +23,8 @@ investigate_reset() if (config.usewhitelist) load_whitelist() + if (config.usealienwhitelist) + load_alienwhitelist() LoadBansjob() Get_Holiday() //~Carn, needs to be here when the station is named so :P src.update_status() diff --git a/config/admins.txt b/config/admins.txt index f4fa450770d..c2b5bf032eb 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -3,7 +3,6 @@ arcalane - Game Admin asanadas - Game Admin bobbehluvspropane - Game Admin cacophony - Game Admin -caelaislinn - Game Master cajoes - Game Admin cib - Retired Admin compactninja - Retired Admin