cleanup

Rxup · Feb 27, 2024 · 398f466 · 398f466
1 parent 6a2d27c
commit 398f466
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 82 deletions.
diff --git a/Content.Client/Backmen/Chat/ShadowkinChatUpdateSystem.cs b/Content.Client/Backmen/Chat/ShadowkinChatUpdateSystem.cs
diff --git a/Content.Client/Chat/Managers/ChatManager.cs b/Content.Client/Chat/Managers/ChatManager.cs
@@ -73,12 +73,6 @@ public void SendMessage(string text, ChatSelectChannel channel)
                     _consoleHost.ExecuteCommand($"tsay \"{CommandParsing.Escape(str)}\"");
                     break;
 
-                // Parkstation-Shadowkin chat start
-                case ChatSelectChannel.Empathy:
-                    _consoleHost.ExecuteCommand($"esay \"{CommandParsing.Escape(str)}\"");
-                    break;
-                // Parkstation-Shadowkin chat end
-
                 default:
                     throw new ArgumentOutOfRangeException(nameof(channel), channel, null);
             }

diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -62,7 +62,6 @@ public sealed class ChatUIController : UIController
     [UISystemDependency] private readonly TypingIndicatorSystem? _typingIndicator = default;
     [UISystemDependency] private readonly ChatSystem? _chatSys = default;
     [UISystemDependency] private readonly PsionicChatUpdateSystem? _psionic = default!; // backmen: psionic
-    [UISystemDependency] private readonly ShadowkinChatUpdateSystem? _shadowkin = default!; //backmen: shadowkin
     [UISystemDependency] private readonly SharedTransformSystem? _xformSystem = default!;
 
     [ValidatePrototypeId<ColorPalettePrototype>]
@@ -527,7 +526,6 @@ private void UpdateChannelPermissions()
             FilterableChannels |= ChatChannel.AdminChat;
             CanSendChannels |= ChatSelectChannel.Admin;
             FilterableChannels |= ChatChannel.Telepathic;
-            FilterableChannels |= ChatChannel.Empathy;
         }
 
         // psionics
@@ -541,17 +539,6 @@ private void UpdateChannelPermissions()
             FilterableChannels |= ChatChannel.Telepathic;
         }
 
-        // Shadowkin
-        if (_shadowkin != null && _shadowkin.IsShadowkin)
-        {
-            FilterableChannels |= ChatChannel.Empathy;
-            CanSendChannels |= ChatSelectChannel.Empathy;
-        }
-        else if (_ghost is { IsGhost: true })
-        {
-            FilterableChannels |= ChatChannel.Empathy;
-        }
-
         SelectableChannels = CanSendChannels;
 
         // Necessary so that we always have a channel to fall back to.

diff --git a/Content.Server/Backmen/CartridgeLoader/Cartridges/BankCartridgeSystem.cs b/Content.Server/Backmen/CartridgeLoader/Cartridges/BankCartridgeSystem.cs
@@ -1,9 +1,11 @@
 using Content.Server.CartridgeLoader;
+using Content.Server.Chat.Managers;
 using Content.Server.PDA.Ringer;
 using Content.Server.Popups;
 using Content.Shared.Backmen.CartridgeLoader.Cartridges;
 using Content.Shared.Backmen.Economy;
 using Content.Shared.CartridgeLoader;
+using Content.Shared.Chat;
 using Content.Shared.Popups;
 using Content.Shared.Store;
 using Robust.Server.Containers;
@@ -19,7 +21,7 @@ public sealed class BankCartridgeSystem : EntitySystem
     [Dependency] private readonly CartridgeLoaderSystem? _cartridgeLoaderSystem = default!;
     [Dependency] private readonly RingerSystem _ringerSystem = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
