From e9d0cc82a1ad56891b69ced848d1203ba183cde3 Mon Sep 17 00:00:00 2001
From: Oxdeception <9624-oxdeception@users.noreply.gitgud.io>
Date: Thu, 31 Jul 2025 18:11:44 -0400
Subject: [PATCH 1/6] Allows the AAC to send messages over the radio

---
 .../_DV/AACTablet/UI/AACBoundUserInterface.cs | 16 +++++++-
 .../_DV/AACTablet/UI/AACWindow.xaml           |  6 ++-
 .../_DV/AACTablet/UI/AACWindow.xaml.cs        | 35 ++++++++++++++--
 .../_DV/AACTablet/AACTabletSystem.cs          | 41 ++++++++++++++++++-
 .../_DV/AACTablet/AACTabletUiMessages.cs      | 10 ++++-
 .../Entities/Objects/Devices/aac_tablet.yml   |  3 +-
 6 files changed, 102 insertions(+), 9 deletions(-)

diff --git a/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs b/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs
index b3f0eb1689..4c0aba7430 100644
--- a/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs
+++ b/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs
@@ -30,9 +30,10 @@ public sealed class AACBoundUserInterface : BoundUserInterface
         _window.SubmitPressed += OnSubmit;
     }
 
-    private void OnPhraseButtonPressed(List<ProtoId<QuickPhrasePrototype>> phraseId)
+    // starcup: added prefix for radio messages
+    private void OnPhraseButtonPressed(List<ProtoId<QuickPhrasePrototype>> phraseId, string prefix)
     {
-        SendMessage(new AACTabletSendPhraseMessage(phraseId));
+        SendMessage(new AACTabletSendPhraseMessage(phraseId, prefix));
     }
 
     private void OnTyping()
@@ -46,4 +47,15 @@ public sealed class AACBoundUserInterface : BoundUserInterface
         _typing ??= EntMan.System<TypingIndicatorSystem>();
         _typing?.ClientSubmittedChatText();
     }
+
+    // starcup
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+
+        if (state is not AACTabletBuiState msg)
+            return;
+
+        _window?.Update(msg);
+    }
 }
diff --git a/Content.Client/_DV/AACTablet/UI/AACWindow.xaml b/Content.Client/_DV/AACTablet/UI/AACWindow.xaml
index f845c71343..763ec0d198 100644
--- a/Content.Client/_DV/AACTablet/UI/AACWindow.xaml
+++ b/Content.Client/_DV/AACTablet/UI/AACWindow.xaml
@@ -29,7 +29,11 @@
                                       StyleClasses="AacBufferText"
                                       Margin="8 4"/>
                         </PanelContainer>
-
+            <!-- begin starcup REMINDER TO MAKE A BUTTON FOR RADIO CHANNELS RAh-->
+            <Button Name="ClearButton" Text="{Loc 'aac-tablet-backspace'}" TextAlign="Center" StyleClasses="OpenBoth" />
+            <OptionButton Name="RadioChannels" StyleClasses="OpenBoth"/>
+            <Button Name="SendButton" Text="{Loc 'aac-tablet-send'}" TextAlign="Center" StyleClasses="OpenLeft"/>
+            <!-- end starcup -->
                         <Button Name="ClearButton"
                                 Text="{Loc 'aac-tablet-backspace'}"
                                 TextAlign="Center"
diff --git a/Content.Client/_DV/AACTablet/UI/AACWindow.xaml.cs b/Content.Client/_DV/AACTablet/UI/AACWindow.xaml.cs
index 2867ab0505..809303ce1b 100644
--- a/Content.Client/_DV/AACTablet/UI/AACWindow.xaml.cs
+++ b/Content.Client/_DV/AACTablet/UI/AACWindow.xaml.cs
@@ -2,6 +2,8 @@ using System.Linq;
 using System.Numerics;
 using Content.Client.UserInterface.Controls;
 using Content.Shared._DV.QuickPhrase;
+using Content.Shared.Chat; // starcup
+using Content.Shared.Radio; // starcup
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -16,7 +18,7 @@ public sealed partial class AACWindow : FancyWindow
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     private readonly List<QuickPhrasePrototype> _phrases;
     private readonly Dictionary<string, List<QuickPhrasePrototype>> _filteredPhrases = new();
-    public event Action<List<ProtoId<QuickPhrasePrototype>>>? PhraseButtonPressed;
+    public event Action<List<ProtoId<QuickPhrasePrototype>>, string>? PhraseButtonPressed; // starcup: radio second parameter
     public event Action? Typing;
     public event Action? SubmitPressed;
 
@@ -42,10 +44,17 @@ public sealed partial class AACWindow : FancyWindow
         SearchBar.OnTextChanged += FilterSearch;
         SendButton.OnPressed += SendBuffer;
         ClearButton.OnPressed += BackspaceBuffer;
+        RadioChannels.OnItemSelected += OnChannelSelected; // starcup
         PopulateGui();
         FilterSearch(null);
     }
 
