From c404ddd1e24f97b0b22e985a7dbc3965a6b8f98f Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Tue, 18 Aug 2020 15:45:55 +0100
Subject: [PATCH] Changed vox_alerts to global list

---
 code/defines/vox_sounds.dm                | 11 ++++++++++-
 code/modules/mob/living/silicon/ai/say.dm | 12 ++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/code/defines/vox_sounds.dm b/code/defines/vox_sounds.dm
index 1d7bb9753a0..5b44f80895b 100644
--- a/code/defines/vox_sounds.dm
+++ b/code/defines/vox_sounds.dm
@@ -1,7 +1,16 @@
 // List is required to compile the resources into the game when it loads.
 // Dynamically loading it has bad results with sounds overtaking each other, even with the wait variable.
 
-GLOBAL_LIST_INIT(vox_sounds, list("," = 'sound/vox_fem/,.ogg',
+GLOBAL_LIST_INIT(vox_alerts, list(
+"bizwarn" = 'sound/vox_fem/bizwarn.ogg',
+"bloop" = 'sound/vox_fem/bloop.ogg',
+"buzwarn" = 'sound/vox_fem/buzwarn.ogg',
+"dadeda" = 'sound/vox_fem/dadeda.ogg',
+"deeoo" = 'sound/vox_fem/deeoo.ogg'
+))
+
+GLOBAL_LIST_INIT(vox_sounds, list(
+"," = 'sound/vox_fem/,.ogg',
 "." = 'sound/vox_fem/..ogg',
 "a" = 'sound/vox_fem/a.ogg',
 "abortions" = 'sound/vox_fem/abortions.ogg',
diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm
index 1b61e674b36..a4e90b50f8e 100644
--- a/code/modules/mob/living/silicon/ai/say.dm
+++ b/code/modules/mob/living/silicon/ai/say.dm
@@ -81,8 +81,8 @@ GLOBAL_VAR_INIT(announcing_vox, 0) // Stores the time of the last announcement
 	<font class='bad'>WARNING:</font><BR>Misuse of the announcement system will get you job banned.<HR>"
 
 	// Show alert and voice sounds separately
-	var/vox_words = GLOB.vox_sounds - vox_alerts
-	dat = help_format(vox_alerts, dat)
+	var/vox_words = GLOB.vox_sounds - GLOB.vox_alerts
+	dat = help_format(GLOB.vox_alerts, dat)
 	dat = help_format(vox_words, dat)
 
 	var/datum/browser/popup = new(src, "announce_help", "Announcement Help", 500, 400)
@@ -192,11 +192,3 @@ GLOBAL_VAR_INIT(announcing_vox, 0) // Stores the time of the last announcement
 //	to_chat(src, "Downloading [file]")
 		var/sound/S = sound("[VOX_PATH][file]")
 		src << browse_rsc(S)
-
-var/vox_alerts = list(
-"bizwarn" = 'sound/vox_fem/bizwarn.ogg',
-"bloop" = 'sound/vox_fem/bloop.ogg',
-"buzwarn" = 'sound/vox_fem/buzwarn.ogg',
-"dadeda" = 'sound/vox_fem/dadeda.ogg',
-"deeoo" = 'sound/vox_fem/deeoo.ogg'
-)