cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Makes lobby music use youtube-dl and goonchat""

Browse Source
This commit is contained in:
nichlas0010
2018-10-31 23:51:33 +01:00
committed by GitHub
parent a7932a6887
commit 692f12d29b
10 changed files with 88 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/controllers/subsystem/ticker.dm
View File

@@ -60,7 +60,7 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/Initialize(timeofday)
load_mode()
var/list/byond_sound_formats = list(
/*var/list/byond_sound_formats = list( //yogs start - goonchat lobby music
"mid" = TRUE,
"midi" = TRUE,
"mod" = TRUE,
@@ -111,8 +111,10 @@ SUBSYSTEM_DEF(ticker)
music = world.file2list(ROUND_START_MUSIC_LIST, "\n")
login_music = pick(music)
else
login_music = "[global.config.directory]/title_music/sounds/[pick(music)]"
login_music = "[global.config.directory]/title_music/sounds/[pick(music)]"*/
login_music = choose_lobby_music()
if(!login_music)
to_chat(world, "<span class='boldwarning'>Could not load lobby music.</span>") //yogs end
if(!GLOB.syndicate_code_phrase)
GLOB.syndicate_code_phrase = generate_code_phrase()
@@ -573,7 +575,7 @@ SUBSYSTEM_DEF(ticker)
round_end_sound_sent = TRUE
// yogs start - Mods can reboot when last ticket is closed
/datum/controller/subsystem/ticker/proc/Reboot(reason, end_string, delay, force = FALSE)
/datum/controller/subsystem/ticker/proc/Reboot(reason, end_string, delay, force = FALSE)
set waitfor = FALSE
if(usr && !force)
if(!check_rights(R_SERVER, TRUE))