diff --git a/Content.Client/Access/IdCardSystem.cs b/Content.Client/Access/IdCardSystem.cs
new file mode 100644
index 000000000000..fcf2bf57de38
--- /dev/null
+++ b/Content.Client/Access/IdCardSystem.cs
@@ -0,0 +1,7 @@
+using Content.Shared.Access.Systems;
+
+namespace Content.Client.Access;
+
+public sealed class IdCardSystem : SharedIdCardSystem
+{
+}
diff --git a/Content.Client/Administration/UI/BwoinkWindow.xaml.cs b/Content.Client/Administration/UI/BwoinkWindow.xaml.cs
index a3e74854972b..730671551280 100644
--- a/Content.Client/Administration/UI/BwoinkWindow.xaml.cs
+++ b/Content.Client/Administration/UI/BwoinkWindow.xaml.cs
@@ -170,9 +170,12 @@ private string FormatTabTitle(ItemList.Item li, PlayerInfo? pl = default)
             if (pl.Antag)
                 sb.Append(new Rune(0x1F5E1)); // 🗡
 
-            sb.AppendFormat("\"{0}\"", pl.CharacterName)
-                .Append(' ')
-                .Append(pl.Username);
+            sb.AppendFormat("\"{0}\"", pl.CharacterName);
+
+            if (pl.IdentityName != pl.CharacterName && pl.IdentityName != string.Empty)
+                sb.Append(' ').AppendFormat("[{0}]", pl.IdentityName);
+
+            sb.Append(' ').Append(pl.Username);
 
             return sb.ToString();
         }
diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
index 02c87dc77880..48f58a6efaba 100644
--- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
+++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
@@ -71,6 +71,8 @@ private void PopulateList(IReadOnlyList<PlayerInfo> _ = null!)
             foreach (var info in _adminSystem.PlayerList)
             {
                 var displayName = $"{info.CharacterName} ({info.Username})";
+                if (info.IdentityName != info.CharacterName)
+                    displayName += $" [{info.IdentityName}]";
                 if (!string.IsNullOrEmpty(FilterLineEdit.Text) &&
                     !displayName.ToLowerInvariant().Contains(FilterLineEdit.Text.Trim().ToLowerInvariant()))
                 {
diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml b/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml
index 9e6ef34cad6d..8dda6b4e3cd0 100644
--- a/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml
@@ -12,6 +12,5 @@
         <Button Name="LoadGamePrototypeButton" Text="{Loc 'load-game-prototype'}"/>
         <cc:UICommandButton Name="LoadBlueprintsButton" Command="loadbp" Text="{Loc 'load-blueprints'}" WindowType="{x:Type abt:LoadBlueprintsWindow}"/>
         <cc:CommandButton Command="deleteewc Singularity" Name="DeleteSingulos" Text="{Loc 'delete-singularities'}"/>
-        <cc:UICommandButton Command="events" Text="{Loc 'open-station-events'}" WindowType="{x:Type abt:StationEventsWindow}" />
     </GridContainer>
 </Control>
diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml
deleted file mode 100644
index 0ba2a38c4a79..000000000000
--- a/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml
+++ /dev/null
@@ -1,13 +0,0 @@
-<DefaultWindow
-    xmlns="https://spacestation14.io" Title="{Loc Events}">
-    <BoxContainer Orientation="Vertical">
-        <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Event}" MinSize="100 0" />
-            <Control MinSize="50 0" />
-            <OptionButton Name="EventsOptions" MinSize="100 0" HorizontalExpand="True" Disabled="True" />
-        </BoxContainer>
-        <Button Name="PauseButton" Text="{Loc Pause}" Disabled="True" />
-        <Button Name="ResumeButton" Text="{Loc Resume}" Disabled="True" />
-        <Button Name="SubmitButton" Text="{Loc Run}" Disabled="True" />
-    </BoxContainer>
-</DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs
deleted file mode 100644
index 62048c45ab1b..000000000000
--- a/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Content.Client.StationEvents.Managers;
-using JetBrains.Annotations;
-using Robust.Client.AutoGenerated;
-using Robust.Client.Console;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-
-namespace Content.Client.Administration.UI.Tabs.AdminbusTab
-{
-    [GenerateTypedNameReferences]
-    [UsedImplicitly]
-    public sealed partial class StationEventsWindow : DefaultWindow
-    {
-        private List<string>? _data;
-
-        [Dependency]
-        private readonly IStationEventManager _eventManager = default!;
-
-        public StationEventsWindow()
-        {
-            IoCManager.InjectDependencies(this);
-
-            MinSize = SetSize = (300, 200);
-            RobustXamlLoader.Load(this);
-        }
-
-        protected override void EnteredTree()
-        {
-            _eventManager.OnStationEventsReceived += OnStationEventsReceived;
-            _eventManager.RequestEvents();
-
-            EventsOptions.AddItem(Loc.GetString("station-events-window-not-loaded-text"));
-        }
-
-        private void OnStationEventsReceived()
-        {
-            // fill events dropdown
-            _data = _eventManager.StationEvents.ToList();
-            EventsOptions.Clear();
-            foreach (var stationEvent in _data)
-            {
-                EventsOptions.AddItem(stationEvent);
-            }
-            EventsOptions.AddItem(Loc.GetString("station-events-window-random-text"));
-
-            // Enable all UI elements
-            EventsOptions.Disabled = false;
-            PauseButton.Disabled = false;
-            ResumeButton.Disabled = false;
-            SubmitButton.Disabled = false;
-
-            // Subscribe to UI events
-            EventsOptions.OnItemSelected += eventArgs => EventsOptions.SelectId(eventArgs.Id);
-            PauseButton.OnPressed += PauseButtonOnOnPressed;
-            ResumeButton.OnPressed += ResumeButtonOnOnPressed;
-            SubmitButton.OnPressed += SubmitButtonOnOnPressed;
-        }
-
-        private static void PauseButtonOnOnPressed(BaseButton.ButtonEventArgs obj)
-        {
-            IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand("events pause");
-        }
-
-        private static void ResumeButtonOnOnPressed(BaseButton.ButtonEventArgs obj)
-        {
-            IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand("events resume");
-        }
-
-        private void SubmitButtonOnOnPressed(BaseButton.ButtonEventArgs obj)
-        {
-            if (_data == null)
-                return;
-
-            // random is always last option
-            var id = EventsOptions.SelectedId;
-            var selectedEvent = id < _data.Count ? _data[id] : "random";
-
-            IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand($"events run \"{selectedEvent}\"");
-        }
-    }
-}
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
index 9e92dc125ba7..84a4817da64b 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
@@ -100,6 +100,7 @@ private void RefreshPlayerList(IReadOnlyList<PlayerInfo> players)
             {
                 var entry = new PlayerTabEntry(player.Username,
                     player.CharacterName,
+                    player.IdentityName,
                     player.StartingJob,
                     player.Antag ? "YES" : "NO",
                     new StyleBoxFlat(useAltColor ? _altColor : _defaultColor),
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
index 1ab6071e033d..45cb4b77034c 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
@@ -10,7 +10,7 @@ public sealed partial class PlayerTabEntry : ContainerButton
 {
     public EntityUid? PlayerUid;
 
-    public PlayerTabEntry(string username, string character, string job, string antagonist, StyleBox styleBox, bool connected)
+    public PlayerTabEntry(string username, string character, string identity, string job, string antagonist, StyleBox styleBox, bool connected)
     {
         RobustXamlLoader.Load(this);
 
@@ -19,6 +19,8 @@ public PlayerTabEntry(string username, string character, string job, string anta
             UsernameLabel.StyleClasses.Add("Disabled");
         JobLabel.Text = job;
         CharacterLabel.Text = character;
+        if (identity != character)
+            CharacterLabel.Text += $" [{identity}]";
         AntagonistLabel.Text = antagonist;
         BackgroundColorPanel.PanelOverride = styleBox;
     }
diff --git a/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs
index 756a7e5b626e..95f7e84291ae 100644
--- a/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs
+++ b/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Cargo.BUI;
 using Content.Shared.Cargo.Events;
 using Content.Shared.Cargo.Prototypes;
+using Content.Shared.IdentityManagement;
 using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Shared.Prototypes;
@@ -55,7 +56,7 @@ protected override void Open()
             string orderRequester;
 
             if (entityManager.TryGetComponent<MetaDataComponent>(localPlayer, out var metadata))
-                orderRequester = metadata.EntityName;
+                orderRequester = Identity.Name(localPlayer.Value, entityManager);
             else
                 orderRequester = string.Empty;
 
diff --git a/Content.Client/ContextMenu/UI/EntityMenuElement.cs b/Content.Client/ContextMenu/UI/EntityMenuElement.cs
index 00ce165a06a0..c371418c079a 100644
--- a/Content.Client/ContextMenu/UI/EntityMenuElement.cs
+++ b/Content.Client/ContextMenu/UI/EntityMenuElement.cs
@@ -1,4 +1,8 @@
+using Content.Client.Administration.Managers;
+using Content.Shared.Administration;
+using Content.Shared.IdentityManagement;
 using Robust.Client.GameObjects;
+using Robust.Client.Player;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -11,6 +15,7 @@ public sealed partial class EntityMenuElement : ContextMenuElement
         public const string StyleClassEntityMenuCountText = "contextMenuCount";
 
         [Dependency] private IEntityManager _entityManager = default!;
+        [Dependency] private IPlayerManager _playerManager = default!;
 
         /// <summary>
         ///     The entity that can be accessed by interacting with this element.
@@ -74,10 +79,12 @@ public void UpdateEntity(EntityUid? entity = null)
 
             EntityIcon.Sprite = _entityManager.GetComponentOrNull<ISpriteComponent>(entity);
 
-            if (UserInterfaceManager.DebugMonitors.Visible)
+            var admin = IoCManager.Resolve<IClientAdminManager>();
+
+            if (admin.HasFlag(AdminFlags.Admin | AdminFlags.Debug))
                 Text = _entityManager.ToPrettyString(entity.Value);
             else
-                Text = _entityManager.GetComponent<MetaDataComponent>(entity.Value).EntityName;
+                Text = Identity.Name(entity.Value, _entityManager, _playerManager.LocalPlayer!.ControlledEntity!);
         }
     }
 }
diff --git a/Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs b/Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs
index 71e1b8fdfa1a..2609527a032c 100644
--- a/Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs
+++ b/Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Content.Shared.IdentityManagement;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -21,7 +22,7 @@ private List<List<EntityUid>> GroupEntities(IEnumerable<EntityUid> entities, int
         {
             if (GroupingContextMenuType == 0)
             {
-                var newEntities = entities.GroupBy(e => _entityManager.GetComponent<MetaDataComponent>(e).EntityName + (_entityManager.GetComponent<MetaDataComponent>(e).EntityPrototype?.ID ?? string.Empty)).ToList();
+                var newEntities = entities.GroupBy(e => Identity.Name(e, _entityManager) + (_entityManager.GetComponent<MetaDataComponent>(e).EntityPrototype?.ID ?? string.Empty)).ToList();
                 return newEntities.Select(grp => grp.ToList()).ToList();
             }
             else
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index 7075911c1a6e..b5e7f82fc5ff 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -17,11 +17,10 @@
 using Content.Client.Parallax;
 using Content.Client.Parallax.Managers;
 using Content.Client.Preferences;
+using Content.Client.Radiation;
 using Content.Client.Sandbox;
 using Content.Client.Screenshot;
 using Content.Client.Singularity;
-using Content.Client.StationEvents;
-using Content.Client.StationEvents.Managers;
 using Content.Client.Stylesheets;
 using Content.Client.Viewport;
 using Content.Client.Voting;
@@ -194,7 +193,6 @@ public override void PostInit()
 
             IoCManager.Resolve<IChatManager>().Initialize();
             IoCManager.Resolve<IClientPreferencesManager>().Initialize();
-            IoCManager.Resolve<IStationEventManager>().Initialize();
             IoCManager.Resolve<EuiManager>().Initialize();
             IoCManager.Resolve<IVoteManager>().Initialize();
             IoCManager.Resolve<IGamePrototypeLoadManager>().Initialize();
diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs
index 1504621899e0..1ffa00855970 100644
--- a/Content.Client/Examine/ExamineSystem.cs
+++ b/Content.Client/Examine/ExamineSystem.cs
@@ -2,6 +2,7 @@
 using System.Threading;
 using Content.Client.Verbs;
 using Content.Shared.Examine;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Input;
 using Content.Shared.Verbs;
 using JetBrains.Annotations;
@@ -192,7 +193,7 @@ public void OpenTooltip(EntityUid player, EntityUid target, bool centeredOnCurso
 
             hBox.AddChild(new Label
             {
-                Text = EntityManager.GetComponent<MetaDataComponent>(target).EntityName,
+                Text = Identity.Name(target, EntityManager, player),
                 HorizontalExpand = true,
             });
 
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
index 25165ae0de67..ca2e25b94d40 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
@@ -7,7 +7,7 @@
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
 using Content.Shared.Damage;
-
+using Content.Shared.IdentityManagement;
 using static Content.Shared.MedicalScanner.SharedHealthAnalyzerComponent;
 
 namespace Content.Client.HealthAnalyzer.UI
@@ -28,8 +28,9 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
             if (msg.TargetEntity != null && entities.TryGetComponent<DamageableComponent>(msg.TargetEntity, out var damageable))
             {
                 string entityName = "Unknown";
-                if (msg.TargetEntity != null && entities.TryGetComponent<MetaDataComponent>(msg.TargetEntity.Value, out var metaData))
-                    entityName = metaData.EntityName;
+                if (msg.TargetEntity != null &&
+                    entities.TryGetComponent<MetaDataComponent>(msg.TargetEntity.Value, out var metaData))
+                    entityName = Identity.Name(msg.TargetEntity.Value, entities);
 
                 IReadOnlyDictionary<string, FixedPoint2> DamagePerGroup = damageable.DamagePerGroup;
                 IReadOnlyDictionary<string, FixedPoint2> DamagePerType = damageable.Damage.DamageDict;
diff --git a/Content.Client/IdentityManagement/IdentitySystem.cs b/Content.Client/IdentityManagement/IdentitySystem.cs
new file mode 100644
index 000000000000..7a7c96010d74
--- /dev/null
+++ b/Content.Client/IdentityManagement/IdentitySystem.cs
@@ -0,0 +1,7 @@
+using Content.Shared.IdentityManagement;
+
+namespace Content.Client.IdentityManagement;
+
+public class IdentitySystem : SharedIdentitySystem
+{
+}
diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
index 9edc87339f3b..a2009d661e73 100644
--- a/Content.Client/Inventory/StrippableBoundUserInterface.cs
+++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Content.Client.Strip;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Strip.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
@@ -28,7 +29,8 @@ protected override void Open()
         {
             base.Open();
 
-            _strippingMenu = new StrippingMenu($"{Loc.GetString("strippable-bound-user-interface-stripping-menu-title",("ownerName", IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Owner).EntityName))}");
+            var entMan = IoCManager.Resolve<IEntityManager>();
+            _strippingMenu = new StrippingMenu($"{Loc.GetString("strippable-bound-user-interface-stripping-menu-title", ("ownerName", Identity.Name(Owner.Owner, entMan)))}");
 
             _strippingMenu.OnClose += Close;
             _strippingMenu.OpenCentered();
diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs
index 148a325d83b2..db2db9b10122 100644
--- a/Content.Client/IoC/ClientContentIoC.cs
+++ b/Content.Client/IoC/ClientContentIoC.cs
@@ -13,7 +13,6 @@
 using Content.Client.Parallax.Managers;
 using Content.Client.Preferences;
 using Content.Client.Screenshot;
-using Content.Client.StationEvents.Managers;
 using Content.Client.Stylesheets;
 using Content.Client.Viewport;
 using Content.Client.Voting;
@@ -37,7 +36,6 @@ public static void Register()
             IoCManager.Register<IStylesheetManager, StylesheetManager>();
             IoCManager.Register<IScreenshotHook, ScreenshotHook>();
             IoCManager.Register<IClickMapManager, ClickMapManager>();
-            IoCManager.Register<IStationEventManager, StationEventManager>();
             IoCManager.Register<IClientAdminManager, ClientAdminManager>();
             IoCManager.Register<EuiManager, EuiManager>();
             IoCManager.Register<IVoteManager, VoteManager>();
diff --git a/Content.Client/Items/UI/ItemStatusPanel.cs b/Content.Client/Items/UI/ItemStatusPanel.cs
index 90b1ff8770a3..3cd1e011100e 100644
--- a/Content.Client/Items/UI/ItemStatusPanel.cs
+++ b/Content.Client/Items/UI/ItemStatusPanel.cs
@@ -4,6 +4,7 @@
 using Content.Client.Resources;
 using Content.Client.Stylesheets;
 using Content.Shared.Hands.Components;
+using Content.Shared.IdentityManagement;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -159,11 +160,12 @@ private void UpdateItemName()
             if (_entityManager.TryGetComponent(_entity, out HandVirtualItemComponent? virtualItem)
                 && _entityManager.EntityExists(virtualItem.BlockingEntity))
             {
-                _itemNameLabel.Text = _entityManager.GetComponent<MetaDataComponent>(virtualItem.BlockingEntity).EntityName;
+                // Uses identity because we can be blocked by pulling someone
+                _itemNameLabel.Text = Identity.Name(virtualItem.BlockingEntity, _entityManager);
             }
             else
             {
-                _itemNameLabel.Text = _entityManager.GetComponent<MetaDataComponent>(_entity.Value).EntityName;
+                _itemNameLabel.Text = Identity.Name(_entity.Value, _entityManager);
             }
         }
 
diff --git a/Content.Client/Nuke/NukeMenu.xaml.cs b/Content.Client/Nuke/NukeMenu.xaml.cs
index a341a69e0dc3..644513a4a738 100644
--- a/Content.Client/Nuke/NukeMenu.xaml.cs
+++ b/Content.Client/Nuke/NukeMenu.xaml.cs
@@ -104,7 +104,7 @@ public void UpdateState(NukeUiState state)
             SecondStatusLabel.Text = secondMsg;
 
             EjectButton.Disabled = !state.DiskInserted || state.Status == NukeStatus.ARMED;
-            AnchorButton.Disabled = !state.DiskInserted;
+            AnchorButton.Disabled = state.Status == NukeStatus.ARMED;
             AnchorButton.Pressed = state.IsAnchored;
             ArmButton.Disabled = !state.AllowArm;
         }
diff --git a/Content.Client/StationEvents/RadiationPulseComponent.cs b/Content.Client/Radiation/RadiationPulseComponent.cs
similarity index 92%
rename from Content.Client/StationEvents/RadiationPulseComponent.cs
rename to Content.Client/Radiation/RadiationPulseComponent.cs
index fe8ce7e6225c..b260c411471a 100644
--- a/Content.Client/StationEvents/RadiationPulseComponent.cs
+++ b/Content.Client/Radiation/RadiationPulseComponent.cs
@@ -1,8 +1,6 @@
-using System;
 using Content.Shared.Radiation;
-using Robust.Shared.GameObjects;
 
-namespace Content.Client.StationEvents
+namespace Content.Client.Radiation
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedRadiationPulseComponent))]
diff --git a/Content.Client/StationEvents/RadiationPulseOverlay.cs b/Content.Client/Radiation/RadiationPulseOverlay.cs
similarity index 97%
rename from Content.Client/StationEvents/RadiationPulseOverlay.cs
rename to Content.Client/Radiation/RadiationPulseOverlay.cs
index d80a17ab6730..cc003485868e 100644
--- a/Content.Client/StationEvents/RadiationPulseOverlay.cs
+++ b/Content.Client/Radiation/RadiationPulseOverlay.cs
@@ -1,16 +1,11 @@
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
-namespace Content.Client.StationEvents
+namespace Content.Client.Radiation
 {
     public sealed class RadiationPulseOverlay : Overlay
     {
diff --git a/Content.Client/StationEvents/Managers/IStationEventManager.cs b/Content.Client/StationEvents/Managers/IStationEventManager.cs
deleted file mode 100644
index 84139de958ed..000000000000
--- a/Content.Client/StationEvents/Managers/IStationEventManager.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Content.Client.StationEvents.Managers
-{
-    public interface IStationEventManager
-    {
-        public IReadOnlyList<string> StationEvents { get; }
-        public void Initialize();
-        public event Action OnStationEventsReceived;
-        public void RequestEvents();
-    }
-}
diff --git a/Content.Client/StationEvents/Managers/StationEventManager.cs b/Content.Client/StationEvents/Managers/StationEventManager.cs
deleted file mode 100644
index d43dda09f3af..000000000000
--- a/Content.Client/StationEvents/Managers/StationEventManager.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Content.Shared.StationEvents;
-using Robust.Shared.IoC;
-using Robust.Shared.Network;
-
-namespace Content.Client.StationEvents.Managers
-{
-    internal sealed class StationEventManager : IStationEventManager
-    {
-        [Dependency] private readonly IClientNetManager _netManager = default!;
-
-        private readonly List<string> _events = new();
-        public IReadOnlyList<string> StationEvents => _events;
-        public event Action? OnStationEventsReceived;
-
-        public void Initialize()
-        {
-            _netManager.RegisterNetMessage<MsgRequestStationEvents>();
-            _netManager.RegisterNetMessage<MsgStationEvents>(RxStationEvents);
-            _netManager.Disconnect += OnNetManagerOnDisconnect;
-        }
-
-        private void OnNetManagerOnDisconnect(object? sender, NetDisconnectedArgs msg)
-        {
-            _events.Clear();
-        }
-
-        private void RxStationEvents(MsgStationEvents msg)
-        {
-            _events.Clear();
-            _events.AddRange(msg.Events);
-            OnStationEventsReceived?.Invoke();
-        }
-
-        public void RequestEvents()
-        {
-            _netManager.ClientSendMessage(_netManager.CreateNetMessage<MsgRequestStationEvents>());
-        }
-    }
-}
diff --git a/Content.IntegrationTests/Tests/GameRules/StartEndGameRulesTest.cs b/Content.IntegrationTests/Tests/GameRules/StartEndGameRulesTest.cs
new file mode 100644
index 000000000000..2e9f31f6bbd2
--- /dev/null
+++ b/Content.IntegrationTests/Tests/GameRules/StartEndGameRulesTest.cs
@@ -0,0 +1,54 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Content.Server.GameTicking;
+using Content.Server.GameTicking.Rules;
+using NUnit.Framework;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests.GameRules;
+
+/// <summary>
+///     Tests that all game rules can be added/started/ended at the same time without exceptions.
+/// </summary>
+[TestFixture]
+public sealed class StartEndGameRulesTest
+{
+    [Test]
+    public async Task Test()
+    {
+        await using var pairTracker = await PoolManager.GetServerClient();
+        var server = pairTracker.Pair.Server;
+
+        await server.WaitAssertion(() =>
+        {
+            var gameTicker = EntitySystem.Get<GameTicker>();
+            var protoMan = IoCManager.Resolve<IPrototypeManager>();
+
+            var rules = protoMan.EnumeratePrototypes<GameRulePrototype>().ToArray();
+
+            // Start all rules
+            foreach (var rule in rules)
+            {
+                gameTicker.StartGameRule(rule);
+            }
+
+            Assert.That(gameTicker.AddedGameRules.Count == rules.Length);
+        });
+
+        // Wait three ticks for any random update loops that might happen
+        await server.WaitRunTicks(3);
+
+        await server.WaitAssertion(() =>
+        {
+            var gameTicker = EntitySystem.Get<GameTicker>();
+
+            // End all rules
+            gameTicker.ClearGameRules();
+            Assert.That(!gameTicker.AddedGameRules.Any());
+        });
+
+        await pairTracker.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs b/Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs
deleted file mode 100644
index ffd4e5f18312..000000000000
--- a/Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System.Threading.Tasks;
-using Content.Server.StationEvents;
-using Content.Shared.GameTicking;
-using NUnit.Framework;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Timing;
-
-namespace Content.IntegrationTests.Tests.StationEvents
-{
-    [TestFixture]
-    public sealed class StationEventsSystemTest
-    {
-        [Test]
-        public async Task Test()
-        {
-            await using var pairTracker = await PoolManager.GetServerClient();
-            var server = pairTracker.Pair.Server;
-
-            await server.WaitAssertion(() =>
-            {
-                // Idle each event
-                var stationEventsSystem = EntitySystem.Get<StationEventSystem>();
-                var dummyFrameTime = (float) IoCManager.Resolve<IGameTiming>().TickPeriod.TotalSeconds;
-
-                foreach (var stationEvent in stationEventsSystem.StationEvents)
-                {
-                    stationEvent.Announce();
-                    stationEvent.Update(dummyFrameTime);
-                    stationEvent.Startup();
-                    stationEvent.Update(dummyFrameTime);
-                    stationEvent.Running = false;
-                    stationEvent.Shutdown();
-                    // Due to timings some events might startup twice when in reality they wouldn't.
-                    Assert.That(stationEvent.Occurrences > 0);
-                }
-
-                stationEventsSystem.Reset(new RoundRestartCleanupEvent());
-
-                foreach (var stationEvent in stationEventsSystem.StationEvents)
-                {
-                    Assert.That(stationEvent.Occurrences, Is.EqualTo(0));
-                }
-            });
-
-            await pairTracker.CleanReturnAsync();
-        }
-    }
-}
diff --git a/Content.Server/Access/Systems/IdCardSystem.cs b/Content.Server/Access/Systems/IdCardSystem.cs
index de769790a87b..9ed03986451a 100644
--- a/Content.Server/Access/Systems/IdCardSystem.cs
+++ b/Content.Server/Access/Systems/IdCardSystem.cs
@@ -83,6 +83,7 @@ public bool TryChangeJobTitle(EntityUid uid, string jobTitle, IdCardComponent? i
                 jobTitle = jobTitle[..SharedIdCardConsoleComponent.MaxJobTitleLength];
 
             id.JobTitle = jobTitle;
+            Dirty(id);
             UpdateEntityName(uid, id);
             return true;
         }
@@ -96,6 +97,7 @@ public bool TryChangeFullName(EntityUid uid, string fullName, IdCardComponent? i
                 fullName = fullName[..SharedIdCardConsoleComponent.MaxFullNameLength];
 
             id.FullName = fullName;
+            Dirty(id);
             UpdateEntityName(uid, id);
             return true;
         }
@@ -129,50 +131,5 @@ private void UpdateEntityName(EntityUid uid, IdCardComponent? id = null)
                     ("jobSuffix", jobSuffix));
             EntityManager.GetComponent<MetaDataComponent>(id.Owner).EntityName = val;
         }
-
-        /// <summary>
-        ///     Attempt to find an ID card on an entity. This will look in the entity itself, in the entity's hands, and
-        ///     in the entity's inventory.
-        /// </summary>
-        public bool TryFindIdCard(EntityUid uid, [NotNullWhen(true)] out IdCardComponent? idCard)
-        {
-            // check held item?
-            if (EntityManager.TryGetComponent(uid, out SharedHandsComponent? hands) &&
-                hands.ActiveHandEntity is EntityUid heldItem &&
-                TryGetIdCard(heldItem, out idCard))
-            {
-                return true;
-            }
-
-            // check entity itself
-            if (TryGetIdCard(uid, out idCard))
-                return true;
-
-            // check inventory slot?
-            if (_inventorySystem.TryGetSlotEntity(uid, "id", out var idUid) && TryGetIdCard(idUid.Value, out idCard))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        ///     Attempt to get an id card component from an entity, either by getting it directly from the entity, or by
-        ///     getting the contained id from a <see cref="PDAComponent"/>.
-        /// </summary>
-        public bool TryGetIdCard(EntityUid uid, [NotNullWhen(true)] out IdCardComponent? idCard)
-        {
-            if (EntityManager.TryGetComponent(uid, out idCard))
-                return true;
-
-            if (EntityManager.TryGetComponent(uid, out PDAComponent? pda) && pda.ContainedID != null)
-            {
-                idCard = pda.ContainedID;
-                return true;
-            }
-
-            return false;
-        }
     }
 }
diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs
index b9e2f5a6339d..84e8962b1814 100644
--- a/Content.Server/Administration/Systems/AdminSystem.cs
+++ b/Content.Server/Administration/Systems/AdminSystem.cs
@@ -1,10 +1,12 @@
 using System.Globalization;
 using System.Linq;
 using Content.Server.Administration.Managers;
+using Content.Server.IdentityManagement;
 using Content.Server.Players;
 using Content.Server.Roles;
 using Content.Shared.Administration;
 using Content.Shared.Administration.Events;
+using Content.Shared.IdentityManagement;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Enums;
@@ -25,6 +27,7 @@ public override void Initialize()
 
             _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
             _adminManager.OnPermsChanged += OnAdminPermsChanged;
+            SubscribeLocalEvent<IdentityChangedEvent>(OnIdentityChanged);
             SubscribeLocalEvent<PlayerAttachedEvent>(OnPlayerAttached);
             SubscribeLocalEvent<PlayerDetachedEvent>(OnPlayerDetached);
             SubscribeLocalEvent<RoleAddedEvent>(OnRoleEvent);
@@ -46,6 +49,14 @@ public void UpdatePlayerList(IPlayerSession player)
             }
         }
 
+        private void OnIdentityChanged(IdentityChangedEvent ev)
+        {
+            if (!TryComp<ActorComponent>(ev.CharacterEntity, out var actor))
+                return;
+
+            UpdatePlayerList(actor.PlayerSession);
+        }
+
         private void OnRoleEvent(RoleEvent ev)
         {
             if (!ev.Role.Antagonist || ev.Role.Mind.Session == null)
@@ -106,9 +117,13 @@ private PlayerInfo GetPlayerInfo(IPlayerSession session)
         {
             var name = session.Name;
             var username = string.Empty;
+            var identityName = string.Empty;
 
             if (session.AttachedEntity != null)
+            {
                 username = EntityManager.GetComponent<MetaDataComponent>(session.AttachedEntity.Value).EntityName;
+                identityName = Identity.Name(session.AttachedEntity.Value, EntityManager);
+            }
 
             var mind = session.ContentData()?.Mind;
 
@@ -119,7 +134,7 @@ private PlayerInfo GetPlayerInfo(IPlayerSession session)
 
             var connected = session.Status is SessionStatus.Connected or SessionStatus.InGame;
 
-            return new PlayerInfo(name, username, startingRole, antag, session.AttachedEntity.GetValueOrDefault(), session.UserId,
+            return new PlayerInfo(name, username, identityName, startingRole, antag, session.AttachedEntity.GetValueOrDefault(), session.UserId,
                 connected);
         }
     }
diff --git a/Content.Server/Animals/Systems/UdderSystem.cs b/Content.Server/Animals/Systems/UdderSystem.cs
index c1dfa4caa6bc..c0e5cbf46989 100644
--- a/Content.Server/Animals/Systems/UdderSystem.cs
+++ b/Content.Server/Animals/Systems/UdderSystem.cs
@@ -4,6 +4,7 @@
 using Content.Server.DoAfter;
 using Content.Server.Nutrition.Components;
 using Content.Server.Popups;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
@@ -110,7 +111,7 @@ private void OnMilkingFinished(EntityUid uid, UdderComponent udder, MilkingFinis
             var split = _solutionContainerSystem.SplitSolution(uid, solution, quantity);
             _solutionContainerSystem.TryAddSolution(ev.ContainerUid, targetSolution, split);
 
-            _popupSystem.PopupEntity(Loc.GetString("udder-system-success", ("amount", quantity), ("target", ev.ContainerUid)), uid,
+            _popupSystem.PopupEntity(Loc.GetString("udder-system-success", ("amount", quantity), ("target", Identity.Entity(ev.ContainerUid, EntityManager))), uid,
                 Filter.Entities(ev.UserUid), PopupType.Medium);
         }
 
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
index ee9e57ffdafc..8eaac8ebfb65 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
@@ -124,6 +124,9 @@ public ReactionResult ReactTile(EntityUid gridId, Vector2i tile)
     public bool IsTileAirBlocked(EntityUid gridUid, Vector2i tile, AtmosDirection directions = AtmosDirection.All, IMapGridComponent? mapGridComp = null)
     {
         var ev = new IsTileAirBlockedMethodEvent(gridUid, tile, directions, mapGridComp);
+        RaiseLocalEvent(gridUid, ref ev);
+
+        // If nothing handled the event, it'll default to true.
         return ev.Result;
     }
 
diff --git a/Content.Server/Bible/BibleSystem.cs b/Content.Server/Bible/BibleSystem.cs
index 2db56b7c3229..e64aad75815c 100644
--- a/Content.Server/Bible/BibleSystem.cs
+++ b/Content.Server/Bible/BibleSystem.cs
@@ -10,6 +10,7 @@
 using Content.Server.Bible.Components;
 using Content.Server.MobState;
 using Content.Server.Popups;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Popups;
 using Robust.Shared.Random;
 using Robust.Shared.Audio;
@@ -121,10 +122,10 @@ private void OnAfterInteract(EntityUid uid, BibleComponent component, AfterInter
             {
                 if (_random.Prob(component.FailChance))
                 {
-                    var othersFailMessage = Loc.GetString(component.LocPrefix + "-heal-fail-others", ("user", args.User),("target", args.Target),("bible", uid));
+                    var othersFailMessage = Loc.GetString(component.LocPrefix + "-heal-fail-others", ("user", Identity.Entity(args.User, EntityManager)),("target", Identity.Entity(args.Target.Value, EntityManager)),("bible", uid));
                     _popupSystem.PopupEntity(othersFailMessage, args.User, Filter.PvsExcept(args.User), PopupType.SmallCaution);
 
-                    var selfFailMessage = Loc.GetString(component.LocPrefix + "-heal-fail-self", ("target", args.Target),("bible", uid));
+                    var selfFailMessage = Loc.GetString(component.LocPrefix + "-heal-fail-self", ("target", Identity.Entity(args.Target.Value, EntityManager)),("bible", uid));
                     _popupSystem.PopupEntity(selfFailMessage, args.User, Filter.Entities(args.User), PopupType.MediumCaution);
 
                     SoundSystem.Play("/Audio/Effects/hit_kick.ogg", Filter.Pvs(args.Target.Value), args.User);
@@ -133,10 +134,10 @@ private void OnAfterInteract(EntityUid uid, BibleComponent component, AfterInter
                 }
             }
 
-            var othersMessage = Loc.GetString(component.LocPrefix + "-heal-success-others", ("user", args.User),("target", args.Target),("bible", uid));
+            var othersMessage = Loc.GetString(component.LocPrefix + "-heal-success-others", ("user", Identity.Entity(args.User, EntityManager)),("target", Identity.Entity(args.Target.Value, EntityManager)),("bible", uid));
             _popupSystem.PopupEntity(othersMessage, args.User, Filter.PvsExcept(args.User), PopupType.Medium);
 
-            var selfMessage = Loc.GetString(component.LocPrefix + "-heal-success-self", ("target", args.Target),("bible", uid));
+            var selfMessage = Loc.GetString(component.LocPrefix + "-heal-success-self", ("target", Identity.Entity(args.Target.Value, EntityManager)),("bible", uid));
             _popupSystem.PopupEntity(selfMessage, args.User, Filter.Entities(args.User), PopupType.Large);
 
             SoundSystem.Play(component.HealSoundPath.GetSound(), Filter.Pvs(args.Target.Value), args.User);
diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs
index d2eb1fcb90f7..89e4dc8f5924 100644
--- a/Content.Server/Body/Systems/BloodstreamSystem.cs
+++ b/Content.Server/Body/Systems/BloodstreamSystem.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
+using Content.Shared.IdentityManagement;
 using Content.Shared.MobState.Components;
 using Content.Shared.Popups;
 using Robust.Shared.Audio;
@@ -174,18 +175,18 @@ private void OnHealthBeingExamined(EntityUid uid, BloodstreamComponent component
         if (component.BleedAmount > 10)
         {
             args.Message.PushNewline();
-            args.Message.AddMarkup(Loc.GetString("bloodstream-component-profusely-bleeding", ("target", uid)));
+            args.Message.AddMarkup(Loc.GetString("bloodstream-component-profusely-bleeding", ("target", Identity.Entity(uid, EntityManager))));
         }
         else if (component.BleedAmount > 0)
         {
             args.Message.PushNewline();
-            args.Message.AddMarkup(Loc.GetString("bloodstream-component-bleeding", ("target", uid)));
+            args.Message.AddMarkup(Loc.GetString("bloodstream-component-bleeding", ("target", Identity.Entity(uid, EntityManager))));
         }
 
         if (GetBloodLevelPercentage(uid, component) < component.BloodlossThreshold)
         {
             args.Message.PushNewline();
-            args.Message.AddMarkup(Loc.GetString("bloodstream-component-looks-pale", ("target", uid)));
+            args.Message.AddMarkup(Loc.GetString("bloodstream-component-looks-pale", ("target", Identity.Entity(uid, EntityManager))));
         }
     }
 
diff --git a/Content.Server/Body/Systems/BodyReassembleSystem.cs b/Content.Server/Body/Systems/BodyReassembleSystem.cs
index 03fab94e40b5..91a0f715d4d6 100644
--- a/Content.Server/Body/Systems/BodyReassembleSystem.cs
+++ b/Content.Server/Body/Systems/BodyReassembleSystem.cs
@@ -7,6 +7,7 @@
 using Content.Server.Preferences.Managers;
 using Content.Shared.Actions;
 using Content.Shared.CharacterAppearance.Systems;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Preferences;
 using Content.Shared.Species;
 using Content.Shared.Verbs;
@@ -176,7 +177,7 @@ private void ReassembleComplete(EntityUid uid, BodyReassembleComponent component
                 EntityManager.DeleteEntity(entity);
             }
 
-            _popupSystem.PopupEntity(Loc.GetString("reassemble-success", ("user", mob)), mob, Filter.Entities(mob));
+            _popupSystem.PopupEntity(Loc.GetString("reassemble-success", ("user", Identity.Entity(mob, EntityManager))), mob, Filter.Entities(mob));
         }
 
         /// <summary>
diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs
index a735d5ef6ace..35d96c4b9a87 100644
--- a/Content.Server/Botany/Systems/PlantHolderSystem.cs
+++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Tag;
 using Content.Shared.FixedPoint;
 using Content.Shared.Audio;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Popups;
 using Content.Shared.Random.Helpers;
 using Robust.Shared.Player;
@@ -241,7 +242,7 @@ private void OnInteractUsing(EntityUid uid, PlantHolderComponent component, Inte
                     ("owner", uid),
                     ("usingItem", args.Used)), Filter.Entities(args.User), PopupType.Medium);
                 _popupSystem.PopupEntity(Loc.GetString("plant-holder-component-compost-others-message",
-                    ("user", args.User),
+                    ("user", Identity.Entity(args.User, EntityManager)),
                     ("usingItem", args.Used),
                     ("owner", uid)), uid, Filter.PvsExcept(args.User));
 
diff --git a/Content.Server/Chemistry/Components/HyposprayComponent.cs b/Content.Server/Chemistry/Components/HyposprayComponent.cs
index 5680d89f0125..b87233f918e1 100644
--- a/Content.Server/Chemistry/Components/HyposprayComponent.cs
+++ b/Content.Server/Chemistry/Components/HyposprayComponent.cs
@@ -6,6 +6,7 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
+using Content.Shared.IdentityManagement;
 using Content.Shared.MobState.Components;
 using Content.Shared.Popups;
 using Content.Shared.Sound;
@@ -66,7 +67,7 @@ public bool TryDoInject(EntityUid? target, EntityUid user)
             if (!solutionsSys.TryGetInjectableSolution(target.Value, out var targetSolution))
             {
                 user.PopupMessage(user,
-                    Loc.GetString("hypospray-cant-inject", ("target", target)));
+                    Loc.GetString("hypospray-cant-inject", ("target", Identity.Entity(target.Value, _entMan))));
                 return false;
             }
 
diff --git a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs
index a6add96c94f8..ad5499ea2c32 100644
--- a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs
+++ b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
 using Content.Shared.Hands;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.MobState.Components;
@@ -63,7 +64,7 @@ private void UseInjector(EntityUid target, EntityUid user, InjectorComponent com
             else
             {
                 _popup.PopupEntity(Loc.GetString("injector-component-cannot-transfer-message",
-                    ("target", target)), component.Owner, Filter.Entities(user));
+                    ("target", Identity.Entity(target, EntityManager))), component.Owner, Filter.Entities(user));
             }
         }
         else if (component.ToggleState == SharedInjectorComponent.InjectorToggleMode.Draw)
@@ -82,7 +83,7 @@ private void UseInjector(EntityUid target, EntityUid user, InjectorComponent com
             else
             {
                 _popup.PopupEntity(Loc.GetString("injector-component-cannot-draw-message",
-                    ("target", target)), component.Owner, Filter.Entities(user));
+                    ("target", Identity.Entity(target, EntityManager))), component.Owner, Filter.Entities(user));
             }
         }
     }
@@ -194,7 +195,7 @@ private void InjectDoAfter(InjectorComponent component, EntityUid user, EntityUi
         if (user != target)
         {
             // Create a pop-up for the target
-            var userName = MetaData(user).EntityName;
+            var userName = Identity.Name(user, EntityManager);
             _popup.PopupEntity(Loc.GetString("injector-component-injecting-target",
                 ("user", userName)), user, Filter.Entities(target));
 
@@ -256,7 +257,7 @@ private void TryInjectIntoBloodstream(InjectorComponent component, BloodstreamCo
 
         if (realTransferAmount <= 0)
         {
-            _popup.PopupEntity(Loc.GetString("injector-component-cannot-inject-message", ("target", targetBloodstream.Owner)),
+            _popup.PopupEntity(Loc.GetString("injector-component-cannot-inject-message", ("target", Identity.Entity(targetBloodstream.Owner, EntityManager))),
                 component.Owner, Filter.Entities(user));
             return;
         }
@@ -270,7 +271,7 @@ private void TryInjectIntoBloodstream(InjectorComponent component, BloodstreamCo
 
         _popup.PopupEntity(Loc.GetString("injector-component-inject-success-message",
                 ("amount", removedSolution.TotalVolume),
-                ("target", targetBloodstream.Owner)), component.Owner, Filter.Entities(user));
+                ("target", Identity.Entity(targetBloodstream.Owner, EntityManager))), component.Owner, Filter.Entities(user));
 
         Dirty(component);
         AfterInject(component);
@@ -289,7 +290,7 @@ private void TryInject(InjectorComponent component, EntityUid targetEntity, Solu
 
         if (realTransferAmount <= 0)
         {
-            _popup.PopupEntity(Loc.GetString("injector-component-target-already-full-message", ("target", targetEntity)),
+            _popup.PopupEntity(Loc.GetString("injector-component-target-already-full-message", ("target", Identity.Entity(targetEntity, EntityManager))),
                 component.Owner, Filter.Entities(user));
             return;
         }
@@ -310,7 +311,7 @@ private void TryInject(InjectorComponent component, EntityUid targetEntity, Solu
 
         _popup.PopupEntity(Loc.GetString("injector-component-transfer-success-message",
                 ("amount", removedSolution.TotalVolume),
-                ("target", targetEntity)), component.Owner, Filter.Entities(user));
+                ("target", Identity.Entity(targetEntity, EntityManager))), component.Owner, Filter.Entities(user));
 
         Dirty(component);
         AfterInject(component);
@@ -349,7 +350,7 @@ private void TryDraw(InjectorComponent component, EntityUid targetEntity, Soluti
 
         if (realTransferAmount <= 0)
         {
-            _popup.PopupEntity(Loc.GetString("injector-component-target-is-empty-message", ("target", targetEntity)),
+            _popup.PopupEntity(Loc.GetString("injector-component-target-is-empty-message", ("target", Identity.Entity(targetEntity, EntityManager))),
                 component.Owner, Filter.Entities(user));
             return;
         }
@@ -371,7 +372,7 @@ private void TryDraw(InjectorComponent component, EntityUid targetEntity, Soluti
 
         _popup.PopupEntity(Loc.GetString("injector-component-draw-success-message",
                 ("amount", removedSolution.TotalVolume),
-                ("target", targetEntity)), component.Owner, Filter.Entities(user));
+                ("target", Identity.Entity(targetEntity, EntityManager))), component.Owner, Filter.Entities(user));
 
         Dirty(component);
         AfterDraw(component);
@@ -395,7 +396,7 @@ private void DrawFromBlood(EntityUid user, EntityUid target, InjectorComponent c
 
         _popup.PopupEntity(Loc.GetString("injector-component-draw-success-message",
                 ("amount", drawAmount),
-                ("target", target)), component.Owner, Filter.Entities(user));
+                ("target", Identity.Entity(target, EntityManager))), component.Owner, Filter.Entities(user));
 
         Dirty(component);
         AfterDraw(component);
diff --git a/Content.Server/Climbing/ClimbSystem.cs b/Content.Server/Climbing/ClimbSystem.cs
index 71e5d465ac5b..2f6096875037 100644
--- a/Content.Server/Climbing/ClimbSystem.cs
+++ b/Content.Server/Climbing/ClimbSystem.cs
@@ -10,6 +10,7 @@
 using Content.Shared.Damage;
 using Content.Shared.DragDrop;
 using Content.Shared.GameTicking;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Physics;
 using Content.Shared.Popups;
@@ -138,7 +139,7 @@ private void Climb(EntityUid uid, EntityUid user, EntityUid climbable, bool sile
             return;
         if (user == uid)
         {
-            var othersMessage = Loc.GetString("comp-climbable-user-climbs-other", ("user", uid),
+            var othersMessage = Loc.GetString("comp-climbable-user-climbs-other", ("user", Identity.Entity(uid, EntityManager)),
                 ("climbable", climbable));
             uid.PopupMessageOtherClients(othersMessage);
 
@@ -147,11 +148,11 @@ private void Climb(EntityUid uid, EntityUid user, EntityUid climbable, bool sile
         }
         else
         {
-            var othersMessage = Loc.GetString("comp-climbable-user-climbs-force-other", ("user", user),
-                ("moved-user", uid), ("climbable", climbable));
+            var othersMessage = Loc.GetString("comp-climbable-user-climbs-force-other", ("user", Identity.Entity(user, EntityManager)),
+                ("moved-user", Identity.Entity(uid, EntityManager)), ("climbable", climbable));
             user.PopupMessageOtherClients(othersMessage);
 
-            var selfMessage = Loc.GetString("comp-climbable-user-climbs-force", ("moved-user", uid),
+            var selfMessage = Loc.GetString("comp-climbable-user-climbs-force", ("moved-user", Identity.Entity(uid, EntityManager)),
                 ("climbable", climbable));
             user.PopupMessage(selfMessage);
         }
@@ -428,4 +429,4 @@ public StartClimbEvent(EntityUid climbable)
     {
         Climbable = climbable;
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/CombatMode/CombatModeSystem.cs b/Content.Server/CombatMode/CombatModeSystem.cs
index 1179f2271704..8432744bbabe 100644
--- a/Content.Server/CombatMode/CombatModeSystem.cs
+++ b/Content.Server/CombatMode/CombatModeSystem.cs
@@ -9,6 +9,7 @@
 using Content.Shared.CombatMode;
 using Content.Shared.Damage;
 using Content.Shared.Database;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Stunnable;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
@@ -81,14 +82,12 @@ private void OnEntityActionPerform(EntityUid uid, SharedCombatModeComponent comp
             {
                 SoundSystem.Play(component.DisarmFailSound.GetSound(), Filter.Pvs(args.Performer), args.Performer, AudioHelpers.WithVariation(0.025f));
 
-                var targetName = Name(args.Target);
-
                 var msgOther = Loc.GetString(
                     "disarm-action-popup-message-other-clients",
-                    ("performerName", Name(args.Performer)),
-                    ("targetName", targetName));
+                    ("performerName", Identity.Entity(args.Performer, EntityManager)),
+                    ("targetName", Identity.Entity(args.Target, EntityManager)));
 
-                var msgUser = Loc.GetString("disarm-action-popup-message-cursor", ("targetName", targetName ));
+                var msgUser = Loc.GetString("disarm-action-popup-message-cursor", ("targetName", Identity.Entity(args.Target, EntityManager)));
 
                 _popupSystem.PopupEntity(msgOther, args.Performer, filterOther);
                 _popupSystem.PopupEntity(msgUser, args.Performer, Filter.Entities(args.Performer));
diff --git a/Content.Server/Disease/DiseaseDiagnosisSystem.cs b/Content.Server/Disease/DiseaseDiagnosisSystem.cs
index 7bf08e9b1775..879240b7339f 100644
--- a/Content.Server/Disease/DiseaseDiagnosisSystem.cs
+++ b/Content.Server/Disease/DiseaseDiagnosisSystem.cs
@@ -17,6 +17,7 @@
 using Robust.Shared.Utility;
 using Content.Shared.Tools.Components;
 using Content.Server.Station.Systems;
+using Content.Shared.IdentityManagement;
 
 namespace Content.Server.Disease
 {
@@ -120,7 +121,7 @@ private void OnAfterInteract(EntityUid uid, DiseaseSwabComponent swab, AfterInte
                 EntityManager.TryGetComponent<IngestionBlockerComponent>(maskUid, out var blocker) &&
                 blocker.Enabled)
             {
-                _popupSystem.PopupEntity(Loc.GetString("swab-mask-blocked", ("target", args.Target), ("mask", maskUid)), args.User, Filter.Entities(args.User));
+                _popupSystem.PopupEntity(Loc.GetString("swab-mask-blocked", ("target", Identity.Entity(args.Target.Value, EntityManager)), ("mask", maskUid)), args.User, Filter.Entities(args.User));
                 return;
             }
 
@@ -320,7 +321,7 @@ private void OnTargetSwabSuccessful(TargetSwabSuccessfulEvent args)
                 return;
 
             args.Swab.Used = true;
-            _popupSystem.PopupEntity(Loc.GetString("swab-swabbed", ("target", args.Target)), args.Target.Value, Filter.Entities(args.User));
+            _popupSystem.PopupEntity(Loc.GetString("swab-swabbed", ("target", Identity.Entity(args.Target.Value, EntityManager))), args.Target.Value, Filter.Entities(args.User));
 
             if (args.Swab.Disease != null || args.Carrier.Diseases.Count == 0)
                 return;
diff --git a/Content.Server/Emag/EmagSystem.cs b/Content.Server/Emag/EmagSystem.cs
index 194e5b50145e..124bbd515f5f 100644
--- a/Content.Server/Emag/EmagSystem.cs
+++ b/Content.Server/Emag/EmagSystem.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Database;
 using Content.Shared.Emag.Components;
 using Content.Shared.Emag.Systems;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Tag;
@@ -65,7 +66,7 @@ private void OnAfterInteract(EntityUid uid, EmagComponent component, AfterIntera
             RaiseLocalEvent(args.Target.Value, emaggedEvent, false);
             if (emaggedEvent.Handled)
             {
-                _popupSystem.PopupEntity(Loc.GetString("emag-success", ("target", args.Target)), args.User,
+                _popupSystem.PopupEntity(Loc.GetString("emag-success", ("target", Identity.Entity(args.Target.Value, EntityManager))), args.User,
                     Filter.Entities(args.User), PopupType.Medium);
                 _adminLogger.Add(LogType.Emag, LogImpact.High, $"{ToPrettyString(args.User):player} emagged {ToPrettyString(args.Target.Value):target}");
                 component.Charges--;
diff --git a/Content.Server/Flash/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs
index db79e8ab75c8..3f585b4403a1 100644
--- a/Content.Server/Flash/FlashSystem.cs
+++ b/Content.Server/Flash/FlashSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.Weapon.Melee;
 using Content.Shared.Examine;
 using Content.Shared.Flash;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory;
@@ -130,7 +131,7 @@ public void Flash(EntityUid target, EntityUid? user, EntityUid? used, float flas
             if (displayPopup && user != null && target != user && EntityManager.EntityExists(user.Value))
             {
                 user.Value.PopupMessage(target, Loc.GetString("flash-component-user-blinds-you",
-                    ("user", user.Value)));
+                    ("user", Identity.Entity(user.Value, EntityManager))));
             }
         }
 
diff --git a/Content.Server/Forensics/Components/ForensicScannerComponent.cs b/Content.Server/Forensics/Components/ForensicScannerComponent.cs
index ff36b139796c..7374421097e3 100644
--- a/Content.Server/Forensics/Components/ForensicScannerComponent.cs
+++ b/Content.Server/Forensics/Components/ForensicScannerComponent.cs
@@ -18,6 +18,8 @@ public sealed class ForensicScannerComponent : Component
         [ViewVariables(VVAccess.ReadOnly)]
         public List<string> Fibers = new();
 
+        public string LastScanned = string.Empty;
+
         /// <summary>
         /// The time (in seconds) that it takes to scan an entity.
         /// </summary>
diff --git a/Content.Server/Forensics/Systems/ForensicPadSystem.cs b/Content.Server/Forensics/Systems/ForensicPadSystem.cs
index faa166e060f4..4fe3c97c94ea 100644
--- a/Content.Server/Forensics/Systems/ForensicPadSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicPadSystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Inventory;
 using Content.Server.DoAfter;
 using Content.Server.Popups;
+using Content.Shared.IdentityManagement;
 using Robust.Shared.Player;
 
 namespace Content.Server.Forensics
@@ -59,7 +60,7 @@ private void OnAfterInteract(EntityUid uid, ForensicPadComponent component, Afte
 
             if (_inventory.TryGetSlotEntity(args.Target.Value, "gloves", out var gloves))
             {
-                _popupSystem.PopupEntity(Loc.GetString("forensic-pad-gloves", ("target", args.Target.Value)), args.Target.Value, Filter.Entities(args.User));
+                _popupSystem.PopupEntity(Loc.GetString("forensic-pad-gloves", ("target", Identity.Entity(args.Target.Value, EntityManager))), args.Target.Value, Filter.Entities(args.User));
                 return;
             }
 
@@ -67,8 +68,8 @@ private void OnAfterInteract(EntityUid uid, ForensicPadComponent component, Afte
             {
                 if (args.User != args.Target)
                 {
-                    _popupSystem.PopupEntity(Loc.GetString("forensic-pad-start-scan-user", ("target", args.Target.Value)), args.Target.Value, Filter.Entities(args.User));
-                    _popupSystem.PopupEntity(Loc.GetString("forensic-pad-start-scan-target", ("user", args.User)), args.Target.Value, Filter.Entities(args.Target.Value));
+                    _popupSystem.PopupEntity(Loc.GetString("forensic-pad-start-scan-user", ("target", Identity.Entity(args.Target.Value, EntityManager))), args.Target.Value, Filter.Entities(args.User));
+                    _popupSystem.PopupEntity(Loc.GetString("forensic-pad-start-scan-target", ("user", Identity.Entity(args.User, EntityManager))), args.Target.Value, Filter.Entities(args.Target.Value));
                 }
                 StartScan(args.User, args.Target.Value, component, fingerprint.Fingerprint);
                 return;
@@ -100,6 +101,11 @@ private void OnTargetPadSuccessful(TargetPadSuccessfulEvent ev)
             if (!EntityManager.TryGetComponent(ev.Pad, out ForensicPadComponent? component))
                 return;
 
+            if (HasComp<FingerprintComponent>(ev.Target))
+                MetaData(component.Owner).EntityName = Loc.GetString("forensic-pad-fingerprint-name", ("entity", ev.Target));
+            else
+                MetaData(component.Owner).EntityName = Loc.GetString("forensic-pad-gloves-name", ("entity", ev.Target));
+
             component.CancelToken = null;
             component.Sample = ev.Sample;
             component.Used = true;
@@ -124,11 +130,11 @@ public PadCancelledEvent(EntityUid pad)
         private sealed class TargetPadSuccessfulEvent : EntityEventArgs
         {
             public EntityUid User;
-            public EntityUid? Target;
+            public EntityUid Target;
             public EntityUid Pad;
             public string Sample = string.Empty;
 
-            public TargetPadSuccessfulEvent(EntityUid user, EntityUid? target, EntityUid pad, string sample)
+            public TargetPadSuccessfulEvent(EntityUid user, EntityUid target, EntityUid pad, string sample)
             {
                 User = user;
                 Target = target;
diff --git a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
index 3eca8f8fa3e9..aa45ebee33bb 100644
--- a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
@@ -51,6 +51,7 @@ private void OnTargetScanSuccessful(TargetScanSuccessfulEvent ev)
 
             scanner.Fingerprints = forensics.Fingerprints.ToList();
             scanner.Fibers = forensics.Fibers.ToList();
+            scanner.LastScanned = MetaData(ev.Target).EntityName;
             OpenUserInterface(ev.User, scanner);
         }
 
@@ -62,7 +63,7 @@ private void OnAfterInteract(EntityUid uid, ForensicScannerComponent component,
             component.CancelToken = new CancellationTokenSource();
             _doAfterSystem.DoAfter(new DoAfterEventArgs(args.User, component.ScanDelay, component.CancelToken.Token, target: args.Target)
             {
-                BroadcastFinishedEvent = new TargetScanSuccessfulEvent(args.User, args.Target, component.Owner),
+                BroadcastFinishedEvent = new TargetScanSuccessfulEvent(args.User, (EntityUid) args.Target, component.Owner),
                 BroadcastCancelledEvent = new ScanCancelledEvent(component.Owner),
                 BreakOnTargetMove = true,
                 BreakOnUserMove = true,
@@ -110,7 +111,7 @@ private void OpenUserInterface(EntityUid user, ForensicScannerComponent componen
             var ui = _uiSystem.GetUi(component.Owner, ForensicScannerUiKey.Key);
 
             ui.Open(actor.PlayerSession);
-            ui.SendMessage(new ForensicScannerUserMessage(component.Fingerprints, component.Fibers));
+            ui.SendMessage(new ForensicScannerUserMessage(component.Fingerprints, component.Fibers, component.LastScanned));
         }
 
         private void OnPrint(EntityUid uid, ForensicScannerComponent component, ForensicScannerPrintMessage args)
@@ -124,7 +125,7 @@ private void OnPrint(EntityUid uid, ForensicScannerComponent component, Forensic
             if (!TryComp<PaperComponent>(printed, out var paper))
                 return;
 
-            MetaData(printed).EntityName = Loc.GetString("forensic-scanner-report-title");
+            MetaData(printed).EntityName = Loc.GetString("forensic-scanner-report-title", ("entity", component.LastScanned));
 
             var text = new StringBuilder();
 
@@ -156,9 +157,9 @@ public ScanCancelledEvent(EntityUid scanner)
         private sealed class TargetScanSuccessfulEvent : EntityEventArgs
         {
             public EntityUid User;
-            public EntityUid? Target;
+            public EntityUid Target;
             public EntityUid Scanner;
-            public TargetScanSuccessfulEvent(EntityUid user, EntityUid? target, EntityUid scanner)
+            public TargetScanSuccessfulEvent(EntityUid user, EntityUid target, EntityUid scanner)
             {
                 User = user;
                 Target = target;
diff --git a/Content.Server/GameTicking/GameTicker.GameRule.cs b/Content.Server/GameTicking/GameTicker.GameRule.cs
index 0f18d0809073..c0b382af2d5e 100644
--- a/Content.Server/GameTicking/GameTicker.GameRule.cs
+++ b/Content.Server/GameTicking/GameTicker.GameRule.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Server.Administration;
 using Content.Server.GameTicking.Rules;
+using Content.Server.GameTicking.Rules.Configurations;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 
@@ -10,10 +11,26 @@ public sealed partial class GameTicker
     {
         // No duplicates.
         [ViewVariables] private readonly HashSet<GameRulePrototype> _addedGameRules = new();
-        public IEnumerable<GameRulePrototype> AddedGameRules => _addedGameRules;
+
+        /// <summary>
+        ///     Holds all currently added game rules.
+        /// </summary>
+        public IReadOnlySet<GameRulePrototype> AddedGameRules => _addedGameRules;
 
         [ViewVariables] private readonly HashSet<GameRulePrototype> _startedGameRules = new();
-        public IEnumerable<GameRulePrototype> StartedGameRules => _startedGameRules;
+
+        /// <summary>
+        ///     Holds all currently started game rules.
+        /// </summary>
+        public IReadOnlySet<GameRulePrototype> StartedGameRules => _startedGameRules;
+
+        [ViewVariables] private readonly List<(TimeSpan, GameRulePrototype)> _allPreviousGameRules = new();
+
+        /// <summary>
+        ///     A list storing the start times of all game rules that have been started this round.
+        ///     Game rules can be started and stopped at any time, including midround.
+        /// </summary>
+        public IReadOnlyList<(TimeSpan, GameRulePrototype)> AllPreviousGameRules => _allPreviousGameRules;
 
         private void InitializeGameRules()
         {
@@ -21,13 +38,15 @@ private void InitializeGameRules()
             _consoleHost.RegisterCommand("addgamerule",
                 string.Empty,
                 "addgamerule <rules>",
-                AddGameRuleCommand);
+                AddGameRuleCommand,
+                AddGameRuleCompletions);
 
             // End game rule command.
             _consoleHost.RegisterCommand("endgamerule",
                 string.Empty,
                 "endgamerule <rules>",
-                EndGameRuleCommand);
+                EndGameRuleCommand,
+                EndGameRuleCompletions);
 
             // Clear game rules command.
             _consoleHost.RegisterCommand("cleargamerules",
@@ -49,50 +68,55 @@ private void ShutdownGameRules()
         /// </summary>
         public void StartGameRule(GameRulePrototype rule)
         {
-            if (!GameRuleAdded(rule))
+            if (!IsGameRuleAdded(rule))
                 AddGameRule(rule);
 
+            _allPreviousGameRules.Add((RoundDuration(), rule));
+            _sawmill.Info($"Started game rule {rule.ID}");
+
             if (_startedGameRules.Add(rule))
                 RaiseLocalEvent(new GameRuleStartedEvent(rule));
         }
 
         /// <summary>
         ///     Ends a game rule.
-        ///     This always includes removing it (removing it from added game rules) so that behavior
+        ///     This always includes removing it (from added game rules) so that behavior
         ///     is not separate from this.
         /// </summary>
         /// <param name="rule"></param>
         public void EndGameRule(GameRulePrototype rule)
         {
-            if (!GameRuleAdded(rule))
+            if (!IsGameRuleAdded(rule))
                 return;
 
             _addedGameRules.Remove(rule);
+            _sawmill.Info($"Ended game rule {rule.ID}");
 
-            if (GameRuleStarted(rule))
+            if (IsGameRuleStarted(rule))
                 _startedGameRules.Remove(rule);
             RaiseLocalEvent(new GameRuleEndedEvent(rule));
         }
 
         /// <summary>
         ///     Adds a game rule to the list, but does not
-        ///     start it yet, instead waiting until roundstart.
+        ///     start it yet, instead waiting until the rule is actually started by other code (usually roundstart)
         /// </summary>
         public bool AddGameRule(GameRulePrototype rule)
         {
             if (!_addedGameRules.Add(rule))
                 return false;
 
+            _sawmill.Info($"Added game rule {rule.ID}");
             RaiseLocalEvent(new GameRuleAddedEvent(rule));
             return true;
         }
 
-        public bool GameRuleAdded(GameRulePrototype rule)
+        public bool IsGameRuleAdded(GameRulePrototype rule)
         {
             return _addedGameRules.Contains(rule);
         }
 
-        public bool GameRuleAdded(string rule)
+        public bool IsGameRuleAdded(string rule)
         {
             foreach (var ruleProto in _addedGameRules)
             {
@@ -103,12 +127,12 @@ public bool GameRuleAdded(string rule)
             return false;
         }
 
-        public bool GameRuleStarted(GameRulePrototype rule)
+        public bool IsGameRuleStarted(GameRulePrototype rule)
         {
             return _startedGameRules.Contains(rule);
         }
 
-        public bool GameRuleStarted(string rule)
+        public bool IsGameRuleStarted(string rule)
         {
             foreach (var ruleProto in _startedGameRules)
             {
@@ -142,12 +166,19 @@ private void AddGameRuleCommand(IConsoleShell shell, string argstr, string[] arg
 
                 AddGameRule(rule);
 
-                // Start rule if we're already in the middle of a round.
+                // Start rule if we're already in the middle of a round
                 if(RunLevel == GameRunLevel.InRound)
                     StartGameRule(rule);
             }
         }
 
+        private CompletionResult AddGameRuleCompletions(IConsoleShell shell, string[] args)
+        {
+            var activeIds = _addedGameRules.Select(c => c.ID);
+            return CompletionResult.FromHintOptions(CompletionHelper.PrototypeIDs<GameRulePrototype>().Where(p => !activeIds.Contains(p.Value)),
+                "<rule>");
+        }
+
         [AdminCommand(AdminFlags.Fun)]
         private void EndGameRuleCommand(IConsoleShell shell, string argstr, string[] args)
         {
@@ -163,12 +194,18 @@ private void EndGameRuleCommand(IConsoleShell shell, string argstr, string[] arg
             }
         }
 
+        private CompletionResult EndGameRuleCompletions(IConsoleShell shell, string[] args)
+        {
+            return CompletionResult.FromHintOptions(_addedGameRules.Select(c => new CompletionOption(c.ID)),
+                "<added rule>");
+        }
+
         [AdminCommand(AdminFlags.Fun)]
         private void ClearGameRulesCommand(IConsoleShell shell, string argstr, string[] args)
         {
             ClearGameRules();
         }
-        
+
         #endregion
     }
 
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 789d67d1fba3..63832b877f96 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -376,7 +376,7 @@ public void RestartRound()
                 ReqWindowAttentionAll();
             }
         }
-        
+
         /// <summary>
         ///     Cleanup that has to run to clear up anything from the previous round.
         ///     Stuff like wiping the previous map clean.
@@ -425,6 +425,7 @@ private void ResettingCleanup()
             ClearGameRules();
 
             _addedGameRules.Clear();
+            _allPreviousGameRules.Clear();
 
             // Round restart cleanup event, so entity systems can reset.
             var ev = new RoundRestartCleanupEvent();
diff --git a/Content.Server/GameTicking/Rules/Configurations/StationEventRuleConfiguration.cs b/Content.Server/GameTicking/Rules/Configurations/StationEventRuleConfiguration.cs
new file mode 100644
index 000000000000..7a73804acba4
--- /dev/null
+++ b/Content.Server/GameTicking/Rules/Configurations/StationEventRuleConfiguration.cs
@@ -0,0 +1,76 @@
+using Content.Shared.Sound;
+using JetBrains.Annotations;
+
+namespace Content.Server.GameTicking.Rules.Configurations;
+
+/// <summary>
+///     Defines a configuration for a given station event game rule, since all station events are just
+///     game rules.
+/// </summary>
+[UsedImplicitly]
+public sealed class StationEventRuleConfiguration : GameRuleConfiguration
+{
+    [DataField("id", required: true)]
+    private string _id = default!;
+    public override string Id => _id;
+
+    public const float WeightVeryLow = 0.0f;
+    public const float WeightLow = 5.0f;
+    public const float WeightNormal = 10.0f;
+    public const float WeightHigh = 15.0f;
+    public const float WeightVeryHigh = 20.0f;
+
+    [DataField("weight")]
+    public float Weight = WeightNormal;
+
+    [DataField("startAnnouncement")]
+    public string? StartAnnouncement;
+
+    [DataField("endAnnouncement")]
+    public string? EndAnnouncement;
+
+    [DataField("startAudio")]
+    public SoundSpecifier? StartAudio;
+
+    [DataField("endAudio")]
+    public SoundSpecifier? EndAudio;
+
+    /// <summary>
+    ///     In minutes, when is the first round time this event can start
+    /// </summary>
+    [DataField("earliestStart")]
+    public int EarliestStart = 5;
+
+    /// <summary>
+    ///     In minutes, the amount of time before the same event can occur again
+    /// </summary>
+    [DataField("reoccurrenceDelay")]
+    public int ReoccurrenceDelay = 30;
+
+    /// <summary>
+    ///     When in the lifetime to start the event.
+    /// </summary>
+    [DataField("startAfter")]
+    public float StartAfter;
+
+    /// <summary>
+    ///     When in the lifetime to end the event..
+    /// </summary>
+    [DataField("endAfter")]
+    public float EndAfter = float.MaxValue;
+
+    /// <summary>
+    ///     How many players need to be present on station for the event to run
+    /// </summary>
+    /// <remarks>
+    ///     To avoid running deadly events with low-pop
+    /// </remarks>
+    [DataField("minimumPlayers")]
+    public int MinimumPlayers;
+
+    /// <summary>
+    ///     How many times this even can occur in a single round
+    /// </summary>
+    [DataField("maxOccurrences")]
+    public int? MaxOccurrences;
+}
diff --git a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
index 78ed1e25f0c0..a0d1fa94c07f 100644
--- a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
@@ -34,14 +34,14 @@ public override void Initialize()
         SubscribeLocalEvent<DamageChangedEvent>(OnHealthChanged);
     }
 
-    public override void Started(GameRuleConfiguration _)
+    public override void Started()
     {
         _chatManager.DispatchServerAnnouncement(Loc.GetString("rule-death-match-added-announcement"));
 
         _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
     }
 
-    public override void Ended(GameRuleConfiguration _)
+    public override void Ended()
     {
         _deadCheckTimer = null;
         _restartTimer = null;
@@ -64,7 +64,7 @@ private void OnPlayerStatusChanged(object? _, SessionStatusEventArgs e)
 
     private void RunDelayedCheck()
     {
-        if (!Enabled || _deadCheckTimer != null)
+        if (!RuleAdded || _deadCheckTimer != null)
             return;
 
         _deadCheckTimer = DeadCheckDelay;
@@ -72,7 +72,7 @@ private void RunDelayedCheck()
 
     public override void Update(float frameTime)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         // If the restart timer is active, that means the round is ending soon, no need to check for winners.
diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.cs
index eba6a386b217..47bd891db271 100644
--- a/Content.Server/GameTicking/Rules/GameRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/GameRuleSystem.cs
@@ -9,10 +9,16 @@ public abstract class GameRuleSystem : EntitySystem
     [Dependency] protected GameTicker GameTicker = default!;
 
     /// <summary>
-    ///     Whether this GameRule is currently enabled or not.
+    ///     Whether this GameRule is currently added or not.
     ///     Be sure to check this before doing anything rule-specific.
     /// </summary>
-    public bool Enabled { get; protected set; } = false;
+    public bool RuleAdded { get; protected set; }
+
+    /// <summary>
+    ///     Whether this game rule has been started after being added.
+    ///     You probably want to check this before doing any update loop stuff.
+    /// </summary>
+    public bool RuleStarted { get; protected set; }
 
     /// <summary>
     ///     When the GameRule prototype with this ID is added, this system will be enabled.
@@ -20,6 +26,12 @@ public abstract class GameRuleSystem : EntitySystem
     /// </summary>
     public new abstract string Prototype { get; }
 
+    /// <summary>
+    ///     Holds the current configuration after the event has been added.
+    ///     This should not be getting accessed before the event is enabled, as usual.
+    /// </summary>
+    public GameRuleConfiguration Configuration = default!;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -35,7 +47,10 @@ private void OnGameRuleAdded(GameRuleAddedEvent ev)
         if (ev.Rule.Configuration.Id != Prototype)
             return;
 
-        Enabled = true;
+        Configuration = ev.Rule.Configuration;
+        RuleAdded = true;
+
+        Added();
     }
 
     private void OnGameRuleStarted(GameRuleStartedEvent ev)
@@ -43,7 +58,9 @@ private void OnGameRuleStarted(GameRuleStartedEvent ev)
         if (ev.Rule.Configuration.Id != Prototype)
             return;
 
-        Started(ev.Rule.Configuration);
+        RuleStarted = true;
+
+        Started();
     }
 
     private void OnGameRuleEnded(GameRuleEndedEvent ev)
@@ -51,17 +68,27 @@ private void OnGameRuleEnded(GameRuleEndedEvent ev)
         if (ev.Rule.Configuration.Id != Prototype)
             return;
 
-        Enabled = false;
-        Ended(ev.Rule.Configuration);
+        RuleAdded = false;
+        RuleStarted = false;
+        Ended();
     }
 
     /// <summary>
-    ///     Called when the game rule has been started..
+    ///     Called when the game rule has been added.
+    ///     You should avoid using this in favor of started--they are not the same thing.
+    /// </summary>
+    /// <remarks>
+    ///     This is virtual because it doesn't actually have to be used, and most of the time shouldn't be.
+    /// </remarks>
+    public virtual void Added() { }
+
+    /// <summary>
+    ///     Called when the game rule has been started.
     /// </summary>
-    public abstract void Started(GameRuleConfiguration configuration);
+    public abstract void Started();
 
     /// <summary>
-    ///     Called when the game rule has ended..
+    ///     Called when the game rule has ended.
     /// </summary>
-    public abstract void Ended(GameRuleConfiguration configuration);
+    public abstract void Ended();
 }
diff --git a/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs b/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs
index 4c76ddd0e1c4..d61b93d45024 100644
--- a/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs
@@ -25,16 +25,16 @@ public override void Initialize()
         SubscribeLocalEvent<GameRunLevelChangedEvent>(RunLevelChanged);
     }
 
-    public override void Started(GameRuleConfiguration config)
+    public override void Started()
     {
-        if (config is not InactivityGameRuleConfiguration inactivityConfig)
+        if (Configuration is not InactivityGameRuleConfiguration inactivityConfig)
             return;
         InactivityMaxTime = inactivityConfig.InactivityMaxTime;
         RoundEndDelay = inactivityConfig.RoundEndDelay;
         _playerManager.PlayerStatusChanged += PlayerStatusChanged;
     }
 
-    public override void Ended(GameRuleConfiguration _)
+    public override void Ended()
     {
         _playerManager.PlayerStatusChanged -= PlayerStatusChanged;
 
@@ -64,7 +64,7 @@ private void TimerFired()
 
     private void RunLevelChanged(GameRunLevelChangedEvent args)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         switch (args.New)
diff --git a/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs b/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs
index 0574bc08c791..6b2a5805c6a4 100644
--- a/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs
@@ -23,10 +23,11 @@ public override void Initialize()
         SubscribeLocalEvent<GameRunLevelChangedEvent>(RunLevelChanged);
     }
 
-    public override void Started(GameRuleConfiguration config)
+    public override void Started()
     {
-        if (config is not MaxTimeRestartRuleConfiguration maxTimeRestartConfig)
+        if (Configuration is not MaxTimeRestartRuleConfiguration maxTimeRestartConfig)
             return;
+
         RoundMaxTime = maxTimeRestartConfig.RoundMaxTime;
         RoundEndDelay = maxTimeRestartConfig.RoundEndDelay;
 
@@ -34,7 +35,7 @@ public override void Started(GameRuleConfiguration config)
             RestartTimer();
     }
 
-    public override void Ended(GameRuleConfiguration _)
+    public override void Ended()
     {
         StopTimer();
     }
@@ -62,7 +63,7 @@ private void TimerFired()
 
     private void RunLevelChanged(GameRunLevelChangedEvent args)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         switch (args.New)
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index 3c3cbb700252..d3b41455b1fe 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -56,7 +56,7 @@ public override void Initialize()
 
     private void OnNukeExploded(NukeExplodedEvent ev)
     {
-    	if (!Enabled)
+    	if (!RuleAdded)
             return;
 
         _opsWon = true;
@@ -65,7 +65,7 @@ private void OnNukeExploded(NukeExplodedEvent ev)
 
     private void OnRoundEndText(RoundEndTextAppendEvent ev)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         ev.AddLine(_opsWon ? Loc.GetString("nukeops-ops-won") : Loc.GetString("nukeops-crew-won"));
@@ -78,7 +78,7 @@ private void OnRoundEndText(RoundEndTextAppendEvent ev)
 
     private void OnMobStateChanged(MobStateChangedEvent ev)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         if (!_aliveNukeops.TryFirstOrNull(x => x.Key.OwnedEntity == ev.Entity, out var op)) return;
@@ -93,7 +93,7 @@ private void OnMobStateChanged(MobStateChangedEvent ev)
 
     private void OnPlayersSpawning(RulePlayerSpawningEvent ev)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         _aliveNukeops.Clear();
@@ -292,7 +292,7 @@ private void OnPlayersSpawning(RulePlayerSpawningEvent ev)
 
     private void OnStartAttempt(RoundStartAttemptEvent ev)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         var minPlayers = _cfg.GetCVar(CCVars.NukeopsMinPlayers);
@@ -311,11 +311,10 @@ private void OnStartAttempt(RoundStartAttemptEvent ev)
         }
     }
 
-
-    public override void Started(GameRuleConfiguration _)
+    public override void Started()
     {
         _opsWon = false;
     }
 
-    public override void Ended(GameRuleConfiguration _) { }
+    public override void Ended() { }
 }
diff --git a/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs b/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
index b6021674a197..00494e88b2dd 100644
--- a/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
@@ -57,7 +57,7 @@ public override void Initialize()
 
     private void OnRoundEndTextEvent(RoundEndTextAppendEvent ev)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         if (Deleted(_pirateShip))
@@ -120,14 +120,14 @@ private void OnRoundEndTextEvent(RoundEndTextAppendEvent ev)
         }
     }
 
-    public override void Started(GameRuleConfiguration _) { }
+    public override void Started() { }
 
-    public override void Ended(GameRuleConfiguration _) { }
+    public override void Ended() { }
 
     private void OnPlayerSpawningEvent(RulePlayerSpawningEvent ev)
     {
         // Forgive me for copy-pasting nukies.
-        if (!Enabled)
+        if (!RuleAdded)
         {
             return;
         }
@@ -225,7 +225,7 @@ private void OnPlayerSpawningEvent(RulePlayerSpawningEvent ev)
 
     private void OnStartAttempt(RoundStartAttemptEvent ev)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         var minPlayers = _cfg.GetCVar(CCVars.PiratesMinPlayers);
diff --git a/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs b/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs
index 418f9ebf5c2e..1df78acd8d45 100644
--- a/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs
@@ -9,12 +9,12 @@ public sealed class SandboxRuleSystem : GameRuleSystem
 
     public override string Prototype => "Sandbox";
 
-    public override void Started(GameRuleConfiguration _)
+    public override void Started()
     {
         _sandbox.IsSandboxEnabled = true;
     }
 
-    public override void Ended(GameRuleConfiguration _)
+    public override void Ended()
     {
         _sandbox.IsSandboxEnabled = false;
     }
diff --git a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs
index 838e8c0212b3..d8e2a3830f19 100644
--- a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs
@@ -16,12 +16,12 @@ public sealed class SecretRuleSystem : GameRuleSystem
 
     public override string Prototype => "Secret";
 
-    public override void Started(GameRuleConfiguration _)
+    public override void Started()
     {
         PickRule();
     }
 
-    public override void Ended(GameRuleConfiguration _)
+    public override void Ended()
     {
         // noop
         // Preset should already handle it.
diff --git a/Content.Server/GameTicking/Rules/SuspicionRuleSystem.cs b/Content.Server/GameTicking/Rules/SuspicionRuleSystem.cs
index d2a07e377cef..d6b1388a3b0a 100644
--- a/Content.Server/GameTicking/Rules/SuspicionRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/SuspicionRuleSystem.cs
@@ -97,7 +97,7 @@ public override void Initialize()
 
     private void OnRoundStartAttempt(RoundStartAttemptEvent ev)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         var minPlayers = _cfg.GetCVar(CCVars.SuspicionMinPlayers);
@@ -119,7 +119,7 @@ private void OnRoundStartAttempt(RoundStartAttemptEvent ev)
 
     private void OnPlayersAssigned(RulePlayerJobsAssignedEvent ev)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         var minTraitors = _cfg.GetCVar(CCVars.SuspicionMinTraitors);
@@ -203,7 +203,7 @@ private void OnPlayersAssigned(RulePlayerJobsAssignedEvent ev)
         }
     }
 
-    public override void Started(GameRuleConfiguration _)
+    public override void Started()
     {
         _playerManager.PlayerStatusChanged += PlayerManagerOnPlayerStatusChanged;
 
@@ -269,7 +269,7 @@ public override void Started(GameRuleConfiguration _)
         Timer.SpawnRepeating(DeadCheckDelay, CheckWinConditions, _checkTimerCancel.Token);
     }
 
-    public override void Ended(GameRuleConfiguration _)
+    public override void Ended()
     {
         _doorSystem.AccessType = SharedDoorSystem.AccessTypes.Id;
         EndTime = null;
@@ -288,7 +288,7 @@ public override void Ended(GameRuleConfiguration _)
 
     private void CheckWinConditions()
     {
-        if (!Enabled || !_cfg.GetCVar(CCVars.GameLobbyEnableWin))
+        if (!RuleAdded || !_cfg.GetCVar(CCVars.GameLobbyEnableWin))
             return;
 
         var traitorsAlive = 0;
@@ -457,7 +457,7 @@ private void OnRoleRemoved(EntityUid uid, SuspicionRoleComponent component, Role
 
     private void OnLateJoinRefresh(RefreshLateJoinAllowedEvent ev)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         ev.Disallow();
diff --git a/Content.Server/GameTicking/Rules/TraitorDeathMatchRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorDeathMatchRuleSystem.cs
index 038e6c62934f..92b6913fc1dd 100644
--- a/Content.Server/GameTicking/Rules/TraitorDeathMatchRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorDeathMatchRuleSystem.cs
@@ -63,7 +63,7 @@ public override void Initialize()
 
     private void OnPlayerSpawned(PlayerSpawnCompleteEvent ev)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         var session = ev.Player;
@@ -144,7 +144,7 @@ private void OnPlayerSpawned(PlayerSpawnCompleteEvent ev)
 
     private void OnGhostAttempt(GhostAttemptHandleEvent ev)
     {
-        if (!Enabled || ev.Handled)
+        if (!RuleAdded || ev.Handled)
             return;
 
         ev.Handled = true;
@@ -181,7 +181,7 @@ private void OnGhostAttempt(GhostAttemptHandleEvent ev)
 
     private void OnRoundEndText(RoundEndTextAppendEvent ev)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         var lines = new List<string>();
@@ -200,14 +200,14 @@ private void OnRoundEndText(RoundEndTextAppendEvent ev)
         ev.AddLine(string.Join('\n', lines));
     }
 
-    public override void Started(GameRuleConfiguration _)
+    public override void Started()
     {
         _restarter.RoundMaxTime = TimeSpan.FromMinutes(30);
         _restarter.RestartTimer();
         _safeToEndRound = true;
     }
 
-    public override void Ended(GameRuleConfiguration _)
+    public override void Ended()
     {
     }
 
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index ee90cd4a45b2..73d28ec244c1 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -49,16 +49,16 @@ public override void Initialize()
         SubscribeLocalEvent<RoundEndTextAppendEvent>(OnRoundEndText);
     }
 
-    public override void Started(GameRuleConfiguration _) {}
+    public override void Started() {}
 
-    public override void Ended(GameRuleConfiguration _)
+    public override void Ended()
     {
         _traitors.Clear();
     }
 
     private void OnStartAttempt(RoundStartAttemptEvent ev)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         // If the current preset doesn't explicitly contain the traitor game rule, just carry on and remove self.
@@ -86,7 +86,7 @@ private void OnStartAttempt(RoundStartAttemptEvent ev)
 
     private void OnPlayersSpawned(RulePlayerJobsAssignedEvent ev)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         var playersPerTraitor = _cfg.GetCVar(CCVars.TraitorPlayersPerTraitor);
@@ -197,7 +197,7 @@ private void OnPlayersSpawned(RulePlayerJobsAssignedEvent ev)
 
     private void OnRoundEndText(RoundEndTextAppendEvent ev)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         var result = Loc.GetString("traitor-round-end-result", ("traitorCount", _traitors.Count));
diff --git a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
index f86ad355ef64..aed7788b09e6 100644
--- a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
@@ -65,7 +65,7 @@ public override void Initialize()
 
     private void OnRoundEndText(RoundEndTextAppendEvent ev)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         //this is just the general condition thing used for determining the win/lose text
@@ -113,7 +113,7 @@ private void OnRoundEndText(RoundEndTextAppendEvent ev)
 
     private void OnJobAssigned(RulePlayerJobsAssignedEvent ev)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         _initialInfectedNames = new();
@@ -127,14 +127,14 @@ private void OnJobAssigned(RulePlayerJobsAssignedEvent ev)
     /// </remarks>
     private void OnMobStateChanged(MobStateChangedEvent ev)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
         CheckRoundEnd(ev.Entity);
     }
 
     private void OnEntityZombified(EntityZombifiedEvent ev)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
         CheckRoundEnd(ev.Target);
     }
@@ -158,7 +158,7 @@ private void CheckRoundEnd(EntityUid target)
 
     private void OnStartAttempt(RoundStartAttemptEvent ev)
     {
-        if (!Enabled)
+        if (!RuleAdded)
             return;
 
         var minPlayers = _cfg.GetCVar(CCVars.ZombieMinPlayers);
@@ -177,13 +177,13 @@ private void OnStartAttempt(RoundStartAttemptEvent ev)
         }
     }
 
-    public override void Started(GameRuleConfiguration configuration)
+    public override void Started()
     {
         //this technically will run twice with zombies on roundstart, but it doesn't matter because it fails instantly
         InfectInitialPlayers();
     }
 
-    public override void Ended(GameRuleConfiguration configuration) { }
+    public override void Ended() { }
 
     private void OnZombifySelf(EntityUid uid, ZombifyOnDeathComponent component, ZombifySelfActionEvent args)
     {
diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs
index 3619b65e7b1e..b52835564391 100644
--- a/Content.Server/Hands/Systems/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -13,6 +13,7 @@
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Input;
 using Content.Shared.Inventory;
 using Content.Shared.Physics.Pull;
@@ -92,10 +93,10 @@ private void OnDisarmed(EntityUid uid, HandsComponent component, DisarmedEvent a
             if (!_handsSystem.TryDrop(uid, component.ActiveHand!, null, checkActionBlocker: false))
                 return;
 
-            var targetName = Name(args.Target);
-
-            var msgOther = Loc.GetString("hands-component-disarm-success-others-message", ("disarmer", Name(args.Source)), ("disarmed", targetName));
-            var msgUser = Loc.GetString("hands-component-disarm-success-message", ("disarmed", targetName));
+            var targEnt = Identity.Entity(args.Target, EntityManager);
+            var msgOther = Loc.GetString("hands-component-disarm-success-others-message",
+                ("disarmer", Identity.Entity(args.Source, EntityManager)), ("disarmed", targEnt));
+            var msgUser = Loc.GetString("hands-component-disarm-success-message", ("disarmed", targEnt));
 
             var filter = Filter.Pvs(args.Source).RemoveWhereAttachedEntity(e => e == args.Source);
             _popupSystem.PopupEntity(msgOther, args.Source, filter);
diff --git a/Content.Server/HealthExaminable/HealthExaminableSystem.cs b/Content.Server/HealthExaminable/HealthExaminableSystem.cs
index 55b0dae1f400..b57182152980 100644
--- a/Content.Server/HealthExaminable/HealthExaminableSystem.cs
+++ b/Content.Server/HealthExaminable/HealthExaminableSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Damage;
 using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Verbs;
 using Robust.Shared.Utility;
 
@@ -60,7 +61,7 @@ private FormattedMessage CreateMarkup(EntityUid uid, HealthExaminableComponent c
             foreach (var threshold in component.Thresholds)
             {
                 var str = $"health-examinable-{component.LocPrefix}-{type}-{threshold}";
-                var tempLocStr = Loc.GetString($"health-examinable-{component.LocPrefix}-{type}-{threshold}", ("target", uid));
+                var tempLocStr = Loc.GetString($"health-examinable-{component.LocPrefix}-{type}-{threshold}", ("target", Identity.Entity(uid, EntityManager)));
 
                 // i.e., this string doesn't exist, because theres nothing for that threshold
                 if (tempLocStr == str)
diff --git a/Content.Server/IdentityManagement/IdentitySystem.cs b/Content.Server/IdentityManagement/IdentitySystem.cs
new file mode 100644
index 000000000000..9a11a2073e30
--- /dev/null
+++ b/Content.Server/IdentityManagement/IdentitySystem.cs
@@ -0,0 +1,165 @@
+using Content.Server.Access.Systems;
+using Content.Server.Administration.Logs;
+using Content.Shared.CharacterAppearance.Components;
+using Content.Shared.Database;
+using Content.Shared.Hands;
+using Content.Shared.IdentityManagement;
+using Content.Shared.IdentityManagement.Components;
+using Content.Shared.Inventory;
+using Content.Shared.Inventory.Events;
+using Content.Shared.Preferences;
+using Robust.Shared.Enums;
+using Robust.Shared.GameObjects.Components.Localization;
+
+namespace Content.Server.IdentityManagement;
+
+/// <summary>
+///     Responsible for updating the identity of an entity on init or clothing equip/unequip.
+/// </summary>
+public class IdentitySystem : SharedIdentitySystem
+{
+    [Dependency] private readonly IdCardSystem _idCard = default!;
+    [Dependency] private readonly IAdminLogManager _adminLog = default!;
+
+    private HashSet<EntityUid> _queuedIdentityUpdates = new();
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<IdentityComponent, DidEquipEvent>((uid, _, _) => QueueIdentityUpdate(uid));
+        SubscribeLocalEvent<IdentityComponent, DidEquipHandEvent>((uid, _, _) => QueueIdentityUpdate(uid));
+        SubscribeLocalEvent<IdentityComponent, DidUnequipEvent>((uid, _, _) => QueueIdentityUpdate(uid));
+        SubscribeLocalEvent<IdentityComponent, DidUnequipHandEvent>((uid, _, _) => QueueIdentityUpdate(uid));
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        foreach (var ent in _queuedIdentityUpdates)
+        {
+            if (!TryComp<IdentityComponent>(ent, out var identity))
+                continue;
+
+            UpdateIdentityInfo(ent, identity);
+        }
+
+        _queuedIdentityUpdates.Clear();
+    }
+
+    // This is where the magic happens
+    protected override void OnComponentInit(EntityUid uid, IdentityComponent component, ComponentInit args)
+    {
+        base.OnComponentInit(uid, component, args);
+
+        var ident = Spawn(null, Transform(uid).Coordinates);
+
+        QueueIdentityUpdate(uid);
+        component.IdentityEntitySlot.Insert(ident);
+    }
+
+    /// <summary>
+    ///     Queues an identity update to the start of the next tick.
+    /// </summary>
+    public void QueueIdentityUpdate(EntityUid uid)
+    {
+        _queuedIdentityUpdates.Add(uid);
+    }
+
+    #region Private API
+
+    /// <summary>
+    ///     Updates the metadata name for the id(entity) from the current state of the character.
+    /// </summary>
+    private void UpdateIdentityInfo(EntityUid uid, IdentityComponent identity)
+    {
+        if (identity.IdentityEntitySlot.ContainedEntity is not { } ident)
+            return;
+
+        var representation = GetIdentityRepresentation(uid);
+        var name = GetIdentityName(uid, representation);
+
+        // Clone the old entity's grammar to the identity entity, for loc purposes.
+        if (TryComp<GrammarComponent>(uid, out var grammar))
+        {
+            var identityGrammar = EnsureComp<GrammarComponent>(ident);
+            identityGrammar.Attributes.Clear();
+
+            foreach (var (k, v) in grammar.Attributes)
+            {
+                identityGrammar.Attributes.Add(k, v);
+            }
+
+            // If presumed name is null and we're using that, we set proper noun to be false ("the old woman")
+            if (name != representation.TrueName && representation.PresumedName == null)
+                identityGrammar.ProperNoun = false;
+        }
+
+        if (name == Name(ident))
+            return;
+
+        MetaData(ident).EntityName = name;
+
+        _adminLog.Add(LogType.Identity, LogImpact.Medium, $"{ToPrettyString(uid)} changed identity to {name}");
+        RaiseLocalEvent(new IdentityChangedEvent(uid, ident));
+    }
+
+    private string GetIdentityName(EntityUid target, IdentityRepresentation representation)
+    {
+        var ev = new SeeIdentityAttemptEvent();
+
+        RaiseLocalEvent(target, ev);
+        return representation.ToStringKnown(!ev.Cancelled);
+    }
+
+    /// <summary>
+    ///     Gets an 'identity representation' of an entity, with their true name being the entity name
+    ///     and their 'presumed name' and 'presumed job' being the name/job on their ID card, if they have one.
+    /// </summary>
+    private IdentityRepresentation GetIdentityRepresentation(EntityUid target,
+        InventoryComponent? inventory=null,
+        HumanoidAppearanceComponent? appearance=null)
+    {
+        int age = HumanoidCharacterProfile.MinimumAge;
+        Gender gender = Gender.Neuter;
+
+        // Always use their actual age and gender, since that can't really be changed by an ID.
+        if (Resolve(target, ref appearance, false))
+        {
+            gender = appearance.Gender;
+            age = appearance.Age;
+        }
+
+        var trueName = Name(target);
+        if (!Resolve(target, ref inventory, false))
+            return new(trueName, age, gender, string.Empty);
+
+        string? presumedJob = null;
+        string? presumedName = null;
+
+        // Get their name and job from their ID for their presumed name.
+        if (_idCard.TryFindIdCard(target, out var id))
+        {
+            presumedName = id.FullName;
+            presumedJob = id.JobTitle?.ToLowerInvariant();
+        }
+
+        // If it didn't find a job, that's fine.
+        return new(trueName, age, gender, presumedName, presumedJob);
+    }
+
+    #endregion
+}
+
+public sealed class IdentityChangedEvent : EntityEventArgs
+{
+    public EntityUid CharacterEntity;
+    public EntityUid IdentityEntity;
+
+    public IdentityChangedEvent(EntityUid characterEntity, EntityUid identityEntity)
+    {
+        CharacterEntity = characterEntity;
+        IdentityEntity = identityEntity;
+    }
+}
diff --git a/Content.Server/Interaction/InteractionPopupSystem.cs b/Content.Server/Interaction/InteractionPopupSystem.cs
index 21683444a245..8aca8656bc25 100644
--- a/Content.Server/Interaction/InteractionPopupSystem.cs
+++ b/Content.Server/Interaction/InteractionPopupSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Popups;
 using Content.Server.Interaction.Components;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.MobState.Components;
 using Robust.Shared.Audio;
@@ -42,7 +43,7 @@ private void OnInteractHand(EntityUid uid, InteractionPopupComponent component,
         if (_random.Prob(component.SuccessChance))
         {
             if (component.InteractSuccessString != null)
-                msg = Loc.GetString(component.InteractSuccessString, ("target", uid)); // Success message (localized).
+                msg = Loc.GetString(component.InteractSuccessString, ("target", Identity.Entity(uid, EntityManager))); // Success message (localized).
 
             if (component.InteractSuccessSound != null)
                 sfx = component.InteractSuccessSound.GetSound();
@@ -50,7 +51,7 @@ private void OnInteractHand(EntityUid uid, InteractionPopupComponent component,
         else
         {
             if (component.InteractFailureString != null)
-                msg = Loc.GetString(component.InteractFailureString, ("target", uid)); // Failure message (localized).
+                msg = Loc.GetString(component.InteractFailureString, ("target", Identity.Entity(uid, EntityManager))); // Failure message (localized).
 
             if (component.InteractFailureSound != null)
                 sfx = component.InteractFailureSound.GetSound();
@@ -58,7 +59,8 @@ private void OnInteractHand(EntityUid uid, InteractionPopupComponent component,
 
         if (component.MessagePerceivedByOthers != null)
         {
-            string msgOthers = Loc.GetString(component.MessagePerceivedByOthers,("user", args.User), ("target", uid));
+            string msgOthers = Loc.GetString(component.MessagePerceivedByOthers,
+                ("user", Identity.Entity(args.User, EntityManager)), ("target", Identity.Entity(uid, EntityManager)));
             _popupSystem.PopupEntity(msg, uid, Filter.Entities(args.User));
             _popupSystem.PopupEntity(msgOthers, uid, Filter.Pvs(uid, 2F, EntityManager).RemoveWhereAttachedEntity(puid => puid == args.User));
         }
diff --git a/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs b/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
index cf708044b4dd..e8c5cb0921e9 100644
--- a/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
@@ -6,6 +6,7 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.DragDrop;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.MobState.Components;
 using Content.Shared.Nutrition.Components;
@@ -123,7 +124,7 @@ private void Spike(EntityUid uid, EntityUid userUid, EntityUid victimUid,
 
             UpdateAppearance(uid, null, component);
 
-            _popupSystem.PopupEntity(Loc.GetString("comp-kitchen-spike-kill", ("user", userUid), ("victim", victimUid)), uid,
+            _popupSystem.PopupEntity(Loc.GetString("comp-kitchen-spike-kill", ("user", Identity.Entity(userUid, EntityManager)), ("victim", victimUid)), uid,
                 Filter.Pvs(userUid), PopupType.LargeCaution);
 
             // THE WHAT?
diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index ed75f10b8de7..0f02306eddc2 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -4,6 +4,7 @@
 using Content.Server.Disease;
 using Content.Server.Popups;
 using Content.Shared.Damage;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.MobState.Components;
 using Robust.Server.GameObjects;
@@ -83,7 +84,7 @@ private void OnTargetScanSuccessful(TargetScanSuccessfulEvent args)
                     args.User, Filter.Entities(args.User));
                 return;
             }
-            _popupSystem.PopupEntity(Loc.GetString("disease-scanner-gave-other", ("target", args.Target), ("disease", args.Component.Disease)),
+            _popupSystem.PopupEntity(Loc.GetString("disease-scanner-gave-other", ("target", Identity.Entity(args.Target.Value, EntityManager)), ("disease", args.Component.Disease)),
                 args.User, Filter.Entities(args.User));
         }
 
diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs
index 967a7bfc1d33..089535964913 100644
--- a/Content.Server/Nuke/NukeSystem.cs
+++ b/Content.Server/Nuke/NukeSystem.cs
@@ -128,8 +128,8 @@ private void OnUnanchorAttempt(EntityUid uid, NukeComponent component, UnanchorA
 
         private void CheckAnchorAttempt(EntityUid uid, NukeComponent component, BaseAnchoredAttemptEvent args)
         {
-            // cancel any anchor attempt without nuke disk
-            if (!component.DiskSlot.HasItem)
+            // cancel any anchor attempt if armed
+            if (component.Status == NukeStatus.ARMED)
             {
                 var msg = Loc.GetString("nuke-component-cant-anchor");
                 _popups.PopupEntity(msg, uid, Filter.Entities(args.User));
@@ -422,15 +422,22 @@ public void ArmBomb(EntityUid uid, NukeComponent? component = null)
                 _alertLevel.SetLevel(stationUid.Value, component.AlertLevelOnActivate, true, true, true, true);
             }
 
+            var nukeXform = Transform(uid);
+            var pos =  nukeXform.MapPosition;
+            var x = (int) pos.X;
+            var y = (int) pos.Y;
+            var posText = $"({x}, {y})";
+
             // warn a crew
             var announcement = Loc.GetString("nuke-component-announcement-armed",
-                ("time", (int) component.RemainingTime));
+                ("time", (int) component.RemainingTime), ("position", posText));
             var sender = Loc.GetString("nuke-component-announcement-sender");
             _chatSystem.DispatchStationAnnouncement(uid, announcement, sender, false, Color.Red);
 
             NukeArmedAudio(component);
 
             _itemSlots.SetLock(uid, component.DiskSlot, true);
+            nukeXform.Anchored = true;
             component.Status = NukeStatus.ARMED;
             UpdateUserInterface(uid, component);
         }
diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
index 1a6dea6443cc..bfe8038d1735 100644
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -13,6 +13,7 @@
 using Content.Shared.Database;
 using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.MobState.Components;
@@ -249,8 +250,7 @@ private bool TryDrink(EntityUid user, EntityUid target, DrinkComponent drink)
 
             if (forceDrink)
             {
-                EntityManager.TryGetComponent(user, out MetaDataComponent? meta);
-                var userName = meta?.EntityName ?? string.Empty;
+                var userName = Identity.Name(user, EntityManager);
 
                 _popupSystem.PopupEntity(Loc.GetString("drink-component-force-feed", ("user", userName)),
                     user, Filter.Entities(target));
@@ -334,11 +334,8 @@ private void OnDrink(EntityUid uid, SharedBodyComponent body, DrinkEvent args)
 
             if (forceDrink)
             {
-                EntityManager.TryGetComponent(uid, out MetaDataComponent? targetMeta);
-                var targetName = targetMeta?.EntityName ?? string.Empty;
-
-                EntityManager.TryGetComponent(args.User, out MetaDataComponent? userMeta);
-                var userName = userMeta?.EntityName ?? string.Empty;
+                var targetName = Identity.Name(uid, EntityManager);
+                var userName = Identity.Name(args.User, EntityManager);
 
                 _popupSystem.PopupEntity(
                     Loc.GetString("drink-component-force-feed-success", ("user", userName)), uid, Filter.Entities(uid));
diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
index 30d49a815453..f0c800c0191a 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
@@ -19,6 +19,7 @@
 using Robust.Shared.Utility;
 using Content.Shared.Inventory;
 using Content.Shared.Hands.EntitySystems;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction.Events;
 
 namespace Content.Server.Nutrition.EntitySystems
@@ -114,9 +115,7 @@ public bool TryFeed(EntityUid user, EntityUid target, FoodComponent food)
 
             if (forceFeed)
             {
-                EntityManager.TryGetComponent(user, out MetaDataComponent? meta);
-                var userName = meta?.EntityName ?? string.Empty;
-
+                var userName = Identity.Name(user, EntityManager);
                 _popupSystem.PopupEntity(Loc.GetString("food-system-force-feed", ("user", userName)),
                     user, Filter.Entities(target));
 
@@ -180,12 +179,8 @@ private void OnFeed(EntityUid uid, SharedBodyComponent body, FeedEvent args)
 
             if (forceFeed)
             {
-                EntityManager.TryGetComponent(uid, out MetaDataComponent? targetMeta);
-                var targetName = targetMeta?.EntityName ?? string.Empty;
-
-                EntityManager.TryGetComponent(args.User, out MetaDataComponent? userMeta);
-                var userName = userMeta?.EntityName ?? string.Empty;
-
+                var targetName = Identity.Name(uid, EntityManager);
+                var userName = Identity.Name(args.User, EntityManager);
                 _popupSystem.PopupEntity(Loc.GetString("food-system-force-feed-success", ("user", userName)),
                     uid, Filter.Entities(uid));
 
diff --git a/Content.Server/Paper/PaperSystem.cs b/Content.Server/Paper/PaperSystem.cs
index cfcd2ff3926f..80ae4650b341 100644
--- a/Content.Server/Paper/PaperSystem.cs
+++ b/Content.Server/Paper/PaperSystem.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Tag;
 using Robust.Server.GameObjects;
 using Content.Server.Popups;
+using Content.Shared.IdentityManagement;
 using Robust.Shared.Player;
 
 using static Content.Shared.Paper.SharedPaperComponent;
@@ -89,9 +90,9 @@ private void OnInteractUsing(EntityUid uid, PaperComponent paperComp, InteractUs
             if (TryComp<StampComponent>(args.Used, out var stampComp) && TryStamp(uid, stampComp.StampedName, stampComp.StampState, paperComp))
             {
                 // successfully stamped, play popup
-                var stampPaperOtherMessage = Loc.GetString("paper-component-action-stamp-paper-other", ("user", args.User),("target", args.Target),("stamp", args.Used));
+                var stampPaperOtherMessage = Loc.GetString("paper-component-action-stamp-paper-other", ("user", Identity.Entity(args.User, EntityManager)),("target", Identity.Entity(args.Target, EntityManager)),("stamp", args.Used));
                     _popupSystem.PopupEntity(stampPaperOtherMessage, args.User, Filter.Pvs(args.User, entityManager: EntityManager).RemoveWhereAttachedEntity(puid => puid == args.User));
-                var stampPaperSelfMessage = Loc.GetString("paper-component-action-stamp-paper-self", ("target", args.Target),("stamp", args.Used));
+                var stampPaperSelfMessage = Loc.GetString("paper-component-action-stamp-paper-self", ("target", Identity.Entity(args.Target, EntityManager)),("stamp", args.Used));
                     _popupSystem.PopupEntity(stampPaperSelfMessage, args.User, Filter.Entities(args.User));
             }
         }
diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
index bf8d522941b7..5b2eb1cda4d9 100644
--- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs
+++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.Players;
 using Content.Server.Pointing.Components;
 using Content.Server.Visible;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Input;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Helpers;
@@ -155,11 +156,11 @@ bool ViewerPredicate(IPlayerSession playerSession)
             string selfMessage;
             string viewerMessage;
             string? viewerPointedAtMessage = null;
-            var playerName = Name(player);
+            var playerName = Identity.Entity(player, EntityManager);
 
             if (Exists(pointed))
             {
-                var pointedName = Name(pointed);
+                var pointedName = Identity.Entity(pointed, EntityManager);
 
                 selfMessage = player == pointed
                     ? Loc.GetString("pointing-system-point-at-self")
diff --git a/Content.Server/Roles/Job.cs b/Content.Server/Roles/Job.cs
index 3ecc9afb74ed..cb37da26cc6d 100644
--- a/Content.Server/Roles/Job.cs
+++ b/Content.Server/Roles/Job.cs
@@ -17,6 +17,9 @@ public sealed class Job : Role
         [ViewVariables]
         public string? StartingGear => Prototype.StartingGear;
 
+        [ViewVariables]
+        public string? JobEntity => Prototype.JobEntity;
+
         [ViewVariables]
         public bool CanBeAntag;
 
diff --git a/Content.Server/Salvage/SalvageMagnetComponent.cs b/Content.Server/Salvage/SalvageMagnetComponent.cs
index 8de904d6ece2..4773cc22b287 100644
--- a/Content.Server/Salvage/SalvageMagnetComponent.cs
+++ b/Content.Server/Salvage/SalvageMagnetComponent.cs
@@ -1,3 +1,7 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Content.Shared.Radio;
+
 namespace Content.Server.Salvage
 {
     /// <summary>
@@ -28,6 +32,11 @@ public sealed class SalvageMagnetComponent : Component
         [ViewVariables(VVAccess.ReadOnly)]
         [DataField("magnetState")]
         public MagnetState MagnetState = MagnetState.Inactive;
+
+        [ViewVariables]
+        [DataField("salvageChannel", customTypeSerializer: typeof(PrototypeIdSerializer<RadioChannelPrototype>))]
+        public string SalvageChannel = "Supply";
+
     }
     public record struct MagnetState(MagnetStateType StateType, TimeSpan Until)
     {
diff --git a/Content.Server/Salvage/SalvageSystem.cs b/Content.Server/Salvage/SalvageSystem.cs
index c769001c5df1..de82e89088ab 100644
--- a/Content.Server/Salvage/SalvageSystem.cs
+++ b/Content.Server/Salvage/SalvageSystem.cs
@@ -69,7 +69,7 @@ private void OnGridRemoval(GridRemovalEvent ev)
             {
                 var gridUid = _mapManager.GetGridEuid(ev.GridId);
                 if (EntityManager.TryGetComponent<SalvageGridComponent>(gridUid, out var salvComp) && salvComp.SpawnerMagnet != null)
-                    Report(salvComp.SpawnerMagnet.Owner, "salvage-system-announcement-spawn-magnet-lost");
+                    Report(salvComp.SpawnerMagnet.Owner, salvComp.SpawnerMagnet.SalvageChannel, "salvage-system-announcement-spawn-magnet-lost");
                 // For the very unlikely possibility that the salvage magnet was on a salvage, we will not return here
             }
             foreach(var gridState in _salvageGridStates)
@@ -96,16 +96,16 @@ private void OnMagnetRemoval(EntityUid uid, SalvageMagnetComponent component, Co
                 return;
             }
             salvageGridState.ActiveMagnets.Remove(component);
-            Report(uid, "salvage-system-announcement-spawn-magnet-lost");
+            Report(uid, component.SalvageChannel, "salvage-system-announcement-spawn-magnet-lost");
             if (component.AttachedEntity.HasValue)
             {
                 SafeDeleteSalvage(component.AttachedEntity.Value);
                 component.AttachedEntity = null;
-                Report(uid, "salvage-system-announcement-lost");
+                Report(uid, component.SalvageChannel, "salvage-system-announcement-lost");
             }
             else if (component.MagnetState is { StateType: MagnetStateType.Attaching })
             {
-                Report(uid, "salvage-system-announcement-spawn-no-debris-available");
+                Report(uid, component.SalvageChannel, "salvage-system-announcement-spawn-no-debris-available");
             }
             component.MagnetState = MagnetState.Inactive;
         }
@@ -168,7 +168,7 @@ private void StartMagnet(SalvageMagnetComponent component, EntityUid user)
                     }
                     gridState.ActiveMagnets.Add(component);
                     component.MagnetState = new MagnetState(MagnetStateType.Attaching, gridState.CurrentTime + AttachingTime);
-                    Report(component.Owner, "salvage-system-report-activate-success");
+                    Report(component.Owner, component.SalvageChannel, "salvage-system-report-activate-success");
                     break;
                 case MagnetStateType.Attaching:
                 case MagnetStateType.Holding:
@@ -279,7 +279,7 @@ private bool SpawnSalvage(SalvageMagnetComponent component)
 
             if (map == null)
             {
-                Report(component.Owner, "salvage-system-announcement-spawn-no-debris-available");
+                Report(component.Owner, component.SalvageChannel, "salvage-system-announcement-spawn-no-debris-available");
                 return false;
             }
 
@@ -291,7 +291,7 @@ private bool SpawnSalvage(SalvageMagnetComponent component)
             var (_, salvageEntityId) = _mapLoader.LoadBlueprint(spl.MapId, map.MapPath.ToString(), opts);
             if (salvageEntityId == null)
             {
-                Report(component.Owner, "salvage-system-announcement-spawn-debris-disintegrated");
+                Report(component.Owner, component.SalvageChannel, "salvage-system-announcement-spawn-debris-disintegrated");
                 return false;
             }
             component.AttachedEntity = salvageEntityId;
@@ -301,16 +301,16 @@ private bool SpawnSalvage(SalvageMagnetComponent component)
             var pulledTransform = EntityManager.GetComponent<TransformComponent>(salvageEntityId.Value);
             pulledTransform.WorldRotation = spAngle;
 
-            Report(component.Owner, "salvage-system-announcement-arrived", ("timeLeft", HoldTime.TotalSeconds));
+            Report(component.Owner, component.SalvageChannel, "salvage-system-announcement-arrived", ("timeLeft", HoldTime.TotalSeconds));
             return true;
         }
 
-        private void Report(EntityUid source, string messageKey, params (string, object)[] args)
+        private void Report(EntityUid source, string channelName, string messageKey, params (string, object)[] args)
         {
             if (!TryComp<IntrinsicRadioComponent>(source, out var radio)) return;
 
             var message = args.Length == 0 ? Loc.GetString(messageKey) : Loc.GetString(messageKey, args);
-            var channel = _prototypeManager.Index<RadioChannelPrototype>("Supply");
+            var channel = _prototypeManager.Index<RadioChannelPrototype>(channelName);
             _radioSystem.SpreadMessage(radio, source, message, channel);
         }
 
@@ -329,7 +329,7 @@ private void Transition(SalvageMagnetComponent magnet, TimeSpan currentTime)
                     }
                     break;
                 case MagnetStateType.Holding:
-                    Report(magnet.Owner, "salvage-system-announcement-losing", ("timeLeft", DetachingTime.TotalSeconds));
+                    Report(magnet.Owner, magnet.SalvageChannel, "salvage-system-announcement-losing", ("timeLeft", DetachingTime.TotalSeconds));
                     magnet.MagnetState = new MagnetState(MagnetStateType.Detaching, currentTime + DetachingTime);
                     break;
                 case MagnetStateType.Detaching:
@@ -341,7 +341,7 @@ private void Transition(SalvageMagnetComponent magnet, TimeSpan currentTime)
                     {
                         Logger.ErrorS("salvage", "Salvage detaching was expecting attached entity but it was null");
                     }
-                    Report(magnet.Owner, "salvage-system-announcement-lost");
+                    Report(magnet.Owner, magnet.SalvageChannel, "salvage-system-announcement-lost");
                     magnet.MagnetState = new MagnetState(MagnetStateType.CoolingDown, currentTime + CooldownTime);
                     break;
                 case MagnetStateType.CoolingDown:
diff --git a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
index 613b26cedfb0..1eef300972f2 100644
--- a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
@@ -55,7 +55,7 @@ private void TrySpawn(ConditionalSpawnerComponent component)
 
             foreach (var rule in component.GameRules)
             {
-                if (!_ticker.GameRuleStarted(rule)) continue;
+                if (!_ticker.IsGameRuleStarted(rule)) continue;
                 Spawn(component);
                 return;
             }
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index 95ea6eb48079..2de0866f3dfd 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -3,10 +3,11 @@
 using Content.Server.DetailExaminable;
 using Content.Server.Hands.Components;
 using Content.Server.Hands.Systems;
+using Content.Server.IdentityManagement;
 using Content.Server.PDA;
 using Content.Server.Roles;
 using Content.Server.Station.Components;
-using Content.Shared.Access.Components;
+using Content.Server.Mind.Commands;
 using Content.Shared.Access.Systems;
 using Content.Shared.CCVar;
 using Content.Shared.Inventory;
@@ -20,6 +21,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
+
 namespace Content.Server.Station.Systems;
 
 /// <summary>
@@ -37,6 +39,7 @@ public sealed class StationSpawningSystem : EntitySystem
     [Dependency] private readonly InventorySystem _inventorySystem = default!;
     [Dependency] private readonly PDASystem _pdaSystem = default!;
     [Dependency] private readonly AccessSystem _accessSystem = default!;
+    [Dependency] private readonly IdentitySystem _identity = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -92,6 +95,16 @@ public EntityUid SpawnPlayerMob(
         HumanoidCharacterProfile? profile,
         EntityUid? station)
     {
+        // If we're not spawning a humanoid, we're gonna exit early without doing all the humanoid stuff.
+        if (job?.JobEntity != null)
+        {
+            var jobEntity = EntityManager.SpawnEntity(job.JobEntity, coordinates);
+            MakeSentientCommand.MakeSentient(jobEntity, EntityManager);
+            DoJobSpecials(job, jobEntity);
+            _identity.QueueIdentityUpdate(jobEntity);
+            return jobEntity;
+        }
+
         var entity = EntityManager.SpawnEntity(
             _prototypeManager.Index<SpeciesPrototype>(profile?.Species ?? SpeciesManager.DefaultSpecies).Prototype,
             coordinates);
@@ -114,12 +127,17 @@ public EntityUid SpawnPlayerMob(
             }
         }
 
+        DoJobSpecials(job, entity);
+        _identity.QueueIdentityUpdate(entity);
+        return entity;
+    }
+
+    private void DoJobSpecials(Job? job, EntityUid entity)
+    {
         foreach (var jobSpecial in job?.Prototype.Special ?? Array.Empty<JobSpecial>())
         {
             jobSpecial.AfterEquip(entity);
         }
-
-        return entity;
     }
 
     /// <summary>
diff --git a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
new file mode 100644
index 000000000000..a6d101f6d499
--- /dev/null
+++ b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
@@ -0,0 +1,247 @@
+using System.Linq;
+using Content.Server.GameTicking.Rules;
+using Content.Server.GameTicking.Rules.Configurations;
+using Content.Shared.CCVar;
+using Content.Shared.GameTicking;
+using JetBrains.Annotations;
+using Robust.Server.Player;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Server.StationEvents
+{
+    /// <summary>
+    ///     The basic event scheduler rule, loosely based off of /tg/ events, which most
+    ///     game presets use.
+    /// </summary>
+    [UsedImplicitly]
+    public sealed class BasicStationEventSchedulerSystem : GameRuleSystem
+    {
+        public override string Prototype => "BasicStationEventScheduler";
+
+        [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IRobustRandom _random = default!;
+        [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+        private const float MinimumTimeUntilFirstEvent = 300;
+        private ISawmill _sawmill = default!;
+
+        /// <summary>
+        /// How long until the next check for an event runs
+        /// </summary>
+        /// Default value is how long until first event is allowed
+        private float _timeUntilNextEvent = MinimumTimeUntilFirstEvent;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            _sawmill = Logger.GetSawmill("basicevents");
+
+            // Can't just check debug / release for a default given mappers need to use release mode
+            // As such we'll always pause it by default.
+            _configurationManager.OnValueChanged(CCVars.EventsEnabled, value => RuleAdded = value, true);
+
+            SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
+        }
+
+        public override void Started()
+        {
+            if (!_configurationManager.GetCVar(CCVars.EventsEnabled))
+                RuleAdded = false;
+        }
+        public override void Ended() { }
+
+        /// <summary>
+        /// Randomly run a valid event <b>immediately</b>, ignoring earlieststart or whether the event is enabled
+        /// </summary>
+        /// <returns></returns>
+        public string RunRandomEvent()
+        {
+            var randomEvent = PickRandomEvent();
+
+            if (randomEvent == null
+                || !_prototype.TryIndex<GameRulePrototype>(randomEvent.Id, out var proto))
+            {
+                return Loc.GetString("station-event-system-run-random-event-no-valid-events");
+            }
+
+            GameTicker.AddGameRule(proto);
+            return Loc.GetString("station-event-system-run-event",("eventName", randomEvent.Id));
+        }
+
+        /// <summary>
+        /// Randomly picks a valid event.
+        /// </summary>
+        public StationEventRuleConfiguration? PickRandomEvent()
+        {
+            var availableEvents = AvailableEvents(true);
+            return FindEvent(availableEvents);
+        }
+
+        public override void Update(float frameTime)
+        {
+            base.Update(frameTime);
+
+            if (!RuleStarted)
+                return;
+
+            if (_timeUntilNextEvent > 0)
+            {
+                _timeUntilNextEvent -= frameTime;
+                return;
+            }
+
+            // No point hammering this trying to find events if none are available
+            var stationEvent = FindEvent(AvailableEvents());
+            if (stationEvent == null
+                || !_prototype.TryIndex<GameRulePrototype>(stationEvent.Id, out var proto))
+            {
+                return;
+            }
+
+            GameTicker.AddGameRule(proto);
+            ResetTimer();
+            _sawmill.Info($"Started event {proto.ID}. Next event in {_timeUntilNextEvent} seconds");
+        }
+
+        /// <summary>
+        /// Reset the event timer once the event is done.
+        /// </summary>
+        private void ResetTimer()
+        {
+            // 5 - 15 minutes. TG does 3-10 but that's pretty frequent
+            _timeUntilNextEvent = _random.Next(300, 900);
+        }
+
+        /// <summary>
+        /// Pick a random event from the available events at this time, also considering their weightings.
+        /// </summary>
+        /// <returns></returns>
+        private StationEventRuleConfiguration? FindEvent(List<StationEventRuleConfiguration> availableEvents)
+        {
+            if (availableEvents.Count == 0)
+            {
+                return null;
+            }
+
+            var sumOfWeights = 0;
+
+            foreach (var stationEvent in availableEvents)
+            {
+                sumOfWeights += (int) stationEvent.Weight;
+            }
+
+            sumOfWeights = _random.Next(sumOfWeights);
+
+            foreach (var stationEvent in availableEvents)
+            {
+                sumOfWeights -= (int) stationEvent.Weight;
+
+                if (sumOfWeights <= 0)
+                {
+                    return stationEvent;
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets the events that have met their player count, time-until start, etc.
+        /// </summary>
+        /// <param name="ignoreEarliestStart"></param>
+        /// <returns></returns>
+        private List<StationEventRuleConfiguration> AvailableEvents(bool ignoreEarliestStart = false)
+        {
+            TimeSpan currentTime;
+            var playerCount = _playerManager.PlayerCount;
+
+            // playerCount does a lock so we'll just keep the variable here
+            if (!ignoreEarliestStart)
+            {
+                currentTime = GameTicker.RoundDuration();
+            }
+            else
+            {
+                currentTime = TimeSpan.Zero;
+            }
+
+            var result = new List<StationEventRuleConfiguration>();
+
+            foreach (var stationEvent in AllEvents())
+            {
+                if (CanRun(stationEvent, playerCount, currentTime))
+                {
+                    result.Add(stationEvent);
+                }
+            }
+
+            return result;
+        }
+
+        private IEnumerable<StationEventRuleConfiguration> AllEvents()
+        {
+            return _prototype.EnumeratePrototypes<GameRulePrototype>()
+                .Where(p => p.Configuration is StationEventRuleConfiguration)
+                .Select(p => (StationEventRuleConfiguration) p.Configuration);
+        }
+
+        private int GetOccurrences(StationEventRuleConfiguration stationEvent)
+        {
+            return GameTicker.AllPreviousGameRules.Count(p => p.Item2.ID == stationEvent.Id);
+        }
+
+        public TimeSpan TimeSinceLastEvent(StationEventRuleConfiguration? stationEvent)
+        {
+            foreach (var (time, rule) in GameTicker.AllPreviousGameRules.Reverse())
+            {
+                if (rule.Configuration is not StationEventRuleConfiguration)
+                    continue;
+
+                if (stationEvent == null || rule.ID == stationEvent.Id)
+                    return time;
+            }
+
+            return TimeSpan.Zero;
+        }
+
+        private bool CanRun(StationEventRuleConfiguration stationEvent, int playerCount, TimeSpan currentTime)
+        {
+            if (GameTicker.IsGameRuleStarted(stationEvent.Id))
+                return false;
+
+            if (stationEvent.MaxOccurrences.HasValue && GetOccurrences(stationEvent) >= stationEvent.MaxOccurrences.Value)
+            {
+                return false;
+            }
+
+            if (playerCount < stationEvent.MinimumPlayers)
+            {
+                return false;
+            }
+
+            if (currentTime != TimeSpan.Zero && currentTime.TotalMinutes < stationEvent.EarliestStart)
+            {
+                return false;
+            }
+
+            var lastRun = TimeSinceLastEvent(stationEvent);
+            if (lastRun != TimeSpan.Zero && currentTime.TotalMinutes <
+                stationEvent.ReoccurrenceDelay + lastRun.TotalMinutes)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        private void Reset(RoundRestartCleanupEvent ev)
+        {
+            _timeUntilNextEvent = MinimumTimeUntilFirstEvent;
+        }
+    }
+}
diff --git a/Content.Server/StationEvents/Events/BreakerFlip.cs b/Content.Server/StationEvents/Events/BreakerFlip.cs
index f115682fdea5..50b3fe85886b 100644
--- a/Content.Server/StationEvents/Events/BreakerFlip.cs
+++ b/Content.Server/StationEvents/Events/BreakerFlip.cs
@@ -7,34 +7,34 @@
 namespace Content.Server.StationEvents.Events;
 
 [UsedImplicitly]
-public sealed class BreakerFlip : StationEvent
+public sealed class BreakerFlip : StationEventSystem
 {
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-
-    public override string Name => "BreakerFlip";
-    public override string? StartAnnouncement =>
-        Loc.GetString("station-event-breaker-flip-announcement", ("data", Loc.GetString(Loc.GetString($"random-sentience-event-data-{_random.Next(1, 6)}"))));
-    public override float Weight => WeightNormal;
-    protected override float EndAfter => 1.0f;
-    public override int? MaxOccurrences => 5;
-    public override int MinimumPlayers => 15;
-
-    public override void Startup()
+    [Dependency] private readonly ApcSystem _apcSystem = default!;
+
+    public override string Prototype => "BreakerFlip";
+
+    public override void Added()
+    {
+        base.Added();
+
+        var str = Loc.GetString("station-event-breaker-flip-announcement", ("data", Loc.GetString(Loc.GetString($"random-sentience-event-data-{RobustRandom.Next(1, 6)}"))));
+        ChatSystem.DispatchGlobalAnnouncement(str, playDefaultSound: false, colorOverride: Color.Gold);
+    }
+
+    public override void Started()
     {
-        base.Startup();
+        base.Started();
 
-        var apcSys = EntitySystem.Get<ApcSystem>();
-        var allApcs = _entityManager.EntityQuery<ApcComponent>().ToList();
-        var toDisable = Math.Min(_random.Next(3, 7), allApcs.Count);
+        var allApcs = EntityQuery<ApcComponent>().ToList();
+        var toDisable = Math.Min(RobustRandom.Next(3, 7), allApcs.Count);
         if (toDisable == 0)
             return;
 
-        _random.Shuffle(allApcs);
+        RobustRandom.Shuffle(allApcs);
 
         for (var i = 0; i < toDisable; i++)
         {
-            apcSys.ApcToggleBreaker(allApcs[i].Owner, allApcs[i]);
+            _apcSystem.ApcToggleBreaker(allApcs[i].Owner, allApcs[i]);
         }
     }
 }
diff --git a/Content.Server/StationEvents/Events/BureaucraticError.cs b/Content.Server/StationEvents/Events/BureaucraticError.cs
index e9f9ed0b1080..d765d387b4c4 100644
--- a/Content.Server/StationEvents/Events/BureaucraticError.cs
+++ b/Content.Server/StationEvents/Events/BureaucraticError.cs
@@ -6,55 +6,44 @@
 namespace Content.Server.StationEvents.Events;
 
 [UsedImplicitly]
-public sealed class BureaucraticError : StationEvent
+public sealed class BureaucraticError : StationEventSystem
 {
-    [Dependency] private readonly IRobustRandom _random = default!;
-    public override string StartAnnouncement =>
-        Loc.GetString("station-event-bureaucratic-error-announcement");
-    public override string Name => "BureaucraticError";
+    [Dependency] private readonly StationJobsSystem _stationJobs = default!;
 
-    public override int MinimumPlayers => 25;
+    public override string Prototype => "BureaucraticError";
 
-    public override float Weight => WeightLow;
-
-    public override int? MaxOccurrences => 2;
-
-    protected override float EndAfter => 1f;
-
-    public override void Startup()
+    public override void Started()
     {
-        base.Startup();
-        var stationSystem = EntitySystem.Get<StationSystem>();
-        var stationJobsSystem = EntitySystem.Get<StationJobsSystem>();
-        if (stationSystem.Stations.Count == 0) return; // No stations
-        var chosenStation = _random.Pick(stationSystem.Stations.ToList());
-        var jobList = stationJobsSystem.GetJobs(chosenStation).Keys.ToList();
+        base.Started();
+
+        if (StationSystem.Stations.Count == 0) return; // No stations
+        var chosenStation = RobustRandom.Pick(StationSystem.Stations.ToList());
+        var jobList = _stationJobs.GetJobs(chosenStation).Keys.ToList();
 
         // Low chance to completely change up the late-join landscape by closing all positions except infinite slots.
         // Lower chance than the /tg/ equivalent of this event.
-        if (_random.Prob(0.25f))
+        if (RobustRandom.Prob(0.25f))
         {
-            var chosenJob = _random.PickAndTake(jobList);
-            stationJobsSystem.MakeJobUnlimited(chosenStation, chosenJob); // INFINITE chaos.
+            var chosenJob = RobustRandom.PickAndTake(jobList);
+            _stationJobs.MakeJobUnlimited(chosenStation, chosenJob); // INFINITE chaos.
             foreach (var job in jobList)
             {
-                if (stationJobsSystem.IsJobUnlimited(chosenStation, job))
+                if (_stationJobs.IsJobUnlimited(chosenStation, job))
                     continue;
-                stationJobsSystem.TrySetJobSlot(chosenStation, job, 0);
+                _stationJobs.TrySetJobSlot(chosenStation, job, 0);
             }
         }
         else
         {
             // Changing every role is maybe a bit too chaotic so instead change 20-30% of them.
-            for (var i = 0; i < _random.Next((int)(jobList.Count * 0.20), (int)(jobList.Count * 0.30)); i++)
+            for (var i = 0; i < RobustRandom.Next((int)(jobList.Count * 0.20), (int)(jobList.Count * 0.30)); i++)
             {
-                var chosenJob = _random.PickAndTake(jobList);
-                if (stationJobsSystem.IsJobUnlimited(chosenStation, chosenJob))
+                var chosenJob = RobustRandom.PickAndTake(jobList);
+                if (_stationJobs.IsJobUnlimited(chosenStation, chosenJob))
                     continue;
 
-                stationJobsSystem.TryAdjustJobSlot(chosenStation, chosenJob, _random.Next(-3, 6));
+                _stationJobs.TryAdjustJobSlot(chosenStation, chosenJob, RobustRandom.Next(-3, 6));
             }
         }
     }
-
 }
diff --git a/Content.Server/StationEvents/Events/DiseaseOutbreak.cs b/Content.Server/StationEvents/Events/DiseaseOutbreak.cs
index f5d0ec523f9d..ab54914dcdca 100644
--- a/Content.Server/StationEvents/Events/DiseaseOutbreak.cs
+++ b/Content.Server/StationEvents/Events/DiseaseOutbreak.cs
@@ -14,11 +14,11 @@ namespace Content.Server.StationEvents.Events;
 /// Infects a couple people
 /// with a random disease that isn't super deadly
 /// </summary>
-public sealed class DiseaseOutbreak : StationEvent
+public sealed class DiseaseOutbreak : StationEventSystem
 {
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly DiseaseSystem _diseaseSystem = default!;
+
+    public override string Prototype => "DiseaseOutbreak";
 
     /// <summary>
     /// Disease prototypes I decided were not too deadly for a random event
@@ -33,62 +33,43 @@ public sealed class DiseaseOutbreak : StationEvent
         "BirdFlew",
         "TongueTwister"
     };
-    public override string Name => "DiseaseOutbreak";
-    public override float Weight => WeightNormal;
-
-    public override SoundSpecifier? StartAudio => new SoundPathSpecifier("/Audio/Announcements/outbreak7.ogg");
-    protected override float EndAfter => 1.0f;
-
-    public override bool AnnounceEvent => false;
 
     /// <summary>
     /// Finds 2-5 random, alive entities that can host diseases
     /// and gives them a randomly selected disease.
     /// They all get the same disease.
     /// </summary>
-    public override void Startup()
+    public override void Started()
     {
-        base.Startup();
+        base.Started();
         HashSet<EntityUid> stationsToNotify = new();
         List<DiseaseCarrierComponent> aliveList = new();
-        foreach (var (carrier, mobState) in _entityManager.EntityQuery<DiseaseCarrierComponent, MobStateComponent>())
+        foreach (var (carrier, mobState) in EntityManager.EntityQuery<DiseaseCarrierComponent, MobStateComponent>())
         {
             if (!mobState.IsDead())
                 aliveList.Add(carrier);
         }
-        _random.Shuffle(aliveList);
-        /// We're going to filter the above out to only alive mobs. Might change after future mobstate rework
+        RobustRandom.Shuffle(aliveList);
 
-        var toInfect = _random.Next(2, 5);
+        // We're going to filter the above out to only alive mobs. Might change after future mobstate rework
+        var toInfect = RobustRandom.Next(2, 5);
 
-        var diseaseName = _random.Pick(NotTooSeriousDiseases);
+        var diseaseName = RobustRandom.Pick(NotTooSeriousDiseases);
 
-        if (!_prototypeManager.TryIndex(diseaseName, out DiseasePrototype? disease))
+        if (!PrototypeManager.TryIndex(diseaseName, out DiseasePrototype? disease))
             return;
 
-        var diseaseSystem = EntitySystem.Get<DiseaseSystem>();
-        var entSysMgr = IoCManager.Resolve<IEntitySystemManager>();
-        var stationSystem = entSysMgr.GetEntitySystem<StationSystem>();
-        var chatSystem = entSysMgr.GetEntitySystem<ChatSystem>();
         // Now we give it to people in the list of living disease carriers earlier
         foreach (var target in aliveList)
         {
             if (toInfect-- == 0)
                 break;
 
-            diseaseSystem.TryAddDisease(target.Owner, disease, target);
+            _diseaseSystem.TryAddDisease(target.Owner, disease, target);
 
-            var station = stationSystem.GetOwningStation(target.Owner);
+            var station = StationSystem.GetOwningStation(target.Owner);
             if(station == null) continue;
             stationsToNotify.Add((EntityUid) station);
         }
-
-        if (!AnnounceEvent)
-            return;
-        foreach (var station in stationsToNotify)
-        {
-            chatSystem.DispatchStationAnnouncement(station, Loc.GetString("station-event-disease-outbreak-announcement"),
-                playDefaultSound: false, colorOverride: Color.YellowGreen);
-        }
     }
 }
diff --git a/Content.Server/StationEvents/Events/FalseAlarm.cs b/Content.Server/StationEvents/Events/FalseAlarm.cs
index f3e22c88e6de..a42697a8651c 100644
--- a/Content.Server/StationEvents/Events/FalseAlarm.cs
+++ b/Content.Server/StationEvents/Events/FalseAlarm.cs
@@ -1,27 +1,33 @@
-using JetBrains.Annotations;
+using Content.Server.GameTicking.Rules.Configurations;
+using JetBrains.Annotations;
+using Robust.Shared.Audio;
+using Robust.Shared.Player;
 
 namespace Content.Server.StationEvents.Events
 {
     [UsedImplicitly]
-    public sealed class FalseAlarm : StationEvent
+    public sealed class FalseAlarm : StationEventSystem
     {
-        public override string Name => "FalseAlarm";
-        public override float Weight => WeightHigh;
-        protected override float EndAfter => 1.0f;
-        public override int? MaxOccurrences => 5;
+        public override string Prototype => "FalseAlarm";
 
-        public override void Announce()
+        public override void Started()
         {
-            var stationEventSystem = EntitySystem.Get<StationEventSystem>();
-            var randomEvent = stationEventSystem.PickRandomEvent();
+            base.Started();
 
-            if (randomEvent != null)
+            var ev = GetRandomEventUnweighted(PrototypeManager, RobustRandom);
+
+            if (ev.Configuration is not StationEventRuleConfiguration cfg)
+                return;
+
+            if (cfg.StartAnnouncement != null)
             {
-                StartAnnouncement = randomEvent.StartAnnouncement;
-                StartAudio = randomEvent.StartAudio;
+                ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(cfg.StartAnnouncement), playDefaultSound: false, colorOverride: Color.Gold);
             }
 
-            base.Announce();
+            if (cfg.StartAudio != null)
+            {
+                SoundSystem.Play(cfg.StartAudio.GetSound(), Filter.Broadcast(), cfg.StartAudio.Params);
+            }
         }
     }
 }
diff --git a/Content.Server/StationEvents/Events/GasLeak.cs b/Content.Server/StationEvents/Events/GasLeak.cs
index a6b70cfdbe74..e90ca6f20dc0 100644
--- a/Content.Server/StationEvents/Events/GasLeak.cs
+++ b/Content.Server/StationEvents/Events/GasLeak.cs
@@ -1,4 +1,6 @@
 using Content.Server.Atmos.EntitySystems;
+using Content.Server.GameTicking.Rules;
+using Content.Server.GameTicking.Rules.Configurations;
 using Content.Shared.Atmos;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;
@@ -7,17 +9,11 @@
 
 namespace Content.Server.StationEvents.Events
 {
-    internal sealed class GasLeak : StationEvent
+    internal sealed class GasLeak : StationEventSystem
     {
-        [Dependency] private readonly IRobustRandom _robustRandom = default!;
-        [Dependency] private readonly IEntityManager _entityManager = default!;
+        [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
 
-        public override string Name => "GasLeak";
-
-        public override string StartAnnouncement => Loc.GetString("station-event-gas-leak-start-announcement");
-
-
-        protected override string EndAnnouncement => Loc.GetString("station-event-gas-leak-end-announcement");
+        public override string Prototype => "GasLeak";
 
         private static readonly Gas[] LeakableGases = {
             Gas.Miasma,
@@ -25,24 +21,6 @@ internal sealed class GasLeak : StationEvent
             Gas.Tritium,
         };
 
-        public override int EarliestStart => 10;
-
-        public override int MinimumPlayers => 5;
-
-        public override float Weight => WeightLow;
-
-        public override int? MaxOccurrences => 1;
-
-        /// <summary>
-        ///     Give people time to get their internals on.
-        /// </summary>
-        protected override float StartAfter => 20f;
-
-        /// <summary>
-        ///     Don't know how long the event will be until we calculate the leak amount.
-        /// </summary>
-        protected override float EndAfter { get; set; } = float.MaxValue;
-
         /// <summary>
         ///     Running cooldown of how much time until another leak.
         /// </summary>
@@ -53,23 +31,18 @@ internal sealed class GasLeak : StationEvent
         /// </summary>
         private const float LeakCooldown = 1.0f;
 
+
         // Event variables
 
         private EntityUid _targetStation;
-
         private EntityUid _targetGrid;
-
         private Vector2i _targetTile;
-
         private EntityCoordinates _targetCoords;
-
         private bool _foundTile;
-
         private Gas _leakGas;
-
         private float _molesPerSecond;
-
         private const int MinimumMolesPerSecond = 20;
+        private float _endAfter = float.MaxValue;
 
         /// <summary>
         ///     Don't want to make it too fast to give people time to flee.
@@ -77,26 +50,25 @@ internal sealed class GasLeak : StationEvent
         private const int MaximumMolesPerSecond = 50;
 
         private const int MinimumGas = 250;
-
         private const int MaximumGas = 1000;
-
         private const float SparkChance = 0.05f;
 
-        public override void Startup()
+        public override void Started()
         {
-            base.Startup();
+            base.Started();
 
             // Essentially we'll pick out a target amount of gas to leak, then a rate to leak it at, then work out the duration from there.
             if (TryFindRandomTile(out _targetTile, out _targetStation, out _targetGrid, out _targetCoords))
             {
                 _foundTile = true;
 
-                _leakGas = _robustRandom.Pick(LeakableGases);
+                _leakGas = RobustRandom.Pick(LeakableGases);
                 // Was 50-50 on using normal distribution.
-                var totalGas = (float) _robustRandom.Next(MinimumGas, MaximumGas);
-                _molesPerSecond = _robustRandom.Next(MinimumMolesPerSecond, MaximumMolesPerSecond);
-                 EndAfter = totalGas / _molesPerSecond + StartAfter;
-                 Logger.InfoS("stationevents", $"Leaking {totalGas} of {_leakGas} over {EndAfter - StartAfter} seconds at {_targetTile}");
+                var totalGas = (float) RobustRandom.Next(MinimumGas, MaximumGas);
+                var startAfter = ((StationEventRuleConfiguration) Configuration).StartAfter;
+                _molesPerSecond = RobustRandom.Next(MinimumMolesPerSecond, MaximumMolesPerSecond);
+                _endAfter = totalGas / _molesPerSecond + startAfter;
+                Sawmill.Info($"Leaking {totalGas} of {_leakGas} over {_endAfter - startAfter} seconds at {_targetTile}");
             }
 
             // Look technically if you wanted to guarantee a leak you'd do this in announcement but having the announcement
@@ -107,32 +79,37 @@ public override void Update(float frameTime)
         {
             base.Update(frameTime);
 
-            if (!Started || !Running) return;
+            if (!RuleStarted)
+                return;
+
+            if (Elapsed > _endAfter)
+            {
+                ForceEndSelf();
+                return;
+            }
 
             _timeUntilLeak -= frameTime;
 
             if (_timeUntilLeak > 0f) return;
             _timeUntilLeak += LeakCooldown;
 
-            var atmosphereSystem = _entityManager.EntitySysManager.GetEntitySystem<AtmosphereSystem>();
-
             if (!_foundTile ||
                 _targetGrid == default ||
-                _entityManager.Deleted(_targetGrid) ||
-                !atmosphereSystem.IsSimulatedGrid(_targetGrid))
+                EntityManager.Deleted(_targetGrid) ||
+                !_atmosphere.IsSimulatedGrid(_targetGrid))
             {
-                Running = false;
+                ForceEndSelf();
                 return;
             }
 
-            var environment = atmosphereSystem.GetTileMixture(_targetGrid, null, _targetTile, true);
+            var environment = _atmosphere.GetTileMixture(_targetGrid, null, _targetTile, true);
 
             environment?.AdjustMoles(_leakGas, LeakCooldown * _molesPerSecond);
         }
 
-        public override void Shutdown()
+        public override void Ended()
         {
-            base.Shutdown();
+            base.Ended();
 
             Spark();
 
@@ -141,25 +118,24 @@ public override void Shutdown()
             _targetTile = default;
             _targetCoords = default;
             _leakGas = Gas.Oxygen;
-            EndAfter = float.MaxValue;
+            _endAfter = float.MaxValue;
         }
 
         private void Spark()
         {
-            var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
-            if (_robustRandom.NextFloat() <= SparkChance)
+            if (RobustRandom.NextFloat() <= SparkChance)
             {
                 if (!_foundTile ||
                     _targetGrid == default ||
-                    (!_entityManager.EntityExists(_targetGrid) ? EntityLifeStage.Deleted : _entityManager.GetComponent<MetaDataComponent>(_targetGrid).EntityLifeStage) >= EntityLifeStage.Deleted ||
-                    !atmosphereSystem.IsSimulatedGrid(_targetGrid))
+                    (!EntityManager.EntityExists(_targetGrid) ? EntityLifeStage.Deleted : EntityManager.GetComponent<MetaDataComponent>(_targetGrid).EntityLifeStage) >= EntityLifeStage.Deleted ||
+                    !_atmosphere.IsSimulatedGrid(_targetGrid))
                 {
                     return;
                 }
 
                 // Don't want it to be so obnoxious as to instantly murder anyone in the area but enough that
                 // it COULD start potentially start a bigger fire.
-                atmosphereSystem.HotspotExpose(_targetGrid, _targetTile, 700f, 50f, true);
+                _atmosphere.HotspotExpose(_targetGrid, _targetTile, 700f, 50f, true);
                 SoundSystem.Play("/Audio/Effects/sparks4.ogg", Filter.Pvs(_targetCoords), _targetCoords);
             }
         }
diff --git a/Content.Server/StationEvents/Events/KudzuGrowth.cs b/Content.Server/StationEvents/Events/KudzuGrowth.cs
index 11153e2a88f1..e0b0f5c687e7 100644
--- a/Content.Server/StationEvents/Events/KudzuGrowth.cs
+++ b/Content.Server/StationEvents/Events/KudzuGrowth.cs
@@ -3,51 +3,26 @@
 
 namespace Content.Server.StationEvents.Events;
 
-public sealed class KudzuGrowth : StationEvent
+public sealed class KudzuGrowth : StationEventSystem
 {
-    [Dependency] private readonly IRobustRandom _robustRandom = default!;
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-
-    public override string Name => "KudzuGrowth";
-
-    public override string? StartAnnouncement =>
-        Loc.GetString("station-event-kudzu-growth-start-announcement");
-
-    public override int EarliestStart => 15;
-
-    public override int MinimumPlayers => 15;
-
-    public override float Weight => WeightLow;
-
-    public override int? MaxOccurrences => 2;
-
-    // Get players to scatter a bit looking for it.
-    protected override float StartAfter => 50f;
-
-    // Give crew at least 9 minutes to either have it gone, or to suffer another event. Kudzu is not actually required to be dead for another event to roll.
-    protected override float EndAfter => 60*4;
-
-    public override bool AnnounceEvent => false;
+    public override string Prototype => "KudzuGrowth";
 
     private EntityUid _targetGrid;
-
     private Vector2i _targetTile;
-
     private EntityCoordinates _targetCoords;
 
-    public override void Startup()
+    public override void Started()
     {
-        base.Startup();
+        base.Started();
 
         // Pick a place to plant the kudzu.
-        if (TryFindRandomTile(out _targetTile, out _, out _targetGrid, out _targetCoords, _robustRandom, _entityManager))
+        if (TryFindRandomTile(out _targetTile, out _, out _targetGrid, out _targetCoords))
         {
-            _entityManager.SpawnEntity("Kudzu", _targetCoords);
-            Logger.InfoS("stationevents", $"Spawning a Kudzu at {_targetTile} on {_targetGrid}");
+            EntityManager.SpawnEntity("Kudzu", _targetCoords);
+            Sawmill.Info($"Spawning a Kudzu at {_targetTile} on {_targetGrid}");
         }
 
         // If the kudzu tile selection fails we just let the announcement happen anyways because it's funny and people
         // will be hunting the non-existent, dangerous plant.
     }
-
 }
diff --git a/Content.Server/StationEvents/Events/MeteorSwarm.cs b/Content.Server/StationEvents/Events/MeteorSwarm.cs
index b5167856c6cc..cacb2b2fe403 100644
--- a/Content.Server/StationEvents/Events/MeteorSwarm.cs
+++ b/Content.Server/StationEvents/Events/MeteorSwarm.cs
@@ -1,4 +1,5 @@
 using Content.Server.GameTicking;
+using Content.Server.GameTicking.Rules;
 using Content.Server.Projectiles.Components;
 using Content.Shared.Sound;
 using Content.Shared.Spawners.Components;
@@ -7,26 +8,9 @@
 
 namespace Content.Server.StationEvents.Events
 {
-    public sealed class MeteorSwarm : StationEvent
+    public sealed class MeteorSwarm : StationEventSystem
     {
-        [Dependency] private readonly IEntityManager _entityManager = default!;
-        [Dependency] private readonly IMapManager _mapManager = default!;
-        [Dependency] private readonly IRobustRandom _robustRandom = default!;
-
-        public override string Name => "MeteorSwarm";
-
-        public override int EarliestStart => 30;
-        public override float Weight => WeightLow;
-        public override int? MaxOccurrences => 2;
-        public override int MinimumPlayers => 20;
-
-        public override string StartAnnouncement =>  Loc.GetString("station-event-meteor-swarm-start-announcement");
-        protected override string EndAnnouncement => Loc.GetString("station-event-meteor-swarm-ebd-announcement");
-
-        public override SoundSpecifier? StartAudio => new SoundPathSpecifier("/Audio/Announcements/meteors.ogg");
-
-        protected override float StartAfter => 30f;
-        protected override float EndAfter => float.MaxValue;
+        public override string Prototype => "MeteorSwarm";
 
         private float _cooldown;
 
@@ -46,53 +30,53 @@ public sealed class MeteorSwarm : StationEvent
         private const float MaxAngularVelocity = 0.25f;
         private const float MinAngularVelocity = -0.25f;
 
-        public override void Startup()
+        public override void Started()
         {
-            base.Startup();
-            var robustRandom = IoCManager.Resolve<IRobustRandom>();
-            _waveCounter = robustRandom.Next(MinimumWaves, MaximumWaves);
+            base.Started();
+            _waveCounter = RobustRandom.Next(MinimumWaves, MaximumWaves);
         }
 
-        public override void Shutdown()
+        public override void Ended()
         {
-            base.Shutdown();
+            base.Ended();
             _waveCounter = 0;
             _cooldown = 0f;
-            EndAfter = float.MaxValue;
         }
 
         public override void Update(float frameTime)
         {
             base.Update(frameTime);
 
-            if (!Started) return;
+            if (!RuleStarted)
+                return;
 
             if (_waveCounter <= 0)
             {
-                Running = false;
+                ForceEndSelf();
                 return;
             }
+
             _cooldown -= frameTime;
 
             if (_cooldown > 0f) return;
 
             _waveCounter--;
 
-            _cooldown += (MaximumCooldown - MinimumCooldown) * _robustRandom.NextFloat() + MinimumCooldown;
+            _cooldown += (MaximumCooldown - MinimumCooldown) * RobustRandom.NextFloat() + MinimumCooldown;
 
             Box2? playableArea = null;
-            var mapId = EntitySystem.Get<GameTicker>().DefaultMap;
+            var mapId = GameTicker.DefaultMap;
 
-            foreach (var grid in _mapManager.GetAllGrids())
+            foreach (var grid in MapManager.GetAllGrids())
             {
-                if (grid.ParentMapId != mapId || !_entityManager.TryGetComponent(grid.GridEntityId, out PhysicsComponent? gridBody)) continue;
+                if (grid.ParentMapId != mapId || !EntityManager.TryGetComponent(grid.GridEntityId, out PhysicsComponent? gridBody)) continue;
                 var aabb = gridBody.GetWorldAABB();
                 playableArea = playableArea?.Union(aabb) ?? aabb;
             }
 
             if (playableArea == null)
             {
-                EndAfter = float.MinValue;
+                ForceEndSelf();
                 return;
             }
 
@@ -103,21 +87,21 @@ public override void Update(float frameTime)
 
             for (var i = 0; i < MeteorsPerWave; i++)
             {
-                var angle = new Angle(_robustRandom.NextFloat() * MathF.Tau);
-                var offset = angle.RotateVec(new Vector2((maximumDistance - minimumDistance) * _robustRandom.NextFloat() + minimumDistance, 0));
+                var angle = new Angle(RobustRandom.NextFloat() * MathF.Tau);
+                var offset = angle.RotateVec(new Vector2((maximumDistance - minimumDistance) * RobustRandom.NextFloat() + minimumDistance, 0));
                 var spawnPosition = new MapCoordinates(center + offset, mapId);
-                var meteor = _entityManager.SpawnEntity("MeteorLarge", spawnPosition);
-                var physics = _entityManager.GetComponent<PhysicsComponent>(meteor);
+                var meteor = EntityManager.SpawnEntity("MeteorLarge", spawnPosition);
+                var physics = EntityManager.GetComponent<PhysicsComponent>(meteor);
                 physics.BodyStatus = BodyStatus.InAir;
                 physics.LinearDamping = 0f;
                 physics.AngularDamping = 0f;
                 physics.ApplyLinearImpulse(-offset.Normalized * MeteorVelocity * physics.Mass);
                 physics.ApplyAngularImpulse(
                     // Get a random angular velocity.
-                    physics.Mass * ((MaxAngularVelocity - MinAngularVelocity) * _robustRandom.NextFloat() +
+                    physics.Mass * ((MaxAngularVelocity - MinAngularVelocity) * RobustRandom.NextFloat() +
                                     MinAngularVelocity));
                 // TODO: God this disgusts me but projectile needs a refactor.
-                IoCManager.Resolve<IEntityManager>().EnsureComponent<TimedDespawnComponent>(meteor).Lifetime = 120f;
+                EnsureComp<TimedDespawnComponent>(meteor).Lifetime = 120f;
             }
         }
     }
diff --git a/Content.Server/StationEvents/Events/MouseMigration.cs b/Content.Server/StationEvents/Events/MouseMigration.cs
index f285b6652b8e..b6c44050656f 100644
--- a/Content.Server/StationEvents/Events/MouseMigration.cs
+++ b/Content.Server/StationEvents/Events/MouseMigration.cs
@@ -4,49 +4,31 @@
 
 namespace Content.Server.StationEvents.Events;
 
-public sealed class MouseMigration : StationEvent
+public sealed class MouseMigration : StationEventSystem
 {
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-
     public static List<string> SpawnedPrototypeChoices = new List<string>() //we double up for that ez fake probability
         {"MobMouse", "MobMouse1", "MobMouse2", "MobRatServant"};
 
-    public override string Name => "MouseMigration";
-
-    public override string? StartAnnouncement =>
-        Loc.GetString("station-event-mouse-migration-announcement");
-
-    public override int EarliestStart => 30;
-
-    public override int MinimumPlayers => 35; //this just ensures that it doesn't spawn on lowpop maps.
-
-    public override float Weight => WeightLow;
-
-    public override int? MaxOccurrences => 1;
-
-    public override bool AnnounceEvent => false;
-
-    protected override float StartAfter => 30f;
-
-    protected override float EndAfter => 60;
+    public override string Prototype => "MouseMigration";
 
-    public override void Startup()
+    public override void Started()
     {
-        base.Startup();
+        base.Started();
 
-        var spawnLocations = _entityManager.EntityQuery<VentCritterSpawnLocationComponent, TransformComponent>().ToList();
-        _random.Shuffle(spawnLocations);
+        var spawnLocations = EntityManager.EntityQuery<VentCritterSpawnLocationComponent, TransformComponent>().ToList();
+        RobustRandom.Shuffle(spawnLocations);
 
-        var spawnAmount = _random.Next(7, 15); // A small colony of critters.
+        var spawnAmount = RobustRandom.Next(7, 15); // A small colony of critters.
 
         for (int i = 0; i < spawnAmount && i < spawnLocations.Count - 1; i++)
         {
-            var spawnChoice = _random.Pick(SpawnedPrototypeChoices);
-            if (_random.Prob(0.01f) || i == 0) //small chance for multiple, but always at least 1
+            var spawnChoice = RobustRandom.Pick(SpawnedPrototypeChoices);
+            if (RobustRandom.Prob(0.01f) || i == 0) //small chance for multiple, but always at least 1
                 spawnChoice = "SpawnPointGhostRatKing";
 
-            _entityManager.SpawnEntity(spawnChoice, spawnLocations[i].Item2.Coordinates);
+            var coords = spawnLocations[i].Item2.Coordinates;
+            Sawmill.Info($"Spawning mouse {spawnChoice} at {coords}");
+            EntityManager.SpawnEntity(spawnChoice, coords);
         }
     }
 }
diff --git a/Content.Server/StationEvents/Events/PowerGridCheck.cs b/Content.Server/StationEvents/Events/PowerGridCheck.cs
index 1076bd7faf31..da38312573a5 100644
--- a/Content.Server/StationEvents/Events/PowerGridCheck.cs
+++ b/Content.Server/StationEvents/Events/PowerGridCheck.cs
@@ -11,21 +11,9 @@
 namespace Content.Server.StationEvents.Events
 {
     [UsedImplicitly]
-    public sealed class PowerGridCheck : StationEvent
+    public sealed class PowerGridCheck : StationEventSystem
     {
-        [Dependency] private readonly IEntityManager _entityManager = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
-
-        public override string Name => "PowerGridCheck";
-        public override float Weight => WeightNormal;
-        public override int? MaxOccurrences => 3;
-        public override string StartAnnouncement => Loc.GetString("station-event-power-grid-check-start-announcement");
-        protected override string EndAnnouncement => Loc.GetString("station-event-power-grid-check-end-announcement");
-        public override SoundSpecifier? StartAudio => new SoundPathSpecifier("/Audio/Announcements/power_off.ogg");
-
-        // If you need EndAudio it's down below. Not set here because we can't play it at the normal time without spamming sounds.
-
-        protected override float StartAfter => 12.0f;
+        public override string Prototype => "PowerGridCheck";
 
         private CancellationTokenSource? _announceCancelToken;
 
@@ -37,34 +25,44 @@ public sealed class PowerGridCheck : StationEvent
         private int _numberPerSecond = 0;
         private float UpdateRate => 1.0f / _numberPerSecond;
         private float _frameTimeAccumulator = 0.0f;
+        private float _endAfter = 0.0f;
 
-        public override void Announce()
+        public override void Added()
         {
-            base.Announce();
-            EndAfter = IoCManager.Resolve<IRobustRandom>().Next(60, 120);
+            base.Added();
+            _endAfter = RobustRandom.Next(60, 120);
         }
 
-        public override void Startup()
+        public override void Started()
         {
-            foreach (var component in _entityManager.EntityQuery<ApcPowerReceiverComponent>(true))
+            foreach (var component in EntityManager.EntityQuery<ApcPowerReceiverComponent>(true))
             {
                 if (!component.PowerDisabled)
                     _powered.Add(component.Owner);
             }
 
-            _random.Shuffle(_powered);
+            RobustRandom.Shuffle(_powered);
 
             _numberPerSecond = Math.Max(1, (int)(_powered.Count / SecondsUntilOff)); // Number of APCs to turn off every second. At least one.
 
-            base.Startup();
+            base.Started();
         }
 
         public override void Update(float frameTime)
         {
             base.Update(frameTime);
-            _frameTimeAccumulator += frameTime;
+
+            if (!RuleStarted)
+                return;
+
+            if (Elapsed > _endAfter)
+            {
+                ForceEndSelf();
+                return;
+            }
 
             var updates = 0;
+            _frameTimeAccumulator += frameTime;
             if (_frameTimeAccumulator > UpdateRate)
             {
                 updates = (int) (_frameTimeAccumulator / UpdateRate);
@@ -77,8 +75,8 @@ public override void Update(float frameTime)
                     break;
 
                 var selected = _powered.Pop();
-                if (_entityManager.Deleted(selected)) continue;
-                if (_entityManager.TryGetComponent<ApcPowerReceiverComponent>(selected, out var powerReceiverComponent))
+                if (EntityManager.Deleted(selected)) continue;
+                if (EntityManager.TryGetComponent<ApcPowerReceiverComponent>(selected, out var powerReceiverComponent))
                 {
                     powerReceiverComponent.PowerDisabled = true;
                 }
@@ -86,13 +84,13 @@ public override void Update(float frameTime)
             }
         }
 
-        public override void Shutdown()
+        public override void Ended()
         {
             foreach (var entity in _unpowered)
             {
-                if (_entityManager.Deleted(entity)) continue;
+                if (EntityManager.Deleted(entity)) continue;
 
-                if (_entityManager.TryGetComponent(entity, out ApcPowerReceiverComponent? powerReceiverComponent))
+                if (EntityManager.TryGetComponent(entity, out ApcPowerReceiverComponent? powerReceiverComponent))
                 {
                     powerReceiverComponent.PowerDisabled = false;
                 }
@@ -103,11 +101,11 @@ public override void Shutdown()
             _announceCancelToken = new CancellationTokenSource();
             Timer.Spawn(3000, () =>
             {
-                SoundSystem.Play("/Audio/Announcements/power_on.ogg", Filter.Broadcast(), AudioParams);
+                SoundSystem.Play("/Audio/Announcements/power_on.ogg", Filter.Broadcast(), AudioParams.Default);
             }, _announceCancelToken.Token);
             _unpowered.Clear();
 
-            base.Shutdown();
+            base.Ended();
         }
     }
 }
diff --git a/Content.Server/StationEvents/Events/RandomSentience.cs b/Content.Server/StationEvents/Events/RandomSentience.cs
index 1ed371651c0a..3e955bc5f7d7 100644
--- a/Content.Server/StationEvents/Events/RandomSentience.cs
+++ b/Content.Server/StationEvents/Events/RandomSentience.cs
@@ -9,26 +9,19 @@
 
 namespace Content.Server.StationEvents.Events;
 
-public sealed class RandomSentience : StationEvent
+public sealed class RandomSentience : StationEventSystem
 {
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly IEntityManager _entityManager = default!;
+    public override string Prototype => "RandomSentience";
 
-    public override string Name => "RandomSentience";
-
-    public override float Weight => WeightNormal;
-
-    protected override float EndAfter => 1.0f;
-
-    public override void Startup()
+    public override void Started()
     {
-        base.Startup();
+        base.Started();
         HashSet<EntityUid> stationsToNotify = new();
 
-        var targetList = _entityManager.EntityQuery<SentienceTargetComponent>().ToList();
-        _random.Shuffle(targetList);
+        var targetList = EntityManager.EntityQuery<SentienceTargetComponent>().ToList();
+        RobustRandom.Shuffle(targetList);
 
-        var toMakeSentient = _random.Next(2, 5);
+        var toMakeSentient = RobustRandom.Next(2, 5);
         var groups = new HashSet<string>();
 
         foreach (var target in targetList)
@@ -36,10 +29,10 @@ public override void Startup()
             if (toMakeSentient-- == 0)
                 break;
 
-            MakeSentientCommand.MakeSentient(target.Owner, _entityManager);
-            _entityManager.RemoveComponent<SentienceTargetComponent>(target.Owner);
-            var comp = _entityManager.AddComponent<GhostTakeoverAvailableComponent>(target.Owner);
-            comp.RoleName = _entityManager.GetComponent<MetaDataComponent>(target.Owner).EntityName;
+            MakeSentientCommand.MakeSentient(target.Owner, EntityManager);
+            EntityManager.RemoveComponent<SentienceTargetComponent>(target.Owner);
+            var comp = EntityManager.AddComponent<GhostTakeoverAvailableComponent>(target.Owner);
+            comp.RoleName = EntityManager.GetComponent<MetaDataComponent>(target.Owner).EntityName;
             comp.RoleDescription = Loc.GetString("station-event-random-sentience-role-description", ("name", comp.RoleName));
             groups.Add(target.FlavorKind);
         }
@@ -67,8 +60,8 @@ public override void Startup()
                 (EntityUid) station,
                 Loc.GetString("station-event-random-sentience-announcement",
                     ("kind1", kind1), ("kind2", kind2), ("kind3", kind3), ("amount", groupList.Count),
-                    ("data", Loc.GetString($"random-sentience-event-data-{_random.Next(1, 6)}")),
-                    ("strength", Loc.GetString($"random-sentience-event-strength-{_random.Next(1, 8)}"))),
+                    ("data", Loc.GetString($"random-sentience-event-data-{RobustRandom.Next(1, 6)}")),
+                    ("strength", Loc.GetString($"random-sentience-event-strength-{RobustRandom.Next(1, 8)}"))),
                 playDefaultSound: false,
                 colorOverride: Color.Gold
             );
diff --git a/Content.Server/StationEvents/Events/StationEvent.cs b/Content.Server/StationEvents/Events/StationEvent.cs
deleted file mode 100644
index 65d8a919a34a..000000000000
--- a/Content.Server/StationEvents/Events/StationEvent.cs
+++ /dev/null
@@ -1,259 +0,0 @@
-using Content.Server.Administration.Logs;
-using Content.Server.Atmos.EntitySystems;
-using Content.Server.Chat;
-using Content.Server.Chat.Managers;
-using Content.Server.Chat.Systems;
-using Content.Server.GameTicking;
-using Content.Server.Station.Components;
-using Content.Server.Station.Systems;
-using Content.Shared.Database;
-using Content.Shared.Sound;
-using Robust.Shared.Audio;
-using Robust.Shared.Map;
-using Robust.Shared.Player;
-using Robust.Shared.Random;
-
-namespace Content.Server.StationEvents.Events
-{
-    public abstract class StationEvent
-    {
-        public const float WeightVeryLow = 0.0f;
-        public const float WeightLow = 5.0f;
-        public const float WeightNormal = 10.0f;
-        public const float WeightHigh = 15.0f;
-        public const float WeightVeryHigh = 20.0f;
-
-        /// <summary>
-        ///     If the event has started and is currently running.
-        /// </summary>
-        public bool Running { get; set; }
-
-        /// <summary>
-        ///     The time when this event last ran.
-        /// </summary>
-        public TimeSpan LastRun { get; set; } = TimeSpan.Zero;
-
-        /// <summary>
-        ///     Human-readable name for the event.
-        /// </summary>
-        public abstract string Name { get; }
-
-        /// <summary>
-        /// The weight this event has in the random-selection process.
-        /// </summary>
-        public virtual float Weight => WeightNormal;
-
-        /// <summary>
-        ///     What should be said in chat when the event starts (if anything).
-        /// </summary>
-        public virtual string? StartAnnouncement { get; set; } = null;
-
-        /// <summary>
-        ///     What should be said in chat when the event ends (if anything).
-        /// </summary>
-        protected virtual string? EndAnnouncement { get; } = null;
-
-        /// <summary>
-        ///     Starting audio of the event.
-        /// </summary>
-        public virtual SoundSpecifier? StartAudio { get; set; } = new SoundPathSpecifier("/Audio/Announcements/attention.ogg");
-
-        /// <summary>
-        ///     Ending audio of the event.
-        /// </summary>
-        public virtual SoundSpecifier? EndAudio { get; } = null;
-
-        public virtual AudioParams AudioParams { get; } = AudioParams.Default.WithVolume(-10f);
-
-        /// <summary>
-        ///     In minutes, when is the first round time this event can start
-        /// </summary>
-        public virtual int EarliestStart { get; } = 5;
-
-        /// <summary>
-        ///     In minutes, the amount of time before the same event can occur again
-        /// </summary>
-        public virtual int ReoccurrenceDelay { get; } = 30;
-
-        /// <summary>
-        ///     When in the lifetime to call Start().
-        /// </summary>
-        protected virtual float StartAfter { get; } = 0.0f;
-
-        /// <summary>
-        ///     When in the lifetime the event should end.
-        /// </summary>
-        protected virtual float EndAfter { get; set; } = 0.0f;
-
-        /// <summary>
-        ///     How long has the event existed. Do not change this.
-        /// </summary>
-        private float Elapsed { get; set; } = 0.0f;
-
-        /// <summary>
-        ///     How many players need to be present on station for the event to run
-        /// </summary>
-        /// <remarks>
-        ///     To avoid running deadly events with low-pop
-        /// </remarks>
-        public virtual int MinimumPlayers { get; } = 0;
-
-        /// <summary>
-        ///     How many times this event has run this round
-        /// </summary>
-        public int Occurrences { get; set; } = 0;
-
-        /// <summary>
-        ///     How many times this even can occur in a single round
-        /// </summary>
-        public virtual int? MaxOccurrences { get; } = null;
-
-        /// <summary>
-        ///     Whether or not the event is announced when it is run
-        /// </summary>
-        public virtual bool AnnounceEvent { get; } = true;
-
-        /// <summary>
-        ///     Has the startup time elapsed?
-        /// </summary>
-        protected bool Started { get; set; } = false;
-
-        /// <summary>
-        ///     Has this event commenced (announcement may or may not be used)?
-        /// </summary>
-        private bool Announced { get; set; } = false;
-
-        /// <summary>
-        ///     Called once to setup the event after StartAfter has elapsed.
-        /// </summary>
-        public virtual void Startup()
-        {
-            Started = true;
-            Occurrences += 1;
-            LastRun = EntitySystem.Get<GameTicker>().RoundDuration();
-
-            IoCManager.Resolve<IAdminLogManager>()
-                .Add(LogType.EventStarted, LogImpact.High, $"Event startup: {Name}");
-        }
-
-        /// <summary>
-        ///     Called once as soon as an event is active.
-        ///     Can also be used for some initial setup.
-        /// </summary>
-        public virtual void Announce()
-        {
-            IoCManager.Resolve<IAdminLogManager>()
-                .Add(LogType.EventAnnounced, $"Event announce: {Name}");
-
-            if (AnnounceEvent && StartAnnouncement != null)
-            {
-                var chatSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ChatSystem>();
-                chatSystem.DispatchGlobalAnnouncement(StartAnnouncement, playDefaultSound: false, colorOverride: Color.Gold);
-            }
-
-            if (AnnounceEvent && StartAudio != null)
-            {
-                SoundSystem.Play(StartAudio.GetSound(), Filter.Broadcast(), AudioParams);
-            }
-
-            Announced = true;
-            Running = true;
-        }
-
-        /// <summary>
-        ///     Called once when the station event ends for any reason.
-        /// </summary>
-        public virtual void Shutdown()
-        {
-            IoCManager.Resolve<IAdminLogManager>()
-                .Add(LogType.EventStopped, $"Event shutdown: {Name}");
-
-            if (AnnounceEvent && EndAnnouncement != null)
-            {
-                var chatSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ChatSystem>();
-                chatSystem.DispatchGlobalAnnouncement(EndAnnouncement, playDefaultSound: false, colorOverride: Color.Gold);
-            }
-
-            if (AnnounceEvent && EndAudio != null)
-            {
-                SoundSystem.Play(EndAudio.GetSound(), Filter.Broadcast(), AudioParams);
-            }
-
-            Started = false;
-            Announced = false;
-            Elapsed = 0;
-        }
-
-        /// <summary>
-        ///     Called every tick when this event is running.
-        /// </summary>
-        /// <param name="frameTime"></param>
-        public virtual void Update(float frameTime)
-        {
-            Elapsed += frameTime;
-
-            if (!Started && Elapsed >= StartAfter)
-            {
-                Startup();
-            }
-
-            if (EndAfter <= Elapsed)
-            {
-                Running = false;
-            }
-        }
-
-
-        public static bool TryFindRandomTile(out Vector2i tile, out EntityUid targetStation, out EntityUid targetGrid, out EntityCoordinates targetCoords, IRobustRandom? robustRandom = null, IEntityManager? entityManager = null, IMapManager? mapManager = null, StationSystem? stationSystem = null)
-        {
-            tile = default;
-            IoCManager.Resolve(ref robustRandom, ref entityManager, ref mapManager);
-            entityManager.EntitySysManager.Resolve(ref stationSystem);
-
-            targetCoords = EntityCoordinates.Invalid;
-            if (stationSystem.Stations.Count == 0)
-            {
-                targetStation = EntityUid.Invalid;
-                targetGrid = EntityUid.Invalid;
-                return false;
-            }
-            targetStation = robustRandom.Pick(stationSystem.Stations);
-            var possibleTargets = entityManager.GetComponent<StationDataComponent>(targetStation).Grids;
-            if (possibleTargets.Count == 0)
-            {
-                targetGrid = EntityUid.Invalid;
-                return false;
-            }
-
-            targetGrid = robustRandom.Pick(possibleTargets);
-
-            if (!entityManager.TryGetComponent<IMapGridComponent>(targetGrid, out var gridComp)
-                || !entityManager.TryGetComponent<TransformComponent>(targetGrid, out var transform))
-                return false;
-            var grid = gridComp.Grid;
-
-            var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
-            var found = false;
-            var gridBounds = grid.WorldAABB;
-            var gridPos = grid.WorldPosition;
-
-            for (var i = 0; i < 10; i++)
-            {
-                var randomX = robustRandom.Next((int) gridBounds.Left, (int) gridBounds.Right);
-                var randomY = robustRandom.Next((int) gridBounds.Bottom, (int) gridBounds.Top);
-
-                tile = new Vector2i(randomX - (int) gridPos.X, randomY - (int) gridPos.Y);
-                if (atmosphereSystem.IsTileSpace(grid.GridEntityId, transform.MapUid, tile, mapGridComp:gridComp)
-                    || atmosphereSystem.IsTileAirBlocked(grid.GridEntityId, tile, mapGridComp:gridComp))
-                    continue;
-                found = true;
-                targetCoords = grid.GridTileToLocal(tile);
-                break;
-            }
-
-            if (!found) return false;
-
-            return true;
-        }
-    }
-}
diff --git a/Content.Server/StationEvents/Events/StationEventSystem.cs b/Content.Server/StationEvents/Events/StationEventSystem.cs
new file mode 100644
index 000000000000..23926d6e93de
--- /dev/null
+++ b/Content.Server/StationEvents/Events/StationEventSystem.cs
@@ -0,0 +1,184 @@
+using System.Linq;
+using Content.Server.Administration.Logs;
+using Content.Server.Atmos.EntitySystems;
+using Content.Server.Chat.Systems;
+using Content.Server.GameTicking.Rules;
+using Content.Server.GameTicking.Rules.Configurations;
+using Content.Server.Station.Components;
+using Content.Server.Station.Systems;
+using Content.Shared.Database;
+using Robust.Shared.Audio;
+using Robust.Shared.Map;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.StationEvents.Events
+{
+    /// <summary>
+    ///     An abstract entity system inherited by all station events for their behavior.
+    /// </summary>
+    public abstract class StationEventSystem : GameRuleSystem
+    {
+        [Dependency] protected readonly IRobustRandom RobustRandom = default!;
+        [Dependency] protected readonly IAdminLogManager AdminLogManager = default!;
+        [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
+        [Dependency] protected readonly IMapManager MapManager = default!;
+        [Dependency] protected readonly ChatSystem ChatSystem = default!;
+        [Dependency] protected readonly StationSystem StationSystem = default!;
+
+        protected ISawmill Sawmill = default!;
+
+        /// <summary>
+        ///     How long has the event existed. Do not change this.
+        /// </summary>
+        protected float Elapsed { get; set; }
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            Sawmill = Logger.GetSawmill("stationevents");
+        }
+
+        /// <summary>
+        ///     Called once to setup the event after StartAfter has elapsed, or if an event is forcibly started.
+        /// </summary>
+        public override void Started()
+        {
+            AdminLogManager.Add(LogType.EventStarted, LogImpact.High, $"Event started: {Configuration.Id}");
+        }
+
+        /// <summary>
+        ///     Called once as soon as an event is added, for announcements.
+        ///     Can also be used for some initial setup.
+        /// </summary>
+        public override void Added()
+        {
+            AdminLogManager.Add(LogType.EventAnnounced, $"Event added / announced: {Configuration.Id}");
+
+            if (Configuration is not StationEventRuleConfiguration ev)
+                return;
+
+            if (ev.StartAnnouncement != null)
+            {
+                ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(ev.StartAnnouncement), playDefaultSound: false, colorOverride: Color.Gold);
+            }
+
+            if (ev.StartAudio != null)
+            {
+                SoundSystem.Play(ev.StartAudio.GetSound(), Filter.Broadcast(), ev.StartAudio.Params);
+            }
+
+            Elapsed = 0;
+        }
+
+        /// <summary>
+        ///     Called once when the station event ends for any reason.
+        /// </summary>
+        public override void Ended()
+        {
+            AdminLogManager.Add(LogType.EventStopped, $"Event ended: {Configuration.Id}");
+
+            if (Configuration is not StationEventRuleConfiguration ev)
+                return;
+
+            if (ev.EndAnnouncement != null)
+            {
+                ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(ev.EndAnnouncement), playDefaultSound: false, colorOverride: Color.Gold);
+            }
+
+            if (ev.EndAudio != null)
+            {
+                SoundSystem.Play(ev.EndAudio.GetSound(), Filter.Broadcast(), ev.EndAudio.Params);
+            }
+        }
+
+        /// <summary>
+        ///     Called every tick when this event is running.
+        ///     Events are responsible for their own lifetime, so this handles starting and ending after time.
+        /// </summary>
+        public override void Update(float frameTime)
+        {
+            if (!RuleAdded || Configuration is not StationEventRuleConfiguration data)
+                return;
+
+            Elapsed += frameTime;
+
+            if (!RuleStarted && Elapsed >= data.StartAfter)
+            {
+                GameTicker.StartGameRule(PrototypeManager.Index<GameRulePrototype>(Prototype));
+            }
+
+            if (RuleStarted && Elapsed >= data.EndAfter)
+            {
+                GameTicker.EndGameRule(PrototypeManager.Index<GameRulePrototype>(Prototype));
+            }
+        }
+
+        #region Helper Functions
+
+        protected void ForceEndSelf()
+        {
+            GameTicker.EndGameRule(PrototypeManager.Index<GameRulePrototype>(Prototype));
+        }
+
+        protected bool TryFindRandomTile(out Vector2i tile, out EntityUid targetStation, out EntityUid targetGrid, out EntityCoordinates targetCoords)
+        {
+            tile = default;
+
+            targetCoords = EntityCoordinates.Invalid;
+            if (StationSystem.Stations.Count == 0)
+            {
+                targetStation = EntityUid.Invalid;
+                targetGrid = EntityUid.Invalid;
+                return false;
+            }
+            targetStation = RobustRandom.Pick(StationSystem.Stations);
+            var possibleTargets = Comp<StationDataComponent>(targetStation).Grids;
+            if (possibleTargets.Count == 0)
+            {
+                targetGrid = EntityUid.Invalid;
+                return false;
+            }
+
+            targetGrid = RobustRandom.Pick(possibleTargets);
+
+            if (!TryComp<IMapGridComponent>(targetGrid, out var gridComp))
+                return false;
+            var grid = gridComp.Grid;
+
+            var atmosphereSystem = Get<AtmosphereSystem>();
+            var found = false;
+            var gridBounds = grid.WorldAABB;
+            var gridPos = grid.WorldPosition;
+
+            for (var i = 0; i < 10; i++)
+            {
+                var randomX = RobustRandom.Next((int) gridBounds.Left, (int) gridBounds.Right);
+                var randomY = RobustRandom.Next((int) gridBounds.Bottom, (int) gridBounds.Top);
+
+                tile = new Vector2i(randomX - (int) gridPos.X, randomY - (int) gridPos.Y);
+                if (atmosphereSystem.IsTileSpace(grid.GridEntityId, Transform(targetGrid).MapUid, tile, mapGridComp:gridComp)
+                    || atmosphereSystem.IsTileAirBlocked(grid.GridEntityId, tile, mapGridComp:gridComp)) continue;
+                found = true;
+                targetCoords = grid.GridTileToLocal(tile);
+                break;
+            }
+
+            if (!found) return false;
+
+            return true;
+        }
+
+        public static GameRulePrototype GetRandomEventUnweighted(IPrototypeManager? prototypeManager = null, IRobustRandom? random = null)
+        {
+            IoCManager.Resolve(ref prototypeManager, ref random);
+
+            return random.Pick(prototypeManager.EnumeratePrototypes<GameRulePrototype>()
+                .Where(p => p.Configuration is StationEventRuleConfiguration).ToArray());
+        }
+
+        #endregion
+    }
+}
diff --git a/Content.Server/StationEvents/Events/VentClog.cs b/Content.Server/StationEvents/Events/VentClog.cs
index e9be75fa3526..822d4b22fcd1 100644
--- a/Content.Server/StationEvents/Events/VentClog.cs
+++ b/Content.Server/StationEvents/Events/VentClog.cs
@@ -11,29 +11,9 @@
 namespace Content.Server.StationEvents.Events;
 
 [UsedImplicitly]
-public sealed class VentClog : StationEvent
+public sealed class VentClog : StationEventSystem
 {
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-
-    public override string Name => "VentClog";
-
-    public override string? StartAnnouncement =>
-        Loc.GetString("station-event-vent-clog-start-announcement");
-
-    public override int EarliestStart => 15;
-
-    public override int MinimumPlayers => 15;
-
-    public override float Weight => WeightLow;
-
-    public override int? MaxOccurrences => 2;
-
-    // Give players time to reach cover.
-    protected override float StartAfter => 50f;
-
-    protected override float EndAfter => 51.0f; // This can, surprisingly, cause the event to end before it starts.
+    public override string Prototype => "VentClog";
 
     public readonly IReadOnlyList<string> SafeishVentChemicals = new[]
     {
@@ -41,33 +21,36 @@ public sealed class VentClog : StationEvent
         "Nutriment", "Sugar", "SpaceLube", "Ethanol", "Mercury", "Ephedrine", "WeldingFuel", "VentCrud"
     };
 
-    public override void Startup()
+    public override void Started()
     {
-        base.Startup();
+        base.Started();
 
         // TODO: "safe random" for chems. Right now this includes admin chemicals.
-        var allReagents = _prototypeManager.EnumeratePrototypes<ReagentPrototype>()
+        var allReagents = PrototypeManager.EnumeratePrototypes<ReagentPrototype>()
             .Where(x => !x.Abstract)
             .Select(x => x.ID).ToList();
 
         // This is gross, but not much can be done until event refactor, which needs Dynamic.
         var sound = new SoundPathSpecifier("/Audio/Effects/extinguish.ogg");
 
-        foreach (var (_, transform) in _entityManager.EntityQuery<GasVentPumpComponent, TransformComponent>())
+        foreach (var (_, transform) in EntityManager.EntityQuery<GasVentPumpComponent, TransformComponent>())
         {
             var solution = new Solution();
 
-            if (_random.Prob(0.05f))
+            if (!RobustRandom.Prob(0.33f))
+                continue;
+
+            if (RobustRandom.Prob(0.05f))
             {
-                solution.AddReagent(_random.Pick(allReagents), 100);
+                solution.AddReagent(RobustRandom.Pick(allReagents), 100);
             }
             else
             {
-                solution.AddReagent(_random.Pick(SafeishVentChemicals), 100);
+                solution.AddReagent(RobustRandom.Pick(SafeishVentChemicals), 100);
             }
 
-            FoamAreaReactionEffect.SpawnFoam("Foam", transform.Coordinates, solution, _random.Next(2, 6), 20, 1,
-                1, sound, _entityManager);
+            FoamAreaReactionEffect.SpawnFoam("Foam", transform.Coordinates, solution, RobustRandom.Next(2, 6), 20, 1,
+                1, sound, EntityManager);
         }
     }
 
diff --git a/Content.Server/StationEvents/Events/VentCritters.cs b/Content.Server/StationEvents/Events/VentCritters.cs
index 9788aab12689..041b304d2b86 100644
--- a/Content.Server/StationEvents/Events/VentCritters.cs
+++ b/Content.Server/StationEvents/Events/VentCritters.cs
@@ -5,51 +5,30 @@
 
 namespace Content.Server.StationEvents.Events;
 
-public sealed class VentCritters : StationEvent
+public sealed class VentCritters : StationEventSystem
 {
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-
     public static List<string> SpawnedPrototypeChoices = new List<string>()
         {"MobGiantSpiderAngry", "MobMouse", "MobMouse1", "MobMouse2"};
 
-    public override string Name => "VentCritters";
-
-    public override string? StartAnnouncement =>
-        Loc.GetString("station-event-vent-spiders-start-announcement", ("data", Loc.GetString(Loc.GetString($"random-sentience-event-data-{_random.Next(1, 6)}"))));
-
-    public override SoundSpecifier? StartAudio => new SoundPathSpecifier("/Audio/Announcements/aliens.ogg");
-
-    public override int EarliestStart => 15;
-
-    public override int MinimumPlayers => 15;
-
-    public override float Weight => WeightLow;
-
-    public override int? MaxOccurrences => 2;
-
-    protected override float StartAfter => 30f;
-
-    protected override float EndAfter => 60;
-
-    public override bool AnnounceEvent => false;
+    public override string Prototype => "VentCritters";
 
-    public override void Startup()
+    public override void Started()
     {
-        base.Startup();
-        var spawnChoice = _random.Pick(SpawnedPrototypeChoices);
-        var spawnLocations = _entityManager.EntityQuery<VentCritterSpawnLocationComponent>().ToList();
-        _random.Shuffle(spawnLocations);
+        base.Started();
+        var spawnChoice = RobustRandom.Pick(SpawnedPrototypeChoices);
+        var spawnLocations = EntityManager.EntityQuery<VentCritterSpawnLocationComponent>().ToList();
+        RobustRandom.Shuffle(spawnLocations);
 
-        var spawnAmount = _random.Next(4, 12); // A small colony of critters.
+        var spawnAmount = RobustRandom.Next(4, 12); // A small colony of critters.
+        Sawmill.Info($"Spawning {spawnAmount} of {spawnChoice}");
         foreach (var location in spawnLocations)
         {
             if (spawnAmount-- == 0)
                 break;
 
-            var coords = _entityManager.GetComponent<TransformComponent>(location.Owner);
+            var coords = EntityManager.GetComponent<TransformComponent>(location.Owner);
 
-            _entityManager.SpawnEntity(spawnChoice, coords.Coordinates);
+            EntityManager.SpawnEntity(spawnChoice, coords.Coordinates);
         }
     }
 }
diff --git a/Content.Server/StationEvents/Events/ZombieOutbreak.cs b/Content.Server/StationEvents/Events/ZombieOutbreak.cs
index c25a45ea78ad..2b495b402ffd 100644
--- a/Content.Server/StationEvents/Events/ZombieOutbreak.cs
+++ b/Content.Server/StationEvents/Events/ZombieOutbreak.cs
@@ -1,10 +1,4 @@
-using Content.Server.Chat;
-using Robust.Shared.Random;
-using Content.Server.Chat.Managers;
-using Content.Server.Chat.Systems;
-using Content.Server.Station.Systems;
 using Content.Shared.MobState.Components;
-using Content.Shared.Sound;
 using Content.Server.Zombies;
 
 namespace Content.Server.StationEvents.Events
@@ -12,62 +6,35 @@ namespace Content.Server.StationEvents.Events
     /// <summary>
     /// Revives several dead entities as zombies
     /// </summary>
-    public sealed class ZombieOutbreak : StationEvent
+    public sealed class ZombieOutbreak : StationEventSystem
     {
-        [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly IEntityManager _entityManager = default!;
+        [Dependency] private readonly ZombifyOnDeathSystem _zombify = default!;
 
-        public override string Name => "ZombieOutbreak";
-        public override int EarliestStart => 50;
-        public override float Weight => WeightLow / 2;
-        public override SoundSpecifier? StartAudio => new SoundPathSpecifier("/Audio/Announcements/bloblarm.ogg");
-        protected override float EndAfter => 1.0f;
-        public override int? MaxOccurrences => 1;
-        public override bool AnnounceEvent => false;
+        public override string Prototype => "ZombieOutbreak";
 
         /// <summary>
-        /// Finds 1-3 random, dead entities accross the station
+        /// Finds 1-3 random, dead entities across the station
         /// and turns them into zombies.
         /// </summary>
-        public override void Startup()
+        public override void Started()
         {
-            base.Startup();
-            HashSet<EntityUid> stationsToNotify = new();
+            base.Started();
             List<MobStateComponent> deadList = new();
-            foreach (var mobState in _entityManager.EntityQuery<MobStateComponent>())
+            foreach (var mobState in EntityManager.EntityQuery<MobStateComponent>())
             {
                 if (mobState.IsDead() || mobState.IsCritical())
                     deadList.Add(mobState);
             }
-            _random.Shuffle(deadList);
+            RobustRandom.Shuffle(deadList);
 
-            var toInfect = _random.Next(1, 3);
-
-            var zombifysys = _entityManager.EntitySysManager.GetEntitySystem<ZombifyOnDeathSystem>();
-
-            // Now we give it to people in the list of dead entities earlier.
-            var entSysMgr = IoCManager.Resolve<IEntitySystemManager>();
-            var stationSystem = entSysMgr.GetEntitySystem<StationSystem>();
-            var chatSystem = entSysMgr.GetEntitySystem<ChatSystem>();
+            var toInfect = RobustRandom.Next(1, 3);
 
             foreach (var target in deadList)
             {
                 if (toInfect-- == 0)
                     break;
 
-                zombifysys.ZombifyEntity(target.Owner);
-
-                var station = stationSystem.GetOwningStation(target.Owner);
-                if(station == null) continue;
-                stationsToNotify.Add((EntityUid) station);
-            }
-
-            if (!AnnounceEvent)
-                return;
-            foreach (var station in stationsToNotify)
-            {
-                chatSystem.DispatchStationAnnouncement(station, Loc.GetString("station-event-zombie-outbreak-announcement"),
-                    playDefaultSound: false, colorOverride: Color.DarkMagenta);
+                _zombify.ZombifyEntity(target.Owner);
             }
         }
     }
diff --git a/Content.Server/StationEvents/StationEventCommand.cs b/Content.Server/StationEvents/StationEventCommand.cs
deleted file mode 100644
index faf8f6e83f6b..000000000000
--- a/Content.Server/StationEvents/StationEventCommand.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using Content.Server.Administration;
-using Content.Shared.Administration;
-using Robust.Server.Player;
-using Robust.Shared.Console;
-using System.Linq;
-using System.Text;
-
-namespace Content.Server.StationEvents
-{
-    [AdminCommand(AdminFlags.Round)]
-    public sealed class StationEventCommand : IConsoleCommand
-    {
-        public string Command => "events";
-        public string Description => Loc.GetString("cmd-events-desc");
-        public string Help => Loc.GetString("cmd-events-help");
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            var player = shell.Player as IPlayerSession;
-            if (!args.Any())
-            {
-                shell.WriteLine(Loc.GetString("shell-wrong-arguments-number") + $"\n{Help}");
-                return;
-            }
-
-            switch (args.First())
-            {
-                case "list":
-                    List(shell, player);
-                    break;
-                case "running":
-                    Running(shell, player);
-                    break;
-                // Didn't use a "toggle" so it's explicit
-                case "pause":
-                    Pause(shell, player);
-                    break;
-                case "resume":
-                    Resume(shell, player);
-                    break;
-                case "stop":
-                    Stop(shell, player);
-                    break;
-                case "run":
-                    if (args.Length != 2)
-                    {
-                        shell.WriteLine(Loc.GetString("shell-wrong-arguments-number-need-specific",
-                                                      ("properAmount", 2),
-                                                      ("currentAmount", args.Length))
-                                        + $"\n{Help}");
-                        break;
-                    }
-
-                    Run(shell, player, args[1]);
-                    break;
-                default:
-                    shell.WriteLine(Loc.GetString($"shell-invalid-command-specific.", ("commandName", "events")) + $"\n{Help}");
-                    break;
-            }
-        }
-
-        private void Run(IConsoleShell shell, IPlayerSession? player, string eventName)
-        {
-            var stationSystem = EntitySystem.Get<StationEventSystem>();
-
-            var resultText = eventName == "random"
-                ? stationSystem.RunRandomEvent()
-                : stationSystem.RunEvent(eventName);
-
-            shell.WriteLine(resultText);
-        }
-
-        private void Running(IConsoleShell shell, IPlayerSession? player)
-        {
-            var eventName = EntitySystem.Get<StationEventSystem>().CurrentEvent?.Name;
-            if (!string.IsNullOrEmpty(eventName))
-            {
-                shell.WriteLine(eventName);
-            }
-            else
-            {
-                shell.WriteLine(Loc.GetString("cmd-events-none-running"));
-            }
-        }
-
-        private void List(IConsoleShell shell, IPlayerSession? player)
-        {
-            var events = EntitySystem.Get<StationEventSystem>();
-            var sb = new StringBuilder();
-
-            sb.AppendLine(Loc.GetString("cmd-events-list-random"));
-
-            foreach (var stationEvents in events.StationEvents)
-            {
-                sb.AppendLine(stationEvents.Name);
-            }
-
-            shell.WriteLine(sb.ToString());
-        }
-
-        private void Pause(IConsoleShell shell, IPlayerSession? player)
-        {
-            var stationEventSystem = EntitySystem.Get<StationEventSystem>();
-
-            if (!stationEventSystem.Enabled)
-            {
-                shell.WriteLine(Loc.GetString("cmd-events-already-paused"));
-            }
-            else
-            {
-                stationEventSystem.Enabled = false;
-                shell.WriteLine(Loc.GetString("cmd-events-paused"));
-            }
-        }
-
-        private void Resume(IConsoleShell shell, IPlayerSession? player)
-        {
-            var stationEventSystem = EntitySystem.Get<StationEventSystem>();
-
-            if (stationEventSystem.Enabled)
-            {
-                shell.WriteLine(Loc.GetString("cmd-events-already-running"));
-            }
-            else
-            {
-                stationEventSystem.Enabled = true;
-                shell.WriteLine(Loc.GetString("cmd-events-resumed"));
-            }
-        }
-
-        private void Stop(IConsoleShell shell, IPlayerSession? player)
-        {
-            var resultText = EntitySystem.Get<StationEventSystem>().StopEvent();
-            shell.WriteLine(resultText);
-        }
-
-        public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
-        {
-            if (args.Length == 1)
-            {
-                var options = new[]
-                {
-                    "list",
-                    "running",
-                    "pause",
-                    "resume",
-                    "stop",
-                    "run"
-                };
-
-                return CompletionResult.FromHintOptions(options, Loc.GetString("cmd-events-arg-subcommand"));
-            }
-
-            var command = args[0];
-
-            if (args.Length != 2)
-                return CompletionResult.Empty;
-
-            if (command == "run")
-            {
-                var system = EntitySystem.Get<StationEventSystem>();
-                var options = new[] { "random" }.Concat(
-                    system.StationEvents.Select(e => e.Name).OrderBy(e => e));
-
-                return CompletionResult.FromHintOptions(options, Loc.GetString("cmd-events-arg-run-eventName"));
-            }
-
-            return CompletionResult.Empty;
-        }
-    }
-}
diff --git a/Content.Server/StationEvents/StationEventSystem.cs b/Content.Server/StationEvents/StationEventSystem.cs
deleted file mode 100644
index f2ee3329ece2..000000000000
--- a/Content.Server/StationEvents/StationEventSystem.cs
+++ /dev/null
@@ -1,371 +0,0 @@
-using System.Linq;
-using System.Text;
-using Content.Server.Administration.Logs;
-using Content.Server.GameTicking;
-using Content.Server.StationEvents.Events;
-using Content.Shared.CCVar;
-using Content.Shared.Database;
-using Content.Shared.GameTicking;
-using Content.Shared.StationEvents;
-using JetBrains.Annotations;
-using Robust.Server.Console;
-using Robust.Server.Player;
-using Robust.Shared.Configuration;
-using Robust.Shared.Network;
-using Robust.Shared.Random;
-using Robust.Shared.Reflection;
-
-namespace Content.Server.StationEvents
-{
-    [UsedImplicitly]
-    // Somewhat based off of TG's implementation of events
-    public sealed class StationEventSystem : EntitySystem
-    {
-        [Dependency] private readonly IConfigurationManager _configurationManager = default!;
-        [Dependency] private readonly IServerNetManager _netManager = default!;
-        [Dependency] private readonly IPlayerManager _playerManager = default!;
-        [Dependency] private readonly IConGroupController _conGroupController = default!;
-        [Dependency] private readonly GameTicker _gameTicker = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
-
-        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-
-        public StationEvent? CurrentEvent { get; private set; }
-        public IReadOnlyCollection<StationEvent> StationEvents => _stationEvents;
-
-        private readonly List<StationEvent> _stationEvents = new();
-
-        private const float MinimumTimeUntilFirstEvent = 300;
-
-        /// <summary>
-        /// How long until the next check for an event runs
-        /// </summary>
-        /// Default value is how long until first event is allowed
-        private float _timeUntilNextEvent = MinimumTimeUntilFirstEvent;
-
-        /// <summary>
-        /// Whether random events can run
-        /// </summary>
-        /// If disabled while an event is running (even if admin run) it will disable it
-        public bool Enabled
-        {
-            get => _enabled;
-            set
-            {
-                if (_enabled == value)
-                {
-                    return;
-                }
-
-                _enabled = value;
-                CurrentEvent?.Shutdown();
-                CurrentEvent = null;
-            }
-        }
-
-        private bool _enabled = true;
-
-        /// <summary>
-        /// Admins can forcibly run events by passing in the Name
-        /// </summary>
-        /// <param name="name">The exact string for Name, without localization</param>
-        /// <returns></returns>
-        public string RunEvent(string name)
-        {
-            _adminLogger.Add(LogType.EventRan, LogImpact.High, $"Event run: {name}");
-
-            // Could use a dictionary but it's such a minor thing, eh.
-            // Wasn't sure on whether to localize this given it's a command
-            var upperName = name.ToUpperInvariant();
-
-            foreach (var stationEvent in _stationEvents)
-            {
-                if (stationEvent.Name.ToUpperInvariant() != upperName)
-                {
-                    continue;
-                }
-
-                CurrentEvent?.Shutdown();
-                CurrentEvent = stationEvent;
-                stationEvent.Announce();
-                return Loc.GetString("station-event-system-run-event", ("eventName", stationEvent.Name));
-            }
-
-            // I had string interpolation but lord it made it hard to read
-            return Loc.GetString("station-event-system-run-event-no-event-name", ("eventName", name));
-        }
-
-        /// <summary>
-        /// Randomly run a valid event <b>immediately</b>, ignoring earlieststart
-        /// </summary>
-        /// <returns></returns>
-        public string RunRandomEvent()
-        {
-            var randomEvent = PickRandomEvent();
-
-            if (randomEvent == null)
-            {
-                return Loc.GetString("station-event-system-run-random-event-no-valid-events");
-            }
-
-            CurrentEvent?.Shutdown();
-            CurrentEvent = randomEvent;
-            CurrentEvent.Startup();
-
-            return Loc.GetString("station-event-system-run-event",("eventName", randomEvent.Name));
-        }
-
-        /// <summary>
-        /// Randomly picks a valid event.
-        /// </summary>
-        public StationEvent? PickRandomEvent()
-        {
-            var availableEvents = AvailableEvents(true);
-            return FindEvent(availableEvents);
-        }
-
-        /// <summary>
-        /// Admins can stop the currently running event (if applicable) and reset the timer
-        /// </summary>
-        /// <returns></returns>
-        public string StopEvent()
-        {
-            string resultText;
-
-            if (CurrentEvent == null)
-            {
-                resultText = Loc.GetString("station-event-system-stop-event-no-running-event");
-            }
-            else
-            {
-                resultText = Loc.GetString("station-event-system-stop-event", ("eventName", CurrentEvent.Name));
-                CurrentEvent.Shutdown();
-                CurrentEvent = null;
-            }
-
-            ResetTimer();
-            return resultText;
-        }
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            var reflectionManager = IoCManager.Resolve<IReflectionManager>();
-            var typeFactory = IoCManager.Resolve<IDynamicTypeFactory>();
-
-            foreach (var type in reflectionManager.GetAllChildren(typeof(StationEvent)))
-            {
-                if (type.IsAbstract) continue;
-
-                var stationEvent = (StationEvent) typeFactory.CreateInstance(type);
-                IoCManager.InjectDependencies(stationEvent);
-                _stationEvents.Add(stationEvent);
-            }
-
-            // Can't just check debug / release for a default given mappers need to use release mode
-            // As such we'll always pause it by default.
-            _configurationManager.OnValueChanged(CCVars.EventsEnabled, value => Enabled = value, true);
-
-            _netManager.RegisterNetMessage<MsgRequestStationEvents>(RxRequest);
-            _netManager.RegisterNetMessage<MsgStationEvents>();
-
-            SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
-        }
-
-        private void RxRequest(MsgRequestStationEvents msg)
-        {
-            if (_playerManager.TryGetSessionByChannel(msg.MsgChannel, out var player))
-                SendEvents(player);
-        }
-
-        private void SendEvents(IPlayerSession player)
-        {
-            if (!_conGroupController.CanCommand(player, "events"))
-                return;
-
-            var newMsg = new MsgStationEvents();
-            newMsg.Events = StationEvents.Select(e => e.Name).ToArray();
-            _netManager.ServerSendMessage(newMsg, player.ConnectedClient);
-        }
-
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-
-            if (!Enabled && CurrentEvent == null)
-            {
-                return;
-            }
-
-            // Stop events from happening in lobby and force active event to end if the round ends
-            if (Get<GameTicker>().RunLevel != GameRunLevel.InRound)
-            {
-                if (CurrentEvent != null)
-                {
-                    Enabled = false;
-                }
-
-                return;
-            }
-
-            // Keep running the current event
-            if (CurrentEvent != null)
-            {
-                CurrentEvent.Update(frameTime);
-
-                // Shutdown the event and set the timer for the next event
-                if (!CurrentEvent.Running)
-                {
-                    CurrentEvent.Shutdown();
-                    CurrentEvent = null;
-                    ResetTimer();
-                }
-
-                return;
-            }
-
-            // Make sure we only count down when no event is running.
-            if (_timeUntilNextEvent > 0 && CurrentEvent == null)
-            {
-                _timeUntilNextEvent -= frameTime;
-                return;
-            }
-
-            // No point hammering this trying to find events if none are available
-            var stationEvent = FindEvent(AvailableEvents());
-            if (stationEvent == null)
-            {
-                ResetTimer();
-            }
-            else
-            {
-                CurrentEvent = stationEvent;
-                CurrentEvent.Announce();
-            }
-        }
-
-        /// <summary>
-        /// Reset the event timer once the event is done.
-        /// </summary>
-        private void ResetTimer()
-        {
-            // 5 - 15 minutes. TG does 3-10 but that's pretty frequent
-            _timeUntilNextEvent = _random.Next(300, 900);
-        }
-
-        /// <summary>
-        /// Pick a random event from the available events at this time, also considering their weightings.
-        /// </summary>
-        /// <returns></returns>
-        private StationEvent? FindEvent(List<StationEvent> availableEvents)
-        {
-            if (availableEvents.Count == 0)
-            {
-                return null;
-            }
-
-            var sumOfWeights = 0;
-
-            foreach (var stationEvent in availableEvents)
-            {
-                sumOfWeights += (int) stationEvent.Weight;
-            }
-
-            sumOfWeights = _random.Next(sumOfWeights);
-
-            foreach (var stationEvent in availableEvents)
-            {
-                sumOfWeights -= (int) stationEvent.Weight;
-
-                if (sumOfWeights <= 0)
-                {
-                    return stationEvent;
-                }
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Gets the events that have met their player count, time-until start, etc.
-        /// </summary>
-        /// <param name="ignoreEarliestStart"></param>
-        /// <returns></returns>
-        private List<StationEvent> AvailableEvents(bool ignoreEarliestStart = false)
-        {
-            TimeSpan currentTime;
-            var playerCount = _playerManager.PlayerCount;
-
-            // playerCount does a lock so we'll just keep the variable here
-            if (!ignoreEarliestStart)
-            {
-                currentTime = _gameTicker.RoundDuration();
-            }
-            else
-            {
-                currentTime = TimeSpan.Zero;
-            }
-
-            var result = new List<StationEvent>();
-
-            foreach (var stationEvent in _stationEvents)
-            {
-                if (CanRun(stationEvent, playerCount, currentTime))
-                {
-                    result.Add(stationEvent);
-                }
-            }
-
-            return result;
-        }
-
-        private bool CanRun(StationEvent stationEvent, int playerCount, TimeSpan currentTime)
-        {
-            if (stationEvent.MaxOccurrences.HasValue && stationEvent.Occurrences >= stationEvent.MaxOccurrences.Value)
-            {
-                return false;
-            }
-
-            if (playerCount < stationEvent.MinimumPlayers)
-            {
-                return false;
-            }
-
-            if (currentTime != TimeSpan.Zero && currentTime.TotalMinutes < stationEvent.EarliestStart)
-            {
-                return false;
-            }
-
-            if (stationEvent.LastRun != TimeSpan.Zero && currentTime.TotalMinutes <
-                stationEvent.ReoccurrenceDelay + stationEvent.LastRun.TotalMinutes)
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        public override void Shutdown()
-        {
-            CurrentEvent?.Shutdown();
-            base.Shutdown();
-        }
-
-        public void Reset(RoundRestartCleanupEvent ev)
-        {
-            if (CurrentEvent?.Running == true)
-            {
-                CurrentEvent.Shutdown();
-                CurrentEvent = null;
-            }
-
-            foreach (var stationEvent in _stationEvents)
-            {
-                stationEvent.Occurrences = 0;
-                stationEvent.LastRun = TimeSpan.Zero;
-            }
-
-            _timeUntilNextEvent = MinimumTimeUntilFirstEvent;
-        }
-    }
-}
diff --git a/Content.Server/Storage/EntitySystems/StorageFillVisualizerSystem.cs b/Content.Server/Storage/EntitySystems/StorageFillVisualizerSystem.cs
index 5629ebfe68b5..6b69810131b2 100644
--- a/Content.Server/Storage/EntitySystems/StorageFillVisualizerSystem.cs
+++ b/Content.Server/Storage/EntitySystems/StorageFillVisualizerSystem.cs
@@ -36,6 +36,9 @@ private void UpdateAppearance(EntityUid uid, ServerStorageComponent? storage = n
         if (!Resolve(uid, ref storage, ref appearance, ref component, false))
             return;
 
+        if (component.MaxFillLevels < 1)
+            return;
+
         var level = ContentHelpers.RoundToEqualLevels(storage.StorageUsed, storage.StorageCapacityMax, component.MaxFillLevels);
         appearance.SetData(StorageFillVisuals.FillLevel, level);
     }
diff --git a/Content.Server/Strip/StrippableSystem.cs b/Content.Server/Strip/StrippableSystem.cs
index e90de452a456..8b6dfca3cdf3 100644
--- a/Content.Server/Strip/StrippableSystem.cs
+++ b/Content.Server/Strip/StrippableSystem.cs
@@ -6,6 +6,7 @@
 using Content.Server.UserInterface;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
@@ -306,7 +307,7 @@ bool Check()
             {
                 if (userHands.ActiveHandEntity != null)
                 {
-                    _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner-insert", ("user", user), ("item", userHands.ActiveHandEntity)), component.Owner,
+                    _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner-insert", ("user", Identity.Entity(user, EntityManager)), ("item", userHands.ActiveHandEntity)), component.Owner,
                         Filter.Entities(component.Owner), PopupType.Large);
                 }
             }
@@ -369,7 +370,7 @@ bool Check()
             {
                 if (handSlot.HeldEntity != null)
                 {
-                    _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner-insert", ("user", user), ("item", handSlot.HeldEntity)), component.Owner,
+                    _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner-insert", ("user", Identity.Entity(user, EntityManager)), ("item", handSlot.HeldEntity)), component.Owner,
                         Filter.Entities(component.Owner), PopupType.Large);
                 }
             }
@@ -437,7 +438,7 @@ bool Check()
                 else
                 {
                     if (_inventorySystem.TryGetSlotEntity(component.Owner, slot, out var slotItem))
-                        _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner", ("user", user), ("item", slotItem)), component.Owner,
+                        _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner", ("user", Identity.Entity(user, EntityManager)), ("item", slotItem)), component.Owner,
                             Filter.Entities(component.Owner), PopupType.Large);
                 }
             }
@@ -501,7 +502,7 @@ bool Check()
             {
                 if (handSlot.HeldEntity != null)
                 {
-                    _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner", ("user", user), ("item", handSlot.HeldEntity)), component.Owner, Filter.Entities(component.Owner));
+                    _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner", ("user", Identity.Entity(user, EntityManager)), ("item", handSlot.HeldEntity)), component.Owner, Filter.Entities(component.Owner));
                 }
             }
 
diff --git a/Content.Server/Stunnable/Systems/StunSystem.cs b/Content.Server/Stunnable/Systems/StunSystem.cs
index 8701cdac8ad7..b341eb202130 100644
--- a/Content.Server/Stunnable/Systems/StunSystem.cs
+++ b/Content.Server/Stunnable/Systems/StunSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.Popups;
 using Content.Shared.Audio;
 using Content.Shared.Database;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Popups;
 using Content.Shared.StatusEffect;
 using Content.Shared.Stunnable;
@@ -38,9 +39,11 @@ private void OnDisarmed(EntityUid uid, StatusEffectsComponent status, DisarmedEv
             var knock = EntityManager.GetComponent<KnockedDownComponent>(uid);
             SoundSystem.Play(knock.StunAttemptSound.GetSound(), Filter.Pvs(source), source, AudioHelpers.WithVariation(0.025f));
 
+            var targetEnt = Identity.Entity(target, EntityManager);
+            var sourceEnt = Identity.Entity(source, EntityManager);
             // TODO: Use PopupSystem
-            source.PopupMessageOtherClients(Loc.GetString("stunned-component-disarm-success-others", ("source", Name(source)), ("target", Name(target))));
-            source.PopupMessageCursor(Loc.GetString("stunned-component-disarm-success", ("target", Name(target))));
+            source.PopupMessageOtherClients(Loc.GetString("stunned-component-disarm-success-others", ("source", sourceEnt), ("target", targetEnt)));
+            source.PopupMessageCursor(Loc.GetString("stunned-component-disarm-success", ("target", targetEnt)));
 
             _adminLogger.Add(LogType.DisarmedKnockdown, LogImpact.Medium, $"{ToPrettyString(args.Source):user} knocked down {ToPrettyString(args.Target):target}");
 
diff --git a/Content.Server/Zombies/ZombifyOnDeathSystem.cs b/Content.Server/Zombies/ZombifyOnDeathSystem.cs
index 51b181f3b2b9..63d4571125f7 100644
--- a/Content.Server/Zombies/ZombifyOnDeathSystem.cs
+++ b/Content.Server/Zombies/ZombifyOnDeathSystem.cs
@@ -28,6 +28,7 @@
 using Content.Server.Traitor;
 using Content.Shared.Zombies;
 using Content.Server.Atmos.Miasma;
+using Content.Server.IdentityManagement;
 
 namespace Content.Server.Zombies
 {
@@ -45,6 +46,7 @@ public sealed class ZombifyOnDeathSystem : EntitySystem
         [Dependency] private readonly ServerInventorySystem _serverInventory = default!;
         [Dependency] private readonly DamageableSystem _damageable = default!;
         [Dependency] private readonly SharedHumanoidAppearanceSystem _sharedHuApp = default!;
+        [Dependency] private readonly IdentitySystem _identity = default!;
         [Dependency] private readonly IChatManager _chatMan = default!;
         [Dependency] private readonly IPrototypeManager _proto = default!;
 
@@ -75,7 +77,7 @@ private void OnDamageChanged(EntityUid uid, ZombifyOnDeathComponent component, M
         /// <remarks>
         ///     ALRIGHT BIG BOY. YOU'VE COME TO THE LAYER OF THE BEAST. THIS IS YOUR WARNING.
         ///     This function is the god function for zombie stuff, and it is cursed. I have
-        ///     attempted to label everything thouroughly for your sanity. I have attempted to 
+        ///     attempted to label everything thouroughly for your sanity. I have attempted to
         ///     rewrite this, but this is how it shall lie eternal. Turn back now.
         ///     -emo
         /// </remarks>
@@ -158,6 +160,8 @@ public void ZombifyEntity(EntityUid target)
             if (TryComp<MetaDataComponent>(target, out var meta))
                 meta.EntityName = Loc.GetString("zombie-name-prefix", ("target", meta.EntityName));
 
+            _identity.QueueIdentityUpdate(target);
+
             //He's gotta have a mind
             var mindcomp = EnsureComp<MindComponent>(target);
             if (mindcomp.Mind != null && mindcomp.Mind.TryGetSession(out var session))
@@ -178,7 +182,7 @@ public void ZombifyEntity(EntityUid target)
             }
 
             ///Goes through every hand, drops the items in it, then removes the hand
-            ///may become the source of various bugs. 
+            ///may become the source of various bugs.
             foreach (var hand in _sharedHands.EnumerateHands(target))
             {
                 _sharedHands.SetActiveHand(target, hand);
diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs
index a08d22eb815f..09246c8832f7 100644
--- a/Content.Shared.Database/LogType.cs
+++ b/Content.Shared.Database/LogType.cs
@@ -74,4 +74,5 @@ public enum LogType
     Emag = 69,
     Gib = 70,
     BagOfHolding = 420,
+    Identity = 71
 }
diff --git a/Content.Shared/Access/Components/IdCardComponent.cs b/Content.Shared/Access/Components/IdCardComponent.cs
index 27fbeed81d04..43395a7a5c9a 100644
--- a/Content.Shared/Access/Components/IdCardComponent.cs
+++ b/Content.Shared/Access/Components/IdCardComponent.cs
@@ -1,11 +1,11 @@
 using Content.Shared.Access.Systems;
 using Content.Shared.PDA;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Access.Components
 {
-    // TODO BUI NETWORKING if ever clients can open their own BUI's (id card console, pda), then this data should be
-    // networked.
-    [RegisterComponent]
+    [RegisterComponent, NetworkedComponent]
     [Access(typeof(SharedIdCardSystem), typeof(SharedPDASystem), typeof(SharedAgentIdCardSystem))]
     public sealed class IdCardComponent : Component
     {
@@ -20,4 +20,17 @@ public sealed class IdCardComponent : Component
         [DataField("jobTitle")]
         public string? JobTitle;
     }
+
+    [Serializable, NetSerializable]
+    public sealed class IdCardComponentState : ComponentState
+    {
+        public string? FullName;
+        public string? JobTitle;
+
+        public IdCardComponentState(string? fullName, string? jobTitle)
+        {
+            FullName = fullName;
+            JobTitle = jobTitle;
+        }
+    }
 }
diff --git a/Content.Shared/Access/Systems/SharedIdCardSystem.cs b/Content.Shared/Access/Systems/SharedIdCardSystem.cs
index b5f31b3ddac4..52b8cc4358cf 100644
--- a/Content.Shared/Access/Systems/SharedIdCardSystem.cs
+++ b/Content.Shared/Access/Systems/SharedIdCardSystem.cs
@@ -1,6 +1,80 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Access.Components;
+using Content.Shared.Hands.Components;
+using Content.Shared.Inventory;
+using Content.Shared.PDA;
+using Robust.Shared.GameStates;
+
 namespace Content.Shared.Access.Systems;
 
 public abstract class SharedIdCardSystem : EntitySystem
 {
-    // this class just exists to make friends. Will you be its friend?
+    [Dependency] private readonly InventorySystem _inventorySystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<IdCardComponent, ComponentGetState>(OnComponentGetState);
+        SubscribeLocalEvent<IdCardComponent, ComponentHandleState>(OnComponentHandleState);
+    }
+
+    private void OnComponentGetState(EntityUid uid, IdCardComponent component, ref ComponentGetState args)
+    {
+        args.State = new IdCardComponentState(component.FullName, component.JobTitle);
+    }
+
+    private void OnComponentHandleState(EntityUid uid, IdCardComponent component, ref ComponentHandleState args)
+    {
+        if (args.Current is IdCardComponentState state)
+        {
+            component.FullName = state.FullName;
+            component.JobTitle = state.JobTitle;
+        }
+    }
+
+    /// <summary>
+    ///     Attempt to find an ID card on an entity. This will look in the entity itself, in the entity's hands, and
+    ///     in the entity's inventory.
+    /// </summary>
+    public bool TryFindIdCard(EntityUid uid, [NotNullWhen(true)] out IdCardComponent? idCard)
+    {
+        // check held item?
+        if (EntityManager.TryGetComponent(uid, out SharedHandsComponent? hands) &&
+            hands.ActiveHandEntity is EntityUid heldItem &&
+            TryGetIdCard(heldItem, out idCard))
+        {
+            return true;
+        }
+
+        // check entity itself
+        if (TryGetIdCard(uid, out idCard))
+            return true;
+
+        // check inventory slot?
+        if (_inventorySystem.TryGetSlotEntity(uid, "id", out var idUid) && TryGetIdCard(idUid.Value, out idCard))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    ///     Attempt to get an id card component from an entity, either by getting it directly from the entity, or by
+    ///     getting the contained id from a <see cref="PDAComponent"/>.
+    /// </summary>
+    public bool TryGetIdCard(EntityUid uid, [NotNullWhen(true)] out IdCardComponent? idCard)
+    {
+        if (EntityManager.TryGetComponent(uid, out idCard))
+            return true;
+
+        if (EntityManager.TryGetComponent(uid, out PDAComponent? pda) && pda.ContainedID != null)
+        {
+            idCard = pda.ContainedID;
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/Content.Shared/Administration/PlayerInfo.cs b/Content.Shared/Administration/PlayerInfo.cs
index d1634e313aa6..f09cd5f77d6f 100644
--- a/Content.Shared/Administration/PlayerInfo.cs
+++ b/Content.Shared/Administration/PlayerInfo.cs
@@ -4,5 +4,5 @@
 namespace Content.Shared.Administration
 {
     [Serializable, NetSerializable]
-    public record PlayerInfo(string Username, string CharacterName, string StartingJob, bool Antag, EntityUid EntityUid, NetUserId SessionId, bool Connected);
+    public record PlayerInfo(string Username, string CharacterName, string IdentityName, string StartingJob, bool Antag, EntityUid EntityUid, NetUserId SessionId, bool Connected);
 }
diff --git a/Content.Shared/Blocking/BlockingSystem.cs b/Content.Shared/Blocking/BlockingSystem.cs
index 813fbdf306bd..0392428c3c11 100644
--- a/Content.Shared/Blocking/BlockingSystem.cs
+++ b/Content.Shared/Blocking/BlockingSystem.cs
@@ -1,10 +1,14 @@
 using Content.Shared.Actions;
 using Content.Shared.Actions.ActionTypes;
+using Content.Shared.Buckle.Components;
 using Content.Shared.Hands;
 using Content.Shared.Hands.EntitySystems;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Physics;
 using Content.Shared.Popups;
 using Content.Shared.Toggleable;
+using Robust.Shared.Containers;
+using Robust.Shared.Map;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Player;
@@ -20,6 +24,8 @@ public sealed class BlockingSystem : EntitySystem
     [Dependency] private readonly FixtureSystem _fixtureSystem = default!;
     [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
 
     public override void Initialize()
     {
@@ -70,6 +76,17 @@ private void OnToggleAction(EntityUid uid, BlockingComponent component, ToggleAc
         if(args.Handled)
             return;
 
+        foreach (var shield in _handsSystem.EnumerateHeld(args.Performer))
+        {
+            if (shield == uid)
+                continue;
+            if (TryComp<BlockingComponent>(shield, out var otherBlockComp) && otherBlockComp.IsBlocking)
+            {
+                CantBlockError(args.Performer);
+                return;
+            }
+        }
+
         if (component.IsBlocking)
             StopBlocking(uid, component, args.Performer);
         else
@@ -105,16 +122,22 @@ public bool StartBlocking(EntityUid item, BlockingComponent component, EntityUid
 
         var shieldName = Name(item);
 
+        var blockerName = Identity.Entity(user, EntityManager);
         var msgUser = Loc.GetString("action-popup-blocking-user", ("shield", shieldName));
-        var msgOther = Loc.GetString("action-popup-blocking-other", ("blockerName", Name(user)), ("shield", shieldName));
+        var msgOther = Loc.GetString("action-popup-blocking-other", ("blockerName", blockerName), ("shield", shieldName));
 
         if (component.BlockingToggleAction != null)
         {
+            if (_containerSystem.IsEntityInContainer(user) || !_mapManager.TryFindGridAt(xform.MapPosition, out var grid))
+            {
+                CantBlockError(user);
+                return false;
+            }
+
             _transformSystem.AnchorEntity(xform);
             if (!xform.Anchored)
             {
-                var msgError = Loc.GetString("action-popup-blocking-user-cant-block");
-                _popupSystem.PopupEntity(msgError, user, Filter.Entities(user));
+                CantBlockError(user);
                 return false;
             }
             _actionsSystem.SetToggled(component.BlockingToggleAction, true);
@@ -139,6 +162,12 @@ public bool StartBlocking(EntityUid item, BlockingComponent component, EntityUid
         return true;
     }
 
+    private void CantBlockError(EntityUid user)
+    {
+        var msgError = Loc.GetString("action-popup-blocking-user-cant-block");
+        _popupSystem.PopupEntity(msgError, user, Filter.Entities(user));
+    }
+
     /// <summary>
     /// Called where you want the user to stop blocking.
     /// </summary>
@@ -154,8 +183,9 @@ public bool StopBlocking(EntityUid item, BlockingComponent component, EntityUid
 
         var shieldName = Name(item);
 
+        var blockerName = Identity.Entity(user, EntityManager);
         var msgUser = Loc.GetString("action-popup-blocking-disabling-user", ("shield", shieldName));
-        var msgOther = Loc.GetString("action-popup-blocking-disabling-other", ("blockerName", Name(user)), ("shield", shieldName));
+        var msgOther = Loc.GetString("action-popup-blocking-disabling-other", ("blockerName", blockerName), ("shield", shieldName));
 
         //If the component blocking toggle isn't null, grab the users SharedBlockingUserComponent and PhysicsComponent
         //then toggle the action to false, unanchor the user, remove the hard fixture
@@ -163,7 +193,9 @@ public bool StopBlocking(EntityUid item, BlockingComponent component, EntityUid
         if (component.BlockingToggleAction != null && TryComp<BlockingUserComponent>(user, out var blockingUserComponent)
                                                      && TryComp<PhysicsComponent>(user, out var physicsComponent))
         {
-            _transformSystem.Unanchor(xform);
+            if (xform.Anchored)
+                _transformSystem.Unanchor(xform);
+
             _actionsSystem.SetToggled(component.BlockingToggleAction, false);
             _fixtureSystem.DestroyFixture(physicsComponent, BlockingComponent.BlockFixtureID);
             physicsComponent.BodyType = blockingUserComponent.OriginalBodyType;
@@ -178,6 +210,7 @@ public bool StopBlocking(EntityUid item, BlockingComponent component, EntityUid
 
     /// <summary>
     /// Called where you want someone to stop blocking and to remove the <see cref="BlockingUserComponent"/> from them
+    /// Won't remove the <see cref="BlockingUserComponent"/> if they're holding another blocking item
     /// </summary>
     /// <param name="uid"> The item the component is attached to</param>
     /// <param name="component"> The <see cref="BlockingComponent"/> </param>
@@ -187,6 +220,15 @@ private void BlockingShutdownHelper(EntityUid uid, BlockingComponent component,
         if (component.IsBlocking)
             StopBlocking(uid, component, user);
 
+        foreach (var shield in _handsSystem.EnumerateHeld(user))
+        {
+            if (HasComp<BlockingComponent>(shield) && TryComp<BlockingUserComponent>(user, out var blockingUserComponent))
+            {
+                blockingUserComponent.BlockingItem = shield;
+                return;
+            }
+        }
+
         RemComp<BlockingUserComponent>(user);
         component.User = null;
     }
diff --git a/Content.Shared/Blocking/BlockingUserSystem.cs b/Content.Shared/Blocking/BlockingUserSystem.cs
index a14d42c293f2..7cc6ad70251c 100644
--- a/Content.Shared/Blocking/BlockingUserSystem.cs
+++ b/Content.Shared/Blocking/BlockingUserSystem.cs
@@ -1,8 +1,10 @@
 using Content.Shared.Audio;
+using Content.Shared.Buckle.Components;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.Hands.EntitySystems;
 using Robust.Shared.Audio;
+using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
@@ -21,12 +23,30 @@ public override void Initialize()
         SubscribeLocalEvent<BlockingUserComponent, DamageChangedEvent>(OnDamageChanged);
         SubscribeLocalEvent<BlockingUserComponent, DamageModifyEvent>(OnUserDamageModified);
 
+        SubscribeLocalEvent<BlockingUserComponent, EntParentChangedMessage>(OnParentChanged);
+        SubscribeLocalEvent<BlockingUserComponent, ContainerGettingInsertedAttemptEvent>(OnInsertAttempt);
         SubscribeLocalEvent<BlockingUserComponent, AnchorStateChangedEvent>(OnAnchorChanged);
     }
 
+    private void OnParentChanged(EntityUid uid, BlockingUserComponent component, ref EntParentChangedMessage args)
+    {
+        if (TryComp<BlockingComponent>(component.BlockingItem, out var blockComp) && blockComp.IsBlocking)
+        {
+            _blockingSystem.StopBlocking(component.BlockingItem.Value, blockComp, uid);
+        }
+    }
+
+    private void OnInsertAttempt(EntityUid uid, BlockingUserComponent component, ContainerGettingInsertedAttemptEvent args)
+    {
+        if (TryComp<BlockingComponent>(component.BlockingItem, out var blockComp) && blockComp.IsBlocking)
+        {
+            _blockingSystem.StopBlocking(component.BlockingItem.Value, blockComp, uid);
+        }
+    }
+
     private void OnAnchorChanged(EntityUid uid, BlockingUserComponent component, ref AnchorStateChangedEvent args)
     {
-        if (!args.Anchored)
+        if (args.Anchored)
             return;
 
         if (TryComp<BlockingComponent>(component.BlockingItem, out var blockComp) && blockComp.IsBlocking)
diff --git a/Content.Shared/CharacterAppearance/Components/HumanoidAppearanceComponent.cs b/Content.Shared/CharacterAppearance/Components/HumanoidAppearanceComponent.cs
index 5cca464186b3..fe3d51ede0ff 100644
--- a/Content.Shared/CharacterAppearance/Components/HumanoidAppearanceComponent.cs
+++ b/Content.Shared/CharacterAppearance/Components/HumanoidAppearanceComponent.cs
@@ -1,4 +1,5 @@
 using Content.Shared.CharacterAppearance.Systems;
+using Content.Shared.Preferences;
 using Content.Shared.Species;
 using Robust.Shared.Enums;
 using Robust.Shared.GameStates;
@@ -23,6 +24,9 @@ public sealed class HumanoidAppearanceComponent : Component
         [ViewVariables]
         public string Species { get; set; } = SpeciesManager.DefaultSpecies;
 
+        [ViewVariables(VVAccess.ReadWrite)]
+        public int Age { get; set; } = HumanoidCharacterProfile.MinimumAge;
+
         [DataField("categoriesHair")]
         [ViewVariables]
         public SpriteAccessoryCategories CategoriesHair { get; set; } = SpriteAccessoryCategories.HumanHair;
@@ -55,16 +59,19 @@ public sealed class HumanoidAppearanceComponentState : ComponentState
         public Sex Sex { get; }
         public Gender Gender { get; }
         public string Species { get; }
+        public int Age { get; }
 
         public HumanoidAppearanceComponentState(HumanoidCharacterAppearance appearance,
             Sex sex,
             Gender gender,
-            string species)
+            string species,
+            int age)
         {
             Appearance = appearance;
             Sex = sex;
             Gender = gender;
             Species = species;
+            Age = age;
         }
     }
 }
diff --git a/Content.Shared/CharacterAppearance/Systems/SharedHumanoidAppearanceSystem.cs b/Content.Shared/CharacterAppearance/Systems/SharedHumanoidAppearanceSystem.cs
index 3d0f6a03a929..67ce557eba90 100644
--- a/Content.Shared/CharacterAppearance/Systems/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/CharacterAppearance/Systems/SharedHumanoidAppearanceSystem.cs
@@ -19,7 +19,7 @@ public override void Initialize()
         public void UpdateFromProfile(EntityUid uid, ICharacterProfile profile, HumanoidAppearanceComponent? appearance=null)
         {
             var humanoid = (HumanoidCharacterProfile) profile;
-            UpdateAppearance(uid, humanoid.Appearance, humanoid.Sex, humanoid.Gender, humanoid.Species, appearance);
+            UpdateAppearance(uid, humanoid.Appearance, humanoid.Sex, humanoid.Gender, humanoid.Species, humanoid.Age, appearance);
         }
 
         // The magic mirror otherwise wouldn't work. (it directly modifies the component server-side)
@@ -29,7 +29,7 @@ public void ForceAppearanceUpdate(EntityUid uid, HumanoidAppearanceComponent? co
             component.Dirty();
         }
 
-        private void UpdateAppearance(EntityUid uid, HumanoidCharacterAppearance appearance, Sex sex, Gender gender, string species, HumanoidAppearanceComponent? component = null)
+        private void UpdateAppearance(EntityUid uid, HumanoidCharacterAppearance appearance, Sex sex, Gender gender, string species, int age, HumanoidAppearanceComponent? component = null)
         {
             if (!Resolve(uid, ref component)) return;
 
@@ -37,6 +37,7 @@ private void UpdateAppearance(EntityUid uid, HumanoidCharacterAppearance appeara
             component.Sex = sex;
             component.Gender = gender;
             component.Species = species;
+            component.Age = age;
 
             if (EntityManager.TryGetComponent(uid, out GrammarComponent? g))
                 g.Gender = gender;
@@ -59,7 +60,7 @@ public void UpdateAppearance(EntityUid uid, HumanoidCharacterAppearance appearan
 
         private void OnAppearanceGetState(EntityUid uid, HumanoidAppearanceComponent component, ref ComponentGetState args)
         {
-            args.State = new HumanoidAppearanceComponentState(component.Appearance, component.Sex, component.Gender, component.Species);
+            args.State = new HumanoidAppearanceComponentState(component.Appearance, component.Sex, component.Gender, component.Species, component.Age);
         }
 
         private void OnAppearanceHandleState(EntityUid uid, HumanoidAppearanceComponent component, ref ComponentHandleState args)
@@ -67,7 +68,7 @@ private void OnAppearanceHandleState(EntityUid uid, HumanoidAppearanceComponent
             if (args.Current is not HumanoidAppearanceComponentState state)
                 return;
 
-            UpdateAppearance(uid, state.Appearance, state.Sex, state.Gender, state.Species);
+            UpdateAppearance(uid, state.Appearance, state.Sex, state.Gender, state.Species, state.Age);
         }
 
         // Scaffolding until Body is moved to ECS.
@@ -106,7 +107,6 @@ public HumanoidAppearanceBodyPartRemovedEvent(EntityUid uid, BodyPartRemovedEven
                 Uid = uid;
                 Args = args;
             }
-
         }
 
         [Serializable, NetSerializable]
diff --git a/Content.Shared/Forensics/ForensicScannerEvent.cs b/Content.Shared/Forensics/ForensicScannerEvent.cs
index 13f0a890c41d..f7f1e1c802a5 100644
--- a/Content.Shared/Forensics/ForensicScannerEvent.cs
+++ b/Content.Shared/Forensics/ForensicScannerEvent.cs
@@ -7,11 +7,13 @@ public sealed class ForensicScannerUserMessage : BoundUserInterfaceMessage
     {
         public readonly List<string> Fingerprints = new();
         public readonly List<string> Fibers = new();
+        public readonly string LastScanned = string.Empty;
 
-        public ForensicScannerUserMessage(List<string> fingerprints, List<string> fibers)
+        public ForensicScannerUserMessage(List<string> fingerprints, List<string> fibers, string lastScanned)
         {
             Fingerprints = fingerprints;
             Fibers = fibers;
+            LastScanned = lastScanned;
         }
     }
 
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs
index 81307ccf2673..4cf780f09fdb 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Examine;
 using Content.Shared.Hands.Components;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Map;
@@ -166,7 +167,7 @@ private void HandleExamined(EntityUid uid, SharedHandsComponent handsComp, Exami
             if (HasComp<HandVirtualItemComponent>(inhand))
                 continue;
 
-            args.PushText(Loc.GetString("comp-hands-examine", ("user", handsComp.Owner), ("item", inhand)));
+            args.PushText(Loc.GetString("comp-hands-examine", ("user", Identity.Entity(handsComp.Owner, EntityManager)), ("item", inhand)));
         }
     }
 }
diff --git a/Content.Shared/IdentityManagement/Components/IdentityBlockerComponent.cs b/Content.Shared/IdentityManagement/Components/IdentityBlockerComponent.cs
new file mode 100644
index 000000000000..a898ab7dce9d
--- /dev/null
+++ b/Content.Shared/IdentityManagement/Components/IdentityBlockerComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Inventory;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.IdentityManagement.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed class IdentityBlockerComponent : Component
+{
+}
+
+/// <summary>
+///     Raised on an entity and relayed to inventory to determine if its identity should be knowable.
+/// </summary>
+public sealed class SeeIdentityAttemptEvent : CancellableEntityEventArgs, IInventoryRelayEvent
+{
+    // i.e. masks or helmets.
+    public SlotFlags TargetSlots => SlotFlags.MASK | SlotFlags.HEAD;
+}
diff --git a/Content.Shared/IdentityManagement/Components/IdentityComponent.cs b/Content.Shared/IdentityManagement/Components/IdentityComponent.cs
new file mode 100644
index 000000000000..8c7a357cb5a5
--- /dev/null
+++ b/Content.Shared/IdentityManagement/Components/IdentityComponent.cs
@@ -0,0 +1,76 @@
+using Robust.Shared.Containers;
+using Robust.Shared.Enums;
+
+namespace Content.Shared.IdentityManagement.Components;
+
+/// <summary>
+///     Stores the identity entity (whose name is the users 'identity', etc)
+///     for a given entity, and marks that it can have an identity at all.
+/// </summary>
+/// <remarks>
+///     This is a <see cref="ContainerSlot"/> and not just a datum entity because we do sort of care that it gets deleted and sent with the user.
+/// </remarks>
+[RegisterComponent]
+public sealed class IdentityComponent : Component
+{
+    [ViewVariables]
+    public ContainerSlot IdentityEntitySlot = default!;
+}
+
+/// <summary>
+///     A data structure representing the 'identity' of an entity as presented to
+///     other players.
+/// </summary>
+public sealed class IdentityRepresentation
+{
+    public string TrueName;
+    public int TrueAge;
+    public Gender TrueGender;
+
+    public string? PresumedName;
+    public string? PresumedJob;
+
+    public IdentityRepresentation(string trueName, int trueAge, Gender trueGender, string? presumedName=null, string? presumedJob=null)
+    {
+        TrueName = trueName;
+        TrueAge = trueAge;
+        TrueGender = trueGender;
+
+        PresumedJob = presumedJob;
+        PresumedName = presumedName;
+    }
+
+    public string ToStringKnown(bool trueName)
+    {
+        return trueName
+            ? TrueName
+            : PresumedName ?? ToStringUnknown();
+    }
+
+    /// <summary>
+    ///     Returns a string representing their identity where it is 'unknown' by a viewer.
+    ///     Used for cases where the viewer is not necessarily able to accurately assess
+    ///     the identity of the person being viewed.
+    /// </summary>
+    public string ToStringUnknown()
+    {
+        var ageString = TrueAge switch
+        {
+            <= 30 => Loc.GetString("identity-age-young"),
+            > 30 and <= 60 => Loc.GetString("identity-age-middle-aged"),
+            > 60 => Loc.GetString("identity-age-old")
+        };
+
+        var genderString = TrueGender switch
+        {
+            Gender.Female => Loc.GetString("identity-gender-feminine"),
+            Gender.Male => Loc.GetString("identity-gender-masculine"),
+            Gender.Epicene or Gender.Neuter or _ => Loc.GetString("identity-gender-person")
+        };
+
+        // i.e. 'young assistant man' or 'old cargo technician person' or 'middle-aged captain'
+        return PresumedJob is null
+            ? $"{ageString} {genderString}"
+            : $"{ageString} {PresumedJob} {genderString}";
+    }
+}
diff --git a/Content.Shared/IdentityManagement/Identity.cs b/Content.Shared/IdentityManagement/Identity.cs
new file mode 100644
index 000000000000..f3f3f1f12119
--- /dev/null
+++ b/Content.Shared/IdentityManagement/Identity.cs
@@ -0,0 +1,60 @@
+using Content.Shared.Ghost;
+using Content.Shared.IdentityManagement.Components;
+
+namespace Content.Shared.IdentityManagement;
+
+/// <summary>
+///     Static content API for getting the identity entities/names for a given entity.
+///     This should almost always be used in favor of metadata name, if the entity in question is a human player that
+///     can have identity.
+/// </summary>
+public static class Identity
+{
+    /// <summary>
+    ///     Returns the name that should be used for this entity for identity purposes.
+    /// </summary>
+    public static string Name(EntityUid uid, IEntityManager ent, EntityUid? viewer=null)
+    {
+        var uidName = ent.GetComponent<MetaDataComponent>(uid).EntityName;
+
+        if (!ent.TryGetComponent<IdentityComponent>(uid, out var identity))
+            return uidName;
+
+        var ident = identity.IdentityEntitySlot.ContainedEntity;
+        if (ident is null)
+            return uidName;
+
+        var identName = ent.GetComponent<MetaDataComponent>(ident.Value).EntityName;
+        if (viewer == null || !CanSeeThroughIdentity(uid, viewer.Value, ent))
+        {
+            return identName;
+        }
+        if (uidName == identName)
+        {
+            return uidName;
+        }
+
+        return uidName + $" ({identName})";
+    }
+
+    /// <summary>
+    ///     Returns the entity that should be used for identity purposes, for example to pass into localization.
+    ///     This is an extension method because of its simplicity, and if it was any harder to call it might not
+    ///     be used enough for loc.
+    /// </summary>
+    public static EntityUid Entity(EntityUid uid, IEntityManager ent)
+    {
+        if (!ent.TryGetComponent<IdentityComponent>(uid, out var identity))
+            return uid;
+
+        return identity.IdentityEntitySlot.ContainedEntity ?? uid;
+    }
+
+    public static bool CanSeeThroughIdentity(EntityUid uid, EntityUid viewer, IEntityManager ent)
+    {
+        // Would check for uid == viewer here but I think it's better for you to see yourself
+        // how everyone else will see you, otherwise people will probably get confused and think they aren't disguised
+        return ent.HasComponent<SharedGhostComponent>(viewer);
+    }
+
+}
diff --git a/Content.Shared/IdentityManagement/SharedIdentitySystem.cs b/Content.Shared/IdentityManagement/SharedIdentitySystem.cs
new file mode 100644
index 000000000000..99c85c5ba0cf
--- /dev/null
+++ b/Content.Shared/IdentityManagement/SharedIdentitySystem.cs
@@ -0,0 +1,28 @@
+using Content.Shared.IdentityManagement.Components;
+using Robust.Shared.Containers;
+
+namespace Content.Shared.IdentityManagement;
+
+public abstract class SharedIdentitySystem : EntitySystem
+{
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    private static string SlotName = "identity";
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<IdentityComponent, ComponentInit>(OnComponentInit);
+        SubscribeLocalEvent<IdentityBlockerComponent, SeeIdentityAttemptEvent>(OnSeeIdentity);
+    }
+
+    private void OnSeeIdentity(EntityUid uid, IdentityBlockerComponent component, SeeIdentityAttemptEvent args)
+    {
+        args.Cancel();
+    }
+
+    protected virtual void OnComponentInit(EntityUid uid, IdentityComponent component, ComponentInit args)
+    {
+        component.IdentityEntitySlot = _container.EnsureContainer<ContainerSlot>(uid, SlotName);
+    }
+}
diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs
index 1179ded8c6ee..bd38228e9c92 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Damage;
 using Content.Shared.Electrocution;
 using Content.Shared.Explosion;
+using Content.Shared.IdentityManagement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Slippery;
 using Content.Shared.Strip.Components;
@@ -17,6 +18,7 @@ public void InitializeRelay()
         SubscribeLocalEvent<InventoryComponent, RefreshMovementSpeedModifiersEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, GetExplosionResistanceEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, BeforeStripEvent>(RelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, SeeIdentityAttemptEvent>(RelayInventoryEvent);
     }
 
     protected void RelayInventoryEvent<T>(EntityUid uid, InventoryComponent component, T args) where T : EntityEventArgs, IInventoryRelayEvent
diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs
index 92915c6af10d..b435dcf812eb 100644
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -51,6 +51,14 @@ public sealed class JobPrototype : IPrototype
         [DataField("startingGear", customTypeSerializer: typeof(PrototypeIdSerializer<StartingGearPrototype>))]
         public string? StartingGear { get; private set; }
 
+        /// <summary>
+        /// Use this to spawn in as a non-humanoid (borg, test subject, etc.)
+        /// Starting gear will be ignored.
+        /// If you want to just add special attributes to a humanoid, use AddComponentSpecial instead.
+        /// </summary>
+        [DataField("jobEntity", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        public string? JobEntity = null;
+
         [DataField("icon")] public string Icon { get; } = string.Empty;
 
         [DataField("special", serverOnly:true)]
diff --git a/Content.Shared/StationEvents/MsgRequestStationEvents.cs b/Content.Shared/StationEvents/MsgRequestStationEvents.cs
deleted file mode 100644
index 09345c692e0b..000000000000
--- a/Content.Shared/StationEvents/MsgRequestStationEvents.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Lidgren.Network;
-using Robust.Shared.Network;
-
-namespace Content.Shared.StationEvents
-{
-    public sealed class MsgRequestStationEvents : NetMessage
-    {
-        public override MsgGroups MsgGroup => MsgGroups.Command;
-
-        public override void ReadFromBuffer(NetIncomingMessage buffer)
-        {
-        }
-
-        public override void WriteToBuffer(NetOutgoingMessage buffer)
-        {
-        }
-    }
-}
diff --git a/Content.Shared/StationEvents/MsgStationEvents.cs b/Content.Shared/StationEvents/MsgStationEvents.cs
deleted file mode 100644
index f6e17a4ffc8a..000000000000
--- a/Content.Shared/StationEvents/MsgStationEvents.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.IO;
-using Lidgren.Network;
-using Robust.Shared.Network;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.StationEvents
-{
-    public sealed class MsgStationEvents : NetMessage
-        {
-            public override MsgGroups MsgGroup => MsgGroups.Command;
-
-            public string[] Events = Array.Empty<string>();
-
-            public override void ReadFromBuffer(NetIncomingMessage buffer)
-            {
-                var serializer = IoCManager.Resolve<IRobustSerializer>();
-                var length = buffer.ReadVariableInt32();
-                using var stream = buffer.ReadAlignedMemory(length);
-                serializer.DeserializeDirect(stream, out Events);
-            }
-
-            public override void WriteToBuffer(NetOutgoingMessage buffer)
-            {
-                var serializer = IoCManager.Resolve<IRobustSerializer>();
-                using (var stream = new MemoryStream())
-                {
-                    serializer.SerializeDirect(stream, Events);
-                    buffer.WriteVariableInt32((int)stream.Length);
-                    stream.TryGetBuffer(out var segment);
-                    buffer.Write(segment);
-                }
-            }
-        }
-}
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 1a25a08616f1..66fa3ecc4fe0 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,40 +1,4 @@
 Entries:
-- author: Macoron
-  changes:
-  - {message: Added artifact container. It's used to safely transport or store dangerous
-      artifacts. Order it in cargo., type: Add}
-  id: 1419
-  time: '2022-04-28T22:03:40.0000000+00:00'
-- author: freeman2651
-  changes:
-  - {message: tweaks to handcuffs and restraints so they can now be used to restrain
-      yourself, type: Tweak}
-  id: 1420
-  time: '2022-04-28T22:04:41.0000000+00:00'
-- author: Rane
-  changes:
-  - {message: Mimes can now create invisible walls using their secret knowledge of
-      their craft., type: Add}
-  - {message: Mimes can no longer speak or scream without revoking their Vow of Silence,
-    type: Remove}
-  id: 1421
-  time: '2022-04-29T03:41:03.0000000+00:00'
-- author: AugustEymann
-  changes:
-  - {message: Microwave Circuitboard and ability to print it at Circuit imprinter.,
-    type: Add}
-  id: 1422
-  time: '2022-04-29T04:50:23.0000000+00:00'
-- author: ElectroJr
-  changes:
-  - {message: Fixed a bug causing hard-suit helmets to get stuck on heads., type: Fix}
-  id: 1423
-  time: '2022-04-30T04:54:35.0000000+00:00'
-- author: lapatison
-  changes:
-  - {message: plant clippers strap for botanical belt, type: Add}
-  id: 1424
-  time: '2022-04-30T21:14:24.0000000+00:00'
 - author: Todd
   changes:
   - {message: Added a new lobby theme., type: Add}
@@ -2950,3 +2914,42 @@ Entries:
       barefoot., type: Add}
   id: 1918
   time: '2022-07-10T09:28:37.0000000+00:00'
+- author: Elijahrane
+  changes:
+  - {message: Forensic pads and reports now label which entity they are from. Detectives
+      rejoice!, type: Add}
+  id: 1919
+  time: '2022-07-11T00:52:54.0000000+00:00'
+- author: Rane
+  changes:
+  - {message: Bodybags are now printable in the medical techfab., type: Add}
+  - {message: Medical techfab doesn't start with all recipes unlocked anymore., type: Fix}
+  id: 1920
+  time: '2022-07-11T01:11:30.0000000+00:00'
+- author: mirrorcult
+  changes:
+  - {message: 'There is now an identity system. Players may not be who they initially
+      seem. Masks and headgear can cover your true identity, and allow you to pass
+      as the ID you''re wearing, or as an unknown person if you have no visible ID.',
+    type: Add}
+  - {message: 'A lot of popups and UI windows were changed to use identity stuff rather
+      than hard-coded name, so if you''re able to see someones ''true'' name when
+      you shouldn''t (through a popup, etc) then please report it.', type: Fix}
+  id: 1921
+  time: '2022-07-11T01:36:53.0000000+00:00'
+- author: keronshb
+  changes:
+  - {message: Unintended blocking bugs are now fixed., type: Fix}
+  id: 1922
+  time: '2022-07-11T01:50:09.0000000+00:00'
+- author: mirrorcult
+  changes:
+  - {message: The nuke now forcibly anchors when armed., type: Tweak}
+  - {message: The nuke now announces its coordinates when armed., type: Tweak}
+  id: 1923
+  time: '2022-07-11T07:29:51.0000000+00:00'
+- author: Duddino
+  changes:
+  - {message: Fixed typo in lobby countdown, type: Fix}
+  id: 1924
+  time: '2022-07-11T18:09:29.0000000+00:00'
diff --git a/Resources/Locale/en-US/actions/actions/blocking.ftl b/Resources/Locale/en-US/actions/actions/blocking.ftl
index 48bbe7d83bc1..cc58e596102f 100644
--- a/Resources/Locale/en-US/actions/actions/blocking.ftl
+++ b/Resources/Locale/en-US/actions/actions/blocking.ftl
@@ -4,7 +4,7 @@ action-description-blocking = Raise or lower your shield.
 action-popup-blocking-user = You raise your {$shield}!
 action-popup-blocking-disabling-user = You lower your {$shield}!
 
-action-popup-blocking-other = {$blockerName} raises their {$shield}!
-action-popup-blocking-disabling-other = {$blockerName} lowers their {$shield}!
+action-popup-blocking-other = {CAPITALIZE(THE($blockerName))} raises {POSS-ADJ($blockerName)} {$shield}!
+action-popup-blocking-disabling-other = {CAPITALIZE(THE($blockerName))} lowers {POSS-ADJ($blockerName)} {$shield}!
 
-action-popup-blocking-user-cant-block = The gravity here prevents you from blocking.
+action-popup-blocking-user-cant-block = You tried to raise your shield, but it was no use.
diff --git a/Resources/Locale/en-US/actions/actions/disarm-action.ftl b/Resources/Locale/en-US/actions/actions/disarm-action.ftl
index 4f97b4f76623..7dded67bc0ce 100644
--- a/Resources/Locale/en-US/actions/actions/disarm-action.ftl
+++ b/Resources/Locale/en-US/actions/actions/disarm-action.ftl
@@ -1,7 +1,7 @@
 disarm-action-free-hand = You need to use a free hand to disarm!
 
-disarm-action-popup-message-other-clients = {$performerName} fails to disarm {$targetName}!
-disarm-action-popup-message-cursor = You fail to disarm {$targetName}!
+disarm-action-popup-message-other-clients = {CAPITALIZE(THE($performerName))} fails to disarm {THE($targetName)}!
+disarm-action-popup-message-cursor = You fail to disarm {THE($targetName)}!
 
 action-name-disarm = [color=red]Disarm[/color]
 action-description-disarm = Attempt to [color=red]disarm[/color] someone.
diff --git a/Resources/Locale/en-US/administration/ui/tabs/adminbus-tab/station-events-window.ftl b/Resources/Locale/en-US/administration/ui/tabs/adminbus-tab/station-events-window.ftl
deleted file mode 100644
index 863ede5794ab..000000000000
--- a/Resources/Locale/en-US/administration/ui/tabs/adminbus-tab/station-events-window.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-station-events-window-not-loaded-text = Not loaded
-station-events-window-random-text = Random
\ No newline at end of file
diff --git a/Resources/Locale/en-US/chemistry/components/injector-component.ftl b/Resources/Locale/en-US/chemistry/components/injector-component.ftl
index 4249c14e870b..e137130290c7 100644
--- a/Resources/Locale/en-US/chemistry/components/injector-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/injector-component.ftl
@@ -21,4 +21,4 @@ injector-component-target-is-empty-message = {$target} is empty!
 ## mob-inject doafter messages
 
 injector-component-injecting-user = You start inserting the needle.
-injector-component-injecting-target = {$user} is trying to stick a needle into you!
+injector-component-injecting-target = {CAPITALIZE(THE($user))} is trying to stick a needle into you!
diff --git a/Resources/Locale/en-US/entity-systems/pointing/pointing-system.ftl b/Resources/Locale/en-US/entity-systems/pointing/pointing-system.ftl
index 6031b8ba91d9..a310fd9b692d 100644
--- a/Resources/Locale/en-US/entity-systems/pointing/pointing-system.ftl
+++ b/Resources/Locale/en-US/entity-systems/pointing/pointing-system.ftl
@@ -2,9 +2,9 @@
 
 pointing-system-try-point-cannot-reach = You can't reach there!
 pointing-system-point-at-self = You point at yourself.
-pointing-system-point-at-other = You point at {$other}.
-pointing-system-point-at-self-others = {$otherName} points at {$other}.
-pointing-system-point-at-other-others = {$otherName} points at {$other}.
+pointing-system-point-at-other = You point at {THE($other)}.
+pointing-system-point-at-self-others = {CAPITALIZE(THE($otherName))} points at {THE($other)}.
+pointing-system-point-at-other-others = {CAPITALIZE(THE($otherName))} points at {THE($other)}.
 pointing-system-point-at-you-other = {$otherName} points at you.
 pointing-system-point-at-tile = You point at the {$tileName}.
-pointing-system-other-point-at-tile = {$otherName} points at the {$tileName}.
+pointing-system-other-point-at-tile = {CAPITALIZE(THE($otherName))} points at the {$tileName}.
diff --git a/Resources/Locale/en-US/forensics/forensics.ftl b/Resources/Locale/en-US/forensics/forensics.ftl
index 5d0ab78c3fdd..397d980f3bd9 100644
--- a/Resources/Locale/en-US/forensics/forensics.ftl
+++ b/Resources/Locale/en-US/forensics/forensics.ftl
@@ -3,7 +3,7 @@ forensic-scanner-interface-fingerprints = Fingerprints
 forensic-scanner-interface-fibers = Fibers
 forensic-scanner-interface-no-data = No scan data available
 forensic-scanner-interface-print = Print
-forensic-scanner-report-title = Forensics Report
+forensic-scanner-report-title = Forensics Report: {$entity}
 forensic-pad-unused = It hasn't been used.
 forensic-pad-sample = It has a sample: {$sample}
 forensic-pad-gloves = {CAPITALIZE($target)} is wearing gloves.
@@ -13,3 +13,6 @@ forensic-pad-already-used = This pad has already been used.
 forensic-scanner-match-fiber = Match in fiber found!
 forensic-scanner-match-fingerprint = Match in fingerprint found!
 forensic-scanner-match-none = No matches found!
+
+forensic-pad-fingerprint-name = {$entity}'s fingerprints
+forensic-pad-gloves-name = fibers from {$entity}
diff --git a/Resources/Locale/en-US/hands/components/hands-component.ftl b/Resources/Locale/en-US/hands/components/hands-component.ftl
index 6782bb403fe1..6f85ae7e0275 100644
--- a/Resources/Locale/en-US/hands/components/hands-component.ftl
+++ b/Resources/Locale/en-US/hands/components/hands-component.ftl
@@ -1,4 +1,4 @@
-hands-component-disarm-success-others-message = {$disarmer} disarms {$disarmed}!
-hands-component-disarm-success-message = You disarm {$disarmed}!
-hands-component-shove-success-others-message = {$shover} shoves {$shoved}!
-hands-component-shove-success-message = You shove {$shoved}!
\ No newline at end of file
+hands-component-disarm-success-others-message = {CAPITALIZE(THE($disarmer))} disarms {THE($disarmed)}!
+hands-component-disarm-success-message = You disarm {THE($disarmed)}!
+hands-component-shove-success-others-message = {CAPITALIZE(THE($shover))} shoves {THE($shoved)}!
+hands-component-shove-success-message = You shove {THE($shoved)}!
diff --git a/Resources/Locale/en-US/identity/identity-system.ftl b/Resources/Locale/en-US/identity/identity-system.ftl
new file mode 100644
index 000000000000..efaadb818862
--- /dev/null
+++ b/Resources/Locale/en-US/identity/identity-system.ftl
@@ -0,0 +1,9 @@
+identity-unknown-name = ???
+
+identity-age-young = young
+identity-age-middle-aged = middle-aged
+identity-age-old = old
+
+identity-gender-feminine = woman
+identity-gender-masculine = man
+identity-gender-person = person
diff --git a/Resources/Locale/en-US/lobby/lobby-state.ftl b/Resources/Locale/en-US/lobby/lobby-state.ftl
index 998eb7bb3474..60bcd908830f 100644
--- a/Resources/Locale/en-US/lobby/lobby-state.ftl
+++ b/Resources/Locale/en-US/lobby/lobby-state.ftl
@@ -1,7 +1,7 @@
 lobby-state-paused = Paused
 lobby-state-right-now-question = Right Now?
 lobby-state-right-now-confirmation = Right Now
-lobby-state-round-start-countdown-text = Rounds Starts In: {$timeLeft}
+lobby-state-round-start-countdown-text = Round Starts In: {$timeLeft}
 lobby-state-ready-button-join-state = Join
 lobby-state-ready-button-ready-up-state = Ready Up
 lobby-state-player-status-not-ready = Not Ready
diff --git a/Resources/Locale/en-US/nuke/nuke-component.ftl b/Resources/Locale/en-US/nuke/nuke-component.ftl
index 52fc260d08eb..615aa7019701 100644
--- a/Resources/Locale/en-US/nuke/nuke-component.ftl
+++ b/Resources/Locale/en-US/nuke/nuke-component.ftl
@@ -1,6 +1,6 @@
 nuke-component-cant-anchor = The bolts seems to be blocked without disk!
 nuke-component-announcement-sender = Nuclear Fission Explosive
-nuke-component-announcement-armed = Attention! The station's self-destruct mechanism has been engaged. {$time} seconds until detonation.
+nuke-component-announcement-armed = Attention! The station's self-destruct mechanism has been engaged at global coordinates {$position}. {$time} seconds until detonation. If this was made in error, the mechanism may still be disarmed.
 nuke-component-announcement-unarmed = The station's self-destruct was deactivated! Have a nice day!
 nuke-component-announcement-send-codes = Attention! Requested self-destruction codes was sent to communication consoles.
 nuke-component-doafter-warning = You start fiddling with wires and knobs in order to disarm the nuke.. This may take a while.
diff --git a/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl b/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl
index 8a6e11dffa7e..6a96c5604812 100644
--- a/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl
+++ b/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl
@@ -1,2 +1,2 @@
 station-event-meteor-swarm-start-announcement = Meteors are on a collision course with the station. Brace for impact.
-station-event-meteor-swarm-ebd-announcement = The meteor swarm has passed. Please return to your stations.
+station-event-meteor-swarm-end-announcement = The meteor swarm has passed. Please return to your stations.
diff --git a/Resources/Locale/en-US/station-events/station-event-command.ftl b/Resources/Locale/en-US/station-events/station-event-command.ftl
deleted file mode 100644
index cc4ede9eb974..000000000000
--- a/Resources/Locale/en-US/station-events/station-event-command.ftl
+++ /dev/null
@@ -1,19 +0,0 @@
-### Localization for events console commands
-
-## 'events' command
-cmd-events-desc = Provides admin control to station events
-cmd-events-help = events <running/list/pause/resume/stop/run <eventName/random>>
-                  running: return the current running event
-                  list: return all event names that can be run
-                  pause: stop all random events from running and any one currently running
-                  resume: allow random events to run again
-                  run <eventName/random>: start a particular event now; <eventName> is case-insensitive and not localized
-cmd-events-arg-subcommand = <subcommand>
-cmd-events-arg-run-eventName = <eventName>
-
-cmd-events-none-running = No station event running
-cmd-events-list-random = Random
-cmd-events-paused = Station events paused
-cmd-events-already-paused = Station events are already paused
-cmd-events-resumed = Station events resumed
-cmd-events-already-running = Station events are already running
diff --git a/Resources/Locale/en-US/station-events/station-event-system.ftl b/Resources/Locale/en-US/station-events/station-event-system.ftl
index a8b6d4184694..2e7843326e45 100644
--- a/Resources/Locale/en-US/station-events/station-event-system.ftl
+++ b/Resources/Locale/en-US/station-events/station-event-system.ftl
@@ -1,7 +1,4 @@
-## StationEventSystem
+## BasicStationEventSchedulerSystem
 
-station-event-system-run-event = Running event {$eventName} 
-station-event-system-run-event-no-event-name = No event named: {$eventName}
+station-event-system-run-event = Running event {$eventName}
 station-event-system-run-random-event-no-valid-events = No valid events available
-station-event-system-stop-event-no-running-event = No event running currently
-station-event-system-stop-event = Stopped event {$eventName} 
\ No newline at end of file
diff --git a/Resources/Locale/en-US/stunnable/components/stunnable-component.ftl b/Resources/Locale/en-US/stunnable/components/stunnable-component.ftl
index 671aee2cefba..71d275504d38 100644
--- a/Resources/Locale/en-US/stunnable/components/stunnable-component.ftl
+++ b/Resources/Locale/en-US/stunnable/components/stunnable-component.ftl
@@ -1,2 +1,2 @@
-stunnable-component-disarm-success-others = {$source} pushes {$target}!
-stunnable-component-disarm-success = You push {$target}!
\ No newline at end of file
+stunnable-component-disarm-success-others = {CAPITALIZE(THE($source))} pushes {THE($target)}!
+stunnable-component-disarm-success = You push {THE($target)}!
diff --git a/Resources/Locale/en-US/stunnable/stun-system.ftl b/Resources/Locale/en-US/stunnable/stun-system.ftl
index 7bdbc718954f..6121a7e83398 100644
--- a/Resources/Locale/en-US/stunnable/stun-system.ftl
+++ b/Resources/Locale/en-US/stunnable/stun-system.ftl
@@ -1,2 +1,2 @@
-stunned-component-disarm-success = You push {$target} down!
-stunned-component-disarm-success-others = {$source} pushes {$target} down!
\ No newline at end of file
+stunned-component-disarm-success = You push {THE($target)} down!
+stunned-component-disarm-success-others = {CAPITALIZE(THE($source))} pushes {THE($target)} down!
diff --git a/Resources/Maps/Shuttles/emergency_shuttle.yml b/Resources/Maps/Shuttles/emergency_shuttle.yml
index a315ac2c1445..fd3a1b5fcb20 100644
--- a/Resources/Maps/Shuttles/emergency_shuttle.yml
+++ b/Resources/Maps/Shuttles/emergency_shuttle.yml
@@ -3382,8 +3382,6 @@ entities:
   - pos: -3.5,4.5
     parent: 0
     type: Transform
-  - enabled: False
-    type: AmbientSound
 - uid: 362
   type: ExtinguisherCabinetFilled
   components:
@@ -3692,4 +3690,60 @@ entities:
   - containers:
       charger-slot: !type:ContainerSlot {}
     type: ContainerContainer
+- uid: 395
+  type: AtmosDeviceFanTiny
+  components:
+  - anchored: True
+    pos: -7.5,5.5
+    parent: 0
+    type: Transform
+- uid: 396
+  type: AtmosDeviceFanTiny
+  components:
+  - anchored: True
+    pos: -7.5,7.5
+    parent: 0
+    type: Transform
+- uid: 397
+  type: AtmosDeviceFanTiny
+  components:
+  - anchored: True
+    pos: 2.5,7.5
+    parent: 0
+    type: Transform
+- uid: 398
+  type: AtmosDeviceFanTiny
+  components:
+  - anchored: True
+    pos: 2.5,5.5
+    parent: 0
+    type: Transform
+- uid: 399
+  type: AtmosDeviceFanTiny
+  components:
+  - anchored: True
+    pos: 2.5,-0.5
+    parent: 0
+    type: Transform
+- uid: 400
+  type: AtmosDeviceFanTiny
+  components:
+  - anchored: True
+    pos: 2.5,-2.5
+    parent: 0
+    type: Transform
+- uid: 401
+  type: AtmosDeviceFanTiny
+  components:
+  - anchored: True
+    pos: -7.5,-2.5
+    parent: 0
+    type: Transform
+- uid: 402
+  type: AtmosDeviceFanTiny
+  components:
+  - anchored: True
+    pos: -7.5,-0.5
+    parent: 0
+    type: Transform
 ...
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
index b5bb9c640d2c..764d976463b1 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
@@ -190,6 +190,18 @@
   category: Livestock
   group: market
 
+- type: cargoProduct
+  name: "mice crate"
+  id: LivestockMouse
+  description: "A crate containing five -blind- mice"
+  icon:
+    sprite: Mobs/Animals/mouse.rsi
+    state: icon-0
+  product: CrateNPCMouse
+  cost: 1500
+  category: Livestock
+  group: market
+
 - type: cargoProduct
   name: "parrot crate"
   id: LivestockParrot
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index c799a92d4303..b196406a3764 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -8,7 +8,7 @@
     sprite: Clothing/Back/Backpacks/backpack.rsi
     state: icon
   - type: Clothing
-    size: 500
+    size: 9999
     quickEquip: false
     Slots:
     - back
@@ -32,7 +32,7 @@
     sprite: Clothing/Back/Backpacks/clown.rsi
   - type: Storage
     storageOpenSound:
-      collection: BikeHorn
+      collection: BikeHorn  
 
 - type: entity
   parent: ClothingBackpack
@@ -91,8 +91,8 @@
     storageOpenSound:
       collection: null
     storageInsertSound:
-      collection: null
-
+      collection: null      
+      
 - type: entity
   parent: ClothingBackpack
   id: ClothingBackpackChemistry
@@ -223,6 +223,4 @@
   - type: Clothing
     sprite: Clothing/Back/Backpacks/holding.rsi
   - type: Storage
-    popup: false
     capacity: 10000
-  - type: OfHolding
diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
index 0d7c544a304c..b764f9ef91ef 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -9,7 +9,7 @@
     state: icon
   - type: Clothing
     sprite: Clothing/Back/Duffels/duffel.rsi
-    size: 500
+    size: 9999
     quickEquip: false
     Slots:
     - back
@@ -102,9 +102,9 @@
   - type: Clothing
     sprite: Clothing/Back/Duffels/mime.rsi
     storageOpenSound:
-      collection: null
+      collection: null    
     storageInsertSound:
-      collection: null
+      collection: null      
 
 - type: entity
   parent: ClothingBackpackDuffel
@@ -168,6 +168,4 @@
   - type: Clothing
     sprite: Clothing/Back/Duffels/holding.rsi
   - type: Storage
-    popup: false
     capacity: 10000
-  - type: OfHolding
diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
index a915a2ac6c0a..8b02102527eb 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -8,7 +8,7 @@
     sprite: Clothing/Back/Satchels/satchel.rsi
     state: icon
   - type: Clothing
-    size: 500
+    size: 9999
     quickEquip: false
     Slots:
     - back
@@ -113,6 +113,4 @@
   - type: Clothing
     sprite: Clothing/Back/Satchels/holding.rsi
   - type: Storage
-    popup: false
     capacity: 10000
-  - type: OfHolding
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index d2f147588e17..50cbee6b3a61 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -8,17 +8,13 @@
     sprite: Clothing/Hands/Gloves/boxing.rsi
   - type: Clothing
     sprite: Clothing/Hands/Gloves/boxing.rsi
-  - type: BoxingGloves
-    damage:
-      types:
-        Blunt: 1
   - type: Fiber
     fiberMaterial: fibers-leather
     fiberColor: fibers-red
   - type: FingerprintMask
 
 - type: entity
-  parent: ClothingHandsGlovesBoxingRed
+  parent: ClothingHandsBase
   id: ClothingHandsGlovesBoxingBlue
   name: blue boxing gloves
   description: Blue gloves for competitive boxing.
@@ -35,7 +31,7 @@
   - type: FingerprintMask
 
 - type: entity
-  parent: ClothingHandsGlovesBoxingRed
+  parent: ClothingHandsBase
   id: ClothingHandsGlovesBoxingGreen
   name: green boxing gloves
   description: Green gloves for competitive boxing.
@@ -52,7 +48,7 @@
   - type: FingerprintMask
 
 - type: entity
-  parent: ClothingHandsGlovesBoxingRed
+  parent: ClothingHandsBase
   id: ClothingHandsGlovesBoxingYellow
   name: yellow boxing gloves
   description: Yellow gloves for competitive boxing.
diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
index 7e7da58c5623..2d5537b85766 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -42,6 +42,7 @@
     - HidesHair
   - type: DiseaseProtection
     protection: 0.05
+  - type: IdentityBlocker
 
 - type: entity
   abstract: true
@@ -76,6 +77,7 @@
     - HidesHair
   - type: DiseaseProtection
     protection: 0.05
+  - type: IdentityBlocker
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 0ccd804e9a24..6945f861ac38 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -59,7 +59,7 @@
         Radiation: 0.5
   - type: TemperatureProtection
     coefficient: 0.005
-
+ 
 - type: entity
   parent: ClothingHeadHardsuitBase
   id: ClothingHeadHelmetHardsuitCap
@@ -186,7 +186,7 @@
       coefficients:
         Blunt: 0.8
         Slash: 0.8
-        Piercing: 0.8
+        Piercing: 0.8 
   - type: PointLight
     radius: 7
     energy: 3
@@ -211,7 +211,7 @@
         Blunt: 0.8
         Slash: 0.8
         Piercing: 0.8
-
+        
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitSecurityRed
@@ -287,13 +287,13 @@
   - type: PressureProtection
     highPressureMultiplier: 0.225
     lowPressureMultiplier: 10000
-
+    
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitSpatio
   noSpawn: true
   name: spationaut hardsuit helmet
-  description: A sturdy helmet designed for complex industrial operations in space.
+  description: A sturdy helmet designed for complex industrial operations in space. 
   components:
   - type: Sprite
     netsync: false
@@ -333,7 +333,7 @@
       right:
       - state: inhand-right
       - state: inhand-right-unshaded
-        shader: unshaded
+        shader: unshaded   
   - type: PressureProtection
     highPressureMultiplier: 0.72
     lowPressureMultiplier: 10000
@@ -351,7 +351,7 @@
     sprite: Clothing/Head/Hardsuits/cybersun.rsi
   - type: PressureProtection
     highPressureMultiplier: 0.3
-    lowPressureMultiplier: 1000
+    lowPressureMultiplier: 1000    
 
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
@@ -395,7 +395,7 @@
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
   - type: TemperatureProtection
-    coefficient: 0.005
+    coefficient: 0.005    
   - type: Armor
     modifiers:
       coefficients:
@@ -444,7 +444,7 @@
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
   - type: TemperatureProtection
-    coefficient: 0.005
+    coefficient: 0.005    
   - type: Armor
     modifiers:
       coefficients:
@@ -467,7 +467,7 @@
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi
   - type: Clothing
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi
-
+    
 - type: entity
   parent: ClothingHeadHelmetHardsuitERTLeader
   id: ClothingHeadHelmetHardsuitERTEngineer
@@ -477,7 +477,7 @@
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi
   - type: Clothing
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi
-
+    
 - type: entity
   parent: ClothingHeadHelmetHardsuitERTLeader
   id: ClothingHeadHelmetHardsuitERTMedical
@@ -487,7 +487,7 @@
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi
   - type: Clothing
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi
-
+    
 - type: entity
   parent: ClothingHeadHelmetHardsuitERTLeader
   id: ClothingHeadHelmetHardsuitERTSecurity
@@ -497,7 +497,7 @@
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi
   - type: Clothing
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi
-
+    
 - type: entity
   parent: ClothingHeadHelmetHardsuitERTLeader
   id: ClothingHeadHelmetHardsuitERTJanitor
diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index 40846bd2def9..140a2686cf3d 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -17,6 +17,7 @@
         Blunt: 0.5
         Slash: 0.8
         Piercing: 0.8
+  - type: IdentityBlocker
 
 - type: entity
   parent: ClothingHeadEVAHelmetBase
@@ -128,6 +129,7 @@
   - type: Tag
     tags:
     - HidesHair
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHelmetSpaceNinja
@@ -142,6 +144,8 @@
   - type: Tag
     tags:
     - HidesHair
+  - type: IdentityBlocker
+
 - type: entity
   parent: ClothingHeadEVAHelmetBase
   id: ClothingHeadHelmetSyndicate
@@ -165,6 +169,7 @@
   - type: Clothing
     sprite: Clothing/Head/Helmets/templar.rsi
   - type: IngestionBlocker
+  - type: IdentityBlocker
 
 - type: entity
   parent: ClothingHeadBase
@@ -188,6 +193,7 @@
   - type: Clothing
     sprite: Clothing/Head/Helmets/wizardhelm.rsi
   - type: IngestionBlocker
+  - type: IdentityBlocker
 
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
@@ -219,7 +225,7 @@
   - type: PressureProtection
     highPressureMultiplier: 0.65
     lowPressureMultiplier: 1000
-
+  - type: IdentityBlocker
 
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
@@ -248,6 +254,7 @@
   - type: PressureProtection
     highPressureMultiplier: 0.45
     lowPressureMultiplier: 1000
+  - type: IdentityBlocker
 
 - type: entity
   parent: ClothingHeadBase
@@ -266,6 +273,7 @@
         Slash: 0.5
         Piercing: 0.5
         Heat: 0.9
+  - type: IdentityBlocker
 
 - type: entity
   parent: ClothingHeadEVAHelmetBase
diff --git a/Resources/Prototypes/Entities/Clothing/Head/welding.yml b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
index b92e12909237..8cc3d7c40f62 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/welding.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
@@ -6,6 +6,7 @@
   components:
   - type: IngestionBlocker
   - type: FlashImmunity
+  - type: IdentityBlocker
 
 - type: entity
   parent: WeldingMaskBase
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index d260371acd15..4b3c714e9ac0 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -12,9 +12,10 @@
   - type: IngestionBlocker
   - type: DiseaseProtection
     protection: 0.05
+  - type: IdentityBlocker
 
 - type: entity
-  parent: ClothingMaskPullableBase
+  parent: ClothingMaskGas
   id: ClothingMaskGasSecurity
   name: security gas mask
   description: A standard issue Security gas mask.
@@ -23,13 +24,9 @@
     sprite: Clothing/Mask/gassecurity.rsi
   - type: Clothing
     sprite: Clothing/Mask/gassecurity.rsi
-  - type: BreathMask
-  - type: IngestionBlocker
-  - type: DiseaseProtection
-    protection: 0.05
 
 - type: entity
-  parent: ClothingMaskPullableBase
+  parent: ClothingMaskGas
   id: ClothingMaskGasSyndicate
   name: syndicate gas mask
   description: A close-fitting tactical mask that can be connected to an air supply.
@@ -38,14 +35,10 @@
     sprite: Clothing/Mask/gassyndicate.rsi
   - type: Clothing
     sprite: Clothing/Mask/gassyndicate.rsi
-  - type: BreathMask
-  - type: IngestionBlocker
-  - type: DiseaseProtection
-    protection: 0.05
   - type: FlashImmunity
 
 - type: entity
-  parent: ClothingMaskPullableBase
+  parent: ClothingMaskGas
   id: ClothingMaskGasAtmos
   name: atmospheric gas mask
   description: Improved gas mask utilized by atmospheric technicians. It's flameproof!
@@ -54,10 +47,6 @@
     sprite: Clothing/Mask/gasatmos.rsi
   - type: Clothing
     sprite: Clothing/Mask/gasatmos.rsi
-  - type: BreathMask
-  - type: IngestionBlocker
-  - type: DiseaseProtection
-    protection: 0.05
   - type: Armor
     modifiers:
       coefficients:
@@ -94,7 +83,7 @@
     protection: 0.05
 
 - type: entity
-  parent: ClothingMaskPullableBase
+  parent: ClothingMaskGas
   id: ClothingMaskGasExplorer
   name: explorer gas mask
   description: A military-grade gas mask that can be connected to an air supply.
@@ -103,10 +92,6 @@
     sprite: Clothing/Mask/gasexplorer.rsi
   - type: Clothing
     sprite: Clothing/Mask/gasexplorer.rsi
-  - type: BreathMask
-  - type: IngestionBlocker
-  - type: DiseaseProtection
-    protection: 0.05
   - type: Armor
     modifiers:
       coefficients:
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index 455bd807e7a8..ca79a3325077 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -588,7 +588,7 @@
     walkModifier: 1.0
     sprintModifier: 1.0
   - type: TemperatureProtection
-    coefficient: 0.001
+    coefficient: 0.001    
   - type: Armor
     modifiers:
       coefficients:
@@ -629,7 +629,7 @@
     sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitERTEngineer
-
+    
 - type: entity
   parent: ClothingOuterHardsuitERTLeader
   id: ClothingOuterHardsuitERTMedical
@@ -653,7 +653,7 @@
     sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitERTSecurity
-
+    
 - type: entity
   parent: ClothingOuterHardsuitERTLeader
   id: ClothingOuterHardsuitERTJanitor
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
index 97e517a3bb5b..a20929cafec5 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -106,6 +106,7 @@
     sprite: Clothing/OuterClothing/WinterCoats/coatclown.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/WinterCoats/coatclown.rsi
+
 - type: entity
   parent: ClothingOuterWinterCoat
   id: ClothingOuterWinterEngi
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index 8563f3069994..11a3843ab642 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -497,7 +497,7 @@
     sprite: Clothing/Uniforms/Jumpskirt/capformaldress.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/capformaldress.rsi
-
+    
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtCentcomFormalDress
@@ -507,8 +507,8 @@
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi
-
+    sprite: Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi   
+    
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtHosFormal
@@ -518,7 +518,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpskirt/hosformaldress.rsi
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/hosformaldress.rsi
+    sprite: Clothing/Uniforms/Jumpskirt/hosformaldress.rsi      
 
 - type: entity
   parent: ClothingUniformSkirtBase
@@ -529,7 +529,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi
+    sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi  
 
 - type: entity
   parent: ClothingUniformSkirtBase
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
index 41436dba32cb..596d66adc7b3 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
@@ -23,6 +23,7 @@
         - PlushieRatvar
         - PlushieSpaceLizard
         - PlushieRouny
+        - PlushieLamp
         - ToyMouse
       chance: 0.5
       offset: 0.2
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index eaaeabfee1e1..9464b94d2663 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -126,7 +126,7 @@
     visuals:
     - type: BuckleVisualizer
   - type: FireVisuals
-    sprite: Effects/fire.rsi
+    sprite: Mobs/Effects/onfire.rsi
     normalState: Generic_mob_burning
   - type: Actions
   - type: DoAfter
diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
index d42e788cb7ad..08ae48469d7a 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -32,6 +32,7 @@
       - !type:WashCreamPieReaction
   - type: Flashable
   - type: Polymorphable
+  - type: Identity
   - type: Hands
   - type: MovementSpeedModifier
   - type: MovedByPressure
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index bcb0bebe6c7f..cfc2bb12cd7f 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -74,6 +74,19 @@
   - type: Sprite
     state: plushie_rouny
 
+- type: entity
+  parent: BasePlushie
+  id: PlushieLamp
+  name: lamp plushie
+  description: A light emitting friend!
+  components:
+  - type: Sprite
+    state: plushie_lamp
+  - type: PointLight
+    netsync: false
+    radius: 1.5
+    energy: 2
+
 - type: entity
   parent: BasePlushie
   id: PlushieLizard #Weh!
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
index ba0e0215c996..db5b3b92f345 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
@@ -54,7 +54,6 @@
           state: icon-on
         name: action-name-jetpack-toggle
         description: action-description-jetpack-toggle
-        itemIconStyle: NoItem
         useDelay: 1.0
         event: !type:ToggleJetpackEvent
     - type: Appearance
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
index 060d1182c847..7d16286ac00c 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -222,6 +222,14 @@
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/atmospherics.rsi
 
+- type: entity
+  parent: Airlock
+  id: AirlockAtmospherics
+  suffix: Atmospherics
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/atmospherics.rsi
+
 - type: entity
   parent: Airlock
   id: AirlockCargo
@@ -582,6 +590,16 @@
   - type: PaintableAirlock
     group: Glass
 
+- type: entity
+  parent: AirlockGlass
+  id: AirlockAtmosphericsGlass
+  suffix: Atmospherics
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/atmospherics.rsi
+  - type: PaintableAirlock
+    group: Glass
+
 - type: entity
   parent: AirlockGlass
   id: AirlockCargoGlass
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 259851549e59..e7eb951a39ad 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -480,6 +480,7 @@
       - CryostasisBeaker
       - Dropper
       - Syringe
+      - BodyBag
       - PillCanister #Everything below this is shared with other lathes
       - FlashlightLantern
       - Bucket
diff --git a/Resources/Prototypes/Entities/Structures/Machines/salvage.yml b/Resources/Prototypes/Entities/Structures/Machines/salvage.yml
index a86000429527..b57d4c60673b 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/salvage.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/salvage.yml
@@ -17,6 +17,7 @@
     - Supply
   - type: SalvageMagnet
     offset: 0, -32
+    salvageChannel: Engineering
   - type: ApcPowerReceiver
     powerLoad: 2500 # TODO change this to a HV power draw that really hits the grid hard WHEN active
 
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
new file mode 100644
index 000000000000..90799de8885c
--- /dev/null
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -0,0 +1,149 @@
+- type: gameRule
+  id: BreakerFlip
+  config:
+    !type:StationEventRuleConfiguration
+    id: BreakerFlip
+    weight: 10
+    endAfter: 1
+    maxOccurrences: 5
+    minimumPlayers: 15
+
+- type: gameRule
+  id: BureaucraticError
+  config:
+    !type:StationEventRuleConfiguration
+    id: BureaucraticError
+    startAnnouncement: station-event-bureaucratic-error-announcement
+    minimumPlayers: 25
+    weight: 5
+    maxOccurrences: 2
+    endAfter: 1
+
+- type: gameRule
+  id: DiseaseOutbreak
+  config:
+    !type:StationEventRuleConfiguration
+    id: DiseaseOutbreak
+    weight: 10
+    endAfter: 1
+
+- type: gameRule
+  id: FalseAlarm
+  config:
+    !type:StationEventRuleConfiguration
+    id: FalseAlarm
+    weight: 15
+    endAfter: 1
+    maxOccurrences: 5
+
+- type: gameRule
+  id: GasLeak
+  config:
+    !type:StationEventRuleConfiguration
+    id: GasLeak
+    startAnnouncement: station-event-gas-leak-start-announcement
+    startAudio:
+      path: /Audio/Announcements/attention.ogg
+    endAnnouncement: station-event-gas-leak-end-announcement
+    earliestStart: 10
+    minimumPlayers: 5
+    weight: 5
+    maxOccurrences: 1
+    startAfter: 20
+
+- type: gameRule
+  id: KudzuGrowth
+  config:
+    !type:StationEventRuleConfiguration
+    id: KudzuGrowth
+    earliestStart: 15
+    minimumPlayers: 15
+    weight: 5
+    maxOccurrences: 2
+    startAfter: 50
+    endAfter: 240
+
+- type: gameRule
+  id: MeteorSwarm
+  config:
+    !type:StationEventRuleConfiguration
+    id: MeteorSwarm
+    earliestStart: 30
+    weight: 5
+    maxOccurrences: 2
+    minimumPlayers: 20
+    startAnnouncement: station-event-meteor-swarm-start-announcement
+    endAnnouncement: station-event-meteor-swarm-end-announcement
+    startAudio:
+      path: /Audio/Announcements/meteors.ogg
+    startAfter: 30
+
+- type: gameRule
+  id: MouseMigration
+  config:
+    !type:StationEventRuleConfiguration
+    id: MouseMigration
+    earliestStart: 30
+    minimumPlayers: 35
+    weightLow: 5
+    maxOccurrences: 1
+    endAfter: 50
+
+- type: gameRule
+  id: PowerGridCheck
+  config:
+    !type:StationEventRuleConfiguration
+    id: PowerGridCheck
+    weight: 10
+    maxOccurrences: 3
+    startAnnouncement: station-event-power-grid-check-start-announcement
+    endAnnouncement: station-event-power-grid-check-end-announcement
+    startAudio:
+      path: /Audio/Announcements/power_off.ogg
+    startAfter: 12
+
+- type: gameRule
+  id: RandomSentience
+  config:
+    !type:StationEventRuleConfiguration
+    id: RandomSentience
+    weight: 10
+    endAfter: 1
+    startAudio:
+      path: /Audio/Announcements/attention.ogg
+
+- type: gameRule
+  id: VentClog
+  config:
+    !type:StationEventRuleConfiguration
+    id: VentClog
+    startAnnouncement: station-event-vent-clog-start-announcement
+    startAudio:
+      path: /Audio/Announcements/attention.ogg
+    earliestStart: 15
+    minimumPlayers: 15
+    weight: 5
+    maxOccurrences: 2
+    startAfter: 50
+    endAfter: 60
+
+- type: gameRule
+  id: VentCritters
+  config:
+    !type:StationEventRuleConfiguration
+    id: VentCritters
+    earliestStart: 15
+    minimumPlayers: 15
+    weight: 5
+    maxOccurrences: 2
+    endAfter: 60
+
+- type: gameRule
+  id: ZombieOutbreak
+  config:
+    !type:StationEventRuleConfiguration
+    id: ZombieOutbreak
+    earliestStart: 50
+    weight: 2.5
+    endAfter: 1
+    maxOccurrences: 1
diff --git a/Resources/Prototypes/game_rules.yml b/Resources/Prototypes/GameRules/roundstart.yml
similarity index 88%
rename from Resources/Prototypes/game_rules.yml
rename to Resources/Prototypes/GameRules/roundstart.yml
index 849f5715c770..d1f636dcc0c2 100644
--- a/Resources/Prototypes/game_rules.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -65,3 +65,10 @@
   config:
     !type:GenericGameRuleConfiguration
     id: Zombie
+
+# event schedulers
+- type: gameRule
+  id: BasicStationEventScheduler
+  config:
+    !type:GenericGameRuleConfiguration
+    id: BasicStationEventScheduler
diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml
index c6dde8b82425..43930f7cfd8c 100644
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -48,12 +48,12 @@
     Steel: 200
 
 - type: latheRecipe
-  id: BodyBag_Folded
+  id: BodyBag
   icon: Objects/Specific/Medical/Morgue/bodybags.rsi/bag_folded.png
   result: BodyBag_Folded
-  completetime: 1.2
+  completetime: 2
   materials:
-    Plastic: 200
+    Plastic: 300
 
 - type: latheRecipe
   id: HandheldCrewMonitor
@@ -97,7 +97,7 @@
   result: ClothingMaskSterile
   completetime: 2
   materials:
-    Plastic: 300
+    Plastic: 100
 
 - type: latheRecipe
   id: DiseaseSwab
diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml
index 78418357ce22..28de81abdf19 100644
--- a/Resources/Prototypes/game_presets.yml
+++ b/Resources/Prototypes/game_presets.yml
@@ -6,6 +6,19 @@
   name: extended-title
   showInVote: false #2boring2vote
   description: extended-description
+  rules:
+    - BasicStationEventScheduler
+
+- type: gamePreset
+  id: Secret
+  alias:
+    - secret
+    - sekrit
+  name: secret-title
+  showInVote: true
+  description: secret-description
+  rules:
+    - Secret
 
 - type: gamePreset
   id: Secret
@@ -38,6 +51,7 @@
   showInVote: false
   rules:
     - Traitor
+    - BasicStationEventScheduler
 
 - type: gamePreset
   id: Suspicion
@@ -79,6 +93,7 @@
   showInVote: false
   rules:
     - Nukeops
+    - BasicStationEventScheduler
 
 - type: gamePreset
   id: Zombie
@@ -93,6 +108,7 @@
   showInVote: false
   rules:
     - Zombie
+    - BasicStationEventScheduler
 
 - type: gamePreset
   id: Pirates
@@ -103,3 +119,4 @@
   showInVote: false
   rules:
     - Pirates
+    - BasicStationEventScheduler
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
index 366fbf2ac526..e38c0abff19f 100644
--- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
@@ -28,6 +28,9 @@
         {
             "name": "plushie_lizard"
         },
+        {
+            "name": "plushie_lamp"
+        },
         {
             "name": "plushie_nuke"
         },
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_lamp.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_lamp.png
new file mode 100644
index 000000000000..43e02fbc95a4
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_lamp.png differ