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

Config dir again except this time it works

Browse Source
This commit is contained in:
Jordan Brown
2018-01-21 13:32:12 -05:00
committed by CitadelStationBot
parent f692ffaa0c
commit 8dead1da6a
14 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/job.dm
+1 -1
View File
@@ -450,7 +450,7 @@ SUBSYSTEM_DEF(job)
/datum/controller/subsystem/job/proc/LoadJobs()
var/jobstext = file2text("config/jobs.txt")
var/jobstext = file2text("[global.config.directory]/jobs.txt")
for(var/datum/job/J in occupations)
var/regex/jobs = new("[J.title]=(-1|\\d+),(-1|\\d+)")
jobs.Find(jobstext)
code/controllers/subsystem/mapping.dm
+3 -3
View File
@@ -229,8 +229,8 @@ GLOBAL_LIST_EMPTY(the_station_areas)
/datum/controller/subsystem/mapping/proc/preloadRuinTemplates()
// Still supporting bans by filename
var/list/banned = generateMapList("config/lavaruinblacklist.txt")
banned += generateMapList("config/spaceruinblacklist.txt")
var/list/banned = generateMapList("[global.config.directory]/lavaruinblacklist.txt")
banned += generateMapList("[global.config.directory]/spaceruinblacklist.txt")
for(var/item in sortList(subtypesof(/datum/map_template/ruin), /proc/cmp_ruincost_priority))
var/datum/map_template/ruin/ruin_type = item
@@ -251,7 +251,7 @@ GLOBAL_LIST_EMPTY(the_station_areas)
space_ruins_templates[R.name] = R
/datum/controller/subsystem/mapping/proc/preloadShuttleTemplates()
var/list/unbuyable = generateMapList("config/unbuyableshuttles.txt")
var/list/unbuyable = generateMapList("[global.config.directory]/unbuyableshuttles.txt")
for(var/item in subtypesof(/datum/map_template/shuttle))
var/datum/map_template/shuttle/shuttle_type = item
code/controllers/subsystem/ticker.dm
+2 -2
View File
@@ -89,7 +89,7 @@ SUBSYSTEM_DEF(ticker)
"aiff" = TRUE
)
var/list/provisional_title_music = flist("config/title_music/sounds/")
var/list/provisional_title_music = flist("[global.config.directory]/title_music/sounds/")
var/list/music = list()
var/use_rare_music = prob(1)
@@ -125,7 +125,7 @@ SUBSYSTEM_DEF(ticker)
music = world.file2list(ROUND_START_MUSIC_LIST, "\n")
login_music = pick(music)
else
login_music = "config/title_music/sounds/[pick(music)]"
login_music = "[global.config.directory]/title_music/sounds/[pick(music)]"
crewobjlist = typesof(/datum/objective/crew)
miscreantobjlist = (typesof(/datum/objective/miscreant) - /datum/objective/miscreant)
code/controllers/subsystem/title.dm
+5 -1
View File
@@ -17,7 +17,7 @@ SUBSYSTEM_DEF(title)
previous_icon = new(previous_icon)
fdel("data/previous_title.dat")
var/list/provisional_title_screens = flist("config/title_screens/images/")
var/list/provisional_title_screens = flist("[global.config.directory]/title_screens/images/")
var/list/title_screens = list()
var/use_rare_screens = prob(1)
@@ -34,7 +34,11 @@ SUBSYSTEM_DEF(title)
break
if(length(title_screens))
<<<<<<< HEAD
file_path = "config/title_screens/images/[pick(title_screens)]"
=======
file_path = "[global.config.directory]/title_screens/images/[pick(title_screens)]"
>>>>>>> 015258d... Config dir again except this time it works (#34606)
if(!file_path)
file_path = "icons/default_title.dmi"