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

[MIRROR] Config dir again except this time it works
2018-01-21 22:41:13 +00:00
parent 07b6d8ab11 574bc8fe25
commit 625d46fa19
14 changed files with 32 additions and 30 deletions
@@ -190,7 +190,7 @@

 /datum/ai_laws/custom/New() //This reads silicon_laws.txt and allows server hosts to set custom AI starting laws.
 	..()
-	for(var/line in world.file2list("config/silicon_laws.txt"))
+	for(var/line in world.file2list("[global.config.directory]/silicon_laws.txt"))
 		if(!line)
 			continue
 		if(findtextEx(line,"#",1,2))