Merge branch 'master' into eddie-old-pulls

AdventureTimeSS14 · Oct 25, 2024 · 683b839 · 683b839
2 parents ac4c6d7 + 98c7828
commit 683b839
Show file tree

Hide file tree

Showing 873 changed files with 30,680 additions and 290 deletions.
diff --git a/Content.Client/ADT/CollectiveMind/Systems/CollectiveMindSystem.cs b/Content.Client/ADT/CollectiveMind/Systems/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/ADT/UserInterface/Systems/Ghost/Controls/GhostBarRulesWindow.xaml b/Content.Client/ADT/UserInterface/Systems/Ghost/Controls/GhostBarRulesWindow.xaml
@@ -0,0 +1,15 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+            Title="{Loc 'ghost-target-window-ghostbar'}"
+            MinSize="550 400"
+            SetSize="550 400">
+    <BoxContainer Orientation="Vertical"
+                  HorizontalExpand="True">
+        <RichTextLabel Name="TopBanner" VerticalExpand="True"/>
+        <Button Name="SpawnButton"
+                Text="{Loc 'ghost-window-spawn-ghostbar-button'}"
+                Disabled="True"
+                TextAlign="Center"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center" />
+    </BoxContainer>
+</DefaultWindow>
diff --git a/Content.Client/ADT/UserInterface/Systems/Ghost/Controls/GhostBarRulesWindow.xaml.cs b/Content.Client/ADT/UserInterface/Systems/Ghost/Controls/GhostBarRulesWindow.xaml.cs
@@ -0,0 +1,53 @@
+using Content.Shared.CCVar;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Configuration;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+
+namespace Content.Client.ADT.UserInterface.Systems.Ghost.Controls
+{
+    [GenerateTypedNameReferences]
+    public sealed partial class GhostBarRulesWindow : DefaultWindow
+    {
+        [Dependency] private readonly IConfigurationManager _cfg = IoCManager.Resolve<IConfigurationManager>();
+        private float _timer;
+
+        public event Action? SpawnButtonPressed;
+        public GhostBarRulesWindow()
+        {
+            RobustXamlLoader.Load(this);
+            var ghostBarTime = _cfg.GetCVar(CCVars.GhostRoleTime);
+            _timer = ghostBarTime;
+
+            if (ghostBarTime > 0f)
+            {
+                SpawnButton.Text = Loc.GetString("ghost-window-spawn-ghostbar-button-timer", ("time", $"{_timer:0.0}"));
+                TopBanner.SetMessage(FormattedMessage.FromMarkupPermissive(Loc.GetString("ghost-bar-rules") + "\n" + Loc.GetString("ghost-roles-window-rules-footer", ("time", ghostBarTime))));
+                SpawnButton.Disabled = true;
+            }
+
+            SpawnButton.OnPressed += _ => SpawnButtonPressed?.Invoke();
+        }
+
+
+        protected override void FrameUpdate(FrameEventArgs args)
+        {
+            base.FrameUpdate(args);
+            if (!SpawnButton.Disabled) return;
+            if (_timer > 0.0)
+            {
+                _timer -= args.DeltaSeconds;
+                SpawnButton.Text = Loc.GetString("ghost-window-spawn-ghostbar-button-timer", ("time", $"{_timer:0.0}"));
+            }
+            else
+            {
+                SpawnButton.Disabled = false;
+                SpawnButton.Text = Loc.GetString("ghost-window-spawn-ghostbar-button");
+            }
+        }
+    }
+
+}
diff --git a/Content.Client/ADT/UserInterface/Systems/Ghost/GhostUIController.Ghostbar.cs b/Content.Client/ADT/UserInterface/Systems/Ghost/GhostUIController.Ghostbar.cs
@@ -0,0 +1,42 @@
+using Content.Client.Gameplay;
+using Content.Client.Ghost;
+using Content.Client.UserInterface.Systems.Gameplay;
+using Content.Client.UserInterface.Systems.Ghost.Widgets;
+using Content.Shared.Ghost;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controllers;
+using Content.Client.UserInterface.Systems.Ghost;
+
+namespace Content.Client.UserInterface.Systems.Ghost;
+
+// TODO hud refactor BEFORE MERGE fix ghost gui being too far up
+public sealed partial class GhostUIController
+{
+    private void GhostBarPressed()
+    {
+        Gui?.GhostBarWindow.OpenCentered();
+    }
+
+    private void GhostBarSpawnPressed()
+    {
+        _system?.GhostBarSpawn();
+    }
+
+    public void LoadGhostbarGui()
+    {
+        if (Gui == null)
+            return;
+
+        Gui.GhostBarPressed += GhostBarPressed;
+        Gui.GhostBarWindow.SpawnButtonPressed += GhostBarSpawnPressed;
+    }
+
+    public void UnloadGhostbarGui()
+    {
+        if (Gui == null)
+            return;
+
+        Gui.GhostBarPressed -= GhostBarPressed;
+        Gui.GhostBarWindow.SpawnButtonPressed -= GhostBarSpawnPressed;
+    }
+}
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; // ADT-CollectiveMind-Tweak
 
     public void Initialize()
     {
@@ -67,8 +68,19 @@ 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);
         }
     }
