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 12:32:29 -06: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/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"