+    // starcup
+    private void OnChannelSelected(OptionButton.ItemSelectedEventArgs args)
+    {
+        RadioChannels.SelectId(args.Id);
+    }
+
     private void BackspaceBuffer(BaseButton.ButtonEventArgs obj)
     {
         if (_phraseBuffer.Count == 0)
@@ -68,12 +77,15 @@ public sealed partial class AACWindow : FancyWindow
 
     private void SendBuffer(BaseButton.ButtonEventArgs obj)
     {
-        PhraseButtonPressed?.Invoke(_phraseBuffer);
+        PhraseButtonPressed?.Invoke(_phraseBuffer, Prefix); // starcup: Prefix
         _phraseBuffer.Clear();
         BufferedString.Text = string.Empty;
         SubmitPressed?.Invoke();
     }
 
+    // starcup
+    private string Prefix => (string?)RadioChannels.SelectedMetadata ?? SharedChatSystem.LocalPrefix.ToString();
+
     private void FilterSearch(LineEdit.LineEditEventArgs? obj)
     {
         SearchResults.RemoveAllChildren();
@@ -236,8 +248,25 @@ public sealed partial class AACWindow : FancyWindow
         {
             _phraseSingle.Clear();
             _phraseSingle.Add(phraseId);
-            PhraseButtonPressed?.Invoke(_phraseSingle);
+            PhraseButtonPressed?.Invoke(_phraseSingle, Prefix); // starcup: Prefix parameter
             SubmitPressed?.Invoke();
         }
     }
+
+    // starcup
+    internal void Update(AACTabletBuiState msg)
+    {
+        RadioChannels.Clear();
+
+        var id = 0;
+        RadioChannels.AddItem("Local", id);
+        RadioChannels.SetItemMetadata(RadioChannels.GetIdx(id), SharedChatSystem.LocalPrefix.ToString());
+
+        foreach (var channel in msg.RadioChannels)
+        {
+            var channelProto = _prototype.Index<RadioChannelPrototype>(channel);
+            RadioChannels.AddItem(channelProto.LocalizedName, ++id);
+            RadioChannels.SetItemMetadata(RadioChannels.GetIdx(id), string.Concat(SharedChatSystem.RadioChannelPrefix, channelProto.KeyCode));
+        }
+    }
 }
diff --git a/Content.Server/_DV/AACTablet/AACTabletSystem.cs b/Content.Server/_DV/AACTablet/AACTabletSystem.cs
index e6efa1afd3..6ed89173a1 100644
--- a/Content.Server/_DV/AACTablet/AACTabletSystem.cs
+++ b/Content.Server/_DV/AACTablet/AACTabletSystem.cs
@@ -5,6 +5,7 @@ using Content.Server.Speech.Components;
 using Content.Shared._DV.AACTablet;
 using Content.Shared.Database;
 using Content.Shared.IdentityManagement;
+using Robust.Server.GameObjects; // starcup
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
@@ -16,6 +17,7 @@ public sealed class AACTabletSystem : EntitySystem
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly UserInterfaceSystem _userInterface = default!; // starcup
 
     private readonly List<string> _localisedPhrases = [];
 
@@ -25,8 +27,38 @@ public sealed class AACTabletSystem : EntitySystem
     {
         base.Initialize();
         SubscribeLocalEvent<AACTabletComponent, AACTabletSendPhraseMessage>(OnSendPhrase);
+        // begin starcup
+        Subs.BuiEvents<AACTabletComponent>(AACTabletKey.Key, subs =>
+        {
+            subs.Event<BoundUIOpenedEvent>(OnBoundUIOpened);
+        });
+        // end starcup
     }
 
