cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Config dir again except this time it works (#34606)

Browse Source 
* Revert "Revert "Fix config_dir usage (#34469)""

* Make config exist before world/New but not load it until then
This commit is contained in:
Jordan Brown
2018-01-21 19:32:12 +01:00
committed by AnturK
parent b4a8b8b8b1
commit 015258d01c
14 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/job.dm
+1 -1
View File
@@ -443,7 +443,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
@@ -82,7 +82,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)
@@ -118,7 +118,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)]"
if(!GLOB.syndicate_code_phrase)
code/controllers/subsystem/title.dm
+3 -3
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)
@@ -27,8 +27,8 @@ SUBSYSTEM_DEF(title)
title_screens += S
if(length(title_screens))
file_path = "config/title_screens/images/[pick(title_screens)]"
file_path = "[global.config.directory]/title_screens/images/[pick(title_screens)]"
if(!file_path)
file_path = "icons/default_title.dmi"