-    [Dependency] private readonly ContainerSystem _containerSystem = default!;
+    [Dependency] private readonly IChatManager _chatManager = default!;
 
     public override void Initialize()
     {
@@ -95,17 +97,17 @@ private void OnChangeBankBalance(EntityUid uid, BankAccountComponent component,
 
         if (TryComp<RingerComponent>(parent, out var ringerComponent))
         {
-            _ringerSystem.RingerPlayRingtone(parent, ringerComponent);
+            _ringerSystem.RingerPlayRingtone((parent, ringerComponent));
             _cartridgeLoaderSystem?.UpdateCartridgeUiState(parent, new BankUiState(component.Balance));
 
             var player = Transform(parent).ParentUid;
-            if (player.IsValid() && HasComp<ActorComponent>(player))
+            if (player.IsValid() && TryComp<ActorComponent>(player, out var actor))
             {
                 var currencySymbol = "";
                 if (_prototypeManager.TryIndex(component.CurrencyType, out CurrencyPrototype? p))
                     currencySymbol = Loc.GetString(p.CurrencySymbol);
 
-                var change = (double)(args.ChangeAmount ?? 0);
+                var change = (double) (args.ChangeAmount ?? 0);
                 var changeAmount = $"{change}";
                 switch (change)
                 {
@@ -121,17 +123,27 @@ private void OnChangeBankBalance(EntityUid uid, BankAccountComponent component,
                     }
                 }
 
+                var wrappedMessage = Loc.GetString(
+                    "bank-program-change-balance-notification",
+                    ("balance", component.Balance), ("change", changeAmount),
+                    ("currencySymbol", currencySymbol)
+                );
+
                 _popupSystem.PopupEntity(
-                    Loc.GetString(
-                        "bank-program-change-balance-notification",
-                        ("balance", component.Balance), ("change", changeAmount),
-                        ( "currencySymbol", currencySymbol )
-                    ),
+                    wrappedMessage,
                     parent,
                     Filter.Entities(player),
                     true,
                     PopupType.Medium
                 );
+
+                _chatManager.ChatMessageToOne(
+                    ChatChannel.Notifications,
+                    wrappedMessage,
+                    wrappedMessage,
+                    EntityUid.Invalid,
+                    false,
+                    actor.PlayerSession.Channel);
             }
         }
         //UpdateUiState(uid, parent, component);

diff --git a/Content.Server/Backmen/Chat/SimpleStationChatSystem.cs b/Content.Server/Backmen/Chat/SimpleStationChatSystem.cs
@@ -18,6 +18,7 @@ namespace Content.Server.Backmen.Chat;
 /// <summary>
 /// Extensions for parkstation's chat stuff
 /// </summary>
+/*
 public sealed class SimpleStationChatSystem : EntitySystem
 {
     [Dependency] private readonly IAdminManager _adminManager = default!;
@@ -57,7 +58,8 @@ public void SendEmpathyChat(EntityUid source, string message, bool hideChat)
         _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Empathy chat from {ToPrettyString(source):Player}: {message}");
 
         _chatSystem.TrySendInGameICMessage(source, localMessage, InGameICChatType.Speak, hideChat);
-        _chatManager.ChatMessageToMany(ChatChannel.Empathy, message, messageWrap, source, hideChat, true, clients.ToList(), Color.PaleVioletRed);
-        _chatManager.ChatMessageToMany(ChatChannel.Empathy, message, adminMessageWrap, source, hideChat, true, admins, Color.PaleVioletRed);
+        //_chatManager.ChatMessageToMany(ChatChannel.Empathy, message, messageWrap, source, hideChat, true, clients.ToList(), Color.PaleVioletRed);
+        //_chatManager.ChatMessageToMany(ChatChannel.Empathy, message, adminMessageWrap, source, hideChat, true, admins, Color.PaleVioletRed);
     }
 }
+*/
diff --git a/Content.Shared/Backmen/Species/Shadowkin/Components/EmpathyChatComponent.cs b/Content.Shared/Backmen/Species/Shadowkin/Components/EmpathyChatComponent.cs
diff --git a/Content.Shared/Chat/ChatChannel.cs b/Content.Shared/Chat/ChatChannel.cs
@@ -91,10 +91,6 @@ public enum ChatChannel : ushort
         /// </summary>
         Telepathic = 1 << 15,
 
-        /// <summary>
-        ///     Empathy channel for Shadowkin.
-        /// </summary>
-        Empathy = 1 << 16,
 
         /// <summary>
         ///     Channels considered to be IC.

diff --git a/Content.Shared/Chat/ChatSelectChannel.cs b/Content.Shared/Chat/ChatSelectChannel.cs
@@ -46,11 +46,6 @@ public enum ChatSelectChannel : ushort
         /// </summary>
         Telepathic = ChatChannel.Telepathic,
 
-        /// <summary>
-        ///     Empathy
-        /// </summary>
-        Empathy = ChatChannel.Empathy,
-
         /// <summary>
         ///     Deadchat
         /// </summary>

diff --git a/Resources/Prototypes/Backmen/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Backmen/Entities/Mobs/Species/shadowkin.yml
@@ -87,7 +87,7 @@
         Blunt: 2
         Slash: 3
         Piercing: 1
-  - type: EmpathyChat
+  #- type: EmpathyChat
   - type: Shadowkin
   - type: ShadowkinDarkSwapPower
   - type: ShadowkinRestPower