+
+// ADT-CollectiveMind-Tweak-Start
+    public void UpdatePermissions()
+    {
+        PermissionsUpdated?.Invoke();
+    }
+// ADT-CollectiveMind-Tweak-End
 }
diff --git a/Content.Client/Chat/Managers/IChatManager.cs b/Content.Client/Chat/Managers/IChatManager.cs
@@ -4,8 +4,14 @@ namespace Content.Client.Chat.Managers
 {
     public interface IChatManager
     {
-        void Initialize();
+        void Initialize(); // ADT-CollectiveMind-Tweak
+
+        /// <summary>
+        ///     Will refresh perms.
+        /// </summary>
+        event Action PermissionsUpdated; // ADT-CollectiveMind-Tweak
 
         public void SendMessage(string text, ChatSelectChannel channel);
+        public void UpdatePermissions(); // ADT-CollectiveMind-Tweak
     }
 }
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
@@ -129,6 +129,7 @@ public override void Init()
             _prototypeManager.RegisterIgnore("nukeopsRole");
             _prototypeManager.RegisterIgnore("stationGoal"); // Corvax-StationGoal
             _prototypeManager.RegisterIgnore("ghostRoleRaffleDecider");
+            _prototypeManager.RegisterIgnore("ghostbarMap"); ///ADT-ghostber
 
             _componentFactory.GenerateNetIds();
             _adminManager.Initialize();

diff --git a/Content.Client/Ghost/GhostSystem.cs b/Content.Client/Ghost/GhostSystem.cs
@@ -176,6 +176,11 @@ public void OpenGhostRoles()
             _console.RemoteExecuteCommand(null, "ghostroles");
         }
 
+        public void GhostBarSpawn() // Goobstation - Ghost Bar
+        {
+            RaiseNetworkEvent(new GhostBarSpawnEvent());
+        }
+
         public void ToggleGhostVisibility(bool? visibility = null)
         {
             GhostVisibility = visibility ?? !GhostVisibility;

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); // ADT-CollectiveMind-Tweak
             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
@@ -205,6 +205,7 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.FocusLocalChat);
             AddButton(ContentKeyFunctions.FocusEmote);
             AddButton(ContentKeyFunctions.FocusWhisperChat);
+            AddButton(ContentKeyFunctions.FocusCollectiveMind); // ADT-CollectiveMind-Tweak
             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; // ADT-CollectiveMind-Tweak
+using System.Globalization;
+using System.Linq;
+using System.Numerics;
 
 namespace Content.Client.UserInterface.Systems.Chat;
 
@@ -66,6 +70,7 @@ public sealed class ChatUIController : UIController
     [UISystemDependency] private readonly TransformSystem? _transform = default;
     [UISystemDependency] private readonly MindSystem? _mindSystem = default!;
     [UISystemDependency] private readonly RoleCodewordSystem? _roleCodewordSystem = default!;
+    [UISystemDependency] private readonly CollectiveMindSystem? _collectiveMind = default!; // ADT-CollectiveMind-Tweak
 
     [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}, // ADT-CollectiveMind-Tweak
         {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}, // ADT-CollectiveMind-Tweak
         {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, // ADT-CollectiveMind-Tweak
+            InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.CollectiveMind))); // ADT-CollectiveMind-Tweak
+
         _input.SetInputCommand(ContentKeyFunctions.FocusLOOC,
             InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.LOOC)));
 
@@ -558,7 +568,15 @@ private void UpdateChannelPermissions()
             FilterableChannels |= ChatChannel.AdminAlert;
             FilterableChannels |= ChatChannel.AdminChat;
             CanSendChannels |= ChatSelectChannel.Admin;
+            FilterableChannels |= ChatChannel.CollectiveMind; // ADT-CollectiveMind-Tweak
+        }
+        // ADT-CollectiveMind-Tweak-Start
+        if (_collectiveMind != null)
+        {
+            CanSendChannels |= ChatSelectChannel.CollectiveMind;
+            FilterableChannels |= ChatChannel.CollectiveMind;
         }
