shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4998 from Citadel-Station-13/upstream-merge-34606

Browse Source 
[MIRROR] Config dir again except this time it works
This commit is contained in:
deathride58
2018-01-21 22:41:13 +00:00
committed by GitHub
parent 07b6d8ab11 574bc8fe25
commit 625d46fa19
14 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_ranks.dm
+2 -2
View File
@@ -122,7 +122,7 @@ GLOBAL_PROTECT(admin_ranks)
if(CONFIG_GET(flag/admin_legacy_system))
var/previous_rights = 0
//load text from file and process each line separately
for(var/line in world.file2list("config/admin_ranks.txt"))
for(var/line in world.file2list("[global.config.directory]/admin_ranks.txt"))
if(!line)
continue
if(findtextEx(line,"#",1,2))
@@ -195,7 +195,7 @@ GLOBAL_PROTECT(admin_ranks)
if(CONFIG_GET(flag/admin_legacy_system))
//load text from file
var/list/lines = world.file2list("config/admins.txt")
var/list/lines = world.file2list("[global.config.directory]/admins.txt")
//process each line separately
for(var/line in lines)
code/modules/admin/verbs/deadsay.dm
+1 -1
View File
@@ -19,7 +19,7 @@
if (!msg)
return
var/static/nicknames = world.file2list("config/admin_nicknames.txt")
var/static/nicknames = world.file2list("[global.config.directory]/admin_nicknames.txt")
var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>ADMIN([src.holder.fakekey ? pick(nicknames) : src.key])</span> says, <span class='message'>\"[msg]\"</span></span>"
code/modules/admin/whitelist.dm
+1 -1
View File
@@ -1,4 +1,4 @@
#define WHITELISTFILE "config/whitelist.txt"
#define WHITELISTFILE "[global.config.directory]/whitelist.txt"
GLOBAL_LIST(whitelist)
GLOBAL_PROTECT(whitelist)