+    // begin starcup
+    private HashSet<string> GetAvailableChannels(EntityUid entity)
+    {
+        var channels = new HashSet<string>();
+
+        // Get all the intrinsic radio channels (IPCs, implants)
+        if (TryComp(entity, out ActiveRadioComponent? intrinsicRadio))
+            channels.UnionWith(intrinsicRadio.Channels);
+
+        // Get the user's headset channels, if any
+        if (TryComp(entity, out WearingHeadsetComponent? headset)
+            && TryComp(headset.Headset, out ActiveRadioComponent? headsetRadio))
+            channels.UnionWith(headsetRadio.Channels);
+
+        return channels;
+    }
+
+    private void OnBoundUIOpened(Entity<AACTabletComponent> ent, ref BoundUIOpenedEvent args)
+    {
+        var state = new AACTabletBuiState(GetAvailableChannels(args.Actor));
+        _userInterface.SetUiState(args.Entity, AACTabletKey.Key, state);
+    }
+    // end starcup
+
     private void OnSendPhrase(Entity<AACTabletComponent> ent, ref AACTabletSendPhraseMessage message)
     {
         if (ent.Comp.NextPhrase > _timing.CurTime || message.PhraseIds.Count > MaxPhrases)
@@ -50,13 +82,20 @@ public sealed class AACTabletSystem : EntitySystem
         if (_localisedPhrases.Count <= 0)
             return;
 
-        EnsureComp<VoiceOverrideComponent>(ent).NameOverride = speakerName;
+        // begin starcup: Radio support
+        // removed voicemask
+
+        // Set the player's currently available channels before sending the message
+        EnsureComp(ent, out IntrinsicRadioTransmitterComponent transmitter);
+        transmitter.Channels = GetAvailableChannels(message.Actor);
+        // end starcup
 
         // L5 — save the message for logging
         var messageToSend = string.Join(" ", _localisedPhrases);
 
         _chat.TrySendInGameICMessage(ent,
             messageToSend,
+            message.Prefix + string.Join(" ", _localisedPhrases), // starcup: prefix
             InGameICChatType.Speak,
             hideChat: false,
             nameOverride: speakerName);
diff --git a/Content.Shared/_DV/AACTablet/AACTabletUiMessages.cs b/Content.Shared/_DV/AACTablet/AACTabletUiMessages.cs
index ce30052513..8f2b048462 100644
--- a/Content.Shared/_DV/AACTablet/AACTabletUiMessages.cs
+++ b/Content.Shared/_DV/AACTablet/AACTabletUiMessages.cs
@@ -11,7 +11,15 @@ public enum AACTabletKey : byte
 }
 
 [Serializable, NetSerializable]
-public sealed class AACTabletSendPhraseMessage(List<ProtoId<QuickPhrasePrototype>> phraseIds) : BoundUserInterfaceMessage
+public sealed class AACTabletSendPhraseMessage(List<ProtoId<QuickPhrasePrototype>> phraseIds, string prefix) : BoundUserInterfaceMessage
 {
     public List<ProtoId<QuickPhrasePrototype>> PhraseIds = phraseIds;
+    public string Prefix = prefix; // starcup
+}
+
+// starcup
+[Serializable, NetSerializable]
+public sealed class AACTabletBuiState(HashSet<string> radioChannels) : BoundUserInterfaceState
+{
+    public HashSet<string> RadioChannels = radioChannels;
 }
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/aac_tablet.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/aac_tablet.yml
index 28b5a3db51..f2bb749679 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Devices/aac_tablet.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/aac_tablet.yml
@@ -40,5 +40,6 @@
         type: AACBoundUserInterface
   - type: Speech
     speechSounds: Alto
+  # - type: VoiceMask  # starcup
   - type: AACTablet
-  - type: VoiceMask
+  - type: IntrinsicRadioTransmitter # starcup

From 3e4b74d718f86c4e8bcf35efcee6045757ba46fa Mon Sep 17 00:00:00 2001
From: Oxdeception <9624-oxdeception@users.noreply.gitgud.io>
Date: Thu, 31 Jul 2025 18:12:28 -0400
Subject: [PATCH 2/6] Allows AAC names to be highlighted in chat

---
 .../Prototypes/_DV/Entities/Objects/Devices/aac_tablet.yml     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/aac_tablet.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/aac_tablet.yml
index f2bb749679..67c4ac3dcb 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Devices/aac_tablet.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/aac_tablet.yml
@@ -43,3 +43,6 @@
   # - type: VoiceMask  # starcup
   - type: AACTablet
   - type: IntrinsicRadioTransmitter # starcup
+  - type: Grammar # starcup
+    attributes:
+      proper: True

From d0db0309d918ef22a865bb35150a374f09b1ed6e Mon Sep 17 00:00:00 2001
From: Oxdeception <9624-oxdeception@users.noreply.gitgud.io>
Date: Fri, 1 Aug 2025 08:31:24 -0400
Subject: [PATCH 3/6] Restores VoiceOverrideComponent to the AAC

---
 Content.Server/_DV/AACTablet/AACTabletSystem.cs               | 4 ++--
 .../Prototypes/_DV/Entities/Objects/Devices/aac_tablet.yml    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Server/_DV/AACTablet/AACTabletSystem.cs b/Content.Server/_DV/AACTablet/AACTabletSystem.cs
index 6ed89173a1..71664e8745 100644
--- a/Content.Server/_DV/AACTablet/AACTabletSystem.cs
+++ b/Content.Server/_DV/AACTablet/AACTabletSystem.cs
@@ -81,9 +81,9 @@ public sealed class AACTabletSystem : EntitySystem
 
         if (_localisedPhrases.Count <= 0)
             return;
-
         // begin starcup: Radio support
-        // removed voicemask
+        EnsureComp<VoiceOverrideComponent>(ent).NameOverride = speakerName;
+
 
         // Set the player's currently available channels before sending the message
         EnsureComp(ent, out IntrinsicRadioTransmitterComponent transmitter);
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/aac_tablet.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/aac_tablet.yml
index 67c4ac3dcb..a3135970dc 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Devices/aac_tablet.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/aac_tablet.yml
@@ -40,7 +40,7 @@
         type: AACBoundUserInterface
   - type: Speech
     speechSounds: Alto
