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

Update ticker.dm

Browse Source
This commit is contained in:
deathride58
2018-01-19 08:47:49 -05:00
committed by GitHub
parent cf538efeb7
commit 7b5b354e9d
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/ticker.dm
-4
View File
@@ -126,10 +126,6 @@ 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)