From 4ceea2a134576b63a09343d241421a25820ac09c Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sat, 10 Jun 2017 23:28:03 -0500
Subject: [PATCH] Update whitelist.dm

---
 code/modules/admin/whitelist.dm | 44 ++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/code/modules/admin/whitelist.dm b/code/modules/admin/whitelist.dm
index 974a753027..082936e0e8 100644
--- a/code/modules/admin/whitelist.dm
+++ b/code/modules/admin/whitelist.dm
@@ -1,23 +1,23 @@
-#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))
-		if(!line)
-			continue
-		if(findtextEx(line,"#",1,2))
-			continue
+#define WHITELISTFILE "config/whitelist.txt"
+
+GLOBAL_LIST(whitelist)
+GLOBAL_PROTECT(whitelist)
+
+/proc/load_whitelist()
+	GLOB.whitelist = list()
+	for(var/line in world.file2list(WHITELISTFILE))
+		if(!line)
+			continue
+		if(findtextEx(line,"#",1,2))
+			continue
 		GLOB.whitelist += ckey(line)
-
-	if(!GLOB.whitelist.len)
-		GLOB.whitelist = null
-
-/proc/check_whitelist(var/ckey)
-	if(!GLOB.whitelist)
-		return FALSE
-	. = (ckey in GLOB.whitelist)
-
-#undef WHITELISTFILE
+
+	if(!GLOB.whitelist.len)
+		GLOB.whitelist = null
+
+/proc/check_whitelist(var/ckey)
+	if(!GLOB.whitelist)
+		return FALSE
+	. = (ckey in GLOB.whitelist)
+
+#undef WHITELISTFILE