-  # - type: VoiceMask  # starcup
+  - type: VoiceMask
   - type: AACTablet
   - type: IntrinsicRadioTransmitter # starcup
   - type: Grammar # starcup

From 0873b66449b9e116c1314f06efd95b355a3bf804 Mon Sep 17 00:00:00 2001
From: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com>
Date: Sat, 2 Aug 2025 08:24:43 -0700
Subject: [PATCH 4/6] refactor: separate confluent code into new files

Signed-off-by: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com>
---
 .../_DV/AACTablet/UI/AACBoundUserInterface.cs | 17 ++--------
 .../_DV/AACTablet/UI/AACWindow.xaml.cs        | 28 ----------------
 .../AACTablet/UI/AACBoundUserInterface.cs     | 16 ++++++++++
 .../_starcup/AACTablet/UI/AACWindow.xaml.cs   | 32 +++++++++++++++++++
 .../_DV/AACTablet/AACTabletSystem.cs          | 27 ++--------------
 .../_starcup/AACTablet/AACTabletSystem.cs     | 30 +++++++++++++++++
 .../_DV/AACTablet/AACTabletUiMessages.cs      | 11 ++-----
 .../_starcup/AACTablet/AACTabletBuiState.cs   |  9 ++++++
 8 files changed, 94 insertions(+), 76 deletions(-)
 create mode 100644 Content.Client/_starcup/AACTablet/UI/AACBoundUserInterface.cs
 create mode 100644 Content.Client/_starcup/AACTablet/UI/AACWindow.xaml.cs
 create mode 100644 Content.Server/_starcup/AACTablet/AACTabletSystem.cs
 create mode 100644 Content.Shared/_starcup/AACTablet/AACTabletBuiState.cs

diff --git a/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs b/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs
index 4c0aba7430..6557ece580 100644
--- a/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs
+++ b/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs
@@ -7,7 +7,8 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Client._DV.AACTablet.UI;
 
-public sealed class AACBoundUserInterface : BoundUserInterface
+public sealed partial class AACBoundUserInterface(EntityUid owner, Enum uiKey)
+    : BoundUserInterface(owner, uiKey) // starcup: made partial
 {
     [ViewVariables]
     private AACWindow? _window;
@@ -30,8 +31,7 @@ public sealed class AACBoundUserInterface : BoundUserInterface
         _window.SubmitPressed += OnSubmit;
     }
 
-    // starcup: added prefix for radio messages
-    private void OnPhraseButtonPressed(List<ProtoId<QuickPhrasePrototype>> phraseId, string prefix)
+    private void OnPhraseButtonPressed(List<ProtoId<QuickPhrasePrototype>> phraseId, string prefix) // starcup: prefix
     {
         SendMessage(new AACTabletSendPhraseMessage(phraseId, prefix));
     }
@@ -47,15 +47,4 @@ public sealed class AACBoundUserInterface : BoundUserInterface
         _typing ??= EntMan.System<TypingIndicatorSystem>();
         _typing?.ClientSubmittedChatText();
     }
-
-    // starcup
-    protected override void UpdateState(BoundUserInterfaceState state)
-    {
-        base.UpdateState(state);
-
-        if (state is not AACTabletBuiState msg)
-            return;
-
-        _window?.Update(msg);
-    }
 }
diff --git a/Content.Client/_DV/AACTablet/UI/AACWindow.xaml.cs b/Content.Client/_DV/AACTablet/UI/AACWindow.xaml.cs
index 809303ce1b..d28f69b51b 100644
--- a/Content.Client/_DV/AACTablet/UI/AACWindow.xaml.cs
+++ b/Content.Client/_DV/AACTablet/UI/AACWindow.xaml.cs
@@ -2,8 +2,6 @@ using System.Linq;
 using System.Numerics;
 using Content.Client.UserInterface.Controls;
 using Content.Shared._DV.QuickPhrase;
-using Content.Shared.Chat; // starcup
-using Content.Shared.Radio; // starcup
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -49,12 +47,6 @@ public sealed partial class AACWindow : FancyWindow
         FilterSearch(null);
     }
 
-    // starcup
-    private void OnChannelSelected(OptionButton.ItemSelectedEventArgs args)
-    {
-        RadioChannels.SelectId(args.Id);
-    }
-
     private void BackspaceBuffer(BaseButton.ButtonEventArgs obj)
     {
         if (_phraseBuffer.Count == 0)
@@ -83,9 +75,6 @@ public sealed partial class AACWindow : FancyWindow
         SubmitPressed?.Invoke();
     }
 
