From de54b1cdd8f3e44158fd0f9473ffc0ae6f6f47fd Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 12 Nov 2017 13:52:14 -0500 Subject: [PATCH 1/2] Merge pull request #32585 from Qbopper/turnitdown adjusted default internet song volume to 25 --- code/modules/goonchat/browserOutput.dm | 2 +- code/modules/goonchat/browserassets/js/browserOutput.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/goonchat/browserOutput.dm b/code/modules/goonchat/browserOutput.dm index 602cef5f5e..7e0ca0bb7d 100644 --- a/code/modules/goonchat/browserOutput.dm +++ b/code/modules/goonchat/browserOutput.dm @@ -13,7 +13,7 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic var/cookieSent = FALSE // Has the client sent a cookie for analysis var/broken = FALSE var/list/connectionHistory //Contains the connection history passed from chat cookie - var/adminMusicVolume = 100 //This is for the Play Global Sound verb + var/adminMusicVolume = 25 //This is for the Play Global Sound verb /datum/chatOutput/New(client/C) owner = C diff --git a/code/modules/goonchat/browserassets/js/browserOutput.js b/code/modules/goonchat/browserassets/js/browserOutput.js index f027b523aa..647e421981 100644 --- a/code/modules/goonchat/browserassets/js/browserOutput.js +++ b/code/modules/goonchat/browserassets/js/browserOutput.js @@ -65,6 +65,8 @@ var opts = { 'volumeUpdateDelay': 5000, //Time from when the volume updates to data being sent to the server 'volumeUpdating': false, //True if volume update function set to fire 'updatedVolume': 0, //The volume level that is sent to the server + + 'defaultMusicVolume': 25, }; @@ -604,6 +606,8 @@ $(function() { opts.updatedVolume = newVolume; sendVolumeUpdate(); internalOutput('Loaded music volume of: '+savedConfig.smusicVolume+'', 'internal'); + } else { + $('#adminMusic').prop('volume', opts.defaultMusicVolume); } (function() {