From 986f54297378eefcc022888905f71b3da331fd05 Mon Sep 17 00:00:00 2001
From: Ava <ava.perhaps+github@pm.me>
Date: Thu, 27 Jul 2023 18:10:27 -0400
Subject: [PATCH] Adds a volume channel for system sounds (roundstart, votes,
 etc)

---
 code/__defines/misc.dm                | 2 ++
 code/controllers/subsystems/ticker.dm | 6 ++++--
 code/controllers/subsystems/vote.dm   | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm
index 59958f9544..201be9b38c 100644
--- a/code/__defines/misc.dm
+++ b/code/__defines/misc.dm
@@ -335,6 +335,7 @@ var/global/list/##LIST_NAME = list();\
 #define VOLUME_CHANNEL_AMBIENCE "Ambience"
 #define VOLUME_CHANNEL_ALARMS "Alarms"
 #define VOLUME_CHANNEL_DOORS "Doors"
+#define VOLUME_CHANNEL_SYSTEM "System"
 
 // Make sure you update this or clients won't be able to adjust the channel
 GLOBAL_LIST_INIT(all_volume_channels, list(
@@ -342,6 +343,7 @@ GLOBAL_LIST_INIT(all_volume_channels, list(
 	VOLUME_CHANNEL_AMBIENCE,
 	VOLUME_CHANNEL_ALARMS,
 	VOLUME_CHANNEL_DOORS,
+	VOLUME_CHANNEL_SYSTEM,
 ))
 
 /*
diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm
index be750f9013..39b9157691 100644
--- a/code/controllers/subsystems/ticker.dm
+++ b/code/controllers/subsystems/ticker.dm
@@ -79,7 +79,8 @@ var/global/datum/controller/subsystem/ticker/ticker
 /datum/controller/subsystem/ticker/proc/pregame_welcome()
 	to_world("<span class='boldannounce notice'><em>Welcome to the pregame lobby!</em></span>")
 	to_world("<span class='boldannounce notice'>Please set up your character and select ready. The round will start in [pregame_timeleft] seconds.</span>")
-	world << sound('sound/misc/server-ready.ogg', volume = 100)
+	for (var/mob/M in player_list)
+		M.playsound_local(null, 'sound/misc/server-ready.ogg', 100, FALSE, is_global = TRUE, volume_channel = VOLUME_CHANNEL_SYSTEM)
 
 // Called during GAME_STATE_PREGAME (RUNLEVEL_LOBBY)
 /datum/controller/subsystem/ticker/proc/pregame_tick()
@@ -185,7 +186,8 @@ var/global/datum/controller/subsystem/ticker/ticker
 			if (S.name != "AI")
 				qdel(S)
 		to_world("<span class='boldannounce notice'><em>Enjoy the game!</em></span>")
-		world << sound('sound/AI/welcome.ogg') // Skie
+		for (var/mob/M in player_list)
+			M.playsound_local(null, 'sound/AI/welcome.ogg', 100, FALSE, is_global = TRUE, volume_channel = VOLUME_CHANNEL_SYSTEM)
 		//Holiday Round-start stuff	~Carn
 		Holiday_Game_Start()
 
diff --git a/code/controllers/subsystems/vote.dm b/code/controllers/subsystems/vote.dm
index f965265441..01645674a8 100644
--- a/code/controllers/subsystems/vote.dm
+++ b/code/controllers/subsystems/vote.dm
@@ -255,7 +255,8 @@ SUBSYSTEM_DEF(vote)
 
 		to_world("<font color='purple'><b>[text]</b>\nType <b>vote</b> or click <a href='?src=\ref[src]'>here</a> to place your votes.\nYou have [config.vote_period / 10] seconds to vote.</font>")
 		if(vote_type == VOTE_CREW_TRANSFER || vote_type == VOTE_GAMEMODE || vote_type == VOTE_CUSTOM)
-			world << sound('sound/ambience/alarm4.ogg', repeat = 0, wait = 0, volume = 50, channel = 3)
+			for (var/mob/M in player_list)
+				M.playsound_local(null, 'sound/ambience/alarm4.ogg', 50, FALSE, is_global = TRUE, channel = 3, volume_channel = VOLUME_CHANNEL_SYSTEM)
 
 		if(mode == VOTE_GAMEMODE && round_progressing)
 			gamemode_vote_called = TRUE