-    // starcup
-    private string Prefix => (string?)RadioChannels.SelectedMetadata ?? SharedChatSystem.LocalPrefix.ToString();
-
     private void FilterSearch(LineEdit.LineEditEventArgs? obj)
     {
         SearchResults.RemoveAllChildren();
@@ -252,21 +241,4 @@ public sealed partial class AACWindow : FancyWindow
             SubmitPressed?.Invoke();
         }
     }
-
-    // starcup
-    internal void Update(AACTabletBuiState msg)
-    {
-        RadioChannels.Clear();
-
-        var id = 0;
-        RadioChannels.AddItem("Local", id);
-        RadioChannels.SetItemMetadata(RadioChannels.GetIdx(id), SharedChatSystem.LocalPrefix.ToString());
-
-        foreach (var channel in msg.RadioChannels)
-        {
-            var channelProto = _prototype.Index<RadioChannelPrototype>(channel);
-            RadioChannels.AddItem(channelProto.LocalizedName, ++id);
-            RadioChannels.SetItemMetadata(RadioChannels.GetIdx(id), string.Concat(SharedChatSystem.RadioChannelPrefix, channelProto.KeyCode));
-        }
-    }
 }
diff --git a/Content.Client/_starcup/AACTablet/UI/AACBoundUserInterface.cs b/Content.Client/_starcup/AACTablet/UI/AACBoundUserInterface.cs
new file mode 100644
index 0000000000..8e6c78cb01
--- /dev/null
+++ b/Content.Client/_starcup/AACTablet/UI/AACBoundUserInterface.cs
@@ -0,0 +1,16 @@
+using Content.Shared._starcup.AACTablet;
+
+namespace Content.Client._DV.AACTablet.UI;
+
+public sealed partial class AACBoundUserInterface
+{
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+
+        if (state is not AACTabletBuiState msg)
+            return;
+
+        _window?.Update(msg);
+    }
+}
diff --git a/Content.Client/_starcup/AACTablet/UI/AACWindow.xaml.cs b/Content.Client/_starcup/AACTablet/UI/AACWindow.xaml.cs
new file mode 100644
index 0000000000..72285aa90a
--- /dev/null
+++ b/Content.Client/_starcup/AACTablet/UI/AACWindow.xaml.cs
@@ -0,0 +1,32 @@
+using Content.Shared._starcup.AACTablet;
+using Content.Shared.Chat;
+using Content.Shared.Radio;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client._DV.AACTablet.UI;
+
+public sealed partial class AACWindow
+{
+    private string Prefix => (string?)RadioChannels.SelectedMetadata ?? SharedChatSystem.LocalPrefix.ToString();
+
+    internal void Update(AACTabletBuiState msg)
+    {
+        RadioChannels.Clear();
+
+        var id = 0;
+        RadioChannels.AddItem("Local", id);
+        RadioChannels.SetItemMetadata(RadioChannels.GetIdx(id), SharedChatSystem.LocalPrefix.ToString());
+
+        foreach (var channel in msg.RadioChannels)
+        {
+            var channelProto = _prototype.Index<RadioChannelPrototype>(channel);
+            RadioChannels.AddItem(channelProto.LocalizedName, ++id);
+            RadioChannels.SetItemMetadata(RadioChannels.GetIdx(id), string.Concat(SharedChatSystem.RadioChannelPrefix, channelProto.KeyCode));
+        }
+    }
+
+    private void OnChannelSelected(OptionButton.ItemSelectedEventArgs args)
+    {
+        RadioChannels.SelectId(args.Id);
+    }
+}
diff --git a/Content.Server/_DV/AACTablet/AACTabletSystem.cs b/Content.Server/_DV/AACTablet/AACTabletSystem.cs
index 71664e8745..af80d1d630 100644
--- a/Content.Server/_DV/AACTablet/AACTabletSystem.cs
+++ b/Content.Server/_DV/AACTablet/AACTabletSystem.cs
@@ -11,7 +11,7 @@ using Robust.Shared.Timing;
 
 namespace Content.Server._DV.AACTablet;
 
