cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 15:17:01 +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/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