Revert "Fix config_dir usage (#34469)"

This commit is contained in:
Leo
2018-01-18 23:38:15 -02:00
committed by CitadelStationBot
parent c545dc2f79
commit a0f815c5c4
4 changed files with 84 additions and 0 deletions
+3
View File
@@ -126,7 +126,10 @@ SUBSYSTEM_DEF(ticker)
login_music = pick(music)
else
login_music = "config/title_music/sounds/[pick(music)]"
<<<<<<< HEAD
=======
>>>>>>> 1bc398c... Merge pull request #34603 from optimumtact/pigfuck
crewobjlist = typesof(/datum/objective/crew)
miscreantobjlist = (typesof(/datum/objective/miscreant) - /datum/objective/miscreant)
+4
View File
@@ -35,7 +35,11 @@ SUBSYSTEM_DEF(title)
if(length(title_screens))
file_path = "config/title_screens/images/[pick(title_screens)]"
<<<<<<< HEAD
=======
>>>>>>> 1bc398c... Merge pull request #34603 from optimumtact/pigfuck
if(!file_path)
file_path = "icons/default_title.dmi"