From 793b86b286fb88affeb75bc3f86b78df4acdca40 Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Wed, 23 Sep 2015 06:53:28 +0200
Subject: [PATCH] Config option for lobby music

---
 code/controllers/configuration.dm | 7 ++++++-
 code/game/sound.dm                | 2 +-
 config/example/config.txt         | 7 +++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index fa7407ff999..a171efe1c8a 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -163,6 +163,8 @@
 	var/disable_away_missions = 0 // disable away missions
 	
 	var/autoconvert_notes = 0 //if all connecting player's notes should attempt to be converted to the database
+	
+	var/disable_lobby_music = 0 // Disables the lobby music
 
 /datum/configuration/New()
 	var/list/L = subtypesof(/datum/game_mode)
@@ -525,7 +527,10 @@
 					config.disable_away_missions = 1
 
 				if("autoconvert_notes")
-					config.autoconvert_notes = 1				
+					config.autoconvert_notes = 1	
+
+				if("disable_lobby_music")
+					config.disable_lobby_music = 1						
 					
 				else
 					diary << "Unknown setting in configuration: '[name]'"
diff --git a/code/game/sound.dm b/code/game/sound.dm
index 165a98d3dcd..0d601c280be 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -95,7 +95,7 @@ var/const/FALLOFF_SOUNDS = 0.5
 	src << S
 
 /client/proc/playtitlemusic()
-	if(!ticker || !ticker.login_music) return
+	if(!ticker || !ticker.login_music || config.disable_lobby_music) return
 	if(prefs.sound & SOUND_LOBBY)
 		src << sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS
 
diff --git a/config/example/config.txt b/config/example/config.txt
index d573e02d0d4..a00f5a52a27 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -290,5 +290,8 @@ PLAYER_REROUTE_CAP 0
 ## Disable the loading of away missions
 #DISABLE_AWAY_MISSIONS
 
-## Uncomment this out if you still use the old .sav file based notes system and haven't used the mass conversion proc
-#AUTOCONVERT_NOTES
\ No newline at end of file
+## Uncomment this if you still use the old .sav file based notes system and haven't used the mass conversion proc
+#AUTOCONVERT_NOTES
+
+## Uncomment this if you want to disable the lobby music
+#DISABLE_LOBBY_MUSIC
\ No newline at end of file