From ccd1235599877ac77563c635262f12baa4e846b4 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 6 Jun 2017 14:48:19 -0500 Subject: [PATCH] testing --- code/modules/admin/whitelist.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/whitelist.dm b/code/modules/admin/whitelist.dm index 934e47aa23..d6e8fc908f 100644 --- a/code/modules/admin/whitelist.dm +++ b/code/modules/admin/whitelist.dm @@ -1,11 +1,11 @@ -#define WHITELISTFILE "config/whitelist.txt" +#define WHITELISTFILE "config/whitelist.txt, gamedata/config/whitelist.txt" GLOBAL_LIST(whitelist) GLOBAL_PROTECT(whitelist) /proc/load_whitelist() GLOB.whitelist = list() - for(var/line in world.file2list(WHITELISTFILE)) + for(var/line in world.file2list(WHITELISTFILE)) if(!line) continue if(findtextEx(line,"#",1,2))