-public sealed class AACTabletSystem : EntitySystem
+public sealed partial class AACTabletSystem : EntitySystem // starcup: made partial
 {
     [Dependency] private readonly ChatSystem _chat = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
@@ -27,6 +27,7 @@ public sealed class AACTabletSystem : EntitySystem
     {
         base.Initialize();
         SubscribeLocalEvent<AACTabletComponent, AACTabletSendPhraseMessage>(OnSendPhrase);
+
         // begin starcup
         Subs.BuiEvents<AACTabletComponent>(AACTabletKey.Key, subs =>
         {
@@ -35,30 +36,6 @@ public sealed class AACTabletSystem : EntitySystem
         // end starcup
     }
 
-    // begin starcup
-    private HashSet<string> GetAvailableChannels(EntityUid entity)
-    {
-        var channels = new HashSet<string>();
-
-        // Get all the intrinsic radio channels (IPCs, implants)
-        if (TryComp(entity, out ActiveRadioComponent? intrinsicRadio))
-            channels.UnionWith(intrinsicRadio.Channels);
-
-        // Get the user's headset channels, if any
-        if (TryComp(entity, out WearingHeadsetComponent? headset)
-            && TryComp(headset.Headset, out ActiveRadioComponent? headsetRadio))
-            channels.UnionWith(headsetRadio.Channels);
-
-        return channels;
-    }
-
-    private void OnBoundUIOpened(Entity<AACTabletComponent> ent, ref BoundUIOpenedEvent args)
-    {
-        var state = new AACTabletBuiState(GetAvailableChannels(args.Actor));
-        _userInterface.SetUiState(args.Entity, AACTabletKey.Key, state);
-    }
-    // end starcup
-
     private void OnSendPhrase(Entity<AACTabletComponent> ent, ref AACTabletSendPhraseMessage message)
     {
         if (ent.Comp.NextPhrase > _timing.CurTime || message.PhraseIds.Count > MaxPhrases)
diff --git a/Content.Server/_starcup/AACTablet/AACTabletSystem.cs b/Content.Server/_starcup/AACTablet/AACTabletSystem.cs
new file mode 100644
index 0000000000..c25f16af95
--- /dev/null
+++ b/Content.Server/_starcup/AACTablet/AACTabletSystem.cs
@@ -0,0 +1,30 @@
+using Content.Server.Radio.Components;
+using Content.Shared._DV.AACTablet;
+using Content.Shared._starcup.AACTablet;
+
+namespace Content.Server._DV.AACTablet;
+
+public sealed partial class AACTabletSystem
+{
+    private HashSet<string> GetAvailableChannels(EntityUid entity)
+    {
+        var channels = new HashSet<string>();
+
+        // Get all the intrinsic radio channels (IPCs, implants)
+        if (TryComp(entity, out ActiveRadioComponent? intrinsicRadio))
+            channels.UnionWith(intrinsicRadio.Channels);
+
+        // Get the user's headset channels, if any
+        if (TryComp(entity, out WearingHeadsetComponent? headset)
+            && TryComp(headset.Headset, out ActiveRadioComponent? headsetRadio))
+            channels.UnionWith(headsetRadio.Channels);
+
+        return channels;
+    }
+
+    private void OnBoundUIOpened(Entity<AACTabletComponent> ent, ref BoundUIOpenedEvent args)
+    {
+        var state = new AACTabletBuiState(GetAvailableChannels(args.Actor));
+        _userInterface.SetUiState(args.Entity, AACTabletKey.Key, state);
+    }
+}
diff --git a/Content.Shared/_DV/AACTablet/AACTabletUiMessages.cs b/Content.Shared/_DV/AACTablet/AACTabletUiMessages.cs
index 8f2b048462..784520dc48 100644
--- a/Content.Shared/_DV/AACTablet/AACTabletUiMessages.cs
+++ b/Content.Shared/_DV/AACTablet/AACTabletUiMessages.cs
@@ -11,15 +11,8 @@ public enum AACTabletKey : byte
 }
 
 [Serializable, NetSerializable]
-public sealed class AACTabletSendPhraseMessage(List<ProtoId<QuickPhrasePrototype>> phraseIds, string prefix) : BoundUserInterfaceMessage
+public sealed class AACTabletSendPhraseMessage(List<ProtoId<QuickPhrasePrototype>> phraseIds, string prefix) : BoundUserInterfaceMessage // starcup: added prefix
 {
     public List<ProtoId<QuickPhrasePrototype>> PhraseIds = phraseIds;
-    public string Prefix = prefix; // starcup
-}
-
-// starcup
-[Serializable, NetSerializable]
-public sealed class AACTabletBuiState(HashSet<string> radioChannels) : BoundUserInterfaceState
-{
-    public HashSet<string> RadioChannels = radioChannels;
+    public string Prefix = prefix; // starcup: radio-enabled aac
 }
diff --git a/Content.Shared/_starcup/AACTablet/AACTabletBuiState.cs b/Content.Shared/_starcup/AACTablet/AACTabletBuiState.cs
new file mode 100644
index 0000000000..7b35cde146
--- /dev/null
+++ b/Content.Shared/_starcup/AACTablet/AACTabletBuiState.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._starcup.AACTablet;
+
+[Serializable, NetSerializable]
+public sealed class AACTabletBuiState(HashSet<string> radioChannels) : BoundUserInterfaceState
+{
+    public HashSet<string> RadioChannels = radioChannels;
+}

From f4f07c16728149af693f80d2d3cdf0e8f6eab7db Mon Sep 17 00:00:00 2001
From: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com>
Date: Sat, 2 Aug 2025 08:26:59 -0700
Subject: [PATCH 5/6] style fix

Signed-off-by: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com>
---
 Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs b/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs
index 6557ece580..5794082ccb 100644
--- a/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs
+++ b/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs
@@ -7,8 +7,7 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Client._DV.AACTablet.UI;
 
-public sealed partial class AACBoundUserInterface(EntityUid owner, Enum uiKey)
-    : BoundUserInterface(owner, uiKey) // starcup: made partial
+public sealed partial class AACBoundUserInterface : BoundUserInterface // starcup: made partial
 {
     [ViewVariables]
     private AACWindow? _window;
@@ -31,9 +30,9 @@ public sealed partial class AACBoundUserInterface(EntityUid owner, Enum uiKey)
         _window.SubmitPressed += OnSubmit;
     }
 
-    private void OnPhraseButtonPressed(List<ProtoId<QuickPhrasePrototype>> phraseId, string prefix) // starcup: prefix
+    private void OnPhraseButtonPressed(List<ProtoId<QuickPhrasePrototype>> phraseId, string prefix)
     {
-        SendMessage(new AACTabletSendPhraseMessage(phraseId, prefix));
+        SendMessage(new AACTabletSendPhraseMessage(phraseId, prefix)); // starcup: prefix parameter
     }
 
     private void OnTyping()

From cb04454b67ab184f591a11e1f74dbddbd6b0efbd Mon Sep 17 00:00:00 2001
From: Stxcking <tamthaotran5@outlook.com>
Date: Wed, 25 Mar 2026 22:28:23 -0400
Subject: [PATCH 6/6] Ugh this took me too long to figure out

-Made so many changes to AACTabletBuiState, moved it under _DV: Made it compatible with Wizden #40293 which moved all radio comps and system to shared
-Had issues with having two AAC UI open so made it so one closes before another opens
-Trial and error with the UI window lol
---
 .../_DV/AACTablet/UI/AACBoundUserInterface.cs      |  6 +++++-
 Content.Client/_DV/AACTablet/UI/AACWindow.xaml     | 14 ++++++++------
 .../_starcup/AACTablet/UI/AACBoundUserInterface.cs |  2 +-
 .../_starcup/AACTablet/UI/AACWindow.xaml.cs        |  2 +-
 Content.Server/_DV/AACTablet/AACTabletSystem.cs    |  4 ++--
 .../_starcup/AACTablet/AACTabletSystem.cs          |  9 +++++----
 Content.Shared/_DV/AACTablet/AACTabletBuiState.cs  | 11 +++++++++++
 .../_starcup/AACTablet/AACTabletBuiState.cs        |  9 ---------
 8 files changed, 33 insertions(+), 24 deletions(-)
 create mode 100644 Content.Shared/_DV/AACTablet/AACTabletBuiState.cs
 delete mode 100644 Content.Shared/_starcup/AACTablet/AACTabletBuiState.cs

diff --git a/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs b/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs
index 5794082ccb..e2a763c14b 100644
--- a/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs
+++ b/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs
@@ -23,8 +23,12 @@ public sealed partial class AACBoundUserInterface : BoundUserInterface // starcu
     protected override void Open()
     {
         base.Open();
-        _window?.Close();
+
+        if (_window is { Disposed: false })
+            _window.Close();
+
         _window = this.CreateWindow<AACWindow>();
+        _window.OnClose += Close;
         _window.PhraseButtonPressed += OnPhraseButtonPressed;
         _window.Typing += OnTyping;
         _window.SubmitPressed += OnSubmit;
diff --git a/Content.Client/_DV/AACTablet/UI/AACWindow.xaml b/Content.Client/_DV/AACTablet/UI/AACWindow.xaml
index 763ec0d198..2ad8c45ae3 100644
--- a/Content.Client/_DV/AACTablet/UI/AACWindow.xaml
+++ b/Content.Client/_DV/AACTablet/UI/AACWindow.xaml
@@ -18,7 +18,14 @@
                                   StyleClasses="AacCheckbox"
                                   Margin="0 0 8 0"/>
                         <Control HorizontalExpand="True"/>
-                    </BoxContainer>
+
+                        <Control SetWidth="170" Margin="8 0 0 0"/>
+
+                        <OptionButton Name="RadioChannels"
+                                      StyleClasses="OpenBoth"
+                                      SetWidth="120"
+                                      Margin="8 0 0 0"/>
+                        </BoxContainer>
 
                     <!-- Buffer Display and Controls -->
                     <BoxContainer Orientation="Horizontal">
@@ -29,11 +36,6 @@
                                       StyleClasses="AacBufferText"
                                       Margin="8 4"/>
                         </PanelContainer>
-            <!-- begin starcup REMINDER TO MAKE A BUTTON FOR RADIO CHANNELS RAh-->
-            <Button Name="ClearButton" Text="{Loc 'aac-tablet-backspace'}" TextAlign="Center" StyleClasses="OpenBoth" />
-            <OptionButton Name="RadioChannels" StyleClasses="OpenBoth"/>
-            <Button Name="SendButton" Text="{Loc 'aac-tablet-send'}" TextAlign="Center" StyleClasses="OpenLeft"/>
-            <!-- end starcup -->
                         <Button Name="ClearButton"
                                 Text="{Loc 'aac-tablet-backspace'}"
                                 TextAlign="Center"
diff --git a/Content.Client/_starcup/AACTablet/UI/AACBoundUserInterface.cs b/Content.Client/_starcup/AACTablet/UI/AACBoundUserInterface.cs
index 8e6c78cb01..20f8a0f5e0 100644
--- a/Content.Client/_starcup/AACTablet/UI/AACBoundUserInterface.cs
+++ b/Content.Client/_starcup/AACTablet/UI/AACBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Content.Shared._starcup.AACTablet;
+using Content.Shared._DV.AACTablet;
 
 namespace Content.Client._DV.AACTablet.UI;
 
diff --git a/Content.Client/_starcup/AACTablet/UI/AACWindow.xaml.cs b/Content.Client/_starcup/AACTablet/UI/AACWindow.xaml.cs
index 72285aa90a..c8428fd435 100644
--- a/Content.Client/_starcup/AACTablet/UI/AACWindow.xaml.cs
+++ b/Content.Client/_starcup/AACTablet/UI/AACWindow.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared._starcup.AACTablet;
+using Content.Shared._DV.AACTablet;
 using Content.Shared.Chat;
 using Content.Shared.Radio;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Server/_DV/AACTablet/AACTabletSystem.cs b/Content.Server/_DV/AACTablet/AACTabletSystem.cs
index af80d1d630..51ce835504 100644
--- a/Content.Server/_DV/AACTablet/AACTabletSystem.cs
+++ b/Content.Server/_DV/AACTablet/AACTabletSystem.cs
@@ -5,6 +5,7 @@ using Content.Server.Speech.Components;
 using Content.Shared._DV.AACTablet;
 using Content.Shared.Database;
 using Content.Shared.IdentityManagement;
+using Content.Shared.Radio.Components;
 using Robust.Server.GameObjects; // starcup
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -71,8 +72,7 @@ public sealed partial class AACTabletSystem : EntitySystem // starcup: made part
         var messageToSend = string.Join(" ", _localisedPhrases);
 
         _chat.TrySendInGameICMessage(ent,
-            messageToSend,
-            message.Prefix + string.Join(" ", _localisedPhrases), // starcup: prefix
+            message.Prefix + messageToSend,
             InGameICChatType.Speak,
             hideChat: false,
             nameOverride: speakerName);
diff --git a/Content.Server/_starcup/AACTablet/AACTabletSystem.cs b/Content.Server/_starcup/AACTablet/AACTabletSystem.cs
index c25f16af95..6a26da7e2b 100644
--- a/Content.Server/_starcup/AACTablet/AACTabletSystem.cs
+++ b/Content.Server/_starcup/AACTablet/AACTabletSystem.cs
@@ -1,14 +1,15 @@
-using Content.Server.Radio.Components;
+using Content.Shared.Radio.Components; // Delta-V
 using Content.Shared._DV.AACTablet;
-using Content.Shared._starcup.AACTablet;
+using Robust.Shared.Prototypes; // Delta-V
+using Content.Shared.Radio; // Delta-V
 
 namespace Content.Server._DV.AACTablet;
 
 public sealed partial class AACTabletSystem
 {
-    private HashSet<string> GetAvailableChannels(EntityUid entity)
+    private HashSet<ProtoId<RadioChannelPrototype>> GetAvailableChannels(EntityUid entity) // Delta-V
     {
-        var channels = new HashSet<string>();
+        var channels = new HashSet<ProtoId<RadioChannelPrototype>>(); // Delta-V
 
         // Get all the intrinsic radio channels (IPCs, implants)
         if (TryComp(entity, out ActiveRadioComponent? intrinsicRadio))
diff --git a/Content.Shared/_DV/AACTablet/AACTabletBuiState.cs b/Content.Shared/_DV/AACTablet/AACTabletBuiState.cs
new file mode 100644
index 0000000000..292255cfbc
--- /dev/null
+++ b/Content.Shared/_DV/AACTablet/AACTabletBuiState.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Radio;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._DV.AACTablet;
+
+[Serializable, NetSerializable]
+public sealed class AACTabletBuiState(HashSet<ProtoId<RadioChannelPrototype>> radioChannels) : BoundUserInterfaceState
+{
+    public HashSet<ProtoId<RadioChannelPrototype>> RadioChannels = radioChannels;
+}
diff --git a/Content.Shared/_starcup/AACTablet/AACTabletBuiState.cs b/Content.Shared/_starcup/AACTablet/AACTabletBuiState.cs
deleted file mode 100644
index 7b35cde146..0000000000
--- a/Content.Shared/_starcup/AACTablet/AACTabletBuiState.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._starcup.AACTablet;
-
-[Serializable, NetSerializable]
-public sealed class AACTabletBuiState(HashSet<string> radioChannels) : BoundUserInterfaceState
-{
-    public HashSet<string> RadioChannels = radioChannels;
-}