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

Revert "Fix config_dir usage (#34469)"

Browse Source
This commit is contained in:
Leo
2018-01-18 19:38:40 -06:00
committed by CitadelStationBot
parent c545dc2f79
commit a0f815c5c4
4 changed files with 84 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/ticker.dm
+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)