Popup ECS Refactor (#4692)

Content.Client/Commands/DebugCommands.cs

@@ -1,6 +1,6 @@
 using System;
 using Content.Client.Markers;
-using Content.Client.Notifications.Managers;
+using Content.Client.Popups;
 using Content.Shared.SubFloor;
 using Robust.Client.GameObjects;
 using Robust.Shared.Console;
@@ -73,8 +73,7 @@ namespace Content.Client.Commands
         {
             var message = args[0];
 
-            var notifyManager = IoCManager.Resolve<IClientNotifyManager>();
+            EntitySystem.Get<PopupSystem>().PopupCursor(message);
-            notifyManager.PopupMessage(message);
         }
     }
 

Content.Client/ContextMenu/UI/ContextMenuElement.cs

@@ -176,7 +176,7 @@ namespace Content.Client.ContextMenu.UI
          }
      }
 
-    public sealed class ContextMenuPopup : Popup
+    public sealed class ContextMenuPopup : Robust.Client.UserInterface.Controls.Popup
     {
         private static readonly Color DefaultColor = Color.FromHex("#1116");
         private static readonly Color MarginColor = Color.FromHex("#222E");

Content.Client/DragDrop/DragDropSystem.cs

@@ -4,8 +4,7 @@ using Content.Client.Viewport;
 using Content.Shared.DragDrop;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Helpers;
-using Content.Shared.Notification;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;

Content.Client/Entry/EntryPoint.cs

@@ -6,14 +6,12 @@ using Content.Client.Chat.Managers;
 using Content.Client.EscapeMenu;
 using Content.Client.Eui;
 using Content.Client.Flash;
-using Content.Client.GameTicking.Managers;
 using Content.Client.HUD;
 using Content.Client.Input;
 using Content.Client.IoC;
 using Content.Client.Launcher;
 using Content.Client.MainMenu;
 using Content.Client.MobState.Overlays;
-using Content.Client.Notifications.Managers;
 using Content.Client.Parallax;
 using Content.Client.Parallax.Managers;
 using Content.Client.Preferences;
@@ -32,7 +30,6 @@ using Content.Shared.Cargo.Components;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Dispenser;
 using Content.Shared.Gravity;
-using Content.Shared.Kitchen.Components;
 using Content.Shared.Lathe;
 using Content.Shared.Markers;
 using Content.Shared.Research.Components;
@@ -166,7 +163,6 @@ namespace Content.Client.Entry
             ContentContexts.SetupContexts(inputMan.Contexts);
 
             IoCManager.Resolve<IGameHud>().Initialize();
-            IoCManager.Resolve<IClientNotifyManager>().Initialize();
 
             var overlayMgr = IoCManager.Resolve<IOverlayManager>();
             overlayMgr.AddOverlay(new ParallaxOverlay());
@@ -228,7 +224,7 @@ namespace Content.Client.Entry
             switch (level)
             {
                 case ModUpdateLevel.FramePreEngine:
-                    IoCManager.Resolve<IClientNotifyManager>().FrameUpdate(frameEventArgs);
+                    // TODO: Turn IChatManager into an EntitySystem and remove the line below.
                     IoCManager.Resolve<IChatManager>().FrameUpdate(frameEventArgs);
                     break;
             }

Content.Client/IoC/ClientContentIoC.cs

@@ -4,11 +4,9 @@ using Content.Client.Chat.Managers;
 using Content.Client.Clickable;
 using Content.Client.EscapeMenu;
 using Content.Client.Eui;
-using Content.Client.GameTicking.Managers;
 using Content.Client.HUD;
 using Content.Client.Items.Managers;
 using Content.Client.Module;
-using Content.Client.Notifications.Managers;
 using Content.Client.Parallax.Managers;
 using Content.Client.Preferences;
 using Content.Client.Sandbox;
@@ -20,8 +18,6 @@ using Content.Client.Voting;
 using Content.Shared.Actions;
 using Content.Shared.Alert;
 using Content.Shared.Module;
-using Content.Shared.Notification;
-using Content.Shared.Notification.Managers;
 using Robust.Shared.IoC;
 
 namespace Content.Client.IoC
@@ -31,8 +27,6 @@ namespace Content.Client.IoC
         public static void Register()
         {
             IoCManager.Register<IGameHud, GameHud>();
-            IoCManager.Register<IClientNotifyManager, ClientNotifyManager>();
-            IoCManager.Register<ISharedNotifyManager, ClientNotifyManager>();
             IoCManager.Register<IParallaxManager, ParallaxManager>();
             IoCManager.Register<IChatManager, ChatManager>();
             IoCManager.Register<IEscapeMenuOwner, EscapeMenuOwner>();

Content.Client/Notifications/Managers/ClientNotifyManager.cs

@@ -1,178 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Content.Client.Stylesheets;
-using Content.Shared;
-using Content.Shared.Notification;
-using Content.Shared.Notification.Managers;
-using Robust.Client.Graphics;
-using Robust.Client.Player;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Console;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
-using Robust.Shared.Network;
-using Robust.Shared.Timing;
-using Robust.Shared.Utility;
-
-namespace Content.Client.Notifications.Managers
-{
-    public class ClientNotifyManager : SharedNotifyManager, IClientNotifyManager
-    {
-        [Dependency] private readonly IPlayerManager _playerManager = default!;
-        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
-        [Dependency] private readonly IEyeManager _eyeManager = default!;
-        [Dependency] private readonly IClientNetManager _netManager = default!;
-        [Dependency] private readonly IEntityManager _entityManager = default!;
-
-        private readonly List<PopupLabel> _aliveLabels = new();
-        private bool _initialized;
-
-        public void Initialize()
-        {
-            DebugTools.Assert(!_initialized);
-
-            _netManager.RegisterNetMessage<MsgDoNotifyCursor>(DoNotifyCursor);
-            _netManager.RegisterNetMessage<MsgDoNotifyCoordinates>(DoNotifyCoordinates);
-            _netManager.RegisterNetMessage<MsgDoNotifyEntity>(DoNotifyEntity);
-
-            _initialized = true;
-        }
-
-        private void DoNotifyCursor(MsgDoNotifyCursor message)
-        {
-            PopupMessage(message.Message);
-        }
-
-        private void DoNotifyCoordinates(MsgDoNotifyCoordinates message)
-        {
-            PopupMessage(_eyeManager.CoordinatesToScreen(message.Coordinates), message.Message);
-        }
-
-        private void DoNotifyEntity(MsgDoNotifyEntity message)
-        {
-            if (_playerManager.LocalPlayer?.ControlledEntity == null ||
-                !_entityManager.TryGetEntity(message.Entity, out var entity))
-            {
-                return;
-            }
-
-            PopupMessage(entity, _playerManager.LocalPlayer.ControlledEntity, message.Message);
-        }
-
-        public override void PopupMessage(IEntity source, IEntity viewer, string message)
-        {
-            PopupMessage(_eyeManager.CoordinatesToScreen(source.Transform.Coordinates), message, source);
-        }
-
-        public override void PopupMessage(EntityCoordinates coordinates, IEntity viewer, string message)
-        {
-            if (viewer != _playerManager.LocalPlayer?.ControlledEntity)
-            {
-                return;
-            }
-
-            PopupMessage(_eyeManager.CoordinatesToScreen(coordinates), message);
-        }
-
-        public override void PopupMessageCursor(IEntity viewer, string message)
-        {
-            if (viewer != _playerManager.LocalPlayer?.ControlledEntity)
-            {
-                return;
-            }
-
-            PopupMessage(message);
-        }
-
-        public void PopupMessage(ScreenCoordinates coordinates, string message)
-        {
-            PopupMessage(coordinates, message, null);
-        }
-
-        public void PopupMessage(ScreenCoordinates coordinates, string message, IEntity? entity)
-        {
-            var label = new PopupLabel(_eyeManager)
-            {
-                Entity = entity,
-                Text = message,
-                StyleClasses = { StyleNano.StyleClassPopupMessage },
-            };
-
-            _userInterfaceManager.PopupRoot.AddChild(label);
-            label.Measure(Vector2.Infinity);
-            var minimumSize = label.DesiredSize;
-
-            label.InitialPos = (coordinates.Position / label.UIScale) - minimumSize / 2;
-            LayoutContainer.SetPosition(label, label.InitialPos);
-            _aliveLabels.Add(label);
-        }
-
-        public void PopupMessage(string message)
-        {
-            PopupMessage(_userInterfaceManager.MousePositionScaled, message);
-        }
-
-        public void FrameUpdate(FrameEventArgs eventArgs)
-        {
-            _aliveLabels.ForEach(l =>
-            {
-                if (l.TimeLeft > 3f)
-                {
-                    l.Dispose();
-                }
-            });
-
-            _aliveLabels.RemoveAll(l => l.Disposed);
-        }
-
-        private class PopupLabel : Label
-        {
-            private readonly IEyeManager _eyeManager;
-
-            public float TimeLeft { get; private set; }
-            public Vector2 InitialPos { get; set; }
-            public IEntity? Entity { get; set; }
-
-            public PopupLabel(IEyeManager eyeManager)
-            {
-                _eyeManager = eyeManager;
-                ShadowOffsetXOverride = 1;
-                ShadowOffsetYOverride = 1;
-                FontColorShadowOverride = Color.Black;
-            }
-
-            protected override void FrameUpdate(FrameEventArgs eventArgs)
-            {
-                TimeLeft += eventArgs.DeltaSeconds;
-
-                var position = Entity == null
-                    ? InitialPos
-                    : (_eyeManager.CoordinatesToScreen(Entity.Transform.Coordinates).Position / UIScale) - DesiredSize / 2;
-
-                LayoutContainer.SetPosition(this, position - (0, 20 * (TimeLeft * TimeLeft + TimeLeft)));
-
-                if (TimeLeft > 0.5f)
-                {
-                    Modulate = Color.White.WithAlpha(1f - 0.2f * (float)Math.Pow(TimeLeft - 0.5f, 3f));
-                }
-            }
-        }
-    }
-
-    public class PopupMessageCommand : IConsoleCommand
-    {
-        public string Command => "popupmsg";
-        public string Description => "";
-        public string Help => "";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            var arg = args[0];
-            var mgr = IoCManager.Resolve<IClientNotifyManager>();
-            mgr.PopupMessage(arg);
-        }
-    }
-}

Content.Client/Notifications/Managers/IClientNotifyManager.cs

@@ -1,15 +0,0 @@
-using Content.Shared.Notification;
-using Content.Shared.Notification.Managers;
-using Robust.Shared.Map;
-using Robust.Shared.Timing;
-
-namespace Content.Client.Notifications.Managers
-{
-    public interface IClientNotifyManager : ISharedNotifyManager
-    {
-        void Initialize();
-        void PopupMessage(ScreenCoordinates coordinates, string message);
-        void PopupMessage(string message);
-        void FrameUpdate(FrameEventArgs eventArgs);
-    }
-}

Content.Client/Popups/PopupSystem.cs

@@ -0,0 +1,177 @@
+using System;
+using System.Collections.Generic;
+using Content.Client.Stylesheets;
+using Content.Shared.GameTicking;
+using Content.Shared.Popups;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Player;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Popups
+{
+    public class PopupSystem : SharedPopupSystem
+    {
+        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IEyeManager _eyeManager = default!;
+
+        private readonly List<PopupLabel> _aliveLabels = new();
+
+        public override void Initialize()
+        {
+            SubscribeNetworkEvent<PopupCursorEvent>(OnPopupCursorEvent);
+            SubscribeNetworkEvent<PopupCoordinatesEvent>(OnPopupCoordinatesEvent);
+            SubscribeNetworkEvent<PopupEntityEvent>(OnPopupEntityEvent);
+            SubscribeNetworkEvent<RoundRestartCleanupEvent>(OnRoundRestart);
+        }
+
+        #region Actual Implementation
+
+        public void PopupCursor(string message)
+        {
+            PopupMessage(message, _userInterfaceManager.MousePositionScaled);
+        }
+
+        public void PopupCoordinates(string message, EntityCoordinates coordinates)
+        {
+            PopupMessage(message, _eyeManager.CoordinatesToScreen(coordinates));
+        }
+
+        public void PopupEntity(string message, EntityUid uid)
+        {
+            if (!EntityManager.EntityExists(uid))
+                return;
+
+            var transform = ComponentManager.GetComponent<ITransformComponent>(uid);
+            PopupMessage(message, _eyeManager.CoordinatesToScreen(transform.Coordinates));
+        }
+
+        public void PopupMessage(string message, ScreenCoordinates coordinates, IEntity? entity = null)
+        {
+            var label = new PopupLabel(_eyeManager)
+            {
+                Entity = entity,
+                Text = message,
+                StyleClasses = { StyleNano.StyleClassPopupMessage },
+            };
+
+            _userInterfaceManager.PopupRoot.AddChild(label);
+            label.Measure(Vector2.Infinity);
+            var minimumSize = label.DesiredSize;
+
+            label.InitialPos = coordinates.Position / label.UIScale - minimumSize / 2;
+            LayoutContainer.SetPosition(label, label.InitialPos);
+            _aliveLabels.Add(label);
+        }
+
+        #endregion
+
+        #region Abstract Method Implementations
+
+        public override void PopupCursor(string message, Filter filter)
+        {
+            if (!filter.CheckPrediction)
+                return;
+        }
+
+        public override void PopupCoordinates(string message, EntityCoordinates coordinates, Filter filter)
+        {
+            if (!filter.CheckPrediction)
+                return;
+        }
+
+        public override void PopupEntity(string message, EntityUid uid, Filter filter)
+        {
+            if (!filter.CheckPrediction)
+                return;
+        }
+
+        public override Filter GetFilterFromEntity(IEntity entity)
+        {
+            return _playerManager.LocalPlayer?.ControlledEntity == entity
+                ? Filter.Local() : Filter.Empty().Unpredicted();
+        }
+
+        #endregion
+
+        #region Network Event Handlers
+
+        private void OnPopupCursorEvent(PopupCursorEvent ev)
+        {
+            PopupCursor(ev.Message);
+        }
+
+        private void OnPopupCoordinatesEvent(PopupCoordinatesEvent ev)
+        {
+            PopupCoordinates(ev.Message, ev.Coordinates);
+        }
+
+        private void OnPopupEntityEvent(PopupEntityEvent ev)
+        {
+            PopupEntity(ev.Message, ev.Uid);
+        }
+
+        private void OnRoundRestart(RoundRestartCleanupEvent ev)
+        {
+            foreach (var label in _aliveLabels)
+            {
+                label.Dispose();
+            }
+
+            _aliveLabels.Clear();
+        }
+
+        #endregion
+
+        public override void FrameUpdate(float frameTime)
+        {
+            foreach (var l in _aliveLabels)
+            {
+                if (l.TimeLeft > 3f)
+                    l.Dispose();
+            }
+
+            _aliveLabels.RemoveAll(l => l.Disposed);
+        }
+
+        private class PopupLabel : Label
+        {
+            private readonly IEyeManager _eyeManager;
+
+            public float TimeLeft { get; private set; }
+            public Vector2 InitialPos { get; set; }
+            public IEntity? Entity { get; set; }
+
+            public PopupLabel(IEyeManager eyeManager)
+            {
+                _eyeManager = eyeManager;
+                ShadowOffsetXOverride = 1;
+                ShadowOffsetYOverride = 1;
+                FontColorShadowOverride = Color.Black;
+            }
+
+            protected override void FrameUpdate(FrameEventArgs eventArgs)
+            {
+                TimeLeft += eventArgs.DeltaSeconds;
+
+                var position = Entity == null
+                    ? InitialPos
+                    : (_eyeManager.CoordinatesToScreen(Entity.Transform.Coordinates).Position / UIScale) - DesiredSize / 2;
+
+                LayoutContainer.SetPosition(this, position - (0, 20 * (TimeLeft * TimeLeft + TimeLeft)));
+
+                if (TimeLeft > 0.5f)
+                {
+                    Modulate = Color.White.WithAlpha(1f - 0.2f * (float)Math.Pow(TimeLeft - 0.5f, 3f));
+                }
+            }
+        }
+    }
+}

Content.Client/Suspicion/SuspicionGui.xaml.cs

@@ -2,8 +2,7 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
-using Content.Shared.Notification;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;

Content.Server/AME/Components/AMEControllerComponent.cs

@@ -8,8 +8,7 @@ using Content.Server.UserInterface;
 using Content.Shared.ActionBlocker;
 using Content.Shared.AME;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using Content.Shared.Sound;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;

Content.Server/AME/Components/AMEPartComponent.cs

@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using Content.Server.Hands.Components;
 using Content.Server.Tools.Components;
 using Content.Shared.Interaction;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Content.Shared.Tool;
 using Robust.Server.GameObjects;

Content.Server/Access/Components/IdCardConsoleComponent.cs

@@ -9,8 +9,7 @@ using Content.Shared.Access;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Acts;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;

Content.Server/Actions/Actions/CombatMode.cs

@@ -1,7 +1,6 @@
 using Content.Server.CombatMode;
 using Content.Shared.Actions.Behaviors;
-using Content.Shared.Notification;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using JetBrains.Annotations;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;

Content.Server/Actions/Actions/DebugInstant.cs

@@ -1,4 +1,4 @@
-using Content.Server.Notification;
+using Content.Server.Popups;
 using Content.Shared.Actions.Behaviors;
 using Content.Shared.Actions.Behaviors.Item;
 using Content.Shared.Cooldown;

Content.Server/Actions/Actions/DebugTargetEntity.cs

@@ -1,4 +1,4 @@
-using Content.Server.Notification;
+using Content.Server.Popups;
 using Content.Shared.Actions.Behaviors;
 using JetBrains.Annotations;
 using Robust.Shared.Serialization.Manager.Attributes;

Content.Server/Actions/Actions/DebugTargetPoint.cs

@@ -1,4 +1,4 @@
-using Content.Server.Notification;
+using Content.Server.Popups;
 using Content.Shared.Actions.Behaviors;
 using JetBrains.Annotations;
 using Robust.Shared.Serialization.Manager.Attributes;

Content.Server/Actions/Actions/DebugToggle.cs

@@ -1,4 +1,4 @@
-using Content.Server.Notification;
+using Content.Server.Popups;
 using Content.Shared.Actions.Behaviors;
 using Content.Shared.Actions.Behaviors.Item;
 using JetBrains.Annotations;

Content.Server/Actions/Actions/DisarmAction.cs

@@ -1,6 +1,5 @@
 using Content.Server.Act;
 using Content.Server.Interaction;
-using Content.Server.Notification;
 using Content.Server.Weapon.Melee;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Actions;
@@ -9,7 +8,6 @@ using Content.Shared.Actions.Components;
 using Content.Shared.Audio;
 using Content.Shared.Cooldown;
 using Content.Shared.Interaction.Helpers;
-using Content.Shared.Notification.Managers;
 using Content.Shared.Sound;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
@@ -24,6 +22,8 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 using System;
 using System.Linq;
+using Content.Server.Popups;
+using Content.Shared.Popups;
 
 namespace Content.Server.Actions.Actions
 {

Content.Server/Actions/Spells/GiveItemSpell.cs

@@ -1,11 +1,10 @@
 using Content.Server.Hands.Components;
 using Content.Server.Items;
-using Content.Server.Notification;
+using Content.Server.Popups;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Actions.Behaviors;
-using Content.Shared.Actions.Components;
 using Content.Shared.Cooldown;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Sound;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;

Content.Server/Atmos/Components/BaseComputerUserInterfaceComponent.cs

@@ -2,7 +2,7 @@ using Content.Server.Power.Components;
 using Content.Server.UserInterface;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Interaction;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;

Content.Server/Atmos/Components/GasAnalyzerComponent.cs

@@ -7,7 +7,7 @@ using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.DragDrop;
 using Content.Shared.Interaction;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;

Content.Server/Atmos/EntitySystems/FlammableSystem.cs

@@ -8,7 +8,7 @@ using Content.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Damage;
 using Content.Shared.Interaction;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Temperature;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;

Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs

@@ -1,11 +1,10 @@
-using System.Buffers;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Piping.Components;
 using Content.Server.Construction.Components;
 using Content.Server.NodeContainer;
 using Content.Server.NodeContainer.Nodes;
 using Content.Shared.Atmos;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;

Content.Server/Body/Behavior/LungBehavior.cs

@@ -4,7 +4,7 @@ using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Circulatory;
 using Content.Server.Body.Respiratory;
-using Content.Server.Notification;
+using Content.Server.Popups;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
 using Content.Shared.MobState;

Content.Server/Body/Mechanism/MechanismComponent.cs

@@ -6,8 +6,7 @@ using Content.Shared.Body.Mechanism;
 using Content.Shared.Body.Part;
 using Content.Shared.Body.Surgery;
 using Content.Shared.Interaction;
-using Content.Shared.Notification;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;

Content.Server/Body/Part/BodyPartComponent.cs

@@ -6,8 +6,7 @@ using Content.Shared.Body.Mechanism;
 using Content.Shared.Body.Part;
 using Content.Shared.Body.Surgery;
 using Content.Shared.Interaction;
-using Content.Shared.Notification;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using Content.Shared.Random.Helpers;
 using Content.Shared.Verbs;
 using Robust.Server.Console;

Content.Server/Body/Respiratory/RespiratorComponent.cs

@@ -13,7 +13,7 @@ using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
 using Content.Shared.Damage;
 using Content.Shared.MobState;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;

Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs

@@ -7,8 +7,7 @@ using Content.Shared.Body.Components;
 using Content.Shared.Body.Mechanism;
 using Content.Shared.Body.Part;
 using Content.Shared.Body.Surgery;
-using Content.Shared.Notification;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using static Content.Shared.Body.Surgery.ISurgeryData;

Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs

@@ -9,7 +9,7 @@ using Content.Shared.Body.Mechanism;
 using Content.Shared.Body.Part;
 using Content.Shared.Body.Surgery;
 using Content.Shared.Interaction;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;

Content.Server/Botany/Components/PlantHolderComponent.cs

@@ -4,8 +4,8 @@ using Content.Server.Atmos;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Fluids.Components;
 using Content.Server.Hands.Components;
-using Content.Server.Notification;
 using Content.Server.Plants;
+using Content.Server.Popups;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Audio;
 using Content.Shared.Botany;
@@ -13,7 +13,7 @@ using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Random.Helpers;
 using Content.Shared.Tag;
 using Robust.Server.GameObjects;

Content.Server/Botany/Components/SeedExtractorComponent.cs

@@ -1,8 +1,7 @@
 using System.Threading.Tasks;
 using Content.Server.Power.Components;
 using Content.Shared.Interaction;
-using Content.Shared.Notification;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;

Content.Server/Botany/Seed.cs

@@ -4,8 +4,7 @@ using System.Linq;
 using Content.Server.Botany.Components;
 using Content.Server.Plants;
 using Content.Shared.Atmos;
-using Content.Shared.Notification;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using Content.Shared.Random.Helpers;
 using Content.Shared.Tag;
 using Robust.Server.GameObjects;

Content.Server/Buckle/Components/BuckleComponent.cs

@@ -9,7 +9,7 @@ using Content.Shared.Alert;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Interaction.Helpers;
 using Content.Shared.MobState.Components;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Standing;
 using Content.Shared.Verbs;
 using Robust.Server.GameObjects;

Content.Server/Cabinet/ItemCabinetSystem.cs

@@ -3,8 +3,7 @@ using Content.Server.Items;
 using Content.Shared.Audio;
 using Content.Shared.Cabinet;
 using Content.Shared.Interaction;
-using Content.Shared.Notification;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;

Content.Server/CharacterAppearance/Components/MagicMirrorComponent.cs

@@ -2,8 +2,7 @@ using Content.Server.UserInterface;
 using Content.Shared.CharacterAppearance;
 using Content.Shared.CharacterAppearance.Components;
 using Content.Shared.Interaction;
-using Content.Shared.Notification;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;

Content.Server/Chat/Commands/SuicideCommand.cs

@@ -5,12 +5,11 @@ using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
 using Content.Server.Hands.Components;
 using Content.Server.Items;
-using Content.Server.Notification;
 using Content.Server.Players;
+using Content.Server.Popups;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
-using Content.Shared.Notification;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;

Content.Server/Chat/Managers/ChatManager.cs

@@ -13,7 +13,7 @@ using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Inventory;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;

Content.Server/Chemistry/Components/ChemMasterComponent.cs

@@ -11,7 +11,7 @@ using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Random.Helpers;
 using Content.Shared.Sound;
 using Content.Shared.Verbs;

Content.Server/Chemistry/Components/HyposprayComponent.cs

@@ -4,7 +4,7 @@ using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.MobState.Components;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;

Content.Server/Chemistry/Components/InjectorComponent.cs

@@ -8,7 +8,7 @@ using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Helpers;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Players;

Content.Server/Chemistry/Components/ReagentDispenserComponent.cs

@@ -12,7 +12,7 @@ using Content.Shared.Chemistry.Dispenser;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Content.Shared.Verbs;
 using JetBrains.Annotations;

Content.Server/Chemistry/Components/SolutionTransferComponent.cs

@@ -9,9 +9,8 @@ using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Helpers;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Verbs;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;

Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs

@@ -1,5 +1,5 @@
 using Content.Server.Chemistry.Components;
-using Content.Server.Notification;
+using Content.Server.Popups;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using JetBrains.Annotations;

Content.Server/Climbing/Components/ClimbableComponent.cs

@@ -1,14 +1,13 @@
 using System;
 using Content.Server.DoAfter;
-using Content.Server.Notification;
+using Content.Server.Popups;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
 using Content.Shared.Climbing;
 using Content.Shared.DragDrop;
-using Content.Shared.Interaction.Events;
 using Content.Shared.Interaction.Helpers;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Verbs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;

Content.Server/Cloning/Components/CloningPodComponent.cs

@@ -6,8 +6,7 @@ using Content.Server.Power.Components;
 using Content.Server.UserInterface;
 using Content.Shared.Cloning;
 using Content.Shared.MobState;
-using Content.Shared.Notification;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Containers;

Content.Server/Clothing/Components/ClothingComponent.cs

@@ -4,12 +4,10 @@ using Content.Server.Items;
 using Content.Shared.Clothing;
 using Content.Shared.Interaction;
 using Content.Shared.Item;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Sound;
-using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
-using Robust.Shared.Player;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;

Content.Server/Construction/Completions/PopupEveryone.cs

@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Content.Server.Notification;
+using Content.Server.Popups;
 using Content.Shared.Construction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;

Content.Server/Construction/Completions/PopupUser.cs

@@ -1,7 +1,6 @@
 using System.Threading.Tasks;
 using Content.Shared.Construction;
-using Content.Shared.Notification;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;

Content.Server/Construction/Components/ConstructionComponent.Verbs.cs

@@ -1,6 +1,5 @@
 using Content.Shared.ActionBlocker;
-using Content.Shared.Interaction.Events;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using Content.Shared.Verbs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;

Content.Server/Construction/ConstructionSystem.cs

@@ -15,9 +15,8 @@ using Content.Shared.Construction.Prototypes;
 using Content.Shared.Construction.Steps;
 using Content.Shared.Coordinates;
 using Content.Shared.Examine;
-using Content.Shared.Interaction.Events;
 using Content.Shared.Interaction.Helpers;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;

Content.Server/Conveyor/ConveyorSystem.cs

@@ -3,12 +3,11 @@ using Content.Server.Items;
 using Content.Server.MachineLinking.Events;
 using Content.Server.MachineLinking.Models;
 using Content.Server.Power.Components;
-using Content.Server.Recycling.Components;
 using Content.Server.Stunnable.Components;
 using Content.Shared.Conveyor;
 using Content.Shared.MachineLinking;
 using Content.Shared.Movement.Components;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
@@ -16,7 +15,6 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
-using Robust.Shared.Physics.Dynamics;
 
 namespace Content.Server.Conveyor
 {

Content.Server/Crayon/CrayonComponent.cs

@@ -3,11 +3,9 @@ using System.Threading.Tasks;
 using Content.Server.UserInterface;
 using Content.Shared.Audio;
 using Content.Shared.Crayon;
-using Content.Shared.DragDrop;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Helpers;
-using Content.Shared.Notification;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using Content.Shared.Sound;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;

Content.Server/Cuffs/Components/CuffableComponent.cs

@@ -7,9 +7,8 @@ using Content.Server.Hands.Components;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Alert;
 using Content.Shared.Cuffs.Components;
-using Content.Shared.Interaction.Events;
 using Content.Shared.Interaction.Helpers;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;

Content.Server/Cuffs/Components/HandcuffComponent.cs

@@ -6,9 +6,8 @@ using Content.Server.Stunnable.Components;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Cuffs.Components;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
 using Content.Shared.Interaction.Helpers;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;

Content.Server/Dice/DiceSystem.cs

@@ -1,5 +1,5 @@
 using System;
-using Content.Server.Notification;
+using Content.Server.Popups;
 using Content.Shared.Audio;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;

Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs

@@ -6,8 +6,7 @@ using Content.Server.Hands.Components;
 using Content.Server.UserInterface;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using Content.Shared.Sound;
 using Content.Shared.Verbs;
 using Robust.Server.Console;

Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs

@@ -3,8 +3,7 @@ using Content.Server.Hands.Components;
 using Content.Server.UserInterface;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using Content.Shared.Sound;
 using Content.Shared.Verbs;
 using Robust.Server.Console;

Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs

@@ -4,7 +4,7 @@ using Content.Server.Construction.Components;
 using Content.Server.Disposal.Unit.Components;
 using Content.Shared.Acts;
 using Content.Shared.Disposal.Components;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Content.Shared.Verbs;
 using Robust.Server.Console;
@@ -17,7 +17,6 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Disposal.Tube.Components

Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs

@@ -15,7 +15,7 @@ using Content.Shared.Disposal;
 using Content.Shared.Disposal.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Movement;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Throwing;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;

Content.Server/Doors/Components/AirlockComponent.cs

@@ -4,14 +4,9 @@ using Content.Server.Power.Components;
 using Content.Server.VendingMachines;
 using Content.Server.WireHacking;
 using Content.Shared.Doors;
-using Content.Shared.Interaction;
-using Content.Shared.Notification;
-using Content.Shared.Notification.Managers;
 using Content.Shared.Sound;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;

Content.Server/Doors/Components/FirelockComponent.cs

@@ -1,12 +1,7 @@
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Doors;
-using Content.Server.Doors.Components;
 using Content.Shared.Doors;
-using Content.Shared.Interaction;
-using Content.Shared.Notification.Managers;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Server.Doors.Components

Content.Server/Doors/Systems/AirlockSystem.cs

@@ -1,7 +1,7 @@
 using Content.Server.Doors.Components;
 using Content.Server.Power.Components;
 using Content.Shared.Doors;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;

Content.Server/Doors/Systems/FirelockSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.Doors.Components;
 using Content.Shared.Doors;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 

Content.Server/Entry/EntryPoint.cs

@@ -11,7 +11,6 @@ using Content.Server.GameTicking;
 using Content.Server.Holiday.Interfaces;
 using Content.Server.IoC;
 using Content.Server.NodeContainer.NodeGroups;
-using Content.Server.Notification.Managers;
 using Content.Server.PDA.Managers;
 using Content.Server.Preferences.Managers;
 using Content.Server.Sandbox;
@@ -62,7 +61,6 @@ namespace Content.Server.Entry
             _euiManager = IoCManager.Resolve<EuiManager>();
             _voteManager = IoCManager.Resolve<IVoteManager>();
 
-            IoCManager.Resolve<IServerNotifyManager>().Initialize();
             IoCManager.Resolve<IChatManager>().Initialize();
 
             var playerManager = IoCManager.Resolve<IPlayerManager>();

Content.Server/Extinguisher/FireExtinguisherComponent.cs

@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
 using Content.Server.Chemistry.Components;
-using Content.Server.Fluids.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;

Content.Server/Flash/FlashSystem.cs

@@ -8,8 +8,8 @@ using Content.Shared.Flash;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Helpers;
 using Content.Shared.Inventory;
-using Content.Shared.Notification.Managers;
 using Content.Shared.Physics;
+using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;

Content.Server/Fluids/Components/BucketComponent.cs

@@ -5,7 +5,7 @@ using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Helpers;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;

Content.Server/Fluids/Components/MopComponent.cs

@@ -5,7 +5,7 @@ using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Helpers;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;

Content.Server/Fluids/Components/SpillableComponent.cs

@@ -3,7 +3,7 @@ using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Verbs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;

Content.Server/Fluids/Components/SprayComponent.cs

@@ -9,7 +9,7 @@ using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Cooldown;
 using Content.Shared.Fluids;
 using Content.Shared.Interaction;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Content.Shared.Vapor;
 using Robust.Server.GameObjects;

Content.Server/Hands/Components/HandsComponent.cs

@@ -5,12 +5,12 @@ using System.Linq;
 using Content.Server.Act;
 using Content.Server.Interaction;
 using Content.Server.Items;
-using Content.Server.Notification;
+using Content.Server.Popups;
 using Content.Server.Pulling;
 using Content.Shared.Audio;
 using Content.Shared.Body.Part;
 using Content.Shared.Hands.Components;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Pulling.Components;
 using Content.Shared.Sound;
 using Robust.Server.GameObjects;

Content.Server/Hands/Systems/HandsSystem.cs

@@ -2,7 +2,6 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Hands.Components;
-using Content.Server.Hands.Systems;
 using Content.Server.Interaction;
 using Content.Server.Inventory.Components;
 using Content.Server.Items;
@@ -13,8 +12,8 @@ using Content.Shared.Examine;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
 using Content.Shared.Input;
-using Content.Shared.Notification.Managers;
 using Content.Shared.Physics.Pull;
+using Content.Shared.Popups;
 using JetBrains.Annotations;
 using Robust.Server.Player;
 using Robust.Shared.Containers;

Content.Server/Instruments/InstrumentComponent.cs

@@ -3,11 +3,10 @@ using System.Linq;
 using Content.Server.Stunnable.Components;
 using Content.Server.UserInterface;
 using Content.Shared.ActionBlocker;
-using Content.Shared.DragDrop;
 using Content.Shared.Hands;
 using Content.Shared.Instruments;
 using Content.Shared.Interaction;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Standing;
 using Content.Shared.Throwing;
 using Robust.Server.GameObjects;

Content.Server/Interaction/InRangeUnoccludedVerb.cs

@@ -1,6 +1,5 @@
 using Content.Shared.Interaction.Helpers;
-using Content.Shared.Notification;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using Content.Shared.Verbs;
 using Robust.Server.Console;
 using Robust.Server.GameObjects;

Content.Server/Interaction/InteractionSystem.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Buckle.Components;
 using Content.Server.CombatMode;
-using Content.Server.DoAfter;
 using Content.Server.Hands.Components;
 using Content.Server.Items;
 using Content.Server.Pulling;
@@ -15,10 +14,9 @@ using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
 using Content.Shared.Input;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
 using Content.Shared.Interaction.Helpers;
 using Content.Shared.Inventory;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Rotatable;
 using Content.Shared.Throwing;
 using Content.Shared.Verbs;
@@ -314,7 +312,7 @@ namespace Content.Server.Interaction
         ///     Resolves user interactions with objects.
         /// </summary>
         /// <remarks>
-        ///     Checks Whether combat mode is enabled and whether the user can actually interact with the given entity. 
+        ///     Checks Whether combat mode is enabled and whether the user can actually interact with the given entity.
         /// </remarks>
         /// <param name="altInteract">Whether to use default or alternative interactions (usually as a result of
         /// alt+clicking). If combat mode is enabled, the alternative action is to perform the default non-combat
@@ -324,7 +322,7 @@ namespace Content.Server.Interaction
             // TODO COMBAT Consider using alt-interact for advanced combat? maybe alt-interact disarms?
             if (!altInteract && user.TryGetComponent(out CombatModeComponent? combatMode) && combatMode.IsInCombatMode)
             {
-                
+
                 DoAttack(user, coordinates, false, clickedUid);
                 return;
 
@@ -501,7 +499,7 @@ namespace Content.Server.Interaction
         }
 
         /// <summary>
-        ///     Alternative interactions on an entity. 
+        ///     Alternative interactions on an entity.
         /// </summary>
         /// <remarks>
         ///     Uses the context menu verb list, and acts out the first verb marked as an alternative interaction. Note

Content.Server/Inventory/Components/DebugEquipComponent.cs

@@ -1,7 +1,6 @@
 using Content.Shared.Hands;
 using Content.Shared.Inventory;
-using Content.Shared.Notification;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.Inventory.Components

Content.Server/Inventory/Components/InventoryComponent.cs

@@ -12,9 +12,8 @@ using Content.Shared.ActionBlocker;
 using Content.Shared.Acts;
 using Content.Shared.EffectBlocker;
 using Content.Shared.Inventory;
-using Content.Shared.Inventory.Events;
 using Content.Shared.Movement.Components;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Verbs;
 using Robust.Server.Console;
 using Robust.Server.GameObjects;

Content.Server/IoC/ServerContentIoC.cs

@@ -9,17 +9,14 @@ using Content.Server.Connection;
 using Content.Server.Database;
 using Content.Server.DeviceNetwork;
 using Content.Server.EUI;
-using Content.Server.GameTicking;
 using Content.Server.Holiday;
 using Content.Server.Holiday.Interfaces;
 using Content.Server.Module;
 using Content.Server.MoMMI;
 using Content.Server.NodeContainer.NodeGroups;
-using Content.Server.Notification.Managers;
 using Content.Server.Objectives;
 using Content.Server.Objectives.Interfaces;
 using Content.Server.PDA.Managers;
-using Content.Server.Power.Components;
 using Content.Server.Preferences.Managers;
 using Content.Server.Sandbox;
 using Content.Server.Speech;
@@ -28,8 +25,6 @@ using Content.Shared.Actions;
 using Content.Shared.Alert;
 using Content.Shared.Kitchen;
 using Content.Shared.Module;
-using Content.Shared.Notification;
-using Content.Shared.Notification.Managers;
 using Robust.Shared.IoC;
 
 namespace Content.Server.IoC
@@ -38,8 +33,6 @@ namespace Content.Server.IoC
     {
         public static void Register()
         {
-            IoCManager.Register<ISharedNotifyManager, ServerNotifyManager>();
-            IoCManager.Register<IServerNotifyManager, ServerNotifyManager>();
             IoCManager.Register<IChatManager, ChatManager>();
             IoCManager.Register<IMoMMILink, MoMMILink>();
             IoCManager.Register<ISandboxManager, SandboxManager>();

Content.Server/Kitchen/Components/KitchenSpikeComponent.cs

@@ -3,14 +3,13 @@ using System.Diagnostics.CodeAnalysis;
 using Content.Server.Act;
 using Content.Server.Chat.Managers;
 using Content.Server.DoAfter;
-using Content.Server.Notification;
+using Content.Server.Popups;
 using Content.Shared.DragDrop;
 using Content.Shared.Interaction;
 using Content.Shared.Kitchen.Components;
 using Content.Shared.MobState;
-using Content.Shared.Notification;
-using Content.Shared.Notification.Managers;
 using Content.Shared.Nutrition.Components;
+using Content.Shared.Popups;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;

Content.Server/Kitchen/Components/MicrowaveComponent.cs

@@ -6,7 +6,7 @@ using Content.Server.Chat.Managers;
 using Content.Server.Chemistry.Components;
 using Content.Server.Hands.Components;
 using Content.Server.Items;
-using Content.Server.Notification;
+using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.UserInterface;
 using Content.Shared.Acts;
@@ -18,7 +18,7 @@ using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
 using Content.Shared.Kitchen;
 using Content.Shared.Kitchen.Components;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Power;
 using Content.Shared.Sound;
 using Robust.Server.GameObjects;

Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs

@@ -11,7 +11,7 @@ using Content.Server.UserInterface;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Kitchen.Components;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Random.Helpers;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;

Content.Server/Light/Components/HandheldLightComponent.cs

@@ -8,9 +8,8 @@ using Content.Shared.Actions.Behaviors.Item;
 using Content.Shared.Actions.Components;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
 using Content.Shared.Light.Component;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Rounding;
 using Content.Shared.Sound;
 using Content.Shared.Verbs;

Content.Server/Light/Components/LightReplacerComponent.cs

@@ -2,9 +2,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Storage.Components;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Sound;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;

Content.Server/Light/Components/PoweredLightComponent.cs

@@ -8,7 +8,7 @@ using Content.Shared.Audio;
 using Content.Shared.Damage;
 using Content.Shared.Interaction;
 using Content.Shared.Light;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;

Content.Server/Lock/LockSystem.cs

@@ -2,7 +2,7 @@ using Content.Server.Access.Components;
 using Content.Server.Storage.Components;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Storage;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;

Content.Server/MachineLinking/System/SignalLinkerSystem.cs

@@ -7,15 +7,12 @@ using Content.Server.MachineLinking.Events;
 using Content.Server.MachineLinking.Exceptions;
 using Content.Server.MachineLinking.Models;
 using Content.Server.Power.Components;
-using Content.Server.Power.EntitySystems;
 using Content.Server.UserInterface;
 using Content.Shared.Interaction;
 using Content.Shared.MachineLinking;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Robust.Server.GameObjects;
-using Robust.Server.Player;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Utility;
 

Content.Server/Medical/Components/MedicalScannerComponent.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Content.Server.Cloning;
 using Content.Server.Mind.Components;
 using Content.Server.Power.Components;
@@ -12,20 +11,16 @@ using Content.Shared.DragDrop;
 using Content.Shared.Interaction;
 using Content.Shared.MedicalScanner;
 using Content.Shared.MobState;
-using Content.Shared.Movement;
+using Content.Shared.Popups;
-using Content.Shared.Notification;
-using Content.Shared.Notification.Managers;
 using Content.Shared.Preferences;
 using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
-using Robust.Server.Player;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Network;
-using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Medical.Components

Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs

@@ -8,7 +8,7 @@ using Content.Shared.Body.Components;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Morgue;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Standing;
 using Content.Shared.Verbs;
 using Robust.Server.GameObjects;

Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs

@@ -2,22 +2,20 @@ using System.Threading;
 using Content.Server.Act;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
-using Content.Server.Notification;
 using Content.Server.Players;
+using Content.Server.Popups;
 using Content.Server.Storage.Components;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
 using Content.Shared.Morgue;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Content.Shared.Standing;
 using Content.Shared.Verbs;
 using Robust.Server.Player;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;

Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs

@@ -6,8 +6,8 @@ using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Helpers;
 using Content.Shared.Morgue;
-using Content.Shared.Notification.Managers;
 using Content.Shared.Physics;
+using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Content.Shared.Standing;
 using Robust.Server.GameObjects;
@@ -165,7 +165,7 @@ namespace Content.Server.Morgue.Components
             if (DoSoulBeep && Appearance != null && Appearance.TryGetData(MorgueVisuals.HasSoul, out bool hasSoul) && hasSoul)
             {
                 SoundSystem.Play(Filter.Pvs(Owner), _occupantHasSoulAlarmSound.GetSound(), Owner);
-            }                
+            }
         }
 
         void IExamine.Examine(FormattedMessage message, bool inDetailsRange)

Content.Server/NodeContainer/NodeGroups/NodeGroupAttribute.cs

@@ -5,7 +5,7 @@ namespace Content.Server.NodeContainer.NodeGroups
 {
     /// <summary>
     ///     Associates a <see cref="INodeGroup"/> implementation with a <see cref="NodeGroupID"/>.
-    ///     This is used to gurantee all <see cref="INode"/>s of the same <see cref="INode.NodeGroupID"/>
+    ///     This is used to gurantee all <see cref="INode"/>s of the same <see cref="NodeGroupID"/>
     ///     have the same type of <see cref="INodeGroup"/>. Used by <see cref="INodeGroupFactory"/>.
     /// </summary>
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]

Content.Server/Notification/Managers/IServerNotifyManager.cs

@@ -1,10 +0,0 @@
-using Content.Shared.Notification;
-using Content.Shared.Notification.Managers;
-
-namespace Content.Server.Notification.Managers
-{
-    public interface IServerNotifyManager : ISharedNotifyManager
-    {
-        void Initialize();
-    }
-}

Content.Server/Notification/Managers/ServerNotifyManager.cs

@@ -1,71 +0,0 @@
-using Content.Shared;
-using Content.Shared.Notification;
-using Content.Shared.Notification.Managers;
-using Robust.Server.GameObjects;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Map;
-using Robust.Shared.Network;
-using Robust.Shared.Utility;
-
-namespace Content.Server.Notification.Managers
-{
-    public class ServerNotifyManager : SharedNotifyManager, IServerNotifyManager
-    {
-        [Dependency] private readonly IServerNetManager _netManager = default!;
-
-        private bool _initialized;
-
-        public void Initialize()
-        {
-            DebugTools.Assert(!_initialized);
-
-            _netManager.RegisterNetMessage<MsgDoNotifyCursor>();
-            _netManager.RegisterNetMessage<MsgDoNotifyCoordinates>();
-            _netManager.RegisterNetMessage<MsgDoNotifyEntity>();
-
-            _initialized = true;
-        }
-
-        public override void PopupMessage(IEntity source, IEntity viewer, string message)
-        {
-            if (!viewer.TryGetComponent(out ActorComponent? actor))
-            {
-                return;
-            }
-
-            var netMessage = _netManager.CreateNetMessage<MsgDoNotifyEntity>();
-            netMessage.Entity = source.Uid;
-            netMessage.Message = message;
-
-            _netManager.ServerSendMessage(netMessage, actor.PlayerSession.ConnectedClient);
-        }
-
-        public override void PopupMessage(EntityCoordinates coordinates, IEntity viewer, string message)
-        {
-            if (!viewer.TryGetComponent(out ActorComponent? actor))
-            {
-                return;
-            }
-
-            var netMessage = _netManager.CreateNetMessage<MsgDoNotifyCoordinates>();
-            netMessage.Coordinates = coordinates;
-            netMessage.Message = message;
-
-            _netManager.ServerSendMessage(netMessage, actor.PlayerSession.ConnectedClient);
-        }
-
-        public override void PopupMessageCursor(IEntity viewer, string message)
-        {
-            if (!viewer.TryGetComponent(out ActorComponent? actor))
-            {
-                return;
-            }
-
-            var netMessage = _netManager.CreateNetMessage<MsgDoNotifyCursor>();
-            netMessage.Message = message;
-
-            _netManager.ServerSendMessage(netMessage, actor.PlayerSession.ConnectedClient);
-        }
-    }
-}

Content.Server/Nutrition/Components/DrinkComponent.cs

@@ -9,8 +9,8 @@ using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Helpers;
-using Content.Shared.Notification.Managers;
 using Content.Shared.Nutrition.Components;
+using Content.Shared.Popups;
 using Content.Shared.Sound;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;

Content.Server/Nutrition/Components/FoodComponent.cs

@@ -10,7 +10,7 @@ using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Helpers;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;

Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs

@@ -1,11 +1,11 @@
 using Content.Server.Fluids.Components;
-using Content.Server.Notification;
 using Content.Server.Nutrition.Components;
+using Content.Server.Popups;
 using Content.Shared.Audio;
 using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Notification.Managers;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Popups;
 using Content.Shared.Throwing;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;

Content.Server/PDA/PDAComponent.cs

@@ -9,11 +9,9 @@ using Content.Server.Items;
 using Content.Server.PDA.Managers;
 using Content.Server.UserInterface;
 using Content.Shared.ActionBlocker;
-using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Notification.Managers;
 using Content.Shared.PDA;
+using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Content.Shared.Tag;
 using Content.Shared.Verbs;

Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading;
-using Content.Server.Notification;
+using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.UserInterface;

Content.Server/Plants/Components/PottedPlantHideComponent.cs

@@ -2,8 +2,7 @@ using System.Threading.Tasks;
 using Content.Server.Storage.Components;
 using Content.Shared.Audio;
 using Content.Shared.Interaction;
-using Content.Shared.Notification;
+using Content.Shared.Popups;
-using Content.Shared.Notification.Managers;
 using Content.Shared.Sound;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;

Content.Server/Pointing/EntitySystems/PointingSystem.cs

@@ -6,9 +6,8 @@ using Content.Server.Pointing.Components;
 using Content.Server.Visible;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Input;
-using Content.Shared.Interaction.Events;
 using Content.Shared.Interaction.Helpers;
-using Content.Shared.Notification.Managers;
+using Content.Shared.Popups;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;