diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm
index 5f8b10fd31..0f392a47da 100644
--- a/code/_onclick/hud/ai.dm
+++ b/code/_onclick/hud/ai.dm
@@ -84,7 +84,7 @@
if(..())
return
var/mob/living/silicon/ai/AI = usr
- AI.announcement()
+ AI.ai_announcement()
/atom/movable/screen/ai/call_shuttle
name = "Call Emergency Shuttle"
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index fd2d98b67f..580ea8f2ee 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -979,10 +979,11 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
addtimer(CALLBACK(SSassets.transport, TYPE_PROC_REF(/datum/asset_transport, send_assets_slow), src, SSassets.transport.preload), 5 SECONDS)
#if (PRELOAD_RSC == 0)
- for (var/name in GLOB.vox_sounds)
- var/file = GLOB.vox_sounds[name]
- Export("##action=load_rsc", file)
- stoplag()
+ for (var/type in GLOB.vox_types)
+ for(var/word in GLOB.vox_types[type])
+ var/file = GLOB.vox_types[type][word]
+ Export("##action=load_rsc", file)
+ stoplag()
#endif
diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm
index 512b4f3dd2..98137ee76c 100644
--- a/code/modules/integrated_electronics/subtypes/output.dm
+++ b/code/modules/integrated_electronics/subtypes/output.dm
@@ -226,15 +226,28 @@
spawn_flags = IC_SPAWN_RESEARCH
/obj/item/integrated_circuit/output/sound/vox
- name = "ai vox sound circuit"
+ name = "Female ai vox sound circuit"
desc = "Takes a sound name as an input, and will play said sound when pulsed. This circuit is often found in AI announcement systems."
spawn_flags = IC_SPAWN_RESEARCH
+ var/voice_type = "Female"
/obj/item/integrated_circuit/output/sound/vox/Initialize(mapload)
- .= ..()
- sounds = GLOB.vox_sounds
+ sounds = GLOB.vox_types[voice_type]
+ . = ..()
extended_desc = "The first input pin determines which sound is used. It uses the AI Vox Broadcast word list. So either experiment to find words that work, or ask the AI to help in figuring them out. The second pin determines the volume of sound that is played, and the third determines if the frequency of the sound will vary with each activation."
+/obj/item/integrated_circuit/output/sound/vox/male
+ name = "Male ai vox sound circuit"
+ desc = "Takes a sound name as an input, and will play said sound when pulsed. This circuit is often found in AI announcement systems."
+ spawn_flags = IC_SPAWN_RESEARCH
+ voice_type = "Male"
+
+/obj/item/integrated_circuit/output/sound/vox/military
+ name = "Military ai vox sound circuit"
+ desc = "Takes a sound name as an input, and will play said sound when pulsed. This circuit is often found in AI announcement systems."
+ spawn_flags = IC_SPAWN_RESEARCH
+ voice_type = "Military"
+
/obj/item/integrated_circuit/output/text_to_speech
name = "text-to-speech circuit"
desc = "Takes any string as an input and will make the device say the string when pulsed."
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 45a49e01b4..96fdbb0ffb 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -104,6 +104,10 @@
// TODO: Currently unused, needs port from TG.
/// Station alert datum for showing alerts UI
var/datum/station_alert/alert_control
+ /// Announcement UI
+ var/datum/ai_announcement/ai_announcement
+ /// Lists possible spoken words for announcements
+ var/datum/announcement_help/announcement_help
///remember AI's last location
var/atom/lastloc
interaction_range = INFINITY
@@ -204,6 +208,8 @@
QDEL_NULL(doomsday_device)
QDEL_NULL(robot_control)
// QDEL_NULL(alert_control)
+ QDEL_NULL(ai_announcement)
+ QDEL_NULL(announcement_help)
QDEL_NULL(aiMulti)
QDEL_NULL(aiPDA)
malfhack = null
diff --git a/code/modules/mob/living/silicon/ai/ai_announcement.dm b/code/modules/mob/living/silicon/ai/ai_announcement.dm
new file mode 100644
index 0000000000..4165dec6bd
--- /dev/null
+++ b/code/modules/mob/living/silicon/ai/ai_announcement.dm
@@ -0,0 +1,59 @@
+#ifdef AI_VOX
+/mob/living/silicon/ai/verb/ai_announcement()
+ set name = "Vox Announcement"
+ set desc = "Make an audible announcement!"
+ set category = "AI Commands"
+
+ if(incapacitated())
+ return
+
+ if(!ai_announcement)
+ ai_announcement = new(src)
+
+ ai_announcement.ui_interact(src)
+
+/datum/ai_announcement
+ var/mob/living/silicon/ai/owner
+
+/datum/ai_announcement/New(mob/living/silicon/ai/new_owner)
+ if(!istype(new_owner))
+ qdel(src)
+ owner = new_owner
+
+/datum/ai_announcement/ui_status(mob/living/silicon/ai/user)
+ if(owner == user && !owner.incapacitated())
+ return ..()
+ return UI_CLOSE
+
+/datum/ai_announcement/ui_state(mob/user)
+ return GLOB.always_state
+
+/datum/ai_announcement/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "AIAnnouncement")
+ ui.open()
+
+/datum/ai_announcement/ui_data(mob/user)
+ var/list/data = ..()
+ data["last_announcement"] = owner.last_announcement
+ return data
+
+/datum/ai_announcement/ui_static_data(mob/user)
+ var/list/data = ..()
+ data["vox_types"] = GLOB.vox_types
+ return data
+
+/datum/ai_announcement/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ switch(action)
+ if("announce")
+ var/vox_type = params["vox_type"]
+ if(!vox_type)
+ return
+ var/to_speak = params["to_speak"]
+ if(!to_speak)
+ return
+ owner.announcement(vox_type, to_speak)
+ ui.close()
+#endif
diff --git a/code/modules/mob/living/silicon/ai/announcement_help.dm b/code/modules/mob/living/silicon/ai/announcement_help.dm
new file mode 100644
index 0000000000..f22b3ce4cb
--- /dev/null
+++ b/code/modules/mob/living/silicon/ai/announcement_help.dm
@@ -0,0 +1,54 @@
+#ifdef AI_VOX
+/mob/living/silicon/ai/verb/announcement_help()
+
+ set name = "Announcement Help"
+ set desc = "Display a list of vocal words to announce to the crew."
+ set category = "AI Commands"
+
+ if(incapacitated())
+ return
+
+ if(!announcement_help)
+ announcement_help = new(src)
+
+ announcement_help.ui_interact(src)
+
+/datum/announcement_help
+ var/mob/living/silicon/ai/owner
+
+/datum/announcement_help/New(mob/living/silicon/ai/new_owner)
+ if(!istype(new_owner))
+ qdel(src)
+ owner = new_owner
+
+/datum/announcement_help/ui_status(mob/living/silicon/ai/user)
+ if(owner == user && !owner.incapacitated())
+ return ..()
+ return UI_CLOSE
+
+/datum/announcement_help/ui_state(mob/user)
+ return GLOB.always_state
+
+/datum/announcement_help/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "AnnouncementHelp")
+ ui.open()
+
+/datum/announcement_help/ui_static_data(mob/user)
+ var/list/data = ..()
+ data["vox_types"] = GLOB.vox_types
+ return data
+
+/datum/announcement_help/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ switch(action)
+ if("say_word")
+ var/vox_type = params["vox_type"]
+ if(!vox_type)
+ return
+ var/to_speak = params["to_speak"]
+ if(!to_speak)
+ return
+ play_vox_word(to_speak, null, owner, vox_type)
+#endif
diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm
index 364fbbadf7..2a05266587 100644
--- a/code/modules/mob/living/silicon/ai/say.dm
+++ b/code/modules/mob/living/silicon/ai/say.dm
@@ -79,59 +79,23 @@
// Make sure that the code compiles with AI_VOX undefined
#ifdef AI_VOX
-#define VOX_DELAY 600
-/mob/living/silicon/ai/verb/announcement_help()
-
- set name = "Announcement Help"
- set desc = "Display a list of vocal words to announce to the crew."
- set category = "AI Commands"
-
- if(incapacitated())
- return
-
- var/dat = {"
- WARNING: Misuse of the announcement system will get you job banned.
- Here is a list of words you can type into the 'Announcement' button to create sentences to vocally announce to everyone on the same level at you.
-
You can also click on the word to PREVIEW it.
-
You can only say 30 words for every announcement.
-
Do not use punctuation as you would normally, if you want a pause you can use the full stop and comma characters by separating them with spaces, like so: 'Alpha . Test , Bravo'.
-
Numbers are in word format, e.g. eight, sixty, etc
-
Sound effects begin with an 's' before the actual word, e.g. scensor
These words are not available on the announcement system: {missing_words.join(" ")}
: null}
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/AnnouncementHelp.js b/tgui/packages/tgui/interfaces/AnnouncementHelp.js
new file mode 100644
index 0000000000..1869a21eab
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/AnnouncementHelp.js
@@ -0,0 +1,100 @@
+import { filter } from 'common/collections';
+import { flow } from 'common/fp';
+import { createSearch } from 'common/string';
+import { useBackend } from '../backend';
+import { Button, Collapsible, Icon, Input, Section, Stack, Tabs } from '../components';
+import { useLocalState } from '../backend';
+import { Window } from '../layouts';
+
+export const AnnouncementHelp = (props, context) => {
+ const { act, data } = useBackend(context);
+ const { vox_types = {} } = data;
+
+ const [
+ current_page,
+ set_page,
+ ] = useLocalState(context, 'current_page', 0);
+
+ const [
+ search_text,
+ set_search_text,
+ ] = useLocalState(context, 'search_text', '');
+
+ // I love `Object`s!!
+ const words_filtered = prepare_search(Object.keys(vox_types[Object.keys(vox_types)[current_page]]), search_text);
+
+ return (
+
+
+
+
+
+
+ WARNING: Misuse of the announcement system will get you job banned.
+ Here is a list of words you can type into the 'Announcement' button to create sentences to vocally announce to everyone on the same level at you.
+
You can also click on the word to PREVIEW it.
+
You can only say 30 words for every announcement.
+
Do not use punctuation as you would normally, if you want a pause you can use the full stop and comma characters by separating them with spaces, like so: 'Alpha . Test , Bravo'.
+
Numbers are in word format, e.g. eight, sixty, etc
+
Sound effects begin with an 's' before the actual word, e.g. scensor