+        // ADT-CollectiveMind-Tweak-End
 
         SelectableChannels = CanSendChannels;
 

diff --git a/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterPopup.xaml.cs b/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterPopup.xaml.cs
@@ -16,6 +16,7 @@ public sealed partial class ChannelFilterPopup : Popup
         ChatChannel.Whisper,
         ChatChannel.Emotes,
         ChatChannel.Radio,
+        ChatChannel.CollectiveMind, // ADT-CollectiveMind-Tweak
         ChatChannel.Notifications,
         ChatChannel.LOOC,
         ChatChannel.OOC,

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, // ADT-CollectiveMind-Tweak
         ChatSelectChannel.LOOC,
         ChatSelectChannel.OOC,
         ChatSelectChannel.Dead,

diff --git a/Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs b/Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs
@@ -9,14 +9,14 @@
 namespace Content.Client.UserInterface.Systems.Ghost;
 
 // TODO hud refactor BEFORE MERGE fix ghost gui being too far up
-public sealed class GhostUIController : UIController, IOnSystemChanged<GhostSystem>
+public sealed partial class GhostUIController : UIController, IOnSystemChanged<GhostSystem> // ADT - now this class is partial
 {
     [Dependency] private readonly IEntityNetworkManager _net = default!;
-
     [UISystemDependency] private readonly GhostSystem? _system = default;
 
     private GhostGui? Gui => UIManager.GetActiveUIWidgetOrNull<GhostGui>();
 
+
     public override void Initialize()
     {
         base.Initialize();
@@ -29,11 +29,13 @@ public override void Initialize()
     private void OnScreenLoad()
     {
         LoadGui();
+        LoadGhostbarGui();  // ADT ghostbar
     }
 
     private void OnScreenUnload()
     {
         UnloadGui();
+        UnloadGhostbarGui();    // ADT ghostbar
     }
 
     public void OnSystemLoaded(GhostSystem system)

diff --git a/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml b/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml
@@ -5,5 +5,6 @@
         <Button Name="ReturnToBodyButton" Text="{Loc ghost-gui-return-to-body-button}" />
         <Button Name="GhostWarpButton" Text="{Loc ghost-gui-ghost-warp-button}" />
         <Button Name="GhostRolesButton" />
+        <Button Name="GhostBarButton" Text="{Loc 'ghost-target-window-ghostbar'}" /> <!-- Goobstation - Ghost Bar -->
     </BoxContainer>
 </widgets:GhostGui>
diff --git a/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs
@@ -3,34 +3,41 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
+using Content.Client.ADT.UserInterface.Systems.Ghost.Controls;
 
 namespace Content.Client.UserInterface.Systems.Ghost.Widgets;
 
 [GenerateTypedNameReferences]
 public sealed partial class GhostGui : UIWidget
 {
     public GhostTargetWindow TargetWindow { get; }
+    public GhostBarRulesWindow GhostBarWindow { get; }
 
     public event Action? RequestWarpsPressed;
     public event Action? ReturnToBodyPressed;
     public event Action? GhostRolesPressed;
+    public event Action? GhostBarPressed; // Goobstation - Ghost Bar
 
     public GhostGui()
     {
         RobustXamlLoader.Load(this);
 
         TargetWindow = new GhostTargetWindow();
 
+        GhostBarWindow = new GhostBarRulesWindow();
+
         MouseFilter = MouseFilterMode.Ignore;
 
         GhostWarpButton.OnPressed += _ => RequestWarpsPressed?.Invoke();
         ReturnToBodyButton.OnPressed += _ => ReturnToBodyPressed?.Invoke();
         GhostRolesButton.OnPressed += _ => GhostRolesPressed?.Invoke();
+        GhostBarButton.OnPressed += _ => GhostBarPressed?.Invoke(); // Goobstation - Ghost Bar
     }
 
     public void Hide()
     {
         TargetWindow.Close();
+        GhostBarWindow.Close(); // Goobstation - Ghost Bar
         Visible = false;
     }
 
@@ -61,6 +68,7 @@ protected override void Dispose(bool disposing)
         if (disposing)
         {
             TargetWindow.Dispose();
+            GhostBarWindow.Dispose(); // Goobstation - Ghost Bar
         }
     }
 }
diff --git a/Content.Server/ADT/Clothing/MadnessMaskSystem.cs b/Content.Server/ADT/Clothing/MadnessMaskSystem.cs
@@ -10,7 +10,7 @@
 using Content.Shared.Stunnable;
 using Robust.Shared.Random;
 
-namespace Content.Server.Goobstation.Clothing;
+namespace Content.Server.ADT.Clothing;
 
 public sealed partial class MadnessMaskSystem : EntitySystem
 {