[MIRROR] Fixes stopsounds properly (#5931)

* Fixes stopsounds properly (#36341)

* Revert "Merge pull request #36340 from vuonojenmustaturska/beelogreen"

This reverts commit 259838f38cfda32619e34cf41d57df4d45b75363, reversing
changes made to 111cd316a92f5f5840d96b1fc4bbe4cb7b1ce6fd.

* Fixes stopsounds properly

Also I forgot to actually block admins from bad protocols
it just showed them a message that it was blocked but didn't
block it

* Fixes stopsounds properly
This commit is contained in:
CitadelStationBot
2018-03-13 05:46:27 -05:00
committed by Poojawa
parent 8dc9fcf816
commit dff9dabf06
5 changed files with 20 additions and 11 deletions
+3
View File
@@ -132,6 +132,9 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic
music_data["musicRate"] = pitch
ehjax_send(data = music_data)
/datum/chatOutput/proc/stopMusic()
ehjax_send(data = "stopMusic")
/datum/chatOutput/proc/setMusicVolume(volume = "")
if(volume)
adminMusicVolume = CLAMP(text2num(volume), 0, 100)
@@ -442,6 +442,8 @@ function ehjaxCallback(data) {
} else if (data == 'roundrestart') {
opts.restarting = true;
internalOutput('<div class="connectionClosed internal restarting">The connection has been closed because the server is restarting. Please wait while you automatically reconnect.</div>', 'internal');
} else if (data == 'stopMusic') {
$('#adminMusic').prop('src', '');
} else {
//Oh we're actually being sent data instead of an instruction
var dataJ;