Merge branch 'master' into test_branch_feature

AdventureTimeSS14 · Apr 3, 2024 · a5e32f5 · a5e32f5
2 parents 440c52e + 5f82200
commit a5e32f5
Show file tree

Hide file tree

Showing 300 changed files with 3,467 additions and 691 deletions.
diff --git a/ADT_STATION b/ADT_STATION
diff --git a/Content.Client/ADT/CollectiveMind/CollectiveMindSystem.cs b/Content.Client/ADT/CollectiveMind/CollectiveMindSystem.cs
@@ -0,0 +1,31 @@
+using Content.Client.Chat.Managers;
+using Content.Shared.Sirena.CollectiveMind;
+using Robust.Client.Player;
+
+namespace Content.Client.Sirena.CollectiveMind;
+
+public sealed class CollectiveMindSystem : EntitySystem
+{
+    [Dependency] private readonly IChatManager _chatManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<CollectiveMindComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<CollectiveMindComponent, ComponentRemove>(OnRemove);
+    }
+
+    public CollectiveMindComponent? Player => CompOrNull<CollectiveMindComponent>(_playerManager.LocalPlayer?.ControlledEntity);
+    public bool IsCollectiveMind => Player != null;
+
+    private void OnInit(EntityUid uid, CollectiveMindComponent component, ComponentInit args)
+    {
+        _chatManager.UpdatePermissions();
+    }
+
+    private void OnRemove(EntityUid uid, CollectiveMindComponent component, ComponentRemove args)
+    {
+        _chatManager.UpdatePermissions();
+    }
+}
diff --git a/Content.Client/Chat/Managers/ChatManager.cs b/Content.Client/Chat/Managers/ChatManager.cs
@@ -14,6 +14,7 @@ internal sealed class ChatManager : IChatManager
         [Dependency] private readonly IEntitySystemManager _systems = default!;
 
         private ISawmill _sawmill = default!;
+        public event Action? PermissionsUpdated;
 
         public void Initialize()
         {
@@ -67,9 +68,18 @@ public void SendMessage(string text, ChatSelectChannel channel)
                     _consoleHost.ExecuteCommand($"whisper \"{CommandParsing.Escape(str)}\"");
                     break;
 
+                case ChatSelectChannel.CollectiveMind:
+                    _consoleHost.ExecuteCommand($"cmsay \"{CommandParsing.Escape(str)}\"");
+                    break;
+
                 default:
                     throw new ArgumentOutOfRangeException(nameof(channel), channel, null);
             }
         }
+
+        public void UpdatePermissions()
+        {
+            PermissionsUpdated?.Invoke();
+        }
     }
 }
diff --git a/Content.Client/Chat/Managers/IChatManager.cs b/Content.Client/Chat/Managers/IChatManager.cs
@@ -6,6 +6,12 @@ public interface IChatManager
     {
         void Initialize();
 
+        /// <summary>
+        ///     Will refresh perms.
+        /// </summary>
+        event Action PermissionsUpdated;
+
         public void SendMessage(string text, ChatSelectChannel channel);
+        public void UpdatePermissions();
     }
 }
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
@@ -15,6 +15,7 @@ public static void SetupContexts(IInputContextContainer contexts)
             common.AddFunction(ContentKeyFunctions.FocusChat);
             common.AddFunction(ContentKeyFunctions.FocusLocalChat);
             common.AddFunction(ContentKeyFunctions.FocusEmote);
+            common.AddFunction(ContentKeyFunctions.FocusCollectiveMind);
             common.AddFunction(ContentKeyFunctions.FocusWhisperChat);
             common.AddFunction(ContentKeyFunctions.FocusRadio);
             common.AddFunction(ContentKeyFunctions.FocusLOOC);

diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -200,6 +200,7 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.FocusLocalChat);
             AddButton(ContentKeyFunctions.FocusEmote);
             AddButton(ContentKeyFunctions.FocusWhisperChat);
+            AddButton(ContentKeyFunctions.FocusCollectiveMind);
             AddButton(ContentKeyFunctions.FocusRadio);
             AddButton(ContentKeyFunctions.FocusLOOC);
             AddButton(ContentKeyFunctions.FocusOOC);

diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -41,6 +41,10 @@
 using Robust.Shared.Replays;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using Content.Client.Sirena.CollectiveMind;
+using System.Globalization;
+using System.Linq;
+using System.Numerics;
 
 namespace Content.Client.UserInterface.Systems.Chat;
 
@@ -64,6 +68,7 @@ public sealed class ChatUIController : UIController
     [UISystemDependency] private readonly GhostSystem? _ghost = default;
     [UISystemDependency] private readonly TypingIndicatorSystem? _typingIndicator = default;
     [UISystemDependency] private readonly ChatSystem? _chatSys = default;
+    [UISystemDependency] private readonly CollectiveMindSystem? _collectiveMind = default!;
 
     [ValidatePrototypeId<ColorPalettePrototype>]
     private const string ChatNamePalette = "ChatNames";
@@ -78,6 +83,7 @@ public sealed class ChatUIController : UIController
     {
         {SharedChatSystem.LocalPrefix, ChatSelectChannel.Local},
         {SharedChatSystem.WhisperPrefix, ChatSelectChannel.Whisper},
+        {SharedChatSystem.CollectiveMindPrefix, ChatSelectChannel.CollectiveMind},
         {SharedChatSystem.ConsolePrefix, ChatSelectChannel.Console},
         {SharedChatSystem.LOOCPrefix, ChatSelectChannel.LOOC},
         {SharedChatSystem.OOCPrefix, ChatSelectChannel.OOC},
@@ -92,6 +98,7 @@ public sealed class ChatUIController : UIController
     {
         {ChatSelectChannel.Local, SharedChatSystem.LocalPrefix},
         {ChatSelectChannel.Whisper, SharedChatSystem.WhisperPrefix},
+        {ChatSelectChannel.CollectiveMind, SharedChatSystem.CollectiveMindPrefix},
         {ChatSelectChannel.Console, SharedChatSystem.ConsolePrefix},
         {ChatSelectChannel.LOOC, SharedChatSystem.LOOCPrefix},
         {ChatSelectChannel.OOC, SharedChatSystem.OOCPrefix},
@@ -204,6 +211,9 @@ public override void Initialize()
         _input.SetInputCommand(ContentKeyFunctions.FocusWhisperChat,
             InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.Whisper)));
 
+        _input.SetInputCommand(ContentKeyFunctions.FocusCollectiveMind,
+            InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.CollectiveMind)));
+
         _input.SetInputCommand(ContentKeyFunctions.FocusLOOC,
             InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.LOOC)));
 
@@ -501,7 +511,7 @@ private void UpdateChannelPermissions()
 
             // Can only send local / radio / emote when attached to a non-ghost entity.
             // TODO: this logic is iffy (checking if controlling something that's NOT a ghost), is there a better way to check this?
-            if (_ghost is not {IsGhost: true})
+            if (_ghost is not { IsGhost: true })
             {
                 CanSendChannels |= ChatSelectChannel.Local;
                 CanSendChannels |= ChatSelectChannel.Whisper;
@@ -511,7 +521,7 @@ private void UpdateChannelPermissions()
         }
 
         // Only ghosts and admins can send / see deadchat.
-        if (_admin.HasFlag(AdminFlags.Admin) || _ghost is {IsGhost: true})
+        if (_admin.HasFlag(AdminFlags.Admin) || _ghost is { IsGhost: true })
         {
             FilterableChannels |= ChatChannel.Dead;
             CanSendChannels |= ChatSelectChannel.Dead;
@@ -524,6 +534,13 @@ private void UpdateChannelPermissions()
             FilterableChannels |= ChatChannel.AdminAlert;
             FilterableChannels |= ChatChannel.AdminChat;
             CanSendChannels |= ChatSelectChannel.Admin;
+            FilterableChannels |= ChatChannel.CollectiveMind;
+        }
+        //        if (_collectiveMind != null && _collectiveMind is { IsCollectiveMind: true })
+        if (_collectiveMind != null)
+        {
+            CanSendChannels |= ChatSelectChannel.CollectiveMind;
+            FilterableChannels |= ChatChannel.CollectiveMind;
         }
 
         SelectableChannels = CanSendChannels;
@@ -641,7 +658,7 @@ private void SetBubbles(List<SpeechBubble> bubbles, bool visible)
 
     public ChatSelectChannel MapLocalIfGhost(ChatSelectChannel channel)
     {
-        if (channel == ChatSelectChannel.Local && _ghost is {IsGhost: true})
+        if (channel == ChatSelectChannel.Local && _ghost is { IsGhost: true })
             return ChatSelectChannel.Dead;
 
         return channel;
@@ -824,7 +841,7 @@ public void ProcessChatMessage(ChatMessage msg, bool speechBubble = true)
                 break;
 
             case ChatChannel.Dead:
-                if (_ghost is not {IsGhost: true})
+                if (_ghost is not { IsGhost: true })
                     break;
 
                 AddSpeechBubble(msg, SpeechBubble.SpeechType.Say);

diff --git a/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterPopup.xaml.cs b/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterPopup.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chat;
+using Content.Shared.Chat;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -16,6 +16,7 @@ public sealed partial class ChannelFilterPopup : Popup
         ChatChannel.Whisper,
         ChatChannel.Emotes,
         ChatChannel.Radio,
+        ChatChannel.CollectiveMind,
         ChatChannel.LOOC,
         ChatChannel.OOC,
         ChatChannel.Dead,

diff --git a/Content.Client/UserInterface/Systems/Chat/Controls/ChannelSelectorPopup.cs b/Content.Client/UserInterface/Systems/Chat/Controls/ChannelSelectorPopup.cs
@@ -13,6 +13,7 @@ public sealed class ChannelSelectorPopup : Popup
         ChatSelectChannel.Whisper,
         ChatSelectChannel.Emotes,
         ChatSelectChannel.Radio,
+        ChatSelectChannel.CollectiveMind,
         ChatSelectChannel.LOOC,
         ChatSelectChannel.OOC,
         ChatSelectChannel.Dead,