diff --git a/CONFLICTS_TO_RESOLVE.txt b/CONFLICTS_TO_RESOLVE.txt
new file mode 100644
index 000000000000..a2912623ec8e
--- /dev/null
+++ b/CONFLICTS_TO_RESOLVE.txt
@@ -0,0 +1,195 @@
+./Content.Client/Commands/DebugCommands.cs.rej
+./Content.Client/Commands/MappingClientSideSetupCommand.cs.rej
+./Content.Client/Cooldown/CooldownGraphic.cs.rej
+./Content.Client/Disposal/PressureBar.cs.rej
+./Content.Client/HotPotato/HotPotatoSystem.cs.rej
+./Content.Client/Instruments/InstrumentSystem.cs.rej
+./Content.Client/Inventory/ClientInventorySystem.cs.rej
+./Content.Client/Light/RgbLightControllerSystem.cs.rej
+./Content.Client/Power/APC/UI/ApcMenu.xaml.cs.rej
+./Content.Client/Trigger/Components/TimerTriggerVisualizerComponent.cs.rej
+./Content.Client/Trigger/Systems/ProximityTriggerAnimationSystem.cs.rej
+./Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs.rej
+./Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs.rej
+./Content.Client/UserInterface/Systems/ProgressColorSystem.cs.rej
+./Content.IntegrationTests/Tests/InventoryHelpersTest.cs.rej
+./Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs.rej
+./Content.IntegrationTests/Tests/RoundEndTest.cs.rej
+./Content.IntegrationTests/Tests/StoreTests.cs.rej
+./Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs.rej
+./Content.Server/Atmos/EntitySystems/FlammableSystem.cs.rej
+./Content.Server/Chat/Managers/ChatSanitizationManager.cs.rej
+./Content.Server/Chat/Systems/ChatSystem.cs.rej
+./Content.Server/Defusable/Systems/DefusableSystem.cs.rej
+./Content.Server/Destructible/DestructibleSystem.cs.rej
+./Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs.rej
+./Content.Server/Destructible/Thresholds/Behaviors/TriggerBehavior.cs.rej
+./Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs.rej
+./Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs.rej
+./Content.Server/DeviceLinking/Systems/SignallerSystem.cs.rej
+./Content.Server/Drowsiness/DrowsinessSystem.cs.rej
+./Content.Server/Emp/EmpSystem.cs.rej
+./Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs.rej
+./Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs.rej
+./Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs.rej
+./Content.Server/GameTicking/Rules/TraitorRuleSystem.cs.rej
+./Content.Server/Ghost/Roles/GhostRoleSystem.cs.rej
+./Content.Server/Holopad/HolopadSystem.cs.rej
+./Content.Server/HotPotato/HotPotatoSystem.cs.rej
+./Content.Server/Instruments/InstrumentSystem.cs.rej
+./Content.Server/LandMines/LandMineSystem.cs.rej
+./Content.Server/Medical/VomitSystem.cs.rej
+./Content.Server/Mind/Commands/MakeSentientCommand.cs.rej
+./Content.Server/Mind/MindSystem.cs.rej
+./Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs.rej
+./Content.Server/NPC/Systems/NPCSteeringSystem.cs.rej
+./Content.Server/NPC/Systems/NPCSystem.cs.rej
+./Content.Server/Ninja/Systems/SpiderChargeSystem.cs.rej
+./Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs.rej
+./Content.Server/Payload/EntitySystems/PayloadSystem.cs.rej
+./Content.Server/PneumaticCannon/PneumaticCannonSystem.cs.rej
+./Content.Server/Polymorph/Systems/PolymorphSystem.cs.rej
+./Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs.rej
+./Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs.rej
+./Content.Server/Silicons/Borgs/BorgSystem.cs.rej
+./Content.Server/Sound/EmitSoundSystem.cs.rej
+./Content.Server/Speech/EntitySystems/BlockListeningSystem.cs.rej
+./Content.Server/Speech/EntitySystems/ListeningSystem.cs.rej
+./Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs.rej
+./Content.Server/Speech/Muting/MutingSystem.cs.rej
+./Content.Server/Station/Systems/StationSpawningSystem.cs.rej
+./Content.Server/Stunnable/Systems/StunOnCollideSystem.cs.rej
+./Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs.rej
+./Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs.rej
+./Content.Server/Telephone/TelephoneSystem.cs.rej
+./Content.Server/Tools/ToolSystem.cs.rej
+./Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs.rej
+./Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs.rej
+./Content.Shared/Actions/Components/TargetActionComponent.cs.rej
+./Content.Shared/Anomaly/AnomalySynchronizerSystem.cs.rej
+./Content.Shared/Anomaly/Components/AnomalySynchronizerComponent.cs.rej
+./Content.Shared/Bed/Sleep/SleepingSystem.cs.rej
+./Content.Shared/CCVar/CCVars.Viewport.cs.rej
+./Content.Shared/CCVar/CCVars.cs.rej
+./Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs.rej
+./Content.Shared/Chat/SharedChatSystem.cs.rej
+./Content.Shared/Cuffs/Components/HandcuffComponent.cs.rej
+./Content.Shared/Cuffs/SharedCuffableSystem.cs.rej
+./Content.Shared/Damage/Systems/SharedGodmodeSystem.cs.rej
+./Content.Shared/Damage/Systems/SharedStaminaSystem.cs.rej
+./Content.Shared/DisplacementMap/DisplacementData.cs.rej
+./Content.Shared/Emp/SharedEmpSystem.cs.rej
+./Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs.rej
+./Content.Shared/Eye/VisibilityFlags.cs.rej
+./Content.Shared/Flash/SharedFlashSystem.cs.rej
+./Content.Shared/Glue/GlueComponent.cs.rej
+./Content.Shared/Glue/GlueSystem.cs.rej
+./Content.Shared/Glue/GluedComponent.cs.rej
+./Content.Shared/HotPotato/HotPotatoComponent.cs.rej
+./Content.Shared/HotPotato/SharedHotPotatoSystem.cs.rej
+./Content.Shared/Humanoid/SkinColor.cs.rej
+./Content.Shared/Interaction/Components/UnremoveableComponent.cs.rej
+./Content.Shared/Inventory/InventoryComponent.cs.rej
+./Content.Shared/Magic/SharedMagicSystem.cs.rej
+./Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs.rej
+./Content.Shared/Mind/SharedMindSystem.cs.rej
+./Content.Shared/Mousetrap/MousetrapComponent.cs.rej
+./Content.Shared/Ninja/Components/SpiderChargeComponent.cs.rej
+./Content.Shared/Payload/Components/PayloadTriggerComponent.cs.rej
+./Content.Shared/Placeable/PlaceableSurfaceSystem.cs.rej
+./Content.Shared/Rootable/SharedRootableSystem.cs.rej
+./Content.Shared/Rotatable/RotatableComponent.cs.rej
+./Content.Shared/SSDIndicator/SSDIndicatorComponent.cs.rej
+./Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs.rej
+./Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs.rej
+./Content.Shared/Slippery/SlipperySystem.cs.rej
+./Content.Shared/Sound/Components/BaseEmitSoundComponent.cs.rej
+./Content.Shared/Speech/ListenEvent.cs.rej
+./Content.Shared/StatusEffect/StatusEffectsSystem.cs.rej
+./Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs.rej
+./Content.Shared/Sticky/Components/StickyComponent.cs.rej
+./Content.Shared/Storage/Components/DumpableComponent.cs.rej
+./Content.Shared/Storage/EntitySystems/DumpableSystem.cs.rej
+./Content.Shared/Stunnable/SharedStunSystem.cs.rej
+./Content.Shared/Tools/Components/WelderComponent.cs.rej
+./Content.Shared/Trigger/Components/Effects/SmokeOnTriggerComponent.cs.rej
+./Content.Shared/Trigger/Components/RandomTimerTriggerComponent.cs.rej
+./Content.Shared/Trigger/Components/Triggers/RepeatingTriggerComponent.cs.rej
+./Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs.rej
+./Content.Shared/Trigger/TriggerVisuals.cs.rej
+./Content.Shared/Weapons/Misc/TetherGunComponent.cs.rej
+./Content.Shared/Weapons/Ranged/Events/OnEmptyGunShotEvent.cs.rej
+./Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs.rej
+./Resources/Credits/GitHub.txt.rej
+./Resources/Locale/en-US/abilities/mime.ftl.rej
+./Resources/Locale/en-US/commands/mappingclientsidesetup-command.ftl.rej
+./Resources/Locale/en-US/nukeops/nuke-ops.ftl.rej
+./Resources/Locale/en-US/station-events/events/random-sentience.ftl.rej
+./Resources/Locale/en-US/storage/components/dumpable-component.ftl.rej
+./Resources/Locale/en-US/store/store.ftl.rej
+./Resources/Prototypes/Catalog/Fills/Lockers/security.yml.rej
+./Resources/Prototypes/Entities/Clothing/Belt/belts.yml.rej
+./Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml.rej
+./Resources/Prototypes/Entities/Effects/admin_triggers.yml.rej
+./Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml.rej
+./Resources/Prototypes/Entities/Mobs/NPCs/animals.yml.rej
+./Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml.rej
+./Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml.rej
+./Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml.rej
+./Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml.rej
+./Resources/Prototypes/Entities/Mobs/Player/dragon.yml.rej
+./Resources/Prototypes/Entities/Mobs/Species/base.yml.rej
+./Resources/Prototypes/Entities/Mobs/Species/vox.yml.rej
+./Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml.rej
+./Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml.rej
+./Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml.rej
+./Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml.rej
+./Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml.rej
+./Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml.rej
+./Resources/Prototypes/Entities/Objects/Devices/payload.yml.rej
+./Resources/Prototypes/Entities/Objects/Fun/toys.yml.rej
+./Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml.rej
+./Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml.rej
+./Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml.rej
+./Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml.rej
+./Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml.rej
+./Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml.rej
+./Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml.rej
+./Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml.rej
+./Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml.rej
+./Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml.rej
+./Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml.rej
+./Resources/Prototypes/Entities/StatusEffects/misc.yml.rej
+./Resources/Prototypes/Entities/Structures/Dispensers/booze.yml.rej
+./Resources/Prototypes/Entities/Structures/Dispensers/soda.yml.rej
+./Resources/Prototypes/Entities/Structures/Holographic/projections.yml.rej
+./Resources/Prototypes/Entities/Structures/Machines/bombs.yml.rej
+./Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml.rej
+./Resources/Prototypes/Entities/Structures/Power/apc.yml.rej
+./Resources/Prototypes/Entities/Structures/Power/chargers.yml.rej
+./Resources/Prototypes/Entities/Structures/Wallmounts/Misc/bell.yml.rej
+./Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml.rej
+./Resources/Prototypes/Entities/Structures/Wallmounts/Misc/noticeboard.yml.rej
+./Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml.rej
+./Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml.rej
+./Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml.rej
+./Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/defib_cabinet.yml.rej
+./Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/extinguisher_cabinet.yml.rej
+./Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/fireaxe_cabinet.yml.rej
+./Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml.rej
+./Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml.rej
+./Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml.rej
+./Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml.rej
+./Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml.rej
+./Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml.rej
+./Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml.rej
+./Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/station_map.yml.rej
+./Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml.rej
+./Resources/Prototypes/GameRules/roundstart.yml.rej
+./Resources/Prototypes/Magic/teleport_spells.yml.rej
+./Resources/Prototypes/Reagents/medicine.yml.rej
+./Resources/Prototypes/Research/civilianservices.yml.rej
+./Resources/Prototypes/tags.yml.rej
+./Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml.rej
+./Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json.rej
+./Resources/Textures/Objects/Misc/id_cards.rsi/meta.json.rej
diff --git a/CONFLICT_RESOLUTION_GUIDE.md b/CONFLICT_RESOLUTION_GUIDE.md
new file mode 100644
index 000000000000..57a9f6679aca
--- /dev/null
+++ b/CONFLICT_RESOLUTION_GUIDE.md
@@ -0,0 +1,127 @@
+# Upstream Merge Conflict Resolution Guide
+
+## Overview
+This document provides guidance for resolving the 171 conflicts from the upstream merge (dec2d42a1d to 61d13ce40d).
+
+## Summary
+- **Commits**: ~210 upstream commits
+- **Files Changed**: 531
+- **Conflicts**: 171 .rej files
+- **Auto-Applied**: 360 files
+
+## How to Resolve Conflicts
+
+Each .rej file contains "hunks" (sections of code) that couldn't be automatically applied. You need to:
+
+1. Open the .rej file to see what upstream wanted to change
+2. Open the corresponding source file
+3. Manually apply the changes while preserving Goobstation-specific code
+4. Delete the .rej file when done
+5. Test the build
+
+## Conflict Categories
+
+### Priority 1: Core Systems (Must Fix First)
+These are critical systems that likely break the build:
+
+**Trigger System Refactor** - Major upstream change
+- Content.Server/Explosion/EntitySystems/TriggerSystem.cs.rej
+- Content.Shared/Explosion/EntitySystems/TriggerSystem.cs.rej
+- Content.Shared/Trigger/* (multiple files)
+- Content.Client/Explosion/TriggerSystem.cs.rej
+
+**Chat & Communication Systems**
+- Content.Server/Chat/Systems/ChatSystem.cs.rej
+- Content.Server/Chat/Managers/ChatSanitizationManager.cs.rej
+- Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs.rej
+
+**Body & Metabolism Systems**
+- Content.Shared/Body/Systems/SharedBodySystem.Metabolism.cs.rej
+- Content.Shared/Body/Systems/StomachSystem.cs.rej
+- Content.Server/Nutrition/EntitySystems/HungerSystem.cs.rej
+
+### Priority 2: Gameplay Systems
+**NPC Systems**
+- Content.Server/NPC/Systems/NPCSystem.cs.rej
+- Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs.rej  
+- Content.Server/NPC/Systems/NPCSteeringSystem.cs.rej
+
+**Damage & Combat**
+- Content.Server/Damage/Systems/DamageOnTriggerSystem.cs.rej
+- Content.Server/Damage/Systems/DamageUserOnTriggerSystem.cs.rej
+- Content.Shared/Damage/Systems/StaminaSystem.cs.rej
+
+**Abilities & Powers**
+- Content.Server/Abilities/Mime/MimePowersSystem.cs.rej
+- Content.Server/Abilities/Psionics/Abilities/TelegnosisSystem.cs.rej
+
+### Priority 3: UI & Client Systems
+- Content.Client/Commands/DebugCommands.cs.rej
+- Content.Client/Cooldown/CooldownGraphic.cs.rej
+- Content.Client/Instruments/InstrumentSystem.cs.rej
+- Content.Client/UserInterface/* (several files)
+
+### Priority 4: Prototypes & Content
+**Medicine** (8 rejects - significant changes)
+- Resources/Prototypes/Reagents/medicine.yml.rej
+
+**Wallmount Devices** (reorganization)
+- Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/*.rej
+
+**Other Prototypes**
+- Resources/Prototypes/GameRules/roundstart.yml.rej
+- Resources/Prototypes/tags.yml.rej
+
+## Recommended Resolution Order
+
+1. Start with **Trigger System** - this is a major refactor that affects many other systems
+2. Fix **Chat & Body systems** - core gameplay
+3. Resolve **NPC & Combat systems**
+4. Handle **UI & Client conflicts**
+5. Finally, update **Prototypes & YAML files**
+
+## Testing Strategy
+
+After resolving each priority group:
+1. Run `dotnet build`
+2. Fix any compile errors
+3. Run integration tests
+4. Test in-game if possible
+
+## Common Conflict Patterns
+
+**Pattern 1: Goobstation added new features**
+- Keep Goobstation's additions
+- Apply upstream refactors around them
+
+**Pattern 2: Upstream refactored/renamed**  
+- Follow upstream's new structure
+- Port Goobstation changes to new structure
+
+**Pattern 3: Both changed same code**
+- Carefully merge both sets of changes
+- Test thoroughly
+
+## Files to Check Carefully
+
+These files have multiple rejects and likely need significant work:
+- Content.Server/Chat/Systems/ChatSystem.cs (likely many Goob changes)
+- Content.Server/NPC/Systems/*.cs (NPC behavior differences)
+- Content.Shared/Body/Systems/*.cs (metabolism/health system)
+- Resources/Prototypes/Reagents/medicine.yml (8 rejects!)
+
+## Next Steps
+
+1. Read through this guide
+2. Start with Priority 1 files
+3. Use `git diff` to see what was auto-applied
+4. Refer to upstream commits for context
+5. Test frequently
+
+## Getting Help
+
+- Check upstream PR discussions for context on changes
+- Look at commit messages: `git log dec2d42a1d..61d13ce40d -- <file>`
+- Compare with vanilla SS14 if needed
+
+Good luck! Take it one category at a time.
diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs
index b0fb8cbfae72..565f4ef6048c 100644
--- a/Content.Client/Actions/ActionsSystem.cs
+++ b/Content.Client/Actions/ActionsSystem.cs
@@ -491,7 +491,12 @@ private void OnWorldTargetAttempt(Entity<WorldTargetActionComponent> ent, ref Ac
 
         private void OnEntityTargetAttempt(Entity<EntityTargetActionComponent> ent, ref ActionTargetAttemptEvent args)
         {
-            if (args.Handled || args.Input.EntityUid is not { Valid: true } entity)
+            if (args.Handled)
+                return;
+
+            args.Handled = true;
+
+            if (args.Input.EntityUid is not { Valid: true } entity)
                 return;
 
             // let world target component handle it
@@ -502,8 +507,6 @@ private void OnEntityTargetAttempt(Entity<EntityTargetActionComponent> ent, ref
                 return;
             }
 
-            args.Handled = true;
-
             var action = args.Action;
             var user = args.User;
 
diff --git a/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml b/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml
new file mode 100644
index 000000000000..1413eff00c57
--- /dev/null
+++ b/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml
@@ -0,0 +1,20 @@
+<Control
+    xmlns="https://spacestation14.io"
+    xmlns:viewport="clr-namespace:Content.Client.Viewport"
+    MouseFilter="Stop">
+    <PanelContainer StyleClasses="BackgroundDark" Name="AdminCameraWindowRoot" Access="Public">
+        <BoxContainer Orientation="Vertical" Access="Public">
+            <!-- Camera -->
+            <Control VerticalExpand="True" Name="CameraViewBox">
+                <viewport:ScalingViewport Name="CameraView"
+                                          MinSize="100 100"
+                                          MouseFilter="Ignore" />
+            </Control>
+            <!-- Controller buttons -->
+            <BoxContainer Orientation="Horizontal" Margin="5 5 5 5">
+                <Button StyleClasses="OpenRight" Name="FollowButton" HorizontalExpand="True" Access="Public" Text="{Loc 'admin-camera-window-follow'}" />
+                <Button StyleClasses="OpenLeft" Name="PopControl" HorizontalExpand="True" Access="Public" Text="{Loc 'admin-camera-window-pop-out'}" />
+            </BoxContainer>
+        </BoxContainer>
+    </PanelContainer>
+</Control>
diff --git a/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml.cs b/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml.cs
new file mode 100644
index 000000000000..beb8344ce352
--- /dev/null
+++ b/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml.cs
@@ -0,0 +1,101 @@
+using System.Numerics;
+using Content.Client.Eye;
+using Content.Shared.Administration;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.Timing;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Administration.UI.AdminCamera;
+
+[GenerateTypedNameReferences]
+public sealed partial class AdminCameraControl : Control
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly IClientGameTiming _timing = default!;
+
+    public event Action? OnFollow;
+    public event Action? OnPopoutControl;
+
+    private readonly EyeLerpingSystem _eyeLerpingSystem;
+    private readonly FixedEye _defaultEye = new();
+    private AdminCameraEuiState? _nextState;
+
+    private const float MinimumZoom = 0.1f;
+    private const float MaximumZoom = 2.0f;
+
+    public EntityUid? CurrentCamera;
+    public float Zoom = 1.0f;
+
+    public bool IsPoppedOut;
+
+    public AdminCameraControl()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        _eyeLerpingSystem = _entManager.System<EyeLerpingSystem>();
+
+        CameraView.Eye = _defaultEye;
+
+        FollowButton.OnPressed += _ => OnFollow?.Invoke();
+        PopControl.OnPressed += _ => OnPopoutControl?.Invoke();
+        CameraView.OnResized += OnResized;
+    }
+
+    private new void OnResized()
+    {
+        var width = Math.Max(CameraView.PixelWidth, (int)Math.Floor(CameraView.MinWidth));
+        var height = Math.Max(CameraView.PixelHeight, (int)Math.Floor(CameraView.MinHeight));
+
+        CameraView.ViewportSize = new Vector2i(width, height);
+    }
+
+    protected override void MouseWheel(GUIMouseWheelEventArgs args)
+    {
+        base.MouseWheel(args);
+
+        if (CameraView.Eye == null)
+            return;
+
+        Zoom = Math.Clamp(Zoom - args.Delta.Y * 0.15f * Zoom, MinimumZoom, MaximumZoom);
+        CameraView.Eye.Zoom = new Vector2(Zoom, Zoom);
+        args.Handle();
+    }
+
+    public void SetState(AdminCameraEuiState state)
+    {
+        _nextState = state;
+    }
+
+    // I know that this is awful, but I copied this from the solution editor anyways.
+    // This is needed because EUIs update before the gamestate is applied, which means it will fail to get the uid from the net entity.
+    // The suggestion from the comment in the solution editor saying to use a BUI is not ideal either:
+    // - We would need to bind the UI to an entity, but with how BUIs currently work we cannot open it in the same tick as we spawn that entity on the server.
+    // - We want the UI opened by the user session, not by their currently attached entity. Otherwise it would close in cases where admins move from one entity to another, for example when ghosting.
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        if (_nextState == null || _timing.LastRealTick < _nextState.Tick) // make sure the last gamestate has been applied
+            return;
+
+        if (!_entManager.TryGetEntity(_nextState.Camera, out var cameraUid))
+            return;
+
+        if (CurrentCamera == null)
+        {
+            _eyeLerpingSystem.AddEye(cameraUid.Value);
+            CurrentCamera = cameraUid;
+        }
+        else if (CurrentCamera != cameraUid)
+        {
+            _eyeLerpingSystem.RemoveEye(CurrentCamera.Value);
+            _eyeLerpingSystem.AddEye(cameraUid.Value);
+            CurrentCamera = cameraUid;
+        }
+
+        if (_entManager.TryGetComponent<EyeComponent>(CurrentCamera, out var eye))
+            CameraView.Eye = eye.Eye ?? _defaultEye;
+    }
+}
diff --git a/Content.Client/Administration/UI/AdminCamera/AdminCameraEui.cs b/Content.Client/Administration/UI/AdminCamera/AdminCameraEui.cs
new file mode 100644
index 000000000000..908fb2740ca0
--- /dev/null
+++ b/Content.Client/Administration/UI/AdminCamera/AdminCameraEui.cs
@@ -0,0 +1,117 @@
+using System.Numerics;
+using Content.Client.Eui;
+using Content.Shared.Administration;
+using Content.Shared.Eui;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.Administration.UI.AdminCamera;
+
+/// <summary>
+/// Admin Eui for opening a viewport window to observe entities.
+/// Use the "Open Camera" admin verb or the "camera" command to open.
+/// </summary>
+[UsedImplicitly]
+public sealed partial class AdminCameraEui : BaseEui
+{
+    private readonly AdminCameraWindow _window;
+    private readonly AdminCameraControl _control;
+
+    // If not null the camera is in "popped out" mode and is in an external window.
+    private OSWindow? _OSWindow;
+
+    // The last location the window was located at in game.
+    // Is used for getting knowing where to "pop in" external windows.
+    private Vector2 _lastLocation;
+
+    public AdminCameraEui()
+    {
+        _window = new AdminCameraWindow();
+        _control = new AdminCameraControl();
+
+        _window.Contents.AddChild(_control);
+
+        _control.OnFollow += () => SendMessage(new AdminCameraFollowMessage());
+        _window.OnClose += () =>
+        {
+            if (!_control.IsPoppedOut)
+                SendMessage(new CloseEuiMessage());
+        };
+
+        _control.OnPopoutControl += () =>
+        {
+            if (_control.IsPoppedOut)
+                PopIn();
+            else
+                PopOut();
+        };
+    }
+
+    // Pop the window out into an external OS window
+    private void PopOut()
+    {
+        _lastLocation = _window.Position;
+
+        // TODO: When there is a way to have a minimum window size, enforce something!
+        _OSWindow = new OSWindow
+        {
+            SetSize = _window.Size,
+            Title = _window.Title ?? Loc.GetString("admin-camera-window-title-placeholder"),
+        };
+
+        _OSWindow.Show();
+
+        if (_OSWindow.Root == null)
+            return;
+
+        _control.Orphan();
+        _OSWindow.Root.AddChild(_control);
+
+        _OSWindow.Closed += () =>
+        {
+            if (_control.IsPoppedOut)
+                SendMessage(new CloseEuiMessage());
+        };
+
+        _control.IsPoppedOut = true;
+        _control.PopControl.Text = Loc.GetString("admin-camera-window-pop-in");
+
+        _window.Close();
+    }
+
+    // Pop the window back into the in game window.
+    private void PopIn()
+    {
+        _control.Orphan();
+        _window.Contents.AddChild(_control);
+
+        _window.Open(_lastLocation);
+
+        _control.IsPoppedOut = false;
+        _control.PopControl.Text = Loc.GetString("admin-camera-window-pop-out");
+
+        _OSWindow?.Close();
+        _OSWindow = null;
+    }
+
+    public override void Opened()
+    {
+        base.Opened();
+        _window.OpenCentered();
+    }
+
+    public override void Closed()
+    {
+        base.Closed();
+        _window.Close();
+    }
+
+    public override void HandleState(EuiStateBase baseState)
+    {
+        if (baseState is not AdminCameraEuiState state)
+            return;
+
+        _window.SetState(state);
+        _control.SetState(state);
+    }
+}
diff --git a/Content.Client/Administration/UI/AdminCamera/AdminCameraWindow.xaml b/Content.Client/Administration/UI/AdminCamera/AdminCameraWindow.xaml
new file mode 100644
index 000000000000..87583cef974d
--- /dev/null
+++ b/Content.Client/Administration/UI/AdminCamera/AdminCameraWindow.xaml
@@ -0,0 +1,6 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+    Title="{Loc admin-camera-window-title-placeholder}"
+    SetSize="425 550"
+    MinSize="200 225"
+    Name="Window">
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/AdminCamera/AdminCameraWindow.xaml.cs b/Content.Client/Administration/UI/AdminCamera/AdminCameraWindow.xaml.cs
new file mode 100644
index 000000000000..07a6e2156eba
--- /dev/null
+++ b/Content.Client/Administration/UI/AdminCamera/AdminCameraWindow.xaml.cs
@@ -0,0 +1,23 @@
+using Content.Shared.Administration;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Administration.UI.AdminCamera;
+
+[GenerateTypedNameReferences]
+public sealed partial class AdminCameraWindow : DefaultWindow
+{
+    public AdminCameraWindow()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        ContentsContainer.Margin = new Thickness(5, 0, 5, 0);
+    }
+
+    public void SetState(AdminCameraEuiState state)
+    {
+        Title = Loc.GetString("admin-camera-window-title", ("name", state.Name));
+    }
+}
diff --git a/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml
index d85ebf3e5c2b..386471147ab8 100644
--- a/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml
+++ b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml
@@ -39,6 +39,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
             <Button Name="FreezeAndMuteToggleButton" Text="{Loc player-panel-freeze-and-mute}" Disabled="True"/>
             <Button Name="BanButton" Text="{Loc player-panel-ban}" Disabled="True"/>
             <controls:ConfirmButton Name="RejuvenateButton" Text="{Loc player-panel-rejuvenate}" Disabled="True"/>
+            <Button Name="CameraButton" Text="{Loc player-panel-camera}" Disabled="True"/>
            </GridContainer>
        </BoxContainer>
     </BoxContainer>
diff --git a/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml.cs b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml.cs
index 11fec0e81a95..af06f8ba5216 100644
--- a/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml.cs
+++ b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml.cs
@@ -95,6 +95,7 @@ public sealed partial class PlayerPanel : FancyWindow
     public event Action<NetUserId?>? OnOpenBans;
     public event Action<NetUserId?>? OnAhelp;
     public event Action<string?>? OnKick;
+    public event Action<string?>? OnCamera;
     public event Action<NetUserId?>? OnOpenBanPanel;
     public event Action<NetUserId?, bool>? OnWhitelistToggle;
     public event Action? OnFollow;
@@ -110,26 +111,27 @@ public sealed partial class PlayerPanel : FancyWindow
 
     public PlayerPanel(IClientAdminManager adminManager)
     {
-            RobustXamlLoader.Load(this);
-            _adminManager = adminManager;
-
-            UsernameCopyButton.OnPressed += _ => OnUsernameCopy?.Invoke(TargetUsername ?? "");
-            BanButton.OnPressed += _ => OnOpenBanPanel?.Invoke(TargetPlayer);
-            KickButton.OnPressed += _ => OnKick?.Invoke(TargetUsername);
-            NotesButton.OnPressed += _ => OnOpenNotes?.Invoke(TargetPlayer);
-            ShowBansButton.OnPressed += _ => OnOpenBans?.Invoke(TargetPlayer);
-            AhelpButton.OnPressed += _ => OnAhelp?.Invoke(TargetPlayer);
-            WhitelistToggle.OnPressed += _ =>
-            {
-                OnWhitelistToggle?.Invoke(TargetPlayer, _isWhitelisted);
-                SetWhitelisted(!_isWhitelisted);
-            };
-            FollowButton.OnPressed += _ => OnFollow?.Invoke();
-            FreezeButton.OnPressed += _ => OnFreeze?.Invoke();
-            FreezeAndMuteToggleButton.OnPressed += _ => OnFreezeAndMuteToggle?.Invoke();
-            LogsButton.OnPressed += _ => OnLogs?.Invoke();
-            DeleteButton.OnPressed += _ => OnDelete?.Invoke();
-            RejuvenateButton.OnPressed += _ => OnRejuvenate?.Invoke();
+        RobustXamlLoader.Load(this);
+        _adminManager = adminManager;
+
+        UsernameCopyButton.OnPressed += _ => OnUsernameCopy?.Invoke(TargetUsername ?? "");
+        BanButton.OnPressed += _ => OnOpenBanPanel?.Invoke(TargetPlayer);
+        KickButton.OnPressed += _ => OnKick?.Invoke(TargetUsername);
+        CameraButton.OnPressed += _ => OnCamera?.Invoke(TargetUsername);
+        NotesButton.OnPressed += _ => OnOpenNotes?.Invoke(TargetPlayer);
+        ShowBansButton.OnPressed += _ => OnOpenBans?.Invoke(TargetPlayer);
+        AhelpButton.OnPressed += _ => OnAhelp?.Invoke(TargetPlayer);
+        WhitelistToggle.OnPressed += _ =>
+        {
+            OnWhitelistToggle?.Invoke(TargetPlayer, _isWhitelisted);
+            SetWhitelisted(!_isWhitelisted);
+        };
+        FollowButton.OnPressed += _ => OnFollow?.Invoke();
+        FreezeButton.OnPressed += _ => OnFreeze?.Invoke();
+        FreezeAndMuteToggleButton.OnPressed += _ => OnFreezeAndMuteToggle?.Invoke();
+        LogsButton.OnPressed += _ => OnLogs?.Invoke();
+        DeleteButton.OnPressed += _ => OnDelete?.Invoke();
+        RejuvenateButton.OnPressed += _ => OnRejuvenate?.Invoke();
     }
 
     public void SetUsername(string player)
@@ -199,6 +201,7 @@ public void SetButtons()
     {
         BanButton.Disabled = !_adminManager.CanCommand("banpanel");
         KickButton.Disabled = !_adminManager.CanCommand("kick");
+        CameraButton.Disabled = !_adminManager.CanCommand("camera");
         NotesButton.Disabled = !_adminManager.CanCommand("adminnotes");
         ShowBansButton.Disabled = !_adminManager.CanCommand("banlist");
         WhitelistToggle.Disabled =
diff --git a/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs b/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs
index 269d20211fc1..cc8f6769c423 100644
--- a/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs
+++ b/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs
@@ -90,7 +90,7 @@ public sealed class PlayerPanelEui : BaseEui
     [Dependency] private readonly IClientAdminManager _admin = default!;
     [Dependency] private readonly IClipboardManager _clipboard = default!;
 
-    private PlayerPanel PlayerPanel { get;  }
+    private PlayerPanel PlayerPanel { get; }
 
     public PlayerPanelEui()
     {
@@ -100,6 +100,7 @@ public PlayerPanelEui()
         PlayerPanel.OnOpenNotes += id => _console.ExecuteCommand($"adminnotes \"{id}\"");
         // Kick command does not support GUIDs
         PlayerPanel.OnKick += username => _console.ExecuteCommand($"kick \"{username}\"");
+        PlayerPanel.OnCamera += username => _console.ExecuteCommand($"camera \"{username}\"");
         PlayerPanel.OnOpenBanPanel += id => _console.ExecuteCommand($"banpanel \"{id}\"");
         PlayerPanel.OnOpenBans += id => _console.ExecuteCommand($"banlist \"{id}\"");
         PlayerPanel.OnAhelp += id => _console.ExecuteCommand($"openahelp \"{id}\"");
@@ -112,7 +113,7 @@ public PlayerPanelEui()
         PlayerPanel.OnFreeze += () => SendMessage(new PlayerPanelFreezeMessage());
         PlayerPanel.OnLogs += () => SendMessage(new PlayerPanelLogsMessage());
         PlayerPanel.OnRejuvenate += () => SendMessage(new PlayerPanelRejuvenationMessage());
-        PlayerPanel.OnDelete+= () => SendMessage(new PlayerPanelDeleteMessage());
+        PlayerPanel.OnDelete += () => SendMessage(new PlayerPanelDeleteMessage());
         PlayerPanel.OnFollow += () => SendMessage(new PlayerPanelFollowMessage());
 
         PlayerPanel.OnClose += () => SendMessage(new CloseEuiMessage());
diff --git a/Content.Client/Animals/Systems/ParrotMemorySystem.cs b/Content.Client/Animals/Systems/ParrotMemorySystem.cs
new file mode 100644
index 000000000000..cdf62a4eae56
--- /dev/null
+++ b/Content.Client/Animals/Systems/ParrotMemorySystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Animals.Systems;
+
+namespace Content.Client.Animals.Systems;
+
+public sealed class ParrotMemorySystem : SharedParrotMemorySystem;
diff --git a/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs
index 8a3d8a4326e9..c91a5eed921f 100644
--- a/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs
+++ b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs
@@ -170,10 +170,10 @@ private List<AtmosMonitoringConsoleLine> GetDecodedAtmosPipeChunks(Dictionary<Ve
         {
             var list = new List<AtmosMonitoringConsoleLine>();
 
-            foreach (var ((netId, layer, hexColor), atmosPipeData) in chunk.AtmosPipeData)
+            foreach (var ((netId, layer, pipeColor), atmosPipeData) in chunk.AtmosPipeData)
             {
                 // Determine the correct coloration for the pipe
-                var color = Color.FromHex(hexColor) * _basePipeNetColor;
+                var color = pipeColor * _basePipeNetColor;
 
                 if (FocusNetId != null && FocusNetId != netId)
                     color *= _unfocusedPipeNetColor;
diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs
index 502c250aae15..8421edbac34f 100644
--- a/Content.Client/Clothing/ClientClothingSystem.cs
+++ b/Content.Client/Clothing/ClientClothingSystem.cs
@@ -93,7 +93,7 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<ClothingComponent, GetEquipmentVisualsEvent>(OnGetVisuals);
-        SubscribeLocalEvent<ClothingComponent, InventoryTemplateUpdated>(OnInventoryTemplateUpdated);
+        SubscribeLocalEvent<InventoryComponent, InventoryTemplateUpdated>(OnInventoryTemplateUpdated);
 
         SubscribeLocalEvent<InventoryComponent, VisualsChangedEvent>(OnVisualsChanged);
         SubscribeLocalEvent<SpriteComponent, DidUnequipEvent>(OnDidUnequip);
@@ -116,20 +116,19 @@ private void OnAppearanceUpdate(EntityUid uid, InventoryComponent component, ref
         }
     }
 
-    private void OnInventoryTemplateUpdated(Entity<ClothingComponent> ent, ref InventoryTemplateUpdated args)
+    private void OnInventoryTemplateUpdated(Entity<InventoryComponent> ent, ref InventoryTemplateUpdated args)
     {
-        UpdateAllSlots(ent.Owner, clothing: ent.Comp);
+        UpdateAllSlots(ent.Owner, ent.Comp);
     }
 
     private void UpdateAllSlots(
         EntityUid uid,
-        InventoryComponent? inventoryComponent = null,
-        ClothingComponent? clothing = null)
+        InventoryComponent? inventoryComponent = null)
     {
         var enumerator = _inventorySystem.GetSlotEnumerator((uid, inventoryComponent));
         while (enumerator.NextItem(out var item, out var slot))
         {
-            RenderEquipment(uid, item, slot.Name, inventoryComponent, clothingComponent: clothing);
+            RenderEquipment(uid, item, slot.Name, inventoryComponent);
         }
     }
 
diff --git a/Content.Client/Commands/DebugCommands.cs.rej b/Content.Client/Commands/DebugCommands.cs.rej
new file mode 100644
index 000000000000..0dc99233eac0
--- /dev/null
+++ b/Content.Client/Commands/DebugCommands.cs.rej
@@ -0,0 +1,64 @@
+diff a/Content.Client/Commands/DebugCommands.cs b/Content.Client/Commands/DebugCommands.cs	(rejected hunks)
+@@ -1,53 +1,42 @@
+ using Content.Client.Markers;
+ using Content.Client.Popups;
+ using Content.Client.SubFloor;
+-using Content.Shared.SubFloor;
+-using Robust.Client.GameObjects;
+ using Robust.Shared.Console;
+-using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
+ 
+ namespace Content.Client.Commands;
+ 
+-internal sealed class ShowMarkersCommand : LocalizedCommands
++internal sealed class ShowMarkersCommand : LocalizedEntityCommands
+ {
+-    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
++    [Dependency] private readonly MarkerSystem _markerSystem = default!;
+ 
+     public override string Command => "showmarkers";
+ 
+-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
+-
+     public override void Execute(IConsoleShell shell, string argStr, string[] args)
+     {
+-        _entitySystemManager.GetEntitySystem<MarkerSystem>().MarkersVisible ^= true;
++        _markerSystem.MarkersVisible ^= true;
+     }
+ }
+ 
+-internal sealed class ShowSubFloor : LocalizedCommands
++internal sealed class ShowSubFloor : LocalizedEntityCommands
+ {
+-    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
++    [Dependency] private readonly SubFloorHideSystem _subfloorSystem = default!;
+ 
+     public override string Command => "showsubfloor";
+ 
+-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
+-
+     public override void Execute(IConsoleShell shell, string argStr, string[] args)
+     {
+-        _entitySystemManager.GetEntitySystem<SubFloorHideSystem>().ShowAll ^= true;
++        _subfloorSystem.ShowAll ^= true;
+     }
+ }
+ 
+-internal sealed class NotifyCommand : LocalizedCommands
++internal sealed class NotifyCommand : LocalizedEntityCommands
+ {
+-    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
++    [Dependency] private readonly PopupSystem _popupSystem = default!;
+ 
+     public override string Command => "notify";
+ 
+-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
+-
+     public override void Execute(IConsoleShell shell, string argStr, string[] args)
+     {
+-        var message = args[0];
+-
+-        _entitySystemManager.GetEntitySystem<PopupSystem>().PopupCursor(message);
++        _popupSystem.PopupCursor(args[0]);
+     }
+ }
diff --git a/Content.Client/Commands/MappingClientSideSetupCommand.cs.rej b/Content.Client/Commands/MappingClientSideSetupCommand.cs.rej
new file mode 100644
index 000000000000..efba4a0821a4
--- /dev/null
+++ b/Content.Client/Commands/MappingClientSideSetupCommand.cs.rej
@@ -0,0 +1,46 @@
+diff a/Content.Client/Commands/MappingClientSideSetupCommand.cs b/Content.Client/Commands/MappingClientSideSetupCommand.cs	(rejected hunks)
+@@ -1,32 +1,29 @@
+ using Content.Client.Actions;
+-using Content.Client.Mapping;
+ using Content.Client.Markers;
+-using JetBrains.Annotations;
++using Content.Client.SubFloor;
+ using Robust.Client.Graphics;
+-using Robust.Client.State;
+ using Robust.Shared.Console;
+ 
+ namespace Content.Client.Commands;
+ 
+-[UsedImplicitly]
+-internal sealed class MappingClientSideSetupCommand : LocalizedCommands
++internal sealed class MappingClientSideSetupCommand : LocalizedEntityCommands
+ {
+-    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
+     [Dependency] private readonly ILightManager _lightManager = default!;
++    [Dependency] private readonly ActionsSystem _actionSystem = default!;
++    [Dependency] private readonly MarkerSystem _markerSystem = default!;
++    [Dependency] private readonly SubFloorHideSystem _subfloorSystem = default!;
+ 
+     public override string Command => "mappingclientsidesetup";
+ 
+-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
+-
+     public override void Execute(IConsoleShell shell, string argStr, string[] args)
+     {
+-        if (!_lightManager.LockConsoleAccess)
+-        {
+-            _entitySystemManager.GetEntitySystem<MarkerSystem>().MarkersVisible = true;
+-            _lightManager.Enabled = false;
+-            shell.ExecuteCommand("showsubfloor");
+-            _entitySystemManager.GetEntitySystem<ActionsSystem>().LoadActionAssignments("/mapping_actions.yml", false);
+-        }
++        if (_lightManager.LockConsoleAccess)
++            return;
++
++        _markerSystem.MarkersVisible = true;
++        _lightManager.Enabled = false;
++        _subfloorSystem.ShowAll = true;
++        _actionSystem.LoadActionAssignments("/mapping_actions.yml", false);
+     }
+ }
+ 
diff --git a/Content.Client/Cooldown/CooldownGraphic.cs b/Content.Client/Cooldown/CooldownGraphic.cs
index c2cb75401ab0..32dc451096c1 100644
--- a/Content.Client/Cooldown/CooldownGraphic.cs
+++ b/Content.Client/Cooldown/CooldownGraphic.cs
@@ -56,7 +56,7 @@ protected override void Draw(DrawingHandleScreen handle)
             if (Progress >= 0f)
             {
                 var hue = (5f / 18f) * lerp;
-                color = Color.FromHsv((hue, 0.75f, 0.75f, 0.50f));
+                color = Color.FromHsv(new Vector4(hue, 0.75f, 0.75f, 0.50f));
             }
             else
             {
diff --git a/Content.Client/Cooldown/CooldownGraphic.cs.rej b/Content.Client/Cooldown/CooldownGraphic.cs.rej
new file mode 100644
index 000000000000..d2ce88f466a6
--- /dev/null
+++ b/Content.Client/Cooldown/CooldownGraphic.cs.rej
@@ -0,0 +1,8 @@
+diff a/Content.Client/Cooldown/CooldownGraphic.cs b/Content.Client/Cooldown/CooldownGraphic.cs	(rejected hunks)
+@@ -1,4 +1,5 @@
+-using Robust.Client.Graphics;
++using System.Numerics;
++using Robust.Client.Graphics;
+ using Robust.Client.UserInterface;
+ using Robust.Shared.Prototypes;
+ using Robust.Shared.Timing;
diff --git a/Content.Client/Damage/Systems/StaminaSystem.cs b/Content.Client/Damage/Systems/StaminaSystem.cs
index 95e0b5bc2054..c70da7c6bc18 100644
--- a/Content.Client/Damage/Systems/StaminaSystem.cs
+++ b/Content.Client/Damage/Systems/StaminaSystem.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Systems;
 using Robust.Client.GameObjects;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Damage.Systems;
 
@@ -109,6 +110,8 @@ private void OnAnimationCompleted(Entity<StaminaComponent> entity, ref Animation
 
     private void PlayAnimation(Entity<StaminaComponent, SpriteComponent> entity)
     {
+        DebugTools.Assert(entity.Comp1.CritThreshold > entity.Comp1.AnimationThreshold, $"Animation threshold on {ToPrettyString(entity)} was not less than the crit threshold. This will cause errors, animation has been cancelled.");
+
         var step = Math.Clamp((entity.Comp1.StaminaDamage - entity.Comp1.AnimationThreshold) /
                               (entity.Comp1.CritThreshold - entity.Comp1.AnimationThreshold),
             0f,
diff --git a/Content.Client/Disposal/PressureBar.cs.rej b/Content.Client/Disposal/PressureBar.cs.rej
new file mode 100644
index 000000000000..e45740951aff
--- /dev/null
+++ b/Content.Client/Disposal/PressureBar.cs.rej
@@ -0,0 +1,8 @@
+diff a/Content.Client/Disposal/PressureBar.cs b/Content.Client/Disposal/PressureBar.cs	(rejected hunks)
+@@ -1,4 +1,5 @@
+-using Content.Shared.Disposal;
++using System.Numerics;
++using Content.Shared.Disposal;
+ using Content.Shared.Disposal.Unit;
+ using Robust.Client.Graphics;
+ using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/Holopad/HolopadSystem.cs b/Content.Client/Holopad/HolopadSystem.cs
index a7069c8a256a..e24b55bfbed2 100644
--- a/Content.Client/Holopad/HolopadSystem.cs
+++ b/Content.Client/Holopad/HolopadSystem.cs
@@ -12,6 +12,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using System.Linq;
+using System.Numerics;
 using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 
 namespace Content.Client.Holopad;
diff --git a/Content.Client/HotPotato/HotPotatoSystem.cs b/Content.Client/HotPotato/HotPotatoSystem.cs
index ecb98f49c6b1..8e3f71bc5e58 100644
--- a/Content.Client/HotPotato/HotPotatoSystem.cs
+++ b/Content.Client/HotPotato/HotPotatoSystem.cs
@@ -20,6 +20,9 @@ public sealed class HotPotatoSystem : SharedHotPotatoSystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
+    private readonly EntProtoId _hotPotatoEffectId = "HotPotatoEffect";
+
+    // TODO: particle system
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
diff --git a/Content.Client/HotPotato/HotPotatoSystem.cs.rej b/Content.Client/HotPotato/HotPotatoSystem.cs.rej
new file mode 100644
index 000000000000..3c6b8822c739
--- /dev/null
+++ b/Content.Client/HotPotato/HotPotatoSystem.cs.rej
@@ -0,0 +1,17 @@
+diff a/Content.Client/HotPotato/HotPotatoSystem.cs b/Content.Client/HotPotato/HotPotatoSystem.cs	(rejected hunks)
+@@ -1,5 +1,6 @@
+ using Content.Shared.HotPotato;
+ using Robust.Shared.Random;
++using Robust.Shared.Prototypes;
+ using Robust.Shared.Timing;
+ 
+ namespace Content.Client.HotPotato;
+@@ -23,7 +27,7 @@ public override void Update(float frameTime)
+             if (_timing.CurTime < comp.TargetTime)
+                 continue;
+             comp.TargetTime = _timing.CurTime + TimeSpan.FromSeconds(comp.EffectCooldown);
+-            Spawn("HotPotatoEffect", _transform.GetMapCoordinates(uid).Offset(_random.NextVector2(0.25f)));
++            Spawn(_hotPotatoEffectId, _transform.GetMapCoordinates(uid).Offset(_random.NextVector2(0.25f)));
+         }
+     }
+ }
diff --git a/Content.Client/Instruments/InstrumentSystem.cs.rej b/Content.Client/Instruments/InstrumentSystem.cs.rej
new file mode 100644
index 000000000000..58e03c7013cb
--- /dev/null
+++ b/Content.Client/Instruments/InstrumentSystem.cs.rej
@@ -0,0 +1,9 @@
+diff a/Content.Client/Instruments/InstrumentSystem.cs b/Content.Client/Instruments/InstrumentSystem.cs	(rejected hunks)
+@@ -294,7 +294,6 @@ public bool OpenMidi(EntityUid uid, byte[] data, InstrumentComponent? instrument
+         SetMaster(uid, null);
+         TrySetChannels(uid, data);
+ 
+-        instrument.MidiEventBuffer.Clear();
+         instrument.Renderer.OnMidiEvent += instrument.MidiEventBuffer.Add;
+         return true;
+     }
diff --git a/Content.Client/Inventory/ClientInventorySystem.cs b/Content.Client/Inventory/ClientInventorySystem.cs
index ff7095a97817..c228b5e668a3 100644
--- a/Content.Client/Inventory/ClientInventorySystem.cs
+++ b/Content.Client/Inventory/ClientInventorySystem.cs
@@ -42,6 +42,7 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Player;
+using Robust.Shared.Timing;
 
 namespace Content.Client.Inventory
 {
@@ -50,7 +51,7 @@ public sealed class ClientInventorySystem : InventorySystem
     {
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IUserInterfaceManager _ui = default!;
-
+        [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly ClientClothingSystem _clothingVisualsSystem = default!;
         [Dependency] private readonly ExamineSystem _examine = default!;
 
@@ -122,6 +123,14 @@ private void OnDidEquip(InventorySlotsComponent component, DidEquipEvent args)
 
         private void OnShutdown(EntityUid uid, InventoryComponent component, ComponentShutdown args)
         {
+            if (TryComp(uid, out InventorySlotsComponent? inventorySlots))
+            {
+                foreach (var slot in component.Slots)
+                {
+                    TryRemoveSlotData((uid, inventorySlots), (SlotData)slot);
+                }
+            }
+
             if (uid == _playerManager.LocalEntity)
                 OnUnlinkInventory?.Invoke();
         }
@@ -133,23 +142,6 @@ private void OnPlayerDetached(EntityUid uid, InventorySlotsComponent component,
 
         private void OnPlayerAttached(EntityUid uid, InventorySlotsComponent component, LocalPlayerAttachedEvent args)
         {
-            if (TryGetSlots(uid, out var definitions))
-            {
-                foreach (var definition in definitions)
-                {
-                    if (!TryGetSlotContainer(uid, definition.Name, out var container, out _))
-                        continue;
-
-                    if (!component.SlotData.TryGetValue(definition.Name, out var data))
-                    {
-                        data = new SlotData(definition);
-                        component.SlotData[definition.Name] = data;
-                    }
-
-                    data.Container = container;
-                }
-            }
-
             OnLinkInventorySlots?.Invoke(uid, component);
         }
 
@@ -159,20 +151,6 @@ public override void Shutdown()
             base.Shutdown();
         }
 
-        protected override void OnInit(EntityUid uid, InventoryComponent component, ComponentInit args)
-        {
-            base.OnInit(uid, component, args);
-            _clothingVisualsSystem.InitClothing(uid, component);
-
-            if (!TryComp(uid, out InventorySlotsComponent? inventorySlots))
-                return;
-
-            foreach (var slot in component.Slots)
-            {
-                TryAddSlotDef(uid, inventorySlots, slot);
-            }
-        }
-
         public void ReloadInventory(InventorySlotsComponent? component = null)
         {
             var player = _playerManager.LocalEntity;
@@ -196,7 +174,10 @@ public void SetSlotHighlight(EntityUid owner, InventorySlotsComponent component,
         public void UpdateSlot(EntityUid owner, InventorySlotsComponent component, string slotName,
             bool? blocked = null, bool? highlight = null)
         {
-            var oldData = component.SlotData[slotName];
+            // The slot might have been removed when changing templates, which can cause items to be dropped.
+            if (!component.SlotData.TryGetValue(slotName, out var oldData))
+                return;
+
             var newHighlight = oldData.Highlighted;
             var newBlocked = oldData.Blocked;
 
@@ -212,14 +193,28 @@ public void UpdateSlot(EntityUid owner, InventorySlotsComponent component, strin
                 EntitySlotUpdate?.Invoke(newData);
         }
 
-        public bool TryAddSlotDef(EntityUid owner, InventorySlotsComponent component, SlotDefinition newSlotDef)
+        public bool TryAddSlotData(Entity<InventorySlotsComponent> ent, SlotData newSlotData)
         {
-            SlotData newSlotData = newSlotDef; //convert to slotData
-            if (!component.SlotData.TryAdd(newSlotDef.Name, newSlotData))
+            if (!ent.Comp.SlotData.TryAdd(newSlotData.SlotName, newSlotData))
                 return false;
 
-            if (owner == _playerManager.LocalEntity)
+            if (TryGetSlotContainer(ent.Owner, newSlotData.SlotName, out var newContainer, out _))
+                ent.Comp.SlotData[newSlotData.SlotName].Container = newContainer;
+
+            if (ent.Owner == _playerManager.LocalEntity)
                 OnSlotAdded?.Invoke(newSlotData);
+
+            return true;
+        }
+
+        public bool TryRemoveSlotData(Entity<InventorySlotsComponent> ent, SlotData removedSlotData)
+        {
+            if (!ent.Comp.SlotData.Remove(removedSlotData.SlotName))
+                return false;
+
+            if (ent.Owner == _playerManager.LocalEntity)
+                OnSlotRemoved?.Invoke(removedSlotData);
+
             return true;
         }
 
diff --git a/Content.Client/Inventory/ClientInventorySystem.cs.rej b/Content.Client/Inventory/ClientInventorySystem.cs.rej
new file mode 100644
index 000000000000..edfadeed1ed0
--- /dev/null
+++ b/Content.Client/Inventory/ClientInventorySystem.cs.rej
@@ -0,0 +1,80 @@
+diff a/Content.Client/Inventory/ClientInventorySystem.cs b/Content.Client/Inventory/ClientInventorySystem.cs	(rejected hunks)
+@@ -1,3 +1,4 @@
++using System.Linq;
+ using Content.Client.Clothing;
+ using Content.Client.Examine;
+ using Content.Client.Verbs.UI;
+@@ -239,33 +235,52 @@ protected override void UpdateInventoryTemplate(Entity<InventoryComponent> ent)
+         {
+             base.UpdateInventoryTemplate(ent);
+ 
+-            if (TryComp(ent, out InventorySlotsComponent? inventorySlots))
++            if (!TryComp<InventorySlotsComponent>(ent, out var inventorySlots))
++                return;
++
++            List<SlotData> slotDataToRemove = new(); // don't modify dict while iterating
++
++            foreach (var slotData in inventorySlots.SlotData.Values)
+             {
+-                foreach (var slot in ent.Comp.Slots)
+-                {
+-                    if (inventorySlots.SlotData.TryGetValue(slot.Name, out var slotData))
+-                        slotData.SlotDef = slot;
+-                }
++                if (!ent.Comp.Slots.Any(s => s.Name == slotData.SlotName))
++                    slotDataToRemove.Add(slotData);
+             }
++
++            // remove slots that are no longer in the new template
++            foreach (var slotData in slotDataToRemove)
++            {
++                TryRemoveSlotData((ent.Owner, inventorySlots), slotData);
++            }
++
++            // update existing slots or add them if they don't exist yet
++            foreach (var slot in ent.Comp.Slots)
++            {
++                if (inventorySlots.SlotData.TryGetValue(slot.Name, out var slotData))
++                    slotData.SlotDef = slot;
++                else
++                    TryAddSlotData((ent.Owner, inventorySlots), (SlotData)slot);
++            }
++
++            _clothingVisualsSystem.InitClothing(ent, ent.Comp);
++            if (ent.Owner == _playerManager.LocalEntity)
++                ReloadInventory(inventorySlots);
+         }
+ 
+         public sealed class SlotData
+         {
+-            public SlotDefinition SlotDef;
+-            public EntityUid? HeldEntity => Container?.ContainedEntity;
+-            public bool Blocked;
+-            public bool Highlighted;
+-
+-            [ViewVariables]
+-            public ContainerSlot? Container;
+-            public bool HasSlotGroup => SlotDef.SlotGroup != "Default";
+-            public Vector2i ButtonOffset => SlotDef.UIWindowPosition;
+-            public string SlotName => SlotDef.Name;
+-            public bool ShowInWindow => SlotDef.ShowInWindow;
+-            public string SlotGroup => SlotDef.SlotGroup;
+-            public string SlotDisplayName => SlotDef.DisplayName;
+-            public string TextureName => "Slots/" + SlotDef.TextureName;
+-            public string FullTextureName => SlotDef.FullTextureName;
++            [ViewVariables] public SlotDefinition SlotDef;
++            [ViewVariables] public EntityUid? HeldEntity => Container?.ContainedEntity;
++            [ViewVariables] public bool Blocked;
++            [ViewVariables] public bool Highlighted;
++            [ViewVariables] public ContainerSlot? Container;
++            [ViewVariables] public bool HasSlotGroup => SlotDef.SlotGroup != "Default";
++            [ViewVariables] public Vector2i ButtonOffset => SlotDef.UIWindowPosition;
++            [ViewVariables] public string SlotName => SlotDef.Name;
++            [ViewVariables] public bool ShowInWindow => SlotDef.ShowInWindow;
++            [ViewVariables] public string SlotGroup => SlotDef.SlotGroup;
++            [ViewVariables] public string SlotDisplayName => SlotDef.DisplayName;
++            [ViewVariables] public string TextureName => "Slots/" + SlotDef.TextureName;
++            [ViewVariables] public string FullTextureName => SlotDef.FullTextureName;
+ 
+             public SlotData(SlotDefinition slotDef, ContainerSlot? container = null, bool highlighted = false,
+                 bool blocked = false)
diff --git a/Content.Client/Light/RgbLightControllerSystem.cs.rej b/Content.Client/Light/RgbLightControllerSystem.cs.rej
new file mode 100644
index 000000000000..394e479f0f9d
--- /dev/null
+++ b/Content.Client/Light/RgbLightControllerSystem.cs.rej
@@ -0,0 +1,7 @@
+diff a/Content.Client/Light/RgbLightControllerSystem.cs b/Content.Client/Light/RgbLightControllerSystem.cs	(rejected hunks)
+@@ -1,4 +1,5 @@
+ using System.Linq;
++using System.Numerics;
+ using Content.Client.Items.Systems;
+ using Content.Shared.Clothing;
+ using Content.Shared.Hands;
diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
index cdd6ead84691..08168db0b32b 100644
--- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
@@ -43,6 +43,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
                 <CheckBox Name="IntegerScalingCheckBox"
                           Text="{Loc 'ui-options-vp-integer-scaling'}"
                           ToolTip="{Loc 'ui-options-vp-integer-scaling-tooltip'}" />
+                <ui:OptionDropDown Name="DropDownFilterMode" Title="{Loc 'ui-options-filter-label'}" />
                 <CheckBox Name="ViewportVerticalFitCheckBox"
                           Text="{Loc 'ui-options-vp-vertical-fit'}"
                           ToolTip="{Loc 'ui-options-vp-vertical-fit-tooltip'}" />
diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
index 5385bc9ec8f0..694ae6be41e0 100644
--- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
@@ -98,6 +98,14 @@ public GraphicsTab()
                 new OptionDropDownCVar<float>.ValueOption(2.00f, Loc.GetString("ui-options-scale-200")),
             ]);
 
+        Control.AddOptionDropDown(
+            CCVars.ViewportScalingFilterMode,
+            DropDownFilterMode,
+            [
+                new OptionDropDownCVar<string>.ValueOption("nearest", Loc.GetString("ui-options-filter-nearest")),
+                new OptionDropDownCVar<string>.ValueOption("bilinear", Loc.GetString("ui-options-filter-bilinear")),
+            ]);
+
         var vpStretch = Control.AddOptionCheckBox(CCVars.ViewportStretch, ViewportStretchCheckBox);
         var vpVertFit = Control.AddOptionCheckBox(CCVars.ViewportVerticalFit, ViewportVerticalFitCheckBox);
         Control.AddOptionSlider(
@@ -109,6 +117,7 @@ public GraphicsTab()
 
         vpStretch.ImmediateValueChanged += _ => UpdateViewportSettingsVisibility();
         vpVertFit.ImmediateValueChanged += _ => UpdateViewportSettingsVisibility();
+        IntegerScalingCheckBox.OnToggled += _ => UpdateViewportSettingsVisibility();
 
         Control.AddOptionSlider(
             CCVars.ViewportWidth,
@@ -136,6 +145,7 @@ private void UpdateViewportSettingsVisibility()
         IntegerScalingCheckBox.Visible = ViewportStretchCheckBox.Pressed;
         ViewportVerticalFitCheckBox.Visible = ViewportStretchCheckBox.Pressed;
         ViewportWidthSlider.Visible = !ViewportStretchCheckBox.Pressed || !ViewportVerticalFitCheckBox.Pressed;
+        DropDownFilterMode.Visible = !IntegerScalingCheckBox.Pressed && ViewportStretchCheckBox.Pressed;
     }
 
     private void UpdateViewportWidthRange()
diff --git a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs.rej b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs.rej
new file mode 100644
index 000000000000..40bbea5c01b7
--- /dev/null
+++ b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs.rej
@@ -0,0 +1,9 @@
+diff a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs	(rejected hunks)
+@@ -3,6 +3,7 @@
+ using Robust.Client.GameObjects;
+ using Robust.Shared.IoC;
+ using System;
++using System.Numerics;
+ using Content.Client.Stylesheets;
+ using Content.Shared.APC;
+ using Robust.Client.Graphics;
diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
index e948d2d93891..0b3ba1567d74 100644
--- a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
+++ b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
@@ -19,7 +19,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
-using Vector4 = Robust.Shared.Maths.Vector4;
 
 namespace Content.Client.Power;
 
diff --git a/Content.Client/Rotation/RotationVisualizerSystem.cs b/Content.Client/Rotation/RotationVisualizerSystem.cs
index 5fac410670ac..f99afe4a4efc 100644
--- a/Content.Client/Rotation/RotationVisualizerSystem.cs
+++ b/Content.Client/Rotation/RotationVisualizerSystem.cs
@@ -33,7 +33,7 @@ private void OnAppearanceChange(EntityUid uid, RotationVisualsComponent componen
             return;
 
         if (!_appearance.TryGetData<RotationState>(uid, RotationVisuals.RotationState, out var state, args.Component))
-            return;
+            state = RotationState.Vertical;
 
         switch (state)
         {
diff --git a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
index e33668748abb..9d71d1e0d9a1 100644
--- a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
@@ -21,7 +21,6 @@
 using Robust.Shared.Threading;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Vector2 = System.Numerics.Vector2;
 
 namespace Content.Client.Shuttles.UI;
 
diff --git a/Content.Client/Singularity/Systems/EmitterSystem.cs b/Content.Client/Singularity/Systems/EmitterSystem.cs
index 77f21473bb07..aa76f7f39199 100644
--- a/Content.Client/Singularity/Systems/EmitterSystem.cs
+++ b/Content.Client/Singularity/Systems/EmitterSystem.cs
@@ -19,6 +19,8 @@ public sealed class EmitterSystem : SharedEmitterSystem
     /// <inheritdoc/>
     public override void Initialize()
     {
+        base.Initialize();
+
         SubscribeLocalEvent<EmitterComponent, AppearanceChangeEvent>(OnAppearanceChange);
     }
 
diff --git a/Content.Client/SmartFridge/SmartFridgeBoundUserInterface.cs b/Content.Client/SmartFridge/SmartFridgeBoundUserInterface.cs
new file mode 100644
index 000000000000..60d8ea413a55
--- /dev/null
+++ b/Content.Client/SmartFridge/SmartFridgeBoundUserInterface.cs
@@ -0,0 +1,43 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.SmartFridge;
+using Robust.Client.UserInterface;
+using Robust.Shared.Input;
+
+namespace Content.Client.SmartFridge;
+
+public sealed class SmartFridgeBoundUserInterface : BoundUserInterface
+{
+    private SmartFridgeMenu? _menu;
+
+    public SmartFridgeBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _menu = this.CreateWindow<SmartFridgeMenu>();
+        _menu.OnItemSelected += OnItemSelected;
+        Refresh();
+    }
+
+    public void Refresh()
+    {
+        if (_menu is not {} menu || !EntMan.TryGetComponent(Owner, out SmartFridgeComponent? fridge))
+            return;
+
+        menu.SetFlavorText(Loc.GetString(fridge.FlavorText));
+        menu.Populate((Owner, fridge));
+    }
+
+    private void OnItemSelected(GUIBoundKeyEventArgs args, ListData data)
+    {
+        if (args.Function != EngineKeyFunctions.UIClick)
+            return;
+
+        if (data is not SmartFridgeListData entry)
+            return;
+        SendPredictedMessage(new SmartFridgeDispenseItemMessage(entry.Entry));
+    }
+}
diff --git a/Content.Client/SmartFridge/SmartFridgeItem.xaml b/Content.Client/SmartFridge/SmartFridgeItem.xaml
new file mode 100644
index 000000000000..3960d7ce4200
--- /dev/null
+++ b/Content.Client/SmartFridge/SmartFridgeItem.xaml
@@ -0,0 +1,16 @@
+<BoxContainer xmlns="https://spacestation14.io"
+            Orientation="Horizontal"
+            HorizontalExpand="True"
+            SeparationOverride="4">
+    <SpriteView
+            Name="EntityView"
+            Margin="4 0 0 0"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            MinSize="32 32"
+            />
+    <Label Name="NameLabel"
+            SizeFlagsStretchRatio="3"
+            HorizontalExpand="True"
+            ClipText="True"/>
+</BoxContainer>
diff --git a/Content.Client/SmartFridge/SmartFridgeItem.xaml.cs b/Content.Client/SmartFridge/SmartFridgeItem.xaml.cs
new file mode 100644
index 000000000000..c69d2e7de237
--- /dev/null
+++ b/Content.Client/SmartFridge/SmartFridgeItem.xaml.cs
@@ -0,0 +1,18 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.SmartFridge;
+
+[GenerateTypedNameReferences]
+public sealed partial class SmartFridgeItem : BoxContainer
+{
+    public SmartFridgeItem(EntityUid uid, string text)
+    {
+        RobustXamlLoader.Load(this);
+
+        EntityView.SetEntity(uid);
+        NameLabel.Text = text;
+    }
+}
diff --git a/Content.Client/SmartFridge/SmartFridgeMenu.xaml b/Content.Client/SmartFridge/SmartFridgeMenu.xaml
new file mode 100644
index 000000000000..73cb0f3925bb
--- /dev/null
+++ b/Content.Client/SmartFridge/SmartFridgeMenu.xaml
@@ -0,0 +1,24 @@
+<controls:FancyWindow
+    xmlns="https://spacestation14.io"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    xmlns:co="clr-namespace:Content.Client.UserInterface.Controls"
+    MinHeight="450"
+    MinWidth="350"
+    Title="{Loc 'smart-fridge-component-title'}">
+    <BoxContainer Name="MainContainer" Orientation="Vertical">
+        <LineEdit Name="SearchBar" PlaceHolder="{Loc 'smart-fridge-component-search-filter'}" HorizontalExpand="True"  Margin ="4 4"/>
+        <co:SearchListContainer Name="VendingContents" VerticalExpand="True" Margin="4 4"/>
+         <!-- Footer -->
+        <BoxContainer Orientation="Vertical">
+            <PanelContainer StyleClasses="LowDivider" />
+            <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
+                <Label Name="LeftFlavorLabel" StyleClasses="WindowFooterText" />
+                <Label Text="{Loc 'vending-machine-flavor-right'}" StyleClasses="WindowFooterText"
+                        HorizontalAlignment="Right" HorizontalExpand="True"  Margin="0 0 5 0" />
+                <TextureRect StyleClasses="NTLogoDark" Stretch="KeepAspectCentered"
+                        VerticalAlignment="Center" HorizontalAlignment="Right" SetSize="19 19"/>
+            </BoxContainer>
+        </BoxContainer>
+    </BoxContainer>
+</controls:FancyWindow>
diff --git a/Content.Client/SmartFridge/SmartFridgeMenu.xaml.cs b/Content.Client/SmartFridge/SmartFridgeMenu.xaml.cs
new file mode 100644
index 000000000000..c896e7fada11
--- /dev/null
+++ b/Content.Client/SmartFridge/SmartFridgeMenu.xaml.cs
@@ -0,0 +1,81 @@
+using System.Linq;
+using System.Numerics;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.SmartFridge;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface.XAML;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.SmartFridge;
+
+public record SmartFridgeListData(EntityUid Representative, SmartFridgeEntry Entry, int Amount) : ListData;
+
+[GenerateTypedNameReferences]
+public sealed partial class SmartFridgeMenu : FancyWindow
+{
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+
+    public event Action<GUIBoundKeyEventArgs, ListData>? OnItemSelected;
+
+    private readonly StyleBoxFlat _styleBox = new() { BackgroundColor = new Color(70, 73, 102) };
+
+    public SmartFridgeMenu()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        VendingContents.SearchBar = SearchBar;
+        VendingContents.DataFilterCondition += DataFilterCondition;
+        VendingContents.GenerateItem += GenerateButton;
+        VendingContents.ItemKeyBindDown += (args, data) => OnItemSelected?.Invoke(args, data);
+    }
+
+    private bool DataFilterCondition(string filter, ListData data)
+    {
+        if (data is not SmartFridgeListData entry)
+            return false;
+
+        if (string.IsNullOrEmpty(filter))
+            return true;
+
+        return entry.Entry.Name.Contains(filter, StringComparison.CurrentCultureIgnoreCase);
+    }
+
+    private void GenerateButton(ListData data, ListContainerButton button)
+    {
+        if (data is not SmartFridgeListData entry)
+            return;
+
+        var label = Loc.GetString("smart-fridge-list-item", ("item", entry.Entry.Name), ("amount", entry.Amount));
+        button.AddChild(new SmartFridgeItem(entry.Representative, label));
+
+        button.ToolTip = label;
+        button.StyleBoxOverride = _styleBox;
+    }
+
+    public void Populate(Entity<SmartFridgeComponent> ent)
+    {
+        var listData = new List<ListData>();
+
+        foreach (var item in ent.Comp.Entries)
+        {
+            if (!ent.Comp.ContainedEntries.TryGetValue(item, out var items) || items.Count == 0)
+            {
+                listData.Add(new SmartFridgeListData(EntityUid.Invalid, item, 0));
+            }
+            else
+            {
+                var representative = _entityManager.GetEntity(items.First());
+                listData.Add(new SmartFridgeListData(representative, item, items.Count));
+            }
+        }
+
+        VendingContents.PopulateList(listData);
+    }
+
+    public void SetFlavorText(string flavor)
+    {
+        LeftFlavorLabel.Text = flavor;
+    }
+}
diff --git a/Content.Client/SmartFridge/SmartFridgeUISystem.cs b/Content.Client/SmartFridge/SmartFridgeUISystem.cs
new file mode 100644
index 000000000000..4068c27e057c
--- /dev/null
+++ b/Content.Client/SmartFridge/SmartFridgeUISystem.cs
@@ -0,0 +1,24 @@
+using Content.Shared.SmartFridge;
+using Robust.Shared.Analyzers;
+
+namespace Content.Client.SmartFridge;
+
+public sealed class SmartFridgeUISystem : EntitySystem
+{
+    [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SmartFridgeComponent, AfterAutoHandleStateEvent>(OnSmartFridgeAfterState);
+    }
+
+    private void OnSmartFridgeAfterState(Entity<SmartFridgeComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        if (!_uiSystem.TryGetOpenUi<SmartFridgeBoundUserInterface>(ent.Owner, SmartFridgeUiKey.Key, out var bui))
+            return;
+
+        bui.Refresh();
+    }
+}
diff --git a/Content.Client/Store/Ui/StoreMenu.xaml b/Content.Client/Store/Ui/StoreMenu.xaml
index 76b0cfb735f2..c1c9a28ca140 100644
--- a/Content.Client/Store/Ui/StoreMenu.xaml
+++ b/Content.Client/Store/Ui/StoreMenu.xaml
@@ -33,7 +33,7 @@ SPDX-License-Identifier: MIT
                     Name="RefundButton"
                     MinWidth="64"
                     HorizontalAlignment="Right"
-                    Text="Refund" />
+                    Text="{Loc 'store-ui-refund-text'}" />
             </BoxContainer>
             <LineEdit Name="SearchBar" Margin="4" PlaceHolder="Search" HorizontalExpand="True"/>
                 <PanelContainer VerticalExpand="True">
diff --git a/Content.Client/Trigger/TimerTriggerVisualizerComponent.cs b/Content.Client/Trigger/Components/TimerTriggerVisualizerComponent.cs
similarity index 100%
rename from Content.Client/Trigger/TimerTriggerVisualizerComponent.cs
rename to Content.Client/Trigger/Components/TimerTriggerVisualizerComponent.cs
diff --git a/Content.Client/Trigger/Components/TimerTriggerVisualizerComponent.cs.rej b/Content.Client/Trigger/Components/TimerTriggerVisualizerComponent.cs.rej
new file mode 100644
index 000000000000..d6c37e9b5880
--- /dev/null
+++ b/Content.Client/Trigger/Components/TimerTriggerVisualizerComponent.cs.rej
@@ -0,0 +1,44 @@
+diff a/Content.Client/Trigger/Components/TimerTriggerVisualizerComponent.cs b/Content.Client/Trigger/Components/TimerTriggerVisualizerComponent.cs	(rejected hunks)
+@@ -1,7 +1,8 @@
++using Content.Client.Trigger.Systems;
+ using Robust.Client.Animations;
+ using Robust.Shared.Audio;
+ 
+-namespace Content.Client.Trigger;
++namespace Content.Client.Trigger.Components;
+ 
+ [RegisterComponent]
+ [Access(typeof(TimerTriggerVisualizerSystem))]
+@@ -16,28 +17,27 @@ public sealed partial class TimerTriggerVisualsComponent : Component
+     /// <summary>
+     /// The RSI state used while the device has not been primed.
+     /// </summary>
+-    [DataField("unprimedSprite")]
+-    [ViewVariables(VVAccess.ReadWrite)]
++    [DataField]
+     public string UnprimedSprite = "icon";
+ 
+     /// <summary>
+     /// The RSI state used when the device is primed.
+     /// Not VVWrite-able because it's only used at component init to construct the priming animation.
+     /// </summary>
+-    [DataField("primingSprite")]
++    [DataField]
+     public string PrimingSprite = "primed";
+ 
+     /// <summary>
+     /// The sound played when the device is primed.
+     /// Not VVWrite-able because it's only used at component init to construct the priming animation.
+     /// </summary>
+-    [DataField("primingSound")]
++    [DataField, ViewVariables]
+     public SoundSpecifier? PrimingSound;
+ 
+     /// <summary>
+     /// The actual priming animation.
+     /// Constructed at component init from the sprite and sound.
+     /// </summary>
+-    [ViewVariables(VVAccess.ReadWrite)]
++    [ViewVariables]
+     public Animation PrimingAnimation = default!;
+ }
diff --git a/Content.Client/Explosion/TriggerSystem.Proximity.cs b/Content.Client/Trigger/Systems/ProximityTriggerAnimationSystem.cs
similarity index 95%
rename from Content.Client/Explosion/TriggerSystem.Proximity.cs
rename to Content.Client/Trigger/Systems/ProximityTriggerAnimationSystem.cs
index 7c70d51bd619..4ab5edfbd6e9 100644
--- a/Content.Client/Explosion/TriggerSystem.Proximity.cs
+++ b/Content.Client/Trigger/Systems/ProximityTriggerAnimationSystem.cs
@@ -29,7 +29,7 @@ public sealed partial class TriggerSystem
 
     private const string AnimKey = "proximity";
 
-    private static readonly Animation _flasherAnimation = new Animation
+    private static readonly Animation FlasherAnimation = new Animation
     {
         Length = TimeSpan.FromSeconds(0.6f),
         AnimationTracks = {
@@ -53,8 +53,10 @@ public sealed partial class TriggerSystem
         }
     };
 
-    private void InitializeProximity()
+    public override void Initialize()
     {
+        base.Initialize();
+
         SubscribeLocalEvent<TriggerOnProximityComponent, ComponentInit>(OnProximityInit);
         SubscribeLocalEvent<TriggerOnProximityComponent, AppearanceChangeEvent>(OnProxAppChange);
         SubscribeLocalEvent<TriggerOnProximityComponent, AnimationCompletedEvent>(OnProxAnimation);
@@ -105,7 +107,7 @@ private void OnChangeData(EntityUid uid, TriggerOnProximityComponent component,
                 break;
             case ProximityTriggerVisuals.Active:
                 if (_player.HasRunningAnimation(uid, player, AnimKey)) return;
-                _player.Play((uid, player), _flasherAnimation, AnimKey);
+                _player.Play((uid, player), FlasherAnimation, AnimKey);
                 break;
             case ProximityTriggerVisuals.Off:
             default:
diff --git a/Content.Client/Trigger/Systems/ProximityTriggerAnimationSystem.cs.rej b/Content.Client/Trigger/Systems/ProximityTriggerAnimationSystem.cs.rej
new file mode 100644
index 000000000000..12c4302854fc
--- /dev/null
+++ b/Content.Client/Trigger/Systems/ProximityTriggerAnimationSystem.cs.rej
@@ -0,0 +1,16 @@
+diff a/Content.Client/Trigger/Systems/ProximityTriggerAnimationSystem.cs b/Content.Client/Trigger/Systems/ProximityTriggerAnimationSystem.cs	(rejected hunks)
+@@ -1,11 +1,12 @@
+ using Content.Shared.Trigger;
++using Content.Shared.Trigger.Components.Triggers;
+ using Robust.Client.Animations;
+ using Robust.Client.GameObjects;
+ using Robust.Shared.Animations;
+ 
+-namespace Content.Client.Explosion;
++namespace Content.Client.Trigger.Systems;
+ 
+-public sealed partial class TriggerSystem
++public sealed class ProximityTriggerAnimationSystem : EntitySystem
+ {
+     [Dependency] private readonly AnimationPlayerSystem _player = default!;
+     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
diff --git a/Content.Client/Trigger/Systems/ReleaseGasOnTriggerSystem.cs b/Content.Client/Trigger/Systems/ReleaseGasOnTriggerSystem.cs
new file mode 100644
index 000000000000..a183282ddea1
--- /dev/null
+++ b/Content.Client/Trigger/Systems/ReleaseGasOnTriggerSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Trigger.Systems;
+
+namespace Content.Client.Trigger.Systems;
+
+public sealed class ReleaseGasOnTriggerSystem : SharedReleaseGasOnTriggerSystem;
diff --git a/Content.Client/Trigger/TimerTriggerVisualizerSystem.cs b/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs
similarity index 86%
rename from Content.Client/Trigger/TimerTriggerVisualizerSystem.cs
rename to Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs
index af13a44d9eb5..9d5c333ce9bc 100644
--- a/Content.Client/Trigger/TimerTriggerVisualizerSystem.cs
+++ b/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs
@@ -24,25 +24,26 @@ public override void Initialize()
         SubscribeLocalEvent<TimerTriggerVisualsComponent, ComponentInit>(OnComponentInit);
     }
 
-    private void OnComponentInit(EntityUid uid, TimerTriggerVisualsComponent comp, ComponentInit args)
+    private void OnComponentInit(Entity<TimerTriggerVisualsComponent> ent, ref ComponentInit args)
     {
-        comp.PrimingAnimation = new Animation
+        ent.Comp.PrimingAnimation = new Animation
         {
             Length = TimeSpan.MaxValue,
             AnimationTracks = {
-                new AnimationTrackSpriteFlick() {
+                new AnimationTrackSpriteFlick()
+                {
                     LayerKey = TriggerVisualLayers.Base,
-                    KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.PrimingSprite, 0f) }
+                    KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(ent.Comp.PrimingSprite, 0f) }
                 }
             },
         };
 
-        if (comp.PrimingSound != null)
+        if (ent.Comp.PrimingSound != null)
         {
-            comp.PrimingAnimation.AnimationTracks.Add(
+            ent.Comp.PrimingAnimation.AnimationTracks.Add(
                 new AnimationTrackPlaySound()
                 {
-                    KeyFrames = { new AnimationTrackPlaySound.KeyFrame(_audioSystem.ResolveSound(comp.PrimingSound), 0) }
+                    KeyFrames = { new AnimationTrackPlaySound.KeyFrame(_audioSystem.ResolveSound(ent.Comp.PrimingSound), 0) }
                 }
             );
         }
diff --git a/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs.rej b/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs.rej
new file mode 100644
index 000000000000..7621fb097365
--- /dev/null
+++ b/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs.rej
@@ -0,0 +1,15 @@
+diff a/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs b/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs	(rejected hunks)
+@@ -1,11 +1,10 @@
++using Content.Client.Trigger.Components;
+ using Content.Shared.Trigger;
+ using Robust.Client.Animations;
+ using Robust.Client.GameObjects;
+-using Robust.Shared.Audio;
+ using Robust.Shared.Audio.Systems;
+-using Robust.Shared.GameObjects;
+ 
+-namespace Content.Client.Trigger;
++namespace Content.Client.Trigger.Systems;
+ 
+ public sealed class TimerTriggerVisualizerSystem : VisualizerSystem<TimerTriggerVisualsComponent>
+ {
diff --git a/Content.Client/UserInterface/Controls/MainViewport.cs b/Content.Client/UserInterface/Controls/MainViewport.cs
index a6ed77a7eb46..7ecea3593abb 100644
--- a/Content.Client/UserInterface/Controls/MainViewport.cs
+++ b/Content.Client/UserInterface/Controls/MainViewport.cs
@@ -40,6 +40,8 @@ public MainViewport()
             };
 
             AddChild(Viewport);
+
+            _cfg.OnValueChanged(CCVars.ViewportScalingFilterMode, _ => UpdateCfg(), true);
         }
 
         protected override void EnteredTree()
@@ -62,6 +64,7 @@ public void UpdateCfg()
             var renderScaleUp = _cfg.GetCVar(CCVars.ViewportScaleRender);
             var fixedFactor = _cfg.GetCVar(CCVars.ViewportFixedScaleFactor);
             var verticalFit = _cfg.GetCVar(CCVars.ViewportVerticalFit);
+            var filterMode = _cfg.GetCVar(CCVars.ViewportScalingFilterMode);
 
             if (stretch)
             {
@@ -70,7 +73,11 @@ public void UpdateCfg()
                 {
                     // Did not find a snap, enable stretching.
                     Viewport.FixedStretchSize = null;
-                    Viewport.StretchMode = ScalingViewportStretchMode.Bilinear;
+                    Viewport.StretchMode = filterMode switch
+                    {
+                        "nearest" => ScalingViewportStretchMode.Nearest,
+                        "bilinear" => ScalingViewportStretchMode.Bilinear
+                    };
                     Viewport.IgnoreDimension = verticalFit ? ScalingViewportIgnoreDimension.Horizontal : ScalingViewportIgnoreDimension.None;
 
                     if (renderScaleUp)
diff --git a/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs.rej b/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs.rej
new file mode 100644
index 000000000000..8430e7d9ce92
--- /dev/null
+++ b/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs.rej
@@ -0,0 +1,6 @@
+diff a/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs b/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs	(rejected hunks)
+@@ -1,3 +1,4 @@
++using System.Numerics;
+ using Content.Shared.Mobs;
+ using Robust.Client.Graphics;
+ using Robust.Client.Player;
diff --git a/Content.Client/UserInterface/Systems/ProgressColorSystem.cs b/Content.Client/UserInterface/Systems/ProgressColorSystem.cs
index f96ed70ab7c2..e242adbd8f88 100644
--- a/Content.Client/UserInterface/Systems/ProgressColorSystem.cs
+++ b/Content.Client/UserInterface/Systems/ProgressColorSystem.cs
@@ -48,7 +48,7 @@ public Color GetProgressColor(float progress)
 
             // lerp
             var hue = 5f / 18f * progress;
-            return Color.FromHsv((hue, 1f, 0.75f, 1f));
+            return Color.FromHsv(new Vector4(hue, 1f, 0.75f, 1f));
         }
 
         return InterpolateColorGaussian(Plasma, progress);
diff --git a/Content.Client/UserInterface/Systems/ProgressColorSystem.cs.rej b/Content.Client/UserInterface/Systems/ProgressColorSystem.cs.rej
new file mode 100644
index 000000000000..6310267da33f
--- /dev/null
+++ b/Content.Client/UserInterface/Systems/ProgressColorSystem.cs.rej
@@ -0,0 +1,6 @@
+diff a/Content.Client/UserInterface/Systems/ProgressColorSystem.cs b/Content.Client/UserInterface/Systems/ProgressColorSystem.cs	(rejected hunks)
+@@ -1,3 +1,4 @@
++using System.Numerics;
+ using Content.Shared.CCVar;
+ using Robust.Shared.Configuration;
+ 
diff --git a/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
index 7ebd2eaa9f93..39a4e01c0f6b 100644
--- a/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
+++ b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
@@ -634,7 +634,7 @@ protected override void FrameUpdate(FrameEventArgs args)
                         {
                             marked.Add(cell);
                             cell.ModulateSelfOverride = spotFree
-                                ? Color.FromHsv((0.18f, 1 / spot, 0.5f / spot + 0.5f, 1f))
+                                ? Color.FromHsv(new Vector4(0.18f, 1 / spot, 0.5f / spot + 0.5f, 1f))
                                 : Color.FromHex("#2222CC");
                         }
                     }
diff --git a/Content.IntegrationTests/Tests/Damageable/StaminaComponentTest.cs b/Content.IntegrationTests/Tests/Damageable/StaminaComponentTest.cs
new file mode 100644
index 000000000000..f0a594dbd466
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Damageable/StaminaComponentTest.cs
@@ -0,0 +1,29 @@
+using Content.Shared.Damage.Components;
+
+namespace Content.IntegrationTests.Tests.Damageable;
+
+public sealed class StaminaComponentTest
+{
+    [Test]
+    public async Task ValidatePrototypes()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var protos = pair.GetPrototypesWithComponent<StaminaComponent>();
+
+        await server.WaitAssertion(() =>
+        {
+            Assert.Multiple(() =>
+            {
+                foreach (var (proto, comp) in protos)
+                {
+                    Assert.That(comp.AnimationThreshold, Is.LessThan(comp.CritThreshold),
+                        $"Animation threshold on {proto.ID} must be less than its crit threshold.");
+                }
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index 83e6e99b6e9d..0228902fc824 100644
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -113,7 +113,7 @@ await server.WaitPost(() =>
                 }
             });
 
-            await server.WaitRunTicks(15);
+            await server.WaitRunTicks(450); // 15 seconds, enough to trigger most update loops
 
             await server.WaitPost(() =>
             {
@@ -172,7 +172,7 @@ await server.WaitPost(() =>
                     entityMan.SpawnEntity(protoId, map.GridCoords);
                 }
             });
-            await server.WaitRunTicks(15);
+            await server.WaitRunTicks(450); // 15 seconds, enough to trigger most update loops
             await server.WaitPost(() =>
             {
                 static IEnumerable<(EntityUid, TComp)> Query<TComp>(IEntityManager entityMan)
@@ -334,7 +334,7 @@ await server.WaitPost(() =>
             await pair.RunTicksSync(3);
 
             // We consider only non-audio entities, as some entities will just play sounds when they spawn.
-            int Count(IEntityManager ent) =>  ent.EntityCount - ent.Count<AudioComponent>();
+            int Count(IEntityManager ent) => ent.EntityCount - ent.Count<AudioComponent>();
             IEnumerable<EntityUid> Entities(IEntityManager entMan) => entMan.GetEntities().Where(entMan.HasComponent<AudioComponent>);
 
             await Assert.MultipleAsync(async () =>
diff --git a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs
index 9ada6ba3ee42..8ad84b8920d8 100644
--- a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs
+++ b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs
@@ -40,9 +40,7 @@ public sealed class InventoryHelpersTest
   components:
   - type: Inventory
   - type: ContainerContainer
-  - type: StatusEffects
-    allowed:
-    - Stun
+  - type: MobState
 
 - type: entity
   name: InventoryJumpsuitJanitorDummy
@@ -93,7 +91,7 @@ await server.WaitAssertion(() =>
                 });
 #pragma warning restore NUnit2045
 
-                systemMan.GetEntitySystem<StunSystem>().TryStun(human, TimeSpan.FromSeconds(1f), true);
+                systemMan.GetEntitySystem<StunSystem>().TryUpdateStunDuration(human, TimeSpan.FromSeconds(1f));
 
 #pragma warning disable NUnit2045
                 // Since the mob is stunned, they can't equip this.
diff --git a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs.rej b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs.rej
new file mode 100644
index 000000000000..13f1d25feb57
--- /dev/null
+++ b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs.rej
@@ -0,0 +1,7 @@
+diff a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs	(rejected hunks)
+@@ -1,4 +1,4 @@
+-using Content.Server.Stunnable;
++using Content.Server.Stunnable;
+ using Content.Shared.Inventory;
+ using Robust.Shared.GameObjects;
+ using Robust.Shared.IoC;
diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.cs b/Content.IntegrationTests/Tests/Minds/MindTests.cs
index 7a1449750e65..9cb2ab02e85d 100644
--- a/Content.IntegrationTests/Tests/Minds/MindTests.cs
+++ b/Content.IntegrationTests/Tests/Minds/MindTests.cs
@@ -16,7 +16,7 @@
 using System.Linq;
 using Content.Server.Ghost.Roles;
 using Content.Server.Ghost.Roles.Components;
-using Content.Server.Mind.Commands;
+using Content.Server.Mind;
 using Content.Server.Roles;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
@@ -353,7 +353,7 @@ public async Task TestPlayerCanGhost()
         var entMan = server.ResolveDependency<IServerEntityManager>();
         var playerMan = server.ResolveDependency<IPlayerManager>();
 
-        var mindSystem = entMan.EntitySysManager.GetEntitySystem<SharedMindSystem>();
+        var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
 
         EntityUid entity = default!;
         EntityUid mindId = default!;
@@ -393,7 +393,7 @@ await server.WaitAssertion(() =>
 
             mob = entMan.SpawnEntity(null, new MapCoordinates());
 
-            MakeSentientCommand.MakeSentient(mob, entMan);
+            mindSystem.MakeSentient(mob);
             mobMindId = mindSystem.CreateMind(player.UserId, "Mindy McThinker the Second");
             mobMind = entMan.GetComponent<MindComponent>(mobMindId);
 
diff --git a/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs b/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs
index 19199ee5050b..4a2b98e82121 100644
--- a/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs
+++ b/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs
@@ -37,19 +37,19 @@ public async Task AssembleAndDetonateGrenade()
         await InteractUsing(Cable);
 
         // Insert & remove trigger
-        AssertComp<OnUseTimerTriggerComponent>(false);
+        AssertComp<TimerTriggerComponent>(false);
         await InteractUsing(Trigger);
-        AssertComp<OnUseTimerTriggerComponent>();
+        AssertComp<TimerTriggerComponent>();
         await FindEntity(Trigger, LookupFlags.Uncontained, shouldSucceed: false);
         await InteractUsing(Pry);
-        AssertComp<OnUseTimerTriggerComponent>(false);
+        AssertComp<TimerTriggerComponent>(false);
 
         // Trigger was dropped to floor, not deleted.
         await FindEntity(Trigger, LookupFlags.Uncontained);
 
         // Re-insert
         await InteractUsing(Trigger);
-        AssertComp<OnUseTimerTriggerComponent>();
+        AssertComp<TimerTriggerComponent>();
 
         // Insert & remove payload.
         await InteractUsing(Payload);
diff --git a/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs.rej b/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs.rej
new file mode 100644
index 000000000000..c096b3d23cd0
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs.rej
@@ -0,0 +1,27 @@
+diff a/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs b/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs	(rejected hunks)
+@@ -1,6 +1,6 @@
+ using Content.IntegrationTests.Tests.Interaction;
+-using Content.Server.Explosion.Components;
+-using Content.Shared.Explosion.Components;
++using Content.Shared.Trigger.Components;
++using Content.Shared.Trigger.Systems;
+ using Robust.Shared.Containers;
+ using Robust.Shared.GameObjects;
+ 
+@@ -56,13 +56,14 @@ public async Task AssembleAndDetonateGrenade()
+         await Pickup();
+         AssertComp<ActiveTimerTriggerComponent>(false);
+         await UseInHand();
++        AssertComp<ActiveTimerTriggerComponent>(true);
+ 
+         // So uhhh grenades in hands don't destroy themselves when exploding. Maybe that will be fixed eventually.
+         await Drop();
+ 
+         // Wait until grenade explodes
+-        var timer = Comp<ActiveTimerTriggerComponent>();
+-        while (timer.TimeRemaining >= 0)
++        var triggerSys = SEntMan.System<TriggerSystem>();
++        while (Target != null && triggerSys.GetRemainingTime(SEntMan.GetEntity(Target.Value))?.TotalSeconds >= 0.0)
+         {
+             await RunTicks(10);
+         }
diff --git a/Content.IntegrationTests/Tests/RoundEndTest.cs b/Content.IntegrationTests/Tests/RoundEndTest.cs
index 90e47ff6512a..959908560549 100644
--- a/Content.IntegrationTests/Tests/RoundEndTest.cs
+++ b/Content.IntegrationTests/Tests/RoundEndTest.cs
@@ -38,7 +38,7 @@ public override void Initialize()
 
             private void OnRoundEnd(RoundEndSystemChangedEvent ev)
             {
-                Interlocked.Increment(ref RoundCount);
+                RoundCount += 1;
             }
         }
 
@@ -143,13 +143,17 @@ Task CheckRunLevel(GameRunLevel level)
 
             async Task WaitForEvent()
             {
-                var timeout = Task.Delay(TimeSpan.FromSeconds(10));
-                var currentCount = Thread.VolatileRead(ref sys.RoundCount);
-                while (currentCount == Thread.VolatileRead(ref sys.RoundCount) && !timeout.IsCompleted)
+                const int maxTicks = 60;
+                var currentCount = sys.RoundCount;
+                for (var i = 0; i < maxTicks; i++)
                 {
-                    await pair.RunTicksSync(5);
+                    if (currentCount != sys.RoundCount)
+                        return;
+
+                    await pair.RunTicksSync(1);
                 }
-                if (timeout.IsCompleted) throw new TimeoutException("Event took too long to trigger");
+
+                throw new TimeoutException("Event took too long to trigger");
             }
 
             // Need to clean self up
diff --git a/Content.IntegrationTests/Tests/RoundEndTest.cs.rej b/Content.IntegrationTests/Tests/RoundEndTest.cs.rej
new file mode 100644
index 000000000000..7b9b086aaff0
--- /dev/null
+++ b/Content.IntegrationTests/Tests/RoundEndTest.cs.rej
@@ -0,0 +1,6 @@
+diff a/Content.IntegrationTests/Tests/RoundEndTest.cs b/Content.IntegrationTests/Tests/RoundEndTest.cs	(rejected hunks)
+@@ -1,4 +1,3 @@
+-using System.Threading;
+ using Content.Server.GameTicking;
+ using Content.Server.RoundEnd;
+ using Content.Shared.CCVar;
diff --git a/Content.IntegrationTests/Tests/SmartFridge/SmartFridgeInteractionTest.cs b/Content.IntegrationTests/Tests/SmartFridge/SmartFridgeInteractionTest.cs
new file mode 100644
index 000000000000..aa2ebef606bd
--- /dev/null
+++ b/Content.IntegrationTests/Tests/SmartFridge/SmartFridgeInteractionTest.cs
@@ -0,0 +1,111 @@
+using Content.IntegrationTests.Tests.Interaction;
+using Content.Shared.SmartFridge;
+
+namespace Content.IntegrationTests.Tests.SmartFridge;
+
+public sealed class SmartFridgeInteractionTest : InteractionTest
+{
+    private const string SmartFridgeProtoId = "SmartFridge";
+    private const string SampleItemProtoId = "FoodAmbrosiaVulgaris";
+    private const string SampleDumpableAndInsertableId = "PillCanisterSomething";
+    private const int SampleDumpableCount = 5;
+    private const string SampleDumpableId = "ChemBagSomething";
+
+    [TestPrototypes]
+    private const string TestPrototypes = $@"
+- type: entity
+  parent: PillCanister
+  id: {SampleDumpableAndInsertableId}
+  components:
+  - type: StorageFill
+    contents:
+    - id: PillCopper
+      amount: 5
+
+- type: entity
+  parent: ChemBag
+  id: {SampleDumpableId}
+  components:
+  - type: StorageFill
+    contents:
+    - id: PillCopper
+      amount: 5
+";
+
+    [Test]
+    public async Task InsertAndDispenseItemTest()
+    {
+        await PlaceInHands(SampleItemProtoId);
+
+        await SpawnTarget(SmartFridgeProtoId);
+        var fridge = SEntMan.GetEntity(Target.Value);
+        var component = SEntMan.GetComponent<SmartFridgeComponent>(fridge);
+
+        await SpawnEntity("APCBasic", SEntMan.GetCoordinates(TargetCoords));
+        await RunTicks(1);
+
+        // smartfridge spawns with nothing
+        Assert.That(component.Entries, Is.Empty);
+        await InteractUsing(SampleItemProtoId);
+
+        // smartfridge now has items
+        Assert.That(component.Entries, Is.Not.Empty);
+        Assert.That(component.ContainedEntries[component.Entries[0]], Is.Not.Empty);
+
+        // open the UI
+        await Activate();
+        Assert.That(IsUiOpen(SmartFridgeUiKey.Key));
+
+        // dispense an item
+        await SendBui(SmartFridgeUiKey.Key, new SmartFridgeDispenseItemMessage(component.Entries[0]));
+
+        // assert that the listing is still there
+        Assert.That(component.Entries, Is.Not.Empty);
+        // but empty
+        Assert.That(component.ContainedEntries[component.Entries[0]], Is.Empty);
+
+        // and that the thing we dispensed is actually around
+        await AssertEntityLookup(
+            ("APCBasic", 1),
+            (SampleItemProtoId, 1)
+        );
+    }
+
+    [Test]
+    public async Task InsertDumpableInsertableItemTest()
+    {
+        await PlaceInHands(SampleItemProtoId);
+
+        await SpawnTarget(SmartFridgeProtoId);
+        var fridge = SEntMan.GetEntity(Target.Value);
+        var component = SEntMan.GetComponent<SmartFridgeComponent>(fridge);
+
+        await SpawnEntity("APCBasic", SEntMan.GetCoordinates(TargetCoords));
+        await RunTicks(1);
+
+        await InteractUsing(SampleDumpableAndInsertableId);
+
+        // smartfridge now has one item only
+        Assert.That(component.Entries, Is.Not.Empty);
+        Assert.That(component.ContainedEntries[component.Entries[0]].Count, Is.EqualTo(1));
+    }
+
+    [Test]
+    public async Task InsertDumpableItemTest()
+    {
+        await PlaceInHands(SampleItemProtoId);
+
+        await SpawnTarget(SmartFridgeProtoId);
+        var fridge = SEntMan.GetEntity(Target.Value);
+        var component = SEntMan.GetComponent<SmartFridgeComponent>(fridge);
+
+        await SpawnEntity("APCBasic", SEntMan.GetCoordinates(TargetCoords));
+        await RunTicks(1);
+
+        await InteractUsing(SampleDumpableId);
+
+        // smartfridge now has N items
+        Assert.That(component.Entries, Is.Not.Empty);
+        Assert.That(component.ContainedEntries[component.Entries[0]].Count, Is.EqualTo(SampleDumpableCount));
+    }
+}
diff --git a/Content.IntegrationTests/Tests/StoreTests.cs.rej b/Content.IntegrationTests/Tests/StoreTests.cs.rej
new file mode 100644
index 000000000000..8cfb6f05663f
--- /dev/null
+++ b/Content.IntegrationTests/Tests/StoreTests.cs.rej
@@ -0,0 +1,19 @@
+diff a/Content.IntegrationTests/Tests/StoreTests.cs b/Content.IntegrationTests/Tests/StoreTests.cs	(rejected hunks)
+@@ -128,7 +128,7 @@ await server.WaitAssertion(() =>
+ 
+ 
+                     var buyMsg = new StoreBuyListingMessage(discountedListingItem.ID){Actor = human};
+-                    server.EntMan.EventBus.RaiseComponentEvent(pda, storeComponent, buyMsg);
++                    server.EntMan.EventBus.RaiseLocalEvent(pda, buyMsg);
+ 
+                     var newBalance = storeComponent.Balance[UplinkSystem.TelecrystalCurrencyPrototype];
+                     Assert.That(newBalance.Value, Is.EqualTo((originalBalance - plainDiscountedCost).Value), "Expected to have balance reduced by discounted cost");
+@@ -141,7 +141,7 @@ await server.WaitAssertion(() =>
+                     Assert.That(costAfterBuy.Value, Is.EqualTo(prototypeCost.Value), "Expected cost after discount refund to be equal to prototype cost.");
+ 
+                     var refundMsg = new StoreRequestRefundMessage { Actor = human };
+-                    server.EntMan.EventBus.RaiseComponentEvent(pda, storeComponent, refundMsg);
++                    server.EntMan.EventBus.RaiseLocalEvent(pda, refundMsg);
+ 
+                     // get refreshed item after refund re-generated items
+                     discountedListingItem = storeComponent.FullListingsCatalog.First(x => x.ID == itemId);
diff --git a/Content.Server/Administration/Commands/CameraCommand.cs b/Content.Server/Administration/Commands/CameraCommand.cs
new file mode 100644
index 000000000000..25837ac7093b
--- /dev/null
+++ b/Content.Server/Administration/Commands/CameraCommand.cs
@@ -0,0 +1,58 @@
+using Content.Server.Administration.UI;
+using Content.Server.EUI;
+using Content.Shared.Administration;
+using Robust.Server.Player;
+using Robust.Shared.Console;
+
+namespace Content.Server.Administration.Commands;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class CameraCommand : LocalizedCommands
+{
+    [Dependency] private readonly EuiManager _eui = default!;
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+
+    public override string Command => "camera";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (shell.Player is not { } user)
+        {
+            shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server"));
+            return;
+        }
+
+        if (args.Length != 1)
+        {
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
+            return;
+        }
+
+        if (!NetEntity.TryParse(args[0], out var targetNetId) || !_entManager.TryGetEntity(targetNetId, out var targetUid))
+        {
+            if (!_playerManager.TryGetSessionByUsername(args[0], out var player)
+                || player.AttachedEntity == null)
+            {
+                shell.WriteError(Loc.GetString("cmd-camera-wrong-argument"));
+                return;
+            }
+            targetUid = player.AttachedEntity.Value;
+        }
+
+        var ui = new AdminCameraEui(targetUid.Value);
+        _eui.OpenEui(ui, user);
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+        {
+            return CompletionResult.FromHintOptions(
+                CompletionHelper.SessionNames(players: _playerManager),
+                Loc.GetString("cmd-camera-hint"));
+        }
+
+        return CompletionResult.Empty;
+    }
+}
diff --git a/Content.Server/Administration/Commands/VariantizeCommand.cs b/Content.Server/Administration/Commands/VariantizeCommand.cs
index a325b14629ad..3542097f0204 100644
--- a/Content.Server/Administration/Commands/VariantizeCommand.cs
+++ b/Content.Server/Administration/Commands/VariantizeCommand.cs
@@ -54,7 +54,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         foreach (var tile in mapsSystem.GetAllTiles(euid.Value, gridComp))
         {
             var def = turfSystem.GetContentTileDefinition(tile);
-            var newTile = new Tile(tile.Tile.TypeId, tile.Tile.Flags, tileSystem.PickVariant(def));
+            var newTile = new Tile(tile.Tile.TypeId, tile.Tile.Flags, tileSystem.PickVariant(def), tile.Tile.RotationMirroring);
             mapsSystem.SetTile(euid.Value, gridComp, tile.GridIndices, newTile);
         }
     }
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs
index 11b049a8da2c..d83282d21c00 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs
@@ -129,7 +129,6 @@
 using Content.Server.Disposal.Tube;
 using Content.Server.EUI;
 using Content.Server.Ghost.Roles;
-using Content.Server.Mind.Commands;
 using Content.Server.Mind;
 using Content.Server.Prayer;
 using Content.Server.Silicons.Laws;
@@ -141,7 +140,6 @@
 using Content.Shared.Database;
 using Content.Shared.Examine;
 using Content.Shared.GameTicking;
-using Content.Shared.Hands.Components;
 using Content.Shared.Inventory;
 using Content.Shared.Mind.Components;
 using Content.Shared.Movement.Components;
@@ -515,6 +513,22 @@ private void AddAdminVerbs(GetVerbsEvent<Verb> args)
                         Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Actions/actions_borg.rsi"), "state-laws"),
                     });
                 }
+
+                // open camera
+                args.Verbs.Add(new Verb()
+                {
+                    Priority = 10,
+                    Text = Loc.GetString("admin-verbs-camera"),
+                    Message = Loc.GetString("admin-verbs-camera-description"),
+                    Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/vv.svg.192dpi.png")),
+                    Category = VerbCategory.Admin,
+                    Act = () =>
+                    {
+                        var ui = new AdminCameraEui(args.Target);
+                        _euiManager.OpenEui(ui, player);
+                    },
+                    Impact = LogImpact.Low
+                });
             }
         }
 
@@ -583,7 +597,7 @@ private void AddDebugVerbs(GetVerbsEvent<Verb> args)
                     Text = Loc.GetString("make-sentient-verb-get-data-text"),
                     Category = VerbCategory.Debug,
                     Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/sentient.svg.192dpi.png")),
-                    Act = () => MakeSentientCommand.MakeSentient(args.Target, EntityManager),
+                    Act = () => _mindSystem.MakeSentient(args.Target),
                     Impact = LogImpact.Medium
                 };
                 args.Verbs.Add(verb);
diff --git a/Content.Server/Administration/UI/AdminCameraEui.cs b/Content.Server/Administration/UI/AdminCameraEui.cs
new file mode 100644
index 000000000000..5230933c829c
--- /dev/null
+++ b/Content.Server/Administration/UI/AdminCameraEui.cs
@@ -0,0 +1,97 @@
+using Content.Server.Administration.Managers;
+using Content.Server.EUI;
+using Content.Shared.Administration;
+using Content.Shared.Eui;
+using Content.Shared.Follower;
+using Content.Shared.Coordinates;
+using Robust.Server.GameStates;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using JetBrains.Annotations;
+
+namespace Content.Server.Administration.UI;
+
+/// <summary>
+/// Admin Eui for opening a viewport window to observe entities.
+/// Use the "Open Camera" admin verb or the "camera" command to open.
+/// </summary>
+[UsedImplicitly]
+public sealed partial class AdminCameraEui : BaseEui
+{
+    [Dependency] private readonly IAdminManager _admin = default!;
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    private readonly FollowerSystem _follower = default!;
+    private readonly PvsOverrideSystem _pvs = default!;
+    private readonly SharedViewSubscriberSystem _viewSubscriber = default!;
+
+    private static readonly EntProtoId CameraProtoId = "AdminCamera";
+
+    private readonly EntityUid _target;
+    private EntityUid? _camera;
+
+
+    public AdminCameraEui(EntityUid target)
+    {
+        IoCManager.InjectDependencies(this);
+        _follower = _entityManager.System<FollowerSystem>();
+        _pvs = _entityManager.System<PvsOverrideSystem>();
+        _viewSubscriber = _entityManager.System<SharedViewSubscriberSystem>();
+
+        _target = target;
+    }
+
+    public override void Opened()
+    {
+        base.Opened();
+
+        _camera = CreateCamera(_target, Player);
+        StateDirty();
+    }
+
+    public override void Closed()
+    {
+        base.Closed();
+
+        _entityManager.DeleteEntity(_camera);
+    }
+
+    public override void HandleMessage(EuiMessageBase msg)
+    {
+        base.HandleMessage(msg);
+
+        switch (msg)
+        {
+            case AdminCameraFollowMessage:
+                if (!_admin.HasAdminFlag(Player, AdminFlags.Admin) || Player.AttachedEntity == null)
+                    return;
+                _follower.StartFollowingEntity(Player.AttachedEntity.Value, _target);
+                break;
+            default:
+                break;
+        }
+    }
+
+    public override EuiStateBase GetNewState()
+    {
+        var name = _entityManager.GetComponent<MetaDataComponent>(_target).EntityName;
+        var netEnt = _entityManager.GetNetEntity(_camera);
+        return new AdminCameraEuiState(netEnt, name, _timing.CurTick);
+    }
+
+    private EntityUid CreateCamera(EntityUid target, ICommonSession observer)
+    {
+        // Spawn a camera entity attached to the target.
+        var coords = target.ToCoordinates();
+        var camera = _entityManager.SpawnAttachedTo(CameraProtoId, coords);
+
+        // Allow the user to see the entities near the camera.
+        // This also force sends the camera entity to the user, overriding the visibility flags.
+        // (The camera entity has its visibility flags set to VisibilityFlags.Admin so that cheat clients can't see it)
+        _viewSubscriber.AddViewSubscriber(camera, observer);
+
+        return camera;
+    }
+}
diff --git a/Content.Server/AlertLevel/AlertLevelChangeOnTriggerComponent.cs b/Content.Server/AlertLevel/AlertLevelChangeOnTriggerComponent.cs
deleted file mode 100644
index aa6c5ba2bd15..000000000000
--- a/Content.Server/AlertLevel/AlertLevelChangeOnTriggerComponent.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Server.AlertLevel.Systems;
-
-namespace Content.Server.AlertLevel;
-/// <summary>
-/// This component is for changing the alert level of the station when triggered.
-/// </summary>
-[RegisterComponent, Access(typeof(AlertLevelChangeOnTriggerSystem))]
-public sealed partial class AlertLevelChangeOnTriggerComponent : Component
-{
-    ///<summary>
-    ///The alert level to change to when triggered.
-    ///</summary>
-    [DataField]
-    public string Level = "blue";
-
-    /// <summary>
-    ///Whether to play the sound when the alert level changes.
-    /// </summary>
-    [DataField]
-    public bool PlaySound = true;
-
-    /// <summary>
-    ///Whether to say the announcement when the alert level changes.
-    /// </summary>
-    [DataField]
-    public bool Announce = true;
-
-    /// <summary>
-    ///Force the alert change. This applies if the alert level is not selectable or not.
-    /// </summary>
-    [DataField]
-    public bool Force = false;
-}
diff --git a/Content.Server/Animals/Systems/ParrotMemorySystem.cs b/Content.Server/Animals/Systems/ParrotMemorySystem.cs
index 6912f9644e16..657338c8248f 100644
--- a/Content.Server/Animals/Systems/ParrotMemorySystem.cs
+++ b/Content.Server/Animals/Systems/ParrotMemorySystem.cs
@@ -5,13 +5,13 @@
 using Content.Server.Mind;
 using Content.Server.Popups;
 using Content.Server.Radio;
-using Content.Server.Speech;
-using Content.Server.Speech.Components;
 using Content.Server.Vocalization.Systems;
+using Content.Shared.Animals.Components;
+using Content.Shared.Animals.Systems;
 using Content.Shared.Database;
 using Content.Shared.Mobs.Systems;
-using Content.Shared.Popups;
-using Content.Shared.Verbs;
+using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
 using Content.Shared.Whitelist;
 using Robust.Shared.Network;
 using Robust.Shared.Random;
@@ -25,7 +25,7 @@ namespace Content.Server.Animals.Systems;
 /// (radiovocalizer) and stores them in a list. When an entity with a VocalizerComponent attempts to vocalize, this will
 /// try to set the message from memory.
 /// </summary>
-public sealed partial class ParrotMemorySystem : EntitySystem
+public sealed partial class ParrotMemorySystem : SharedParrotMemorySystem
 {
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
@@ -42,8 +42,6 @@ public override void Initialize()
 
         SubscribeLocalEvent<EraseEvent>(OnErase);
 
-        SubscribeLocalEvent<ParrotMemoryComponent, GetVerbsEvent<Verb>>(OnGetVerbs);
-
         SubscribeLocalEvent<ParrotListenerComponent, MapInitEvent>(ListenerOnMapInit);
 
         SubscribeLocalEvent<ParrotListenerComponent, ListenEvent>(OnListen);
@@ -57,30 +55,6 @@ private void OnErase(ref EraseEvent args)
         DeletePlayerMessages(args.PlayerNetUserId);
     }
 
-    private void OnGetVerbs(Entity<ParrotMemoryComponent> entity, ref GetVerbsEvent<Verb> args)
-    {
-        var user = args.User;
-
-        // limit this to admins
-        if (!_admin.IsAdmin(user))
-            return;
-
-        // simple verb that just clears the memory list
-        var clearMemoryVerb = new Verb()
-        {
-            Text = Loc.GetString("parrot-verb-clear-memory"),
-            Category = VerbCategory.Admin,
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/clear-parrot.png")),
-            Act = () =>
-            {
-                entity.Comp.SpeechMemories.Clear();
-                _popup.PopupEntity(Loc.GetString("parrot-popup-memory-cleared"), entity, user, PopupType.Medium);
-            },
-        };
-
-        args.Verbs.Add(clearMemoryVerb);
-    }
-
     private void ListenerOnMapInit(Entity<ParrotListenerComponent> entity, ref MapInitEvent args)
     {
         // If an entity has a ParrotListenerComponent it really ought to have an ActiveListenerComponent
diff --git a/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs b/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs
index 4e034239d5b8..2dea40b31917 100644
--- a/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs
@@ -103,7 +103,7 @@ private void AddAnomalyToBody(Entity<InnerBodyAnomalyComponent> ent)
 
         EntityManager.AddComponents(ent, injectedAnom.Components);
 
-        _stun.TryParalyze(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration), true);
+        _stun.TryUpdateParalyzeDuration(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration));
         _jitter.DoJitter(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration), true);
 
         if (ent.Comp.StartSound is not null)
@@ -132,7 +132,7 @@ private void AddAnomalyToBody(Entity<InnerBodyAnomalyComponent> ent)
 
     private void OnAnomalyPulse(Entity<InnerBodyAnomalyComponent> ent, ref AnomalyPulseEvent args)
     {
-        _stun.TryParalyze(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration / 2 * args.Severity), true);
+        _stun.TryUpdateParalyzeDuration(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration / 2 * args.Severity));
         _jitter.DoJitter(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration / 2 * args.Severity), true);
     }
 
@@ -220,7 +220,7 @@ private void RemoveAnomalyFromBody(Entity<InnerBodyAnomalyComponent> ent)
         if (_proto.TryIndex(ent.Comp.InjectionProto, out var injectedAnom))
             EntityManager.RemoveComponents(ent, injectedAnom.Components);
 
-        _stun.TryParalyze(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration), true);
+        _stun.TryUpdateParalyzeDuration(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration));
 
         if (ent.Comp.EndMessage is not null &&
             _mind.TryGetMind(ent, out _, out var mindComponent) &&
diff --git a/Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs b/Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs
index fb4d648dea62..299c85c0e100 100644
--- a/Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs
+++ b/Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs
@@ -22,6 +22,7 @@
 using Robust.Shared.Timing;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.NodeContainer;
 
@@ -58,6 +59,7 @@ public override void Initialize()
 
         // Grid events
         SubscribeLocalEvent<GridSplitEvent>(OnGridSplit);
+        SubscribeLocalEvent<PipeNodeGroupRemovedEvent>(OnPipeNodeGroupRemoved);
     }
 
     #region Event handling
@@ -300,6 +302,25 @@ private bool TryGetAtmosDeviceNavMapData
 
     #region Pipe net functions
 
+    private void OnPipeNodeGroupRemoved(ref PipeNodeGroupRemovedEvent args)
+    {
+        // When a pipe node group is removed, we need to iterate over all of
+        // our pipe chunks and remove any entries with a matching net id.
+        // (We only need to check the chunks for the affected grid, though.)
+
+        if (!_gridAtmosPipeChunks.TryGetValue(args.Grid, out var chunkData))
+            return;
+
+        foreach (var chunk in chunkData.Values)
+        {
+            foreach (var key in chunk.AtmosPipeData.Keys)
+            {
+                if (key.NetId == args.NetId)
+                    chunk.AtmosPipeData.Remove(key);
+            }
+        }
+    }
+
     private void RebuildAtmosPipeGrid(EntityUid gridUid, MapGridComponent grid)
     {
         var allChunks = new Dictionary<Vector2i, AtmosPipeChunk>();
@@ -416,7 +437,7 @@ private void UpdateAtmosPipeChunk
                 continue;
 
             var netId = GetPipeNodeNetId(pipeNode);
-            var subnet = new AtmosMonitoringConsoleSubnet(netId, pipeNode.CurrentPipeLayer, pipeColor.Color.ToHex());
+            var subnet = new AtmosMonitoringConsoleSubnet(netId, pipeNode.CurrentPipeLayer, pipeColor.Color);
             var pipeDirection = pipeNode.CurrentPipeDirection;
 
             chunk.AtmosPipeData.TryGetValue(subnet, out var atmosPipeData);
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
index 526e27051383..118d5c3a18fd 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
@@ -290,6 +290,14 @@ public bool AddPipeNet(Entity<GridAtmosphereComponent?> grid, PipeNet pipeNet)
 
     public bool RemovePipeNet(Entity<GridAtmosphereComponent?> grid, PipeNet pipeNet)
     {
+        // Technically this event can be fired even on grids that don't
+        // actually have grid atmospheres.
+        if (pipeNet.Grid is not null)
+        {
+            var ev = new PipeNodeGroupRemovedEvent(grid, pipeNet.NetId);
+            RaiseLocalEvent(ref ev);
+        }
+
         return _atmosQuery.Resolve(grid, ref grid.Comp, false) && grid.Comp.PipeNets.Remove(pipeNet);
     }
 
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs.rej b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs.rej
new file mode 100644
index 000000000000..e26f966d3a89
--- /dev/null
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs.rej
@@ -0,0 +1,14 @@
+diff a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs	(rejected hunks)
+@@ -329,3 +337,12 @@ [ByRefEvent] private record struct HotspotExtinguishMethodEvent
+     [ByRefEvent] private record struct IsHotspotActiveMethodEvent
+         (EntityUid Grid, Vector2i Tile, bool Result = false, bool Handled = false);
+ }
++
++
++/// <summary>
++/// Raised broadcasted when a pipe node group within a grid has been removed.
++/// </summary>
++/// <param name="Grid">The grid with the removed node group.</param>
++/// <param name="NetId">The net id of the removed node group.</param>
++[ByRefEvent]
++public record struct PipeNodeGroupRemovedEvent(EntityUid Grid, int NetId);
diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs.rej b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs.rej
new file mode 100644
index 000000000000..e72946145907
--- /dev/null
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs.rej
@@ -0,0 +1,10 @@
+diff a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs	(rejected hunks)
+@@ -394,7 +394,7 @@ public void Resist(EntityUid uid,
+             flammable.Resisting = true;
+ 
+             _popup.PopupEntity(Loc.GetString("flammable-component-resist-message"), uid, uid);
+-            _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(2f), true);
++            _stunSystem.TryUpdateParalyzeDuration(uid, TimeSpan.FromSeconds(2f));
+ 
+             // TODO FLAMMABLE: Make this not use TimerComponent...
+             uid.SpawnTimer(2000, () =>
diff --git a/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs b/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs
index b4892aa8d63c..509e98294cf9 100644
--- a/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs
+++ b/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs
@@ -61,7 +61,7 @@ public sealed partial class AtmosAlarmableComponent : Component
     public HashSet<string> SyncWithTags { get; private set; } = new();
 
     [DataField("monitorAlertTypes")]
-    public HashSet<AtmosMonitorThresholdType>? MonitorAlertTypes { get; private set; }
+    public AtmosMonitorThresholdTypeFlags MonitorAlertTypes { get; private set; }
 
     /// <summary>
     ///     If this device should receive only. If it can only
diff --git a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs b/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
index 2e001047aaf2..3aaf21ec493a 100644
--- a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
+++ b/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
@@ -75,7 +75,7 @@ public sealed partial class AtmosMonitorComponent : Component
     public AtmosAlarmType LastAlarmState = AtmosAlarmType.Normal;
 
     [DataField("trippedThresholds")]
-    public HashSet<AtmosMonitorThresholdType> TrippedThresholds = new();
+    public AtmosMonitorThresholdTypeFlags TrippedThresholds;
 
     /// <summary>
     ///     Registered devices in this atmos monitor. Alerts will be sent directly
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
index ccc9ca5a5bd6..ec3f58e53170 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
@@ -176,9 +176,9 @@ private void OnPacketRecv(EntityUid uid, AtmosAlarmableComponent component, Devi
                     break;
                 }
 
-                if (args.Data.TryGetValue(AlertTypes, out HashSet<AtmosMonitorThresholdType>? types) && component.MonitorAlertTypes != null)
+                if (args.Data.TryGetValue(AlertTypes, out AtmosMonitorThresholdTypeFlags types) && component.MonitorAlertTypes != AtmosMonitorThresholdTypeFlags.None)
                 {
-                    isValid = types.Any(type => component.MonitorAlertTypes.Contains(type));
+                    isValid = (types & component.MonitorAlertTypes) != 0;
                 }
 
                 if (!component.NetworkAlarmStates.ContainsKey(args.SenderAddress))
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
index 2b788d200472..570538f9d5ab 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
@@ -279,7 +279,7 @@ private void OnFireEvent(EntityUid uid, AtmosMonitorComponent component, ref Til
         if (component.MonitorFire
             && component.LastAlarmState != AtmosAlarmType.Danger)
         {
-            component.TrippedThresholds.Add(AtmosMonitorThresholdType.Temperature);
+            component.TrippedThresholds |= AtmosMonitorThresholdTypeFlags.Temperature;
             Alert(uid, AtmosAlarmType.Danger, null, component); // technically???
         }
 
@@ -290,7 +290,7 @@ private void OnFireEvent(EntityUid uid, AtmosMonitorComponent component, ref Til
             && component.TemperatureThreshold.CheckThreshold(args.Temperature, out var temperatureState)
             && temperatureState > component.LastAlarmState)
         {
-            component.TrippedThresholds.Add(AtmosMonitorThresholdType.Temperature);
+            component.TrippedThresholds |= AtmosMonitorThresholdTypeFlags.Temperature;
             Alert(uid, AtmosAlarmType.Danger, null, component);
         }
     }
@@ -331,7 +331,7 @@ private void UpdateState(EntityUid uid, GasMixture? air, AtmosMonitorComponent?
         if (!Resolve(uid, ref monitor)) return;
 
         var state = AtmosAlarmType.Normal;
-        HashSet<AtmosMonitorThresholdType> alarmTypes = new(monitor.TrippedThresholds);
+        var alarmTypes = monitor.TrippedThresholds;
 
         if (monitor.TemperatureThreshold != null
             && monitor.TemperatureThreshold.CheckThreshold(air.Temperature, out var temperatureState))
@@ -339,11 +339,11 @@ private void UpdateState(EntityUid uid, GasMixture? air, AtmosMonitorComponent?
             if (temperatureState > state)
             {
                 state = temperatureState;
-                alarmTypes.Add(AtmosMonitorThresholdType.Temperature);
+                alarmTypes |= AtmosMonitorThresholdTypeFlags.Temperature;
             }
             else if (temperatureState == AtmosAlarmType.Normal)
             {
-                alarmTypes.Remove(AtmosMonitorThresholdType.Temperature);
+                alarmTypes &= ~AtmosMonitorThresholdTypeFlags.Temperature;
             }
         }
 
@@ -354,11 +354,11 @@ private void UpdateState(EntityUid uid, GasMixture? air, AtmosMonitorComponent?
             if (pressureState > state)
             {
                 state = pressureState;
-                alarmTypes.Add(AtmosMonitorThresholdType.Pressure);
+                alarmTypes |= AtmosMonitorThresholdTypeFlags.Pressure;
             }
             else if (pressureState == AtmosAlarmType.Normal)
             {
-                alarmTypes.Remove(AtmosMonitorThresholdType.Pressure);
+                alarmTypes &= ~AtmosMonitorThresholdTypeFlags.Pressure;
             }
         }
 
@@ -378,17 +378,17 @@ private void UpdateState(EntityUid uid, GasMixture? air, AtmosMonitorComponent?
 
             if (tripped)
             {
-                alarmTypes.Add(AtmosMonitorThresholdType.Gas);
+                alarmTypes |= AtmosMonitorThresholdTypeFlags.Gas;
             }
             else
             {
-                alarmTypes.Remove(AtmosMonitorThresholdType.Gas);
+                alarmTypes &= ~AtmosMonitorThresholdTypeFlags.Gas;
             }
         }
 
         // if the state of the current air doesn't match the last alarm state,
         // we update the state
-        if (state != monitor.LastAlarmState || !alarmTypes.SetEquals(monitor.TrippedThresholds))
+        if (state != monitor.LastAlarmState || alarmTypes != monitor.TrippedThresholds)
         {
             Alert(uid, state, alarmTypes, monitor);
         }
@@ -399,7 +399,7 @@ private void UpdateState(EntityUid uid, GasMixture? air, AtmosMonitorComponent?
     /// </summary>
     /// <param name="state">The alarm state to set this monitor to.</param>
     /// <param name="alarms">The alarms that caused this alarm state.</param>
-    public void Alert(EntityUid uid, AtmosAlarmType state, HashSet<AtmosMonitorThresholdType>? alarms = null, AtmosMonitorComponent? monitor = null)
+    public void Alert(EntityUid uid, AtmosAlarmType state, AtmosMonitorThresholdTypeFlags? alarms = null, AtmosMonitorComponent? monitor = null)
     {
         if (!Resolve(uid, ref monitor))
             return;
diff --git a/Content.Server/Chat/Managers/ChatSanitizationManager.cs b/Content.Server/Chat/Managers/ChatSanitizationManager.cs
index d48d1a9ae762..1d6c1d18ab7f 100644
--- a/Content.Server/Chat/Managers/ChatSanitizationManager.cs
+++ b/Content.Server/Chat/Managers/ChatSanitizationManager.cs
@@ -148,21 +148,8 @@ public bool TrySanitizeEmoteShorthands(string message,
         // -1 is just a canary for nothing found yet
         var lastEmoteIndex = -1;
 
-        foreach (var (shorthand, emoteKey) in ShorthandToEmote)
+        foreach (var (r, emoteKey) in ShorthandToEmote)
         {
-            // We have to escape it because shorthands like ":)" or "-_-" would break the regex otherwise.
-            var escaped = Regex.Escape(shorthand);
-
-            // So there are 2 cases:
-            // - If there is whitespace before it and after it is either punctuation, whitespace, or the end of the line
-            //   Delete the word and the whitespace before
-            // - If it is at the start of the string and is followed by punctuation, whitespace, or the end of the line
-            //   Delete the word and the punctuation if it exists.
-            var pattern =
-                $@"\s{escaped}(?=\p{{P}}|\s|$)|^{escaped}(?:\p{{P}}|(?=\s|$))";
-
-            var r = new Regex(pattern, RegexOptions.RightToLeft | RegexOptions.IgnoreCase);
-
             // We're using sanitized as the original message until the end so that we can make sure the indices of
             // the emotes are accurate.
             var lastMatch = r.Match(sanitized);
diff --git a/Content.Server/Chat/Managers/ChatSanitizationManager.cs.rej b/Content.Server/Chat/Managers/ChatSanitizationManager.cs.rej
new file mode 100644
index 000000000000..ccc68b4bfca0
--- /dev/null
+++ b/Content.Server/Chat/Managers/ChatSanitizationManager.cs.rej
@@ -0,0 +1,190 @@
+diff a/Content.Server/Chat/Managers/ChatSanitizationManager.cs b/Content.Server/Chat/Managers/ChatSanitizationManager.cs	(rejected hunks)
+@@ -12,86 +12,86 @@ namespace Content.Server.Chat.Managers;
+ /// </summary>
+ public sealed class ChatSanitizationManager : IChatSanitizationManager
+ {
+-    private static readonly Dictionary<string, string> ShorthandToEmote = new()
+-    {
+-        { ":)", "chatsan-smiles" },
+-        { ":]", "chatsan-smiles" },
+-        { "=)", "chatsan-smiles" },
+-        { "=]", "chatsan-smiles" },
+-        { "(:", "chatsan-smiles" },
+-        { "[:", "chatsan-smiles" },
+-        { "(=", "chatsan-smiles" },
+-        { "[=", "chatsan-smiles" },
+-        { "^^", "chatsan-smiles" },
+-        { "^-^", "chatsan-smiles" },
+-        { ":(", "chatsan-frowns" },
+-        { ":[", "chatsan-frowns" },
+-        { "=(", "chatsan-frowns" },
+-        { "=[", "chatsan-frowns" },
+-        { "):", "chatsan-frowns" },
+-        { ")=", "chatsan-frowns" },
+-        { "]:", "chatsan-frowns" },
+-        { "]=", "chatsan-frowns" },
+-        { ":D", "chatsan-smiles-widely" },
+-        { "D:", "chatsan-frowns-deeply" },
+-        { ":O", "chatsan-surprised" },
+-        { ":3", "chatsan-smiles" },
+-        { ":S", "chatsan-uncertain" },
+-        { ":>", "chatsan-grins" },
+-        { ":<", "chatsan-pouts" },
+-        { "xD", "chatsan-laughs" },
+-        { ":'(", "chatsan-cries" },
+-        { ":'[", "chatsan-cries" },
+-        { "='(", "chatsan-cries" },
+-        { "='[", "chatsan-cries" },
+-        { ")':", "chatsan-cries" },
+-        { "]':", "chatsan-cries" },
+-        { ")'=", "chatsan-cries" },
+-        { "]'=", "chatsan-cries" },
+-        { ";-;", "chatsan-cries" },
+-        { ";_;", "chatsan-cries" },
+-        { "qwq", "chatsan-cries" },
+-        { ":u", "chatsan-smiles-smugly" },
+-        { ":v", "chatsan-smiles-smugly" },
+-        { ">:i", "chatsan-annoyed" },
+-        { ":i", "chatsan-sighs" },
+-        { ":|", "chatsan-sighs" },
+-        { ":p", "chatsan-stick-out-tongue" },
+-        { ";p", "chatsan-stick-out-tongue" },
+-        { ":b", "chatsan-stick-out-tongue" },
+-        { "0-0", "chatsan-wide-eyed" },
+-        { "o-o", "chatsan-wide-eyed" },
+-        { "o.o", "chatsan-wide-eyed" },
+-        { "._.", "chatsan-surprised" },
+-        { ".-.", "chatsan-confused" },
+-        { "-_-", "chatsan-unimpressed" },
+-        { "smh", "chatsan-unimpressed" },
+-        { "o/", "chatsan-waves" },
+-        { "^^/", "chatsan-waves" },
+-        { ":/", "chatsan-uncertain" },
+-        { ":\\", "chatsan-uncertain" },
+-        { "lmao", "chatsan-laughs" },
+-        { "lmfao", "chatsan-laughs" },
+-        { "lol", "chatsan-laughs" },
+-        { "lel", "chatsan-laughs" },
+-        { "kek", "chatsan-laughs" },
+-        { "rofl", "chatsan-laughs" },
+-        { "o7", "chatsan-salutes" },
+-        { ";_;7", "chatsan-tearfully-salutes" },
+-        { "idk", "chatsan-shrugs" },
+-        { ";)", "chatsan-winks" },
+-        { ";]", "chatsan-winks" },
+-        { "(;", "chatsan-winks" },
+-        { "[;", "chatsan-winks" },
+-        { ":')", "chatsan-tearfully-smiles" },
+-        { ":']", "chatsan-tearfully-smiles" },
+-        { "=')", "chatsan-tearfully-smiles" },
+-        { "=']", "chatsan-tearfully-smiles" },
+-        { "(':", "chatsan-tearfully-smiles" },
+-        { "[':", "chatsan-tearfully-smiles" },
+-        { "('=", "chatsan-tearfully-smiles" },
+-        { "['=", "chatsan-tearfully-smiles" }
+-    };
++    private static readonly (Regex regex, string emoteKey)[] ShorthandToEmote =
++    [
++        Entry(":)", "chatsan-smiles"),
++        Entry(":]", "chatsan-smiles"),
++        Entry("=)", "chatsan-smiles"),
++        Entry("=]", "chatsan-smiles"),
++        Entry("(:", "chatsan-smiles"),
++        Entry("[:", "chatsan-smiles"),
++        Entry("(=", "chatsan-smiles"),
++        Entry("[=", "chatsan-smiles"),
++        Entry("^^", "chatsan-smiles"),
++        Entry("^-^", "chatsan-smiles"),
++        Entry(":(", "chatsan-frowns"),
++        Entry(":[", "chatsan-frowns"),
++        Entry("=(", "chatsan-frowns"),
++        Entry("=[", "chatsan-frowns"),
++        Entry("):", "chatsan-frowns"),
++        Entry(")=", "chatsan-frowns"),
++        Entry("]:", "chatsan-frowns"),
++        Entry("]=", "chatsan-frowns"),
++        Entry(":D", "chatsan-smiles-widely"),
++        Entry("D:", "chatsan-frowns-deeply"),
++        Entry(":O", "chatsan-surprised"),
++        Entry(":3", "chatsan-smiles"),
++        Entry(":S", "chatsan-uncertain"),
++        Entry(":>", "chatsan-grins"),
++        Entry(":<", "chatsan-pouts"),
++        Entry("xD", "chatsan-laughs"),
++        Entry(":'(", "chatsan-cries"),
++        Entry(":'[", "chatsan-cries"),
++        Entry("='(", "chatsan-cries"),
++        Entry("='[", "chatsan-cries"),
++        Entry(")':", "chatsan-cries"),
++        Entry("]':", "chatsan-cries"),
++        Entry(")'=", "chatsan-cries"),
++        Entry("]'=", "chatsan-cries"),
++        Entry(";-;", "chatsan-cries"),
++        Entry(";_;", "chatsan-cries"),
++        Entry("qwq", "chatsan-cries"),
++        Entry(":u", "chatsan-smiles-smugly"),
++        Entry(":v", "chatsan-smiles-smugly"),
++        Entry(">:i", "chatsan-annoyed"),
++        Entry(":i", "chatsan-sighs"),
++        Entry(":|", "chatsan-sighs"),
++        Entry(":p", "chatsan-stick-out-tongue"),
++        Entry(";p", "chatsan-stick-out-tongue"),
++        Entry(":b", "chatsan-stick-out-tongue"),
++        Entry("0-0", "chatsan-wide-eyed"),
++        Entry("o-o", "chatsan-wide-eyed"),
++        Entry("o.o", "chatsan-wide-eyed"),
++        Entry("._.", "chatsan-surprised"),
++        Entry(".-.", "chatsan-confused"),
++        Entry("-_-", "chatsan-unimpressed"),
++        Entry("smh", "chatsan-unimpressed"),
++        Entry("o/", "chatsan-waves"),
++        Entry("^^/", "chatsan-waves"),
++        Entry(":/", "chatsan-uncertain"),
++        Entry(":\\", "chatsan-uncertain"),
++        Entry("lmao", "chatsan-laughs"),
++        Entry("lmfao", "chatsan-laughs"),
++        Entry("lol", "chatsan-laughs"),
++        Entry("lel", "chatsan-laughs"),
++        Entry("kek", "chatsan-laughs"),
++        Entry("rofl", "chatsan-laughs"),
++        Entry("o7", "chatsan-salutes"),
++        Entry(";_;7", "chatsan-tearfully-salutes"),
++        Entry("idk", "chatsan-shrugs"),
++        Entry(";)", "chatsan-winks"),
++        Entry(";]", "chatsan-winks"),
++        Entry("(;", "chatsan-winks"),
++        Entry("[;", "chatsan-winks"),
++        Entry(":')", "chatsan-tearfully-smiles"),
++        Entry(":']", "chatsan-tearfully-smiles"),
++        Entry("=')", "chatsan-tearfully-smiles"),
++        Entry("=']", "chatsan-tearfully-smiles"),
++        Entry("(':", "chatsan-tearfully-smiles"),
++        Entry("[':", "chatsan-tearfully-smiles"),
++        Entry("('=", "chatsan-tearfully-smiles"),
++        Entry("['=", "chatsan-tearfully-smiles"),
++    ];
+ 
+     [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+     [Dependency] private readonly ILocalizationManager _loc = default!;
+@@ -159,4 +146,21 @@ public bool TrySanitizeEmoteShorthands(string message,
+         sanitized = message.Trim();
+         return emote is not null;
+     }
++
++    private static (Regex regex, string emoteKey) Entry(string shorthand, string emoteKey)
++    {
++        // We have to escape it because shorthands like ":)" or "-_-" would break the regex otherwise.
++        var escaped = Regex.Escape(shorthand);
++
++        // So there are 2 cases:
++        // - If there is whitespace before it and after it is either punctuation, whitespace, or the end of the line
++        //   Delete the word and the whitespace before
++        // - If it is at the start of the string and is followed by punctuation, whitespace, or the end of the line
++        //   Delete the word and the punctuation if it exists.
++        var pattern = new Regex(
++            $@"\s{escaped}(?=\p{{P}}|\s|$)|^{escaped}(?:\p{{P}}|(?=\s|$))",
++            RegexOptions.RightToLeft | RegexOptions.IgnoreCase | RegexOptions.Compiled);
++
++        return (pattern, emoteKey);
++    }
+ }
diff --git a/Content.Server/Chat/SuicideSystem.cs b/Content.Server/Chat/SuicideSystem.cs
index d77aaaebba49..4932bc547181 100644
--- a/Content.Server/Chat/SuicideSystem.cs
+++ b/Content.Server/Chat/SuicideSystem.cs
@@ -146,6 +146,9 @@ public bool Suicide(EntityUid victim)
         if (!suicideGhostEvent.Handled || _tagSystem.HasTag(victim, CannotSuicideTag))
             return false;
 
+        // TODO: fix this
+        // This is a handled event, but the result is never used
+        // It looks like TriggerOnMobstateChange is supposed to prevent you from suiciding
         var suicideEvent = new SuicideEvent(victim);
         RaiseLocalEvent(victim, suicideEvent);
 
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs.rej b/Content.Server/Chat/Systems/ChatSystem.cs.rej
new file mode 100644
index 000000000000..dde4a7e3e340
--- /dev/null
+++ b/Content.Server/Chat/Systems/ChatSystem.cs.rej
@@ -0,0 +1,13 @@
+diff a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs	(rejected hunks)
+@@ -60,11 +60,6 @@ public sealed partial class ChatSystem : SharedChatSystem
+     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+     [Dependency] private readonly ExamineSystemShared _examineSystem = default!;
+ 
+-    public const int VoiceRange = 10; // how far voice goes in world units
+-    public const int WhisperClearRange = 2; // how far whisper goes while still being understandable, in world units
+-    public const int WhisperMuffledRange = 5; // how far whisper goes at all, in world units
+-    public const string DefaultAnnouncementSound = "/Audio/Announcements/announce.ogg";
+-
+     private bool _loocEnabled = true;
+     private bool _deadLoocEnabled;
+     private bool _critLoocEnabled;
diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs
index 88c0b184d653..f9398f2d075e 100644
--- a/Content.Server/Cluwne/CluwneSystem.cs
+++ b/Content.Server/Cluwne/CluwneSystem.cs
@@ -123,7 +123,7 @@ private void OnEmote(EntityUid uid, CluwneComponent component, ref EmoteEvent ar
         else if (_robustRandom.Prob(component.KnockChance))
         {
             _audio.PlayPvs(component.KnockSound, uid);
-            _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(component.ParalyzeTime), true);
+            _stunSystem.TryUpdateParalyzeDuration(uid, TimeSpan.FromSeconds(component.ParalyzeTime));
             _chat.TrySendInGameICMessage(uid, "spasms", InGameICChatType.Emote, ChatTransmitRange.Normal);
         }
     }
diff --git a/Content.Server/Defusable/Systems/DefusableSystem.cs b/Content.Server/Defusable/Systems/DefusableSystem.cs
index bf563b575d69..ef654ea92eef 100644
--- a/Content.Server/Defusable/Systems/DefusableSystem.cs
+++ b/Content.Server/Defusable/Systems/DefusableSystem.cs
@@ -89,12 +89,13 @@ private void OnExamine(EntityUid uid, DefusableComponent comp, ExaminedEvent arg
             {
                 args.PushMarkup(Loc.GetString("defusable-examine-defused", ("name", uid)));
             }
-            else if (comp.Activated && TryComp<ActiveTimerTriggerComponent>(uid, out var activeComp))
+            else if (comp.Activated)
             {
-                if (comp.DisplayTime)
+                var remaining = _trigger.GetRemainingTime(uid);
+                if (comp.DisplayTime && remaining != null)
                 {
                     args.PushMarkup(Loc.GetString("defusable-examine-live", ("name", uid),
-                        ("time", MathF.Floor(activeComp.TimeRemaining))));
+                        ("time", Math.Floor(remaining.Value.TotalSeconds))));
                 }
                 else
                 {
@@ -154,16 +155,9 @@ public void TryStartCountdown(EntityUid uid, EntityUid user, DefusableComponent
         SetActivated(comp, true);
 
         _popup.PopupEntity(Loc.GetString("defusable-popup-begun", ("name", uid)), uid);
-        if (TryComp<OnUseTimerTriggerComponent>(uid, out var timerTrigger))
+        if (TryComp<TimerTriggerComponent>(uid, out var timerTrigger))
         {
-            _trigger.HandleTimerTrigger(
-                uid,
-                user,
-                timerTrigger.Delay,
-                timerTrigger.BeepInterval,
-                timerTrigger.InitialBeepDelay,
-                timerTrigger.BeepSound
-            );
+            _trigger.ActivateTimerTrigger((uid, timerTrigger));
         }
 
         RaiseLocalEvent(uid, new BombArmedEvent(uid));
@@ -183,7 +177,7 @@ public void TryDetonateBomb(EntityUid uid, EntityUid detonator, DefusableCompone
 
         RaiseLocalEvent(uid, new BombDetonatedEvent(uid));
 
-        _explosion.TriggerExplosive(uid, user:detonator);
+        _explosion.TriggerExplosive(uid, user: detonator);
         QueueDel(uid);
 
         _appearance.SetData(uid, DefusableVisuals.Active, comp.Activated);
@@ -203,7 +197,7 @@ public void TryDefuseBomb(EntityUid uid, DefusableComponent comp)
         {
             SetUsable(comp, false);
             RemComp<ExplodeOnTriggerComponent>(uid);
-            RemComp<OnUseTimerTriggerComponent>(uid);
+            RemComp<TimerTriggerComponent>(uid);
         }
         RemComp<ActiveTimerTriggerComponent>(uid);
 
@@ -261,7 +255,7 @@ public void DelayWirePulse(EntityUid user, Wire wire, DefusableComponent comp)
         if (comp is not { Activated: true, DelayWireUsed: false })
             return;
 
-        _trigger.TryDelay(wire.Owner, 30f);
+        _trigger.TryDelay(wire.Owner, TimeSpan.FromSeconds(30));
         _popup.PopupEntity(Loc.GetString("defusable-popup-wire-chirp", ("name", wire.Owner)), wire.Owner);
         comp.DelayWireUsed = true;
     }
@@ -283,7 +277,7 @@ public void ProceedWirePulse(EntityUid user, Wire wire, DefusableComponent comp)
         if (comp is { Activated: true, ProceedWireUsed: false })
         {
             comp.ProceedWireUsed = true;
-            _trigger.TryDelay(wire.Owner, -15f);
+            _trigger.TryDelay(wire.Owner, TimeSpan.FromSeconds(-15));
         }
 
         _popup.PopupEntity(Loc.GetString("defusable-popup-wire-proceed-pulse", ("name", wire.Owner)), wire.Owner);
@@ -313,7 +307,7 @@ public void ActivateWirePulse(EntityUid user, Wire wire, DefusableComponent comp
         {
             if (!comp.ActivatedWireUsed)
             {
-                _trigger.TryDelay(wire.Owner, 30f);
+                _trigger.TryDelay(wire.Owner, TimeSpan.FromSeconds(30));
                 _popup.PopupEntity(Loc.GetString("defusable-popup-wire-chirp", ("name", wire.Owner)), wire.Owner);
                 comp.ActivatedWireUsed = true;
             }
diff --git a/Content.Server/Defusable/Systems/DefusableSystem.cs.rej b/Content.Server/Defusable/Systems/DefusableSystem.cs.rej
new file mode 100644
index 000000000000..72acdaa9bfc1
--- /dev/null
+++ b/Content.Server/Defusable/Systems/DefusableSystem.cs.rej
@@ -0,0 +1,24 @@
+diff a/Content.Server/Defusable/Systems/DefusableSystem.cs b/Content.Server/Defusable/Systems/DefusableSystem.cs	(rejected hunks)
+@@ -1,5 +1,4 @@
+ using Content.Server.Defusable.Components;
+-using Content.Server.Explosion.Components;
+ using Content.Server.Explosion.EntitySystems;
+ using Content.Server.Popups;
+ using Content.Server.Wires;
+@@ -8,13 +7,13 @@
+ using Content.Shared.Database;
+ using Content.Shared.Defusable;
+ using Content.Shared.Examine;
+-using Content.Shared.Explosion.Components;
+-using Content.Shared.Explosion.Components.OnTrigger;
+ using Content.Shared.Popups;
++using Content.Shared.Trigger.Components;
++using Content.Shared.Trigger.Components.Effects;
++using Content.Shared.Trigger.Systems;
+ using Content.Shared.Verbs;
+ using Content.Shared.Wires;
+ using Robust.Server.GameObjects;
+-using Robust.Shared.Audio;
+ using Robust.Shared.Audio.Systems;
+ 
+ namespace Content.Server.Defusable.Systems;
diff --git a/Content.Server/Destructible/DestructibleSystem.cs.rej b/Content.Server/Destructible/DestructibleSystem.cs.rej
new file mode 100644
index 000000000000..ad3c33bdd4d3
--- /dev/null
+++ b/Content.Server/Destructible/DestructibleSystem.cs.rej
@@ -0,0 +1,25 @@
+diff a/Content.Server/Destructible/DestructibleSystem.cs b/Content.Server/Destructible/DestructibleSystem.cs	(rejected hunks)
+@@ -1,4 +1,5 @@
+ using System.Diagnostics.CodeAnalysis;
++using System.Linq;
+ using Content.Server.Administration.Logs;
+ using Content.Server.Atmos.EntitySystems;
+ using Content.Server.Body.Systems;
+@@ -14,15 +15,13 @@
+ using Content.Shared.Database;
+ using Content.Shared.Destructible;
+ using Content.Shared.FixedPoint;
++using Content.Shared.Humanoid;
++using Content.Shared.Trigger.Systems;
+ using JetBrains.Annotations;
+ using Robust.Server.Audio;
+-using Robust.Server.GameObjects;
+ using Robust.Shared.Containers;
+ using Robust.Shared.Prototypes;
+ using Robust.Shared.Random;
+-using System.Linq;
+-using Content.Shared.Humanoid;
+-using Robust.Shared.Player;
+ 
+ namespace Content.Server.Destructible
+ {
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs.rej b/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs.rej
new file mode 100644
index 000000000000..59cccf10df20
--- /dev/null
+++ b/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs.rej
@@ -0,0 +1,9 @@
+diff a/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs	(rejected hunks)
+@@ -5,6 +5,6 @@ public sealed partial class TimerStartBehavior : IThresholdBehavior
+ {
+     public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
+     {
+-        system.TriggerSystem.StartTimer(owner, cause);
++        system.TriggerSystem.ActivateTimerTrigger(owner, cause);
+     }
+ }
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/TriggerBehavior.cs.rej b/Content.Server/Destructible/Thresholds/Behaviors/TriggerBehavior.cs.rej
new file mode 100644
index 000000000000..01f403d195e9
--- /dev/null
+++ b/Content.Server/Destructible/Thresholds/Behaviors/TriggerBehavior.cs.rej
@@ -0,0 +1,22 @@
+diff a/Content.Server/Destructible/Thresholds/Behaviors/TriggerBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/TriggerBehavior.cs	(rejected hunks)
+@@ -1,10 +1,18 @@
+-namespace Content.Server.Destructible.Thresholds.Behaviors;
++using Content.Shared.Trigger.Systems;
++
++namespace Content.Server.Destructible.Thresholds.Behaviors;
+ 
+ [DataDefinition]
+ public sealed partial class TriggerBehavior : IThresholdBehavior
+ {
++    /// <summary>
++    /// The trigger key to use when triggering.
++    /// </summary>
++    [DataField]
++    public string? KeyOut { get; set; } = TriggerSystem.DefaultTriggerKey;
++
+     public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
+     {
+-        system.TriggerSystem.Trigger(owner, cause);
++        system.TriggerSystem.Trigger(owner, cause, KeyOut);
+     }
+ }
diff --git a/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs.rej b/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs.rej
new file mode 100644
index 000000000000..e515878c3a85
--- /dev/null
+++ b/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs.rej
@@ -0,0 +1,8 @@
+diff a/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs b/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs	(rejected hunks)
+@@ -1,4 +1,6 @@
+ using Content.Server.DeviceLinking.Components;
++using Content.Server.DeviceNetwork;
++using Content.Server.DeviceNetwork.Components;
+ using Content.Server.DeviceNetwork.Systems;
+ using Content.Shared.DeviceLinking;
+ using Content.Shared.DeviceLinking.Events;
diff --git a/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs.rej b/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs.rej
new file mode 100644
index 000000000000..06c029666b50
--- /dev/null
+++ b/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs.rej
@@ -0,0 +1,7 @@
+diff a/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs b/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs	(rejected hunks)
+@@ -1,5 +1,4 @@
+ using Content.Server.DeviceLinking.Components;
+-using Content.Server.DeviceNetwork;
+ using Content.Shared.DeviceLinking;
+ using Content.Shared.DeviceLinking.Events;
+ using Content.Shared.DeviceNetwork;
diff --git a/Content.Server/DeviceLinking/Systems/SignallerSystem.cs b/Content.Server/DeviceLinking/Systems/SignallerSystem.cs
index 3c15479b4b03..039ef14abede 100644
--- a/Content.Server/DeviceLinking/Systems/SignallerSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/SignallerSystem.cs
@@ -24,7 +24,6 @@ namespace Content.Server.DeviceLinking.Systems;
 public sealed class SignallerSystem : EntitySystem
 {
     [Dependency] private readonly DeviceLinkSystem _link = default!;
-    [Dependency] private readonly UseDelaySystem _useDelay = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
 
     public override void Initialize()
@@ -33,7 +32,6 @@ public override void Initialize()
 
         SubscribeLocalEvent<SignallerComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<SignallerComponent, UseInHandEvent>(OnUseInHand);
-        SubscribeLocalEvent<SignallerComponent, TriggerEvent>(OnTrigger);
     }
 
     private void OnInit(EntityUid uid, SignallerComponent component, ComponentInit args)
diff --git a/Content.Server/DeviceLinking/Systems/SignallerSystem.cs.rej b/Content.Server/DeviceLinking/Systems/SignallerSystem.cs.rej
new file mode 100644
index 000000000000..200947ffec62
--- /dev/null
+++ b/Content.Server/DeviceLinking/Systems/SignallerSystem.cs.rej
@@ -0,0 +1,25 @@
+diff a/Content.Server/DeviceLinking/Systems/SignallerSystem.cs b/Content.Server/DeviceLinking/Systems/SignallerSystem.cs	(rejected hunks)
+@@ -1,6 +1,5 @@
+ using Content.Server.Administration.Logs;
+ using Content.Server.DeviceLinking.Components;
+-using Content.Server.Explosion.EntitySystems;
+ using Content.Shared.Database;
+ using Content.Shared.Interaction.Events;
+ using Content.Shared.Timing;
+@@ -36,16 +33,4 @@ private void OnUseInHand(EntityUid uid, SignallerComponent component, UseInHandE
+         _link.InvokePort(uid, component.Port);
+         args.Handled = true;
+     }
+-
+-    private void OnTrigger(EntityUid uid, SignallerComponent component, TriggerEvent args)
+-    {
+-        if (!TryComp(uid, out UseDelayComponent? useDelay)
+-            // if on cooldown, do nothing
+-            // and set cooldown to prevent clocks
+-            || !_useDelay.TryResetDelay((uid, useDelay), true))
+-            return;
+-
+-        _link.InvokePort(uid, component.Port);
+-        args.Handled = true;
+-    }
+ }
diff --git a/Content.Server/Drowsiness/DrowsinessSystem.cs.rej b/Content.Server/Drowsiness/DrowsinessSystem.cs.rej
new file mode 100644
index 000000000000..257e0c038667
--- /dev/null
+++ b/Content.Server/Drowsiness/DrowsinessSystem.cs.rej
@@ -0,0 +1,7 @@
+diff a/Content.Server/Drowsiness/DrowsinessSystem.cs b/Content.Server/Drowsiness/DrowsinessSystem.cs	(rejected hunks)
+@@ -1,4 +1,4 @@
+-using Content.Shared.Bed.Sleep;
++using Content.Shared.Bed.Sleep;
+ using Content.Shared.Drowsiness;
+ using Content.Shared.StatusEffectNew;
+ using Content.Shared.StatusEffectNew.Components;
diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs
index 06214b3ed074..cb8cbb621268 100644
--- a/Content.Server/Electrocution/ElectrocutionSystem.cs
+++ b/Content.Server/Electrocution/ElectrocutionSystem.cs
@@ -111,7 +111,7 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
 
-    private static readonly ProtoId<StatusEffectPrototype> StatusEffectKey = "Electrocution";
+    private static readonly ProtoId<StatusEffectPrototype> StatusKeyIn = "Electrocution";
     private static readonly ProtoId<DamageTypePrototype> DamageType = "Shock";
     private static readonly ProtoId<TagPrototype> WindowTag = "Window";
 
@@ -463,18 +463,23 @@ private bool DoCommonElectrocution(EntityUid uid, EntityUid? sourceUid,
         }
 
         if (!Resolve(uid, ref statusEffects, false) ||
-            !_statusEffects.CanApplyEffect(uid, StatusEffectKey, statusEffects))
+            !_statusEffects.CanApplyEffect(uid, StatusKeyIn, statusEffects))
         {
             return false;
         }
 
-        if (!_statusEffects.TryAddStatusEffect<ElectrocutedComponent>(uid, StatusEffectKey, time, refresh, statusEffects))
+        if (!_statusEffects.TryAddStatusEffect<ElectrocutedComponent>(uid, StatusKeyIn, time, refresh, statusEffects))
             return false;
 
         var shouldStun = siemensCoefficient > 0.5f;
 
         if (shouldStun)
-            _stun.TryParalyze(uid, time * ParalyzeTimeMultiplier, refresh, statusEffects);
+        {
+            _ = refresh
+                ? _stun.TryUpdateParalyzeDuration(uid, time * ParalyzeTimeMultiplier)
+                : _stun.TryAddParalyzeDuration(uid, time * ParalyzeTimeMultiplier);
+        }
+
 
         // TODO: Sparks here.
 
diff --git a/Content.Server/Emp/EmpSystem.cs b/Content.Server/Emp/EmpSystem.cs
index facd04c18a8c..47817005e89a 100644
--- a/Content.Server/Emp/EmpSystem.cs
+++ b/Content.Server/Emp/EmpSystem.cs
@@ -32,7 +32,6 @@ public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<EmpDisabledComponent, ExaminedEvent>(OnExamine);
-        SubscribeLocalEvent<EmpOnTriggerComponent, TriggerEvent>(HandleEmpTrigger);
 
         SubscribeLocalEvent<EmpDisabledComponent, RadioSendAttemptEvent>(OnRadioSendAttempt);
         SubscribeLocalEvent<EmpDisabledComponent, RadioReceiveAttemptEvent>(OnRadioReceiveAttempt);
@@ -40,14 +39,7 @@ public override void Initialize()
         SubscribeLocalEvent<EmpDisabledComponent, SurveillanceCameraSetActiveAttemptEvent>(OnCameraSetActive);
     }
 
-    /// <summary>
-    ///   Triggers an EMP pulse at the given location, by first raising an <see cref="EmpAttemptEvent"/>, then a raising <see cref="EmpPulseEvent"/> on all entities in range.
-    /// </summary>
-    /// <param name="coordinates">The location to trigger the EMP pulse at.</param>
-    /// <param name="range">The range of the EMP pulse.</param>
-    /// <param name="energyConsumption">The amount of energy consumed by the EMP pulse.</param>
-    /// <param name="duration">The duration of the EMP effects.</param>
-    public void EmpPulse(MapCoordinates coordinates, float range, float energyConsumption, float duration)
+    public override void EmpPulse(MapCoordinates coordinates, float range, float energyConsumption, float duration)
     {
         foreach (var uid in _lookup.GetEntitiesInRange(coordinates, range))
         {
@@ -130,12 +122,6 @@ private void OnExamine(EntityUid uid, EmpDisabledComponent component, ExaminedEv
         args.PushMarkup(Loc.GetString("emp-disabled-comp-on-examine"));
     }
 
-    private void HandleEmpTrigger(EntityUid uid, EmpOnTriggerComponent comp, TriggerEvent args)
-    {
-        EmpPulse(_transform.GetMapCoordinates(uid), comp.Range, comp.EnergyConsumption, comp.DisableDuration);
-        args.Handled = true;
-    }
-
     private void OnRadioSendAttempt(EntityUid uid, EmpDisabledComponent component, ref RadioSendAttemptEvent args)
     {
         args.Cancelled = true;
diff --git a/Content.Server/Emp/EmpSystem.cs.rej b/Content.Server/Emp/EmpSystem.cs.rej
new file mode 100644
index 000000000000..11ca6b27b34b
--- /dev/null
+++ b/Content.Server/Emp/EmpSystem.cs.rej
@@ -0,0 +1,6 @@
+diff a/Content.Server/Emp/EmpSystem.cs b/Content.Server/Emp/EmpSystem.cs	(rejected hunks)
+@@ -1,4 +1,3 @@
+-using Content.Server.Explosion.EntitySystems;
+ using Content.Server.Power.EntitySystems;
+ using Content.Server.Radio;
+ using Content.Server.SurveillanceCamera;
diff --git a/Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs.rej b/Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs.rej
new file mode 100644
index 000000000000..28f61f8151fb
--- /dev/null
+++ b/Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs.rej
@@ -0,0 +1,12 @@
+diff a/Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs b/Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs	(rejected hunks)
+@@ -45,4 +45,10 @@ public sealed partial class ProjectileGrenadeComponent : Component
+     /// </summary>
+     [DataField]
+     public float MaxVelocity = 6f;
++
++    /// <summary>
++    /// The trigger key that will activate the grenade.
++    /// </summary>
++    [DataField]
++    public string TriggerKey = "timer";
+ }
diff --git a/Content.Server/Explosion/Components/TriggerOnUseComponent.cs b/Content.Server/Explosion/Components/TriggerOnUseComponent.cs
deleted file mode 100644
index 2b44d2fbac4d..000000000000
--- a/Content.Server/Explosion/Components/TriggerOnUseComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Triggers on use in hand.
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerOnUseComponent : Component { }
diff --git a/Content.Server/Explosion/Components/TriggerWhitelistComponent.cs b/Content.Server/Explosion/Components/TriggerWhitelistComponent.cs
deleted file mode 100644
index 80becf17ccdd..000000000000
--- a/Content.Server/Explosion/Components/TriggerWhitelistComponent.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Content.Shared.Whitelist;
-
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Checks if the user of a Trigger satisfies a whitelist and blacklist condition.
-/// Cancels the trigger otherwise.
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerWhitelistComponent : Component
-{
-    /// <summary>
-    /// Whitelist for what entites can cause this trigger.
-    /// </summary>
-    [DataField]
-    public EntityWhitelist? Whitelist;
-
-    /// <summary>
-    /// Blacklist for what entites can cause this trigger.
-    /// </summary>
-    [DataField]
-    public EntityWhitelist? Blacklist;
-}
diff --git a/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs b/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs
index b48b8fc959fb..f8d37aa38c3b 100644
--- a/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs
@@ -52,6 +52,9 @@ private void OnFragStartup(Entity<ProjectileGrenadeComponent> entity, ref Compon
     /// </summary>
     private void OnFragTrigger(Entity<ProjectileGrenadeComponent> entity, ref TriggerEvent args)
     {
+        if (args.Key != entity.Comp.TriggerKey)
+            return;
+
         FragmentIntoProjectiles(entity.Owner, entity.Comp);
         args.Handled = true;
     }
diff --git a/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs.rej b/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs.rej
new file mode 100644
index 000000000000..b639ac5b8406
--- /dev/null
+++ b/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs.rej
@@ -0,0 +1,8 @@
+diff a/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs b/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs	(rejected hunks)
+@@ -1,5 +1,6 @@
+ using Content.Server.Explosion.Components;
+ using Content.Server.Weapons.Ranged.Systems;
++using Content.Shared.Trigger;
+ using Robust.Server.GameObjects;
+ using Robust.Shared.Containers;
+ using Robust.Shared.Map;
diff --git a/Content.Server/Explosion/EntitySystems/ReleaseGasOnTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/ReleaseGasOnTriggerSystem.cs
deleted file mode 100644
index ae3f84f84390..000000000000
--- a/Content.Server/Explosion/EntitySystems/ReleaseGasOnTriggerSystem.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Explosion.Components.OnTrigger;
-using Content.Shared.Explosion.EntitySystems;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Explosion.EntitySystems;
-
-/// <summary>
-/// Releases a gas mixture to the atmosphere when triggered.
-/// Can also release gas over a set timespan to prevent trolling people
-/// with the instant-wall-of-pressure-inator.
-/// </summary>
-public sealed partial class ReleaseGasOnTriggerSystem : SharedReleaseGasOnTriggerSystem
-{
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<ReleaseGasOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    /// <summary>
-    /// Shrimply sets the component to active when triggered, allowing it to release over time.
-    /// </summary>
-    private void OnTrigger(Entity<ReleaseGasOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        ent.Comp.Active = true;
-        ent.Comp.NextReleaseTime = _timing.CurTime;
-        ent.Comp.StartingTotalMoles = ent.Comp.Air.TotalMoles;
-        UpdateAppearance(ent.Owner, true);
-    }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var curTime = _timing.CurTime;
-        var query = EntityQueryEnumerator<ReleaseGasOnTriggerComponent>();
-
-        while (query.MoveNext(out var uid, out var comp))
-        {
-            if (!comp.Active || comp.NextReleaseTime > curTime)
-                continue;
-
-            var giverGasMix = comp.Air.Remove(comp.StartingTotalMoles * comp.RemoveFraction);
-            var environment = _atmosphereSystem.GetContainingMixture(uid, false, true);
-
-            if (environment == null)
-            {
-                UpdateAppearance(uid, false);
-                RemCompDeferred<ReleaseGasOnTriggerComponent>(uid);
-                continue;
-            }
-
-            _atmosphereSystem.Merge(environment, giverGasMix);
-            comp.NextReleaseTime += comp.ReleaseInterval;
-
-            if (comp.PressureLimit != 0 && environment.Pressure >= comp.PressureLimit ||
-                comp.Air.TotalMoles <= 0)
-            {
-                UpdateAppearance(uid, false);
-                RemCompDeferred<ReleaseGasOnTriggerComponent>(uid);
-                continue;
-            }
-        }
-    }
-
-    private void UpdateAppearance(Entity<AppearanceComponent?> entity, bool state)
-    {
-        if (!Resolve(entity, ref entity.Comp, false))
-            return;
-
-        _appearance.SetData(entity, ReleaseGasOnTriggerVisuals.Key, state);
-    }
-}
diff --git a/Content.Server/Explosion/EntitySystems/RepulseAttractOnTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/RepulseAttractOnTriggerSystem.cs
deleted file mode 100644
index 9e595c5d9e52..000000000000
--- a/Content.Server/Explosion/EntitySystems/RepulseAttractOnTriggerSystem.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Content.Shared.Explosion.Components.OnTrigger;
-using Content.Shared.Explosion.EntitySystems;
-using Content.Shared.RepulseAttract;
-using Content.Shared.Timing;
-
-namespace Content.Server.Explosion.EntitySystems;
-
-public sealed class RepulseAttractOnTriggerSystem : SharedRepulseAttractOnTriggerSystem
-{
-    [Dependency] private readonly RepulseAttractSystem _repulse = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
-    [Dependency] private readonly UseDelaySystem _delay = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SharedRepulseAttractOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(Entity<SharedRepulseAttractOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (_delay.IsDelayed(ent.Owner))
-            return;
-
-        var position = _transform.GetMapCoordinates(ent);
-        _repulse.TryRepulseAttract(position, args.User, ent.Comp.Speed, ent.Comp.Range, ent.Comp.Whitelist, ent.Comp.CollisionMask);
-    }
-}
diff --git a/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs b/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs
index cb1b4242f324..04900a8c537d 100644
--- a/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs
@@ -20,6 +20,7 @@ public sealed class ScatteringGrenadeSystem : SharedScatteringGrenadeSystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ThrowingSystem _throwingSystem = default!;
     [Dependency] private readonly TransformSystem _transformSystem = default!;
+    [Dependency] private readonly TriggerSystem _trigger = default!;
 
     public override void Initialize()
     {
@@ -35,6 +36,9 @@ public override void Initialize()
     /// </summary>
     private void OnScatteringTrigger(Entity<ScatteringGrenadeComponent> entity, ref TriggerEvent args)
     {
+        if (args.Key != entity.Comp.TriggerKey)
+            return;
+
         entity.Comp.IsTriggered = true;
         args.Handled = true;
     }
@@ -81,13 +85,12 @@ public override void Update(float frametime)
 
                     _throwingSystem.TryThrow(contentUid, direction, component.Velocity);
 
-                    if (component.TriggerContents)
+                    if (component.TriggerContents && TryComp<TimerTriggerComponent>(contentUid, out var contentTimer))
                     {
                         additionalIntervalDelay += _random.NextFloat(component.IntervalBetweenTriggersMin, component.IntervalBetweenTriggersMax);
-                        var contentTimer = EnsureComp<ActiveTimerTriggerComponent>(contentUid);
-                        contentTimer.TimeRemaining = component.DelayBeforeTriggerContents + additionalIntervalDelay;
-                        var ev = new ActiveTimerTriggerEvent(contentUid, uid);
-                        RaiseLocalEvent(contentUid, ref ev);
+
+                        _trigger.SetDelay((contentUid, contentTimer), TimeSpan.FromSeconds(component.DelayBeforeTriggerContents + additionalIntervalDelay));
+                        _trigger.ActivateTimerTrigger((contentUid, contentTimer));
                     }
                 }
 
diff --git a/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs.rej b/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs.rej
new file mode 100644
index 000000000000..3b53b49165b6
--- /dev/null
+++ b/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs.rej
@@ -0,0 +1,10 @@
+diff a/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs b/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs	(rejected hunks)
+@@ -1,5 +1,8 @@
+ using Content.Shared.Explosion.Components;
+ using Content.Shared.Throwing;
++using Content.Shared.Trigger;
++using Content.Shared.Trigger.Systems;
++using Content.Shared.Trigger.Components;
+ using Robust.Server.GameObjects;
+ using Robust.Shared.Containers;
+ using Robust.Shared.Map;
diff --git a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
index 04f2e45b0c6d..52595ca0e410 100644
--- a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
@@ -352,7 +352,7 @@ private bool CheckRevsLose()
                     continue;
 
                 _npcFaction.RemoveFaction(uid, RevolutionaryNpcFaction);
-                _stun.TryParalyze(uid, stunTime, true);
+                _stun.TryUpdateParalyzeDuration(uid, stunTime);
                 RemCompDeferred<RevolutionaryComponent>(uid);
                 _popup.PopupEntity(Loc.GetString("rev-break-control", ("name", Identity.Entity(uid, EntityManager))), uid);
                 _adminLogManager.Add(LogType.Mind, LogImpact.Medium, $"{ToPrettyString(uid)} was deconverted due to all Head Revolutionaries dying.");
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs.rej b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs.rej
new file mode 100644
index 000000000000..c59f91de85e5
--- /dev/null
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs.rej
@@ -0,0 +1,12 @@
+diff a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs	(rejected hunks)
+@@ -125,8 +125,8 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
+         if (traitorRole is not null)
+         {
+             Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Add traitor briefing components");
+-            AddComp<RoleBriefingComponent>(traitorRole.Value.Owner);
+-            Comp<RoleBriefingComponent>(traitorRole.Value.Owner).Briefing = briefing;
++            EnsureComp<RoleBriefingComponent>(traitorRole.Value.Owner, out var briefingComp);
++            briefingComp.Briefing = briefing;
+         }
+         else
+         {
diff --git a/Content.Server/Ghost/Roles/GhostRoleSystem.cs b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
index 4d9b24e1f76b..5362b9a94c03 100644
--- a/Content.Server/Ghost/Roles/GhostRoleSystem.cs
+++ b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
@@ -49,7 +49,6 @@
 using Content.Server.Ghost.Roles.Events;
 using Content.Shared.Ghost.Roles.Raffles;
 using Content.Server.Ghost.Roles.UI;
-using Content.Server.Mind.Commands;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
@@ -793,7 +792,7 @@ private void OnTakeoverTakeRole(EntityUid uid, GhostTakeoverAvailableComponent c
         }
 
         if (ghostRole.MakeSentient)
-            MakeSentientCommand.MakeSentient(uid, EntityManager, ghostRole.AllowMovement, ghostRole.AllowSpeech);
+            _mindSystem.MakeSentient(uid, ghostRole.AllowMovement, ghostRole.AllowSpeech);
 
         GhostRoleInternalCreateMindAndTransfer(args.Player, uid, uid, ghostRole);
         UnregisterGhostRole((uid, ghostRole));
diff --git a/Content.Server/Ghost/Roles/GhostRoleSystem.cs.rej b/Content.Server/Ghost/Roles/GhostRoleSystem.cs.rej
new file mode 100644
index 000000000000..1049460b5270
--- /dev/null
+++ b/Content.Server/Ghost/Roles/GhostRoleSystem.cs.rej
@@ -0,0 +1,10 @@
+diff a/Content.Server/Ghost/Roles/GhostRoleSystem.cs b/Content.Server/Ghost/Roles/GhostRoleSystem.cs	(rejected hunks)
+@@ -698,7 +697,7 @@ private void OnSpawnerTakeRole(EntityUid uid, GhostRoleMobSpawnerComponent compo
+         RaiseLocalEvent(mob, spawnedEvent);
+ 
+         if (ghostRole.MakeSentient)
+-            MakeSentientCommand.MakeSentient(mob, EntityManager, ghostRole.AllowMovement, ghostRole.AllowSpeech);
++            _mindSystem.MakeSentient(mob, ghostRole.AllowMovement, ghostRole.AllowSpeech);
+ 
+         EnsureComp<MindContainerComponent>(mob);
+ 
diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs
index a7b94d1947d5..4d16d1292460 100644
--- a/Content.Server/Holopad/HolopadSystem.cs
+++ b/Content.Server/Holopad/HolopadSystem.cs
@@ -28,6 +28,7 @@
 using Content.Shared.Power;
 using Content.Shared.Silicons.StationAi;
 using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
 using Content.Shared.Telephone;
 using Content.Shared.UserInterface;
 using Content.Shared.Verbs;
diff --git a/Content.Server/Holopad/HolopadSystem.cs.rej b/Content.Server/Holopad/HolopadSystem.cs.rej
new file mode 100644
index 000000000000..d4e8579abdae
--- /dev/null
+++ b/Content.Server/Holopad/HolopadSystem.cs.rej
@@ -0,0 +1,9 @@
+diff a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs	(rejected hunks)
+@@ -1,7 +1,6 @@
+ using Content.Server.Chat.Systems;
+ using Content.Server.Popups;
+ using Content.Server.Power.EntitySystems;
+-using Content.Server.Speech.Components;
+ using Content.Server.Telephone;
+ using Content.Shared.Access.Systems;
+ using Content.Shared.Audio;
diff --git a/Content.Server/HotPotato/HotPotatoSystem.cs.rej b/Content.Server/HotPotato/HotPotatoSystem.cs.rej
new file mode 100644
index 000000000000..3fd58bca56b5
--- /dev/null
+++ b/Content.Server/HotPotato/HotPotatoSystem.cs.rej
@@ -0,0 +1,64 @@
+diff a/Content.Server/HotPotato/HotPotatoSystem.cs b/Content.Server/HotPotato/HotPotatoSystem.cs	(rejected hunks)
+@@ -1,61 +1,5 @@
+-using Content.Server.Audio;
+-using Content.Server.Explosion.EntitySystems;
+-using Content.Shared.Damage.Systems;
+-using Content.Shared.Hands.Components;
+-using Content.Shared.Hands.EntitySystems;
+ using Content.Shared.HotPotato;
+-using Content.Shared.Popups;
+-using Content.Shared.Weapons.Melee.Events;
+ 
+ namespace Content.Server.HotPotato;
+ 
+-public sealed class HotPotatoSystem : SharedHotPotatoSystem
+-{
+-    [Dependency] private readonly SharedHandsSystem _hands = default!;
+-    [Dependency] private readonly SharedPopupSystem _popup = default!;
+-    [Dependency] private readonly AmbientSoundSystem _ambientSound = default!;
+-    [Dependency] private readonly DamageOnHoldingSystem _damageOnHolding = default!;
+-
+-    public override void Initialize()
+-    {
+-        base.Initialize();
+-        SubscribeLocalEvent<HotPotatoComponent, ActiveTimerTriggerEvent>(OnActiveTimer);
+-        SubscribeLocalEvent<HotPotatoComponent, MeleeHitEvent>(OnMeleeHit);
+-    }
+-
+-    private void OnActiveTimer(EntityUid uid, HotPotatoComponent comp, ref ActiveTimerTriggerEvent args)
+-    {
+-        EnsureComp<ActiveHotPotatoComponent>(uid);
+-        comp.CanTransfer = false;
+-        _ambientSound.SetAmbience(uid, true);
+-        _damageOnHolding.SetEnabled(uid, true);
+-        Dirty(uid, comp);
+-    }
+-
+-    private void OnMeleeHit(EntityUid uid, HotPotatoComponent comp, MeleeHitEvent args)
+-    {
+-        if (!HasComp<ActiveHotPotatoComponent>(uid))
+-            return;
+-
+-        comp.CanTransfer = true;
+-        foreach (var hitEntity in args.HitEntities)
+-        {
+-            if (!TryComp<HandsComponent>(hitEntity, out var hands))
+-                continue;
+-
+-            if (!_hands.IsHolding((hitEntity, hands), uid, out _) && _hands.TryForcePickupAnyHand(hitEntity, uid, handsComp: hands))
+-            {
+-                _popup.PopupEntity(Loc.GetString("hot-potato-passed",
+-                    ("from", args.User), ("to", hitEntity)), uid, PopupType.Medium);
+-                break;
+-            }
+-
+-            _popup.PopupEntity(Loc.GetString("hot-potato-failed",
+-                ("to", hitEntity)), uid, PopupType.Medium);
+-
+-            break;
+-        }
+-        comp.CanTransfer = false;
+-        Dirty(uid, comp);
+-    }
+-}
++public sealed class HotPotatoSystem : SharedHotPotatoSystem;
diff --git a/Content.Server/Instruments/InstrumentSystem.cs.rej b/Content.Server/Instruments/InstrumentSystem.cs.rej
new file mode 100644
index 000000000000..8b298b5de46f
--- /dev/null
+++ b/Content.Server/Instruments/InstrumentSystem.cs.rej
@@ -0,0 +1,10 @@
+diff a/Content.Server/Instruments/InstrumentSystem.cs b/Content.Server/Instruments/InstrumentSystem.cs	(rejected hunks)
+@@ -461,7 +461,7 @@ public override void Update(float frameTime)
+             {
+                 if (instrument.InstrumentPlayer is {Valid: true} mob)
+                 {
+-                    _stuns.TryParalyze(mob, TimeSpan.FromSeconds(1), true);
++                    _stuns.TryUpdateParalyzeDuration(mob, TimeSpan.FromSeconds(1));
+ 
+                     _popup.PopupEntity(Loc.GetString("instrument-component-finger-cramps-max-message"),
+                         uid, mob, PopupType.LargeCaution);
diff --git a/Content.Server/LandMines/LandMineSystem.cs b/Content.Server/LandMines/LandMineSystem.cs
index 8dbc38c09fe9..af8517d2c2c6 100644
--- a/Content.Server/LandMines/LandMineSystem.cs
+++ b/Content.Server/LandMines/LandMineSystem.cs
@@ -39,15 +39,15 @@ public override void Initialize()
     /// </summary>
     private void HandleStepOnTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredOnEvent args)
     {
-      if (!string.IsNullOrEmpty(component.TriggerText))
-      {
-          _popupSystem.PopupCoordinates(
-              Loc.GetString(component.TriggerText, ("mine", uid)),
-              Transform(uid).Coordinates,
-              args.Tripper,
-              PopupType.LargeCaution);
-      }
-      _audioSystem.PlayPvs(component.Sound, uid);
+        if (!string.IsNullOrEmpty(component.TriggerText))
+        {
+            _popupSystem.PopupCoordinates(
+                Loc.GetString(component.TriggerText, ("mine", uid)),
+                Transform(uid).Coordinates,
+                args.Tripper,
+                PopupType.LargeCaution);
+        }
+        _audioSystem.PlayPvs(component.Sound, uid);
     }
 
     /// <summary>
@@ -55,7 +55,8 @@ private void HandleStepOnTriggered(EntityUid uid, LandMineComponent component, r
     /// </summary>
     private void HandleStepOffTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredOffEvent args)
     {
-        _trigger.Trigger(uid, args.Tripper);
+        // TODO: Adjust to the new trigger system
+        _trigger.Trigger(uid, args.Tripper, TriggerSystem.DefaultTriggerKey);
     }
 
     /// <summary>
diff --git a/Content.Server/LandMines/LandMineSystem.cs.rej b/Content.Server/LandMines/LandMineSystem.cs.rej
new file mode 100644
index 000000000000..c3719260bdcc
--- /dev/null
+++ b/Content.Server/LandMines/LandMineSystem.cs.rej
@@ -0,0 +1,12 @@
+diff a/Content.Server/LandMines/LandMineSystem.cs b/Content.Server/LandMines/LandMineSystem.cs	(rejected hunks)
+@@ -1,9 +1,9 @@
+-using Content.Server.Explosion.EntitySystems;
+ using Content.Shared.Armable;
+ using Content.Shared.Item.ItemToggle.Components;
+ using Content.Shared.LandMines;
+ using Content.Shared.Popups;
+ using Content.Shared.StepTrigger.Systems;
++using Content.Shared.Trigger.Systems;
+ using Robust.Shared.Audio.Systems;
+ 
+ namespace Content.Server.LandMines;
diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs
index 9d5e7c991d68..c478278b4934 100644
--- a/Content.Server/Medical/CryoPodSystem.cs
+++ b/Content.Server/Medical/CryoPodSystem.cs
@@ -136,7 +136,6 @@ public override void Initialize()
         SubscribeLocalEvent<CryoPodComponent, AtmosDeviceUpdateEvent>(OnCryoPodUpdateAtmosphere);
         SubscribeLocalEvent<CryoPodComponent, DragDropTargetEvent>(HandleDragDropOn);
         SubscribeLocalEvent<CryoPodComponent, InteractUsingEvent>(OnInteractUsing);
-        SubscribeLocalEvent<CryoPodComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<CryoPodComponent, PowerChangedEvent>(OnPowerChanged);
         SubscribeLocalEvent<CryoPodComponent, GasAnalyzerScanEvent>(OnGasAnalyzed);
         SubscribeLocalEvent<CryoPodComponent, ActivatableUIOpenAttemptEvent>(OnActivateUIAttempt);
@@ -290,22 +289,6 @@ private void OnInteractUsing(Entity<CryoPodComponent> entity, ref InteractUsingE
         args.Handled = _toolSystem.UseTool(args.Used, args.User, entity.Owner, entity.Comp.PryDelay, PryingQuality, new CryoPodPryFinished());
     }
 
-    private void OnExamined(Entity<CryoPodComponent> entity, ref ExaminedEvent args)
-    {
-        var container = _itemSlotsSystem.GetItemOrNull(entity.Owner, entity.Comp.SolutionContainerName);
-        if (args.IsInDetailsRange && container != null && _solutionContainerSystem.TryGetFitsInDispenser(container.Value, out _, out var containerSolution))
-        {
-            using (args.PushGroup(nameof(CryoPodComponent)))
-            {
-                args.PushMarkup(Loc.GetString("cryo-pod-examine", ("beaker", Name(container.Value))));
-                if (containerSolution.Volume == 0)
-                {
-                    args.PushMarkup(Loc.GetString("cryo-pod-empty-beaker"));
-                }
-            }
-        }
-    }
-
     private void OnPowerChanged(Entity<CryoPodComponent> entity, ref PowerChangedEvent args)
     {
         // Needed to avoid adding/removing components on a deleted entity
diff --git a/Content.Server/Medical/VomitSystem.cs b/Content.Server/Medical/VomitSystem.cs
index 93aa5b245bb5..3a20ce13f6f2 100644
--- a/Content.Server/Medical/VomitSystem.cs
+++ b/Content.Server/Medical/VomitSystem.cs
@@ -118,7 +118,7 @@ public sealed class VomitSystem : EntitySystem
         [Dependency] private readonly PopupSystem _popup = default!;
         [Dependency] private readonly PuddleSystem _puddle = default!;
         [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-        [Dependency] private readonly StunSystem _stun = default!;
+        [Dependency] private readonly MovementModStatusSystem _movementMod = default!;
         [Dependency] private readonly ThirstSystem _thirst = default!;
         [Dependency] private readonly ForensicsSystem _forensics = default!;
         [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
@@ -148,8 +148,7 @@ public void Vomit(EntityUid uid, float thirstAdded = -40f, float hungerAdded = -
             // It fully empties the stomach, this amount from the chem stream is relatively small
             var solutionSize = (MathF.Abs(thirstAdded) + MathF.Abs(hungerAdded)) / 6;
             // Apply a bit of slowdown
-            if (TryComp<StatusEffectsComponent>(uid, out var status))
-                _stun.TrySlowdown(uid, TimeSpan.FromSeconds(solutionSize), true, 0.5f, 0.5f, status);
+            _movementMod.TryUpdateMovementSpeedModDuration(uid, MovementModStatusSystem.VomitingSlowdown, TimeSpan.FromSeconds(solutionSize),  0.5f);
 
             // TODO: Need decals
             var solution = new Solution();
diff --git a/Content.Server/Medical/VomitSystem.cs.rej b/Content.Server/Medical/VomitSystem.cs.rej
new file mode 100644
index 000000000000..af5231cf21ba
--- /dev/null
+++ b/Content.Server/Medical/VomitSystem.cs.rej
@@ -0,0 +1,19 @@
+diff a/Content.Server/Medical/VomitSystem.cs b/Content.Server/Medical/VomitSystem.cs	(rejected hunks)
+@@ -2,16 +2,15 @@
+ using Content.Server.Fluids.EntitySystems;
+ using Content.Server.Forensics;
+ using Content.Server.Popups;
+-using Content.Server.Stunnable;
+ using Content.Shared.Body.Components;
+ using Content.Shared.Body.Systems;
+ using Content.Shared.Chemistry.Components;
+ using Content.Shared.Chemistry.EntitySystems;
+ using Content.Shared.Chemistry.Reagent;
+ using Content.Shared.IdentityManagement;
++using Content.Shared.Movement.Systems;
+ using Content.Shared.Nutrition.Components;
+ using Content.Shared.Nutrition.EntitySystems;
+-using Content.Shared.StatusEffect;
+ using Robust.Server.Audio;
+ using Robust.Shared.Audio;
+ using Robust.Shared.Prototypes;
diff --git a/Content.Server/Mind/Commands/MakeSentientCommand.cs.rej b/Content.Server/Mind/Commands/MakeSentientCommand.cs.rej
new file mode 100644
index 000000000000..f3264c662ede
--- /dev/null
+++ b/Content.Server/Mind/Commands/MakeSentientCommand.cs.rej
@@ -0,0 +1,81 @@
+diff a/Content.Server/Mind/Commands/MakeSentientCommand.cs b/Content.Server/Mind/Commands/MakeSentientCommand.cs	(rejected hunks)
+@@ -1,63 +1,30 @@
+ using Content.Server.Administration;
+ using Content.Shared.Administration;
+-using Content.Shared.Emoting;
+-using Content.Shared.Examine;
+-using Content.Shared.Mind.Components;
+-using Content.Shared.Movement.Components;
+-using Content.Shared.Speech;
+ using Robust.Shared.Console;
+ 
+-namespace Content.Server.Mind.Commands
++namespace Content.Server.Mind.Commands;
++
++[AdminCommand(AdminFlags.Admin)]
++public sealed class MakeSentientCommand : LocalizedEntityCommands
+ {
+-    [AdminCommand(AdminFlags.Admin)]
+-    public sealed class MakeSentientCommand : IConsoleCommand
+-    {
+-        [Dependency] private readonly IEntityManager _entManager = default!;
++    [Dependency] private readonly MindSystem _mindSystem = default!;
+ 
+-        public string Command => "makesentient";
+-        public string Description => "Makes an entity sentient (able to be controlled by a player)";
+-        public string Help => "makesentient <entity id>";
++    public override string Command => "makesentient";
+ 
+-        public void Execute(IConsoleShell shell, string argStr, string[] args)
++    public override void Execute(IConsoleShell shell, string argStr, string[] args)
++    {
++        if (args.Length != 1)
+         {
+-            if (args.Length != 1)
+-            {
+-                shell.WriteLine("Wrong number of arguments.");
+-                return;
+-            }
+-
+-            if (!NetEntity.TryParse(args[0], out var entNet) || !_entManager.TryGetEntity(entNet, out var entId))
+-            {
+-                shell.WriteLine("Invalid argument.");
+-                return;
+-            }
+-
+-            if (!_entManager.EntityExists(entId))
+-            {
+-                shell.WriteLine("Invalid entity specified!");
+-                return;
+-            }
+-
+-            MakeSentient(entId.Value, _entManager, true, true);
++            shell.WriteLine(Loc.GetString("shell-need-exactly-one-argument"));
++            return;
+         }
+ 
+-        public static void MakeSentient(EntityUid uid, IEntityManager entityManager, bool allowMovement = true, bool allowSpeech = true)
++        if (!NetEntity.TryParse(args[0], out var entNet) || !EntityManager.TryGetEntity(entNet, out var entId) || !EntityManager.EntityExists(entId))
+         {
+-            entityManager.EnsureComponent<MindContainerComponent>(uid);
+-            if (allowMovement)
+-            {
+-                entityManager.EnsureComponent<InputMoverComponent>(uid);
+-                entityManager.EnsureComponent<MobMoverComponent>(uid);
+-                entityManager.EnsureComponent<MovementSpeedModifierComponent>(uid);
+-            }
+-
+-            if (allowSpeech)
+-            {
+-                entityManager.EnsureComponent<SpeechComponent>(uid);
+-                entityManager.EnsureComponent<EmotingComponent>(uid);
+-            }
+-
+-            entityManager.EnsureComponent<ExaminerComponent>(uid);
++            shell.WriteLine(Loc.GetString("shell-could-not-find-entity-with-uid", ("uid", args[0])));
++            return;
+         }
++
++        _mindSystem.MakeSentient(entId.Value);
+     }
+ }
diff --git a/Content.Server/Mind/MindSystem.cs.rej b/Content.Server/Mind/MindSystem.cs.rej
new file mode 100644
index 000000000000..9a9df09f49a6
--- /dev/null
+++ b/Content.Server/Mind/MindSystem.cs.rej
@@ -0,0 +1,18 @@
+diff a/Content.Server/Mind/MindSystem.cs b/Content.Server/Mind/MindSystem.cs	(rejected hunks)
+@@ -1,7 +1,6 @@
+ using Content.Server.Administration.Logs;
+ using Content.Server.GameTicking;
+ using Content.Server.Ghost;
+-using Content.Server.Mind.Commands;
+ using Content.Shared.Database;
+ using Content.Shared.Ghost;
+ using Content.Shared.Mind;
+@@ -349,7 +348,7 @@ public override void ControlMob(NetUserId user, EntityUid target)
+             return;
+         }
+ 
+-        MakeSentientCommand.MakeSentient(target, EntityManager);
++        MakeSentient(target);
+         TransferTo(mindId, target, ghostCheckOverride: true, mind: mind);
+     }
+ }
diff --git a/Content.Server/Mobs/CritMobActionsSystem.cs b/Content.Server/Mobs/CritMobActionsSystem.cs
index d71c21c664bc..9c209e4e04b3 100644
--- a/Content.Server/Mobs/CritMobActionsSystem.cs
+++ b/Content.Server/Mobs/CritMobActionsSystem.cs
@@ -79,6 +79,10 @@ private void OnLastWords(EntityUid uid, MobStateActionsComponent component, Crit
         _quickDialog.OpenDialog(actor.PlayerSession, Loc.GetString("action-name-crit-last-words"), "",
             (string lastWords) =>
             {
+                // if a person is gibbed/deleted, they can't say last words
+                if (Deleted(uid))
+                    return;
+
                 // Intentionally does not check for muteness
                 if (actor.PlayerSession.AttachedEntity != uid
                     || !_mobState.IsCritical(uid))
diff --git a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs.rej b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs.rej
new file mode 100644
index 000000000000..a7afa03f59c1
--- /dev/null
+++ b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs.rej
@@ -0,0 +1,10 @@
+diff a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs	(rejected hunks)
+@@ -205,7 +205,7 @@ private void UpdateRanged(float frameTime)
+                 return;
+             }
+ 
+-            _gun.AttemptShoot(uid, gunUid, gun, targetCordinates);
++            _gun.AttemptShoot(uid, gunUid, gun, targetCordinates, comp.Target);
+         }
+     }
+ }
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
index b2b9122e2535..fd598dde1a7f 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
@@ -153,6 +153,8 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
 
     private object _obstacles = new();
 
+    private int _activeSteeringCount;
+
     public override void Initialize()
     {
         base.Initialize();
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.cs.rej b/Content.Server/NPC/Systems/NPCSteeringSystem.cs.rej
new file mode 100644
index 000000000000..bc05bd5a4bd2
--- /dev/null
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.cs.rej
@@ -0,0 +1,43 @@
+diff a/Content.Server/NPC/Systems/NPCSteeringSystem.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.cs	(rejected hunks)
+@@ -30,11 +30,16 @@
+ using Robust.Shared.Utility;
+ using Content.Shared.Prying.Systems;
+ using Microsoft.Extensions.ObjectPool;
++using Prometheus;
+ 
+ namespace Content.Server.NPC.Systems;
+ 
+ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
+ {
++    private static readonly Gauge ActiveSteeringGauge = Metrics.CreateGauge(
++        "npc_steering_active_count",
++        "Amount of NPCs trying to actively do steering");
++
+     /*
+      * We use context steering to determine which way to move.
+      * This involves creating an array of possible directions and assigning a value for the desireability of each direction.
+@@ -244,12 +251,15 @@ public override void Update(float frameTime)
+         };
+         var curTime = _timing.CurTime;
+ 
++        _activeSteeringCount = 0;
++
+         Parallel.For(0, index, options, i =>
+         {
+             var (uid, steering, mover, xform) = npcs[i];
+             Steer(uid, steering, mover, xform, frameTime, curTime);
+         });
+ 
++        ActiveSteeringGauge.Set(_activeSteeringCount);
+ 
+         if (_subscribedSessions.Count > 0)
+         {
+@@ -324,6 +334,8 @@ private void Steer(
+             return;
+         }
+ 
++        Interlocked.Increment(ref _activeSteeringCount);
++
+         var agentRadius = steering.Radius;
+         var worldPos = _transform.GetWorldPosition(xform);
+         var (layer, mask) = _physics.GetHardCollision(uid);
diff --git a/Content.Server/NPC/Systems/NPCSystem.cs b/Content.Server/NPC/Systems/NPCSystem.cs
index c570b0a188cd..6110f13e8de8 100644
--- a/Content.Server/NPC/Systems/NPCSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSystem.cs
@@ -39,6 +39,10 @@ namespace Content.Server.NPC.Systems
     /// </summary>
     public sealed partial class NPCSystem : EntitySystem
     {
+        private static readonly Gauge ActiveGauge = Metrics.CreateGauge(
+            "npc_active_count",
+            "Amount of NPCs that are actively processing");
+
         [Dependency] private readonly IConfigurationManager _configurationManager = default!;
         [Dependency] private readonly HTNSystem _htn = default!;
         [Dependency] private readonly MobStateSystem _mobState = default!;
@@ -158,6 +162,8 @@ public override void Update(float frameTime)
 
             // Add your system here.
             _htn.UpdateNPC(ref _count, _maxUpdates, frameTime);
+
+            ActiveGauge.Set(Count<ActiveNPCComponent>());
         }
 
         public void OnMobStateChange(EntityUid uid, HTNComponent component, MobStateChangedEvent args)
diff --git a/Content.Server/NPC/Systems/NPCSystem.cs.rej b/Content.Server/NPC/Systems/NPCSystem.cs.rej
new file mode 100644
index 000000000000..c1f5fdb27610
--- /dev/null
+++ b/Content.Server/NPC/Systems/NPCSystem.cs.rej
@@ -0,0 +1,9 @@
+diff a/Content.Server/NPC/Systems/NPCSystem.cs b/Content.Server/NPC/Systems/NPCSystem.cs	(rejected hunks)
+@@ -8,6 +8,7 @@
+ using Content.Shared.Mobs.Systems;
+ using Content.Shared.NPC;
+ using Content.Shared.NPC.Systems;
++using Prometheus;
+ using Robust.Server.GameObjects;
+ using Robust.Shared.Configuration;
+ using Robust.Shared.Player;
diff --git a/Content.Server/Ninja/Systems/SpiderChargeSystem.cs b/Content.Server/Ninja/Systems/SpiderChargeSystem.cs
index 9bdb6a2666ce..4603d7f82373 100644
--- a/Content.Server/Ninja/Systems/SpiderChargeSystem.cs
+++ b/Content.Server/Ninja/Systems/SpiderChargeSystem.cs
@@ -88,6 +88,7 @@
 using Content.Shared.Ninja.Systems;
 using Content.Shared.Roles;
 using Content.Shared.Sticky;
+using Content.Shared.Trigger;
 
 namespace Content.Server.Ninja.Systems;
 
@@ -161,6 +162,9 @@ private void OnStuck(EntityUid uid, SpiderChargeComponent comp, ref EntityStuckE
     /// </summary>
     private void OnExplode(EntityUid uid, SpiderChargeComponent comp, TriggerEvent args)
     {
+        if (args.Key != comp.TriggerKey)
+            return;
+
         if (!TryComp<SpaceNinjaComponent>(comp.Planter, out var ninja))
             return;
 
diff --git a/Content.Server/Ninja/Systems/SpiderChargeSystem.cs.rej b/Content.Server/Ninja/Systems/SpiderChargeSystem.cs.rej
new file mode 100644
index 000000000000..685d06ef8c67
--- /dev/null
+++ b/Content.Server/Ninja/Systems/SpiderChargeSystem.cs.rej
@@ -0,0 +1,6 @@
+diff a/Content.Server/Ninja/Systems/SpiderChargeSystem.cs b/Content.Server/Ninja/Systems/SpiderChargeSystem.cs	(rejected hunks)
+@@ -1,4 +1,3 @@
+-using Content.Server.Explosion.EntitySystems;
+ using Content.Server.Mind;
+ using Content.Server.Objectives.Components;
+ using Content.Server.Popups;
diff --git a/Content.Server/Ninja/Systems/StunProviderSystem.cs b/Content.Server/Ninja/Systems/StunProviderSystem.cs
index 8c80f03fe244..6f6931e35741 100644
--- a/Content.Server/Ninja/Systems/StunProviderSystem.cs
+++ b/Content.Server/Ninja/Systems/StunProviderSystem.cs
@@ -72,7 +72,7 @@ private void OnBeforeInteractHand(Entity<StunProviderComponent> ent, ref BeforeI
         _audio.PlayPvs(comp.Sound, target);
 
         _damageable.TryChangeDamage(target, comp.StunDamage, false, true, null, origin: uid);
-        _stun.TryParalyze(target, comp.StunTime, refresh: false);
+        _stun.TryAddParalyzeDuration(target, comp.StunTime);
 
         // short cooldown to prevent instant stunlocking
         _useDelay.SetLength((uid, useDelay), comp.Cooldown, id: comp.DelayId);
diff --git a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
index 240b3fb29658..5764f5fb15d9 100644
--- a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
@@ -171,15 +171,9 @@ private void ActivatePayload(EntityUid uid)
             {
                 if (_itemSlots.TryEject(uid, itemSlot, user: null, out var item))
                 {
-                    if (TryComp<OnUseTimerTriggerComponent>(item.Value, out var timerTrigger))
+                    if (TryComp<TimerTriggerComponent>(item.Value, out var timerTrigger))
                     {
-                        _trigger.HandleTimerTrigger(
-                            item.Value,
-                            null,
-                            timerTrigger.Delay,
-                            timerTrigger.BeepInterval,
-                            timerTrigger.InitialBeepDelay,
-                            timerTrigger.BeepSound);
+                        _trigger.ActivateTimerTrigger((item.Value, timerTrigger));
                     }
                 }
             }
diff --git a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs.rej b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs.rej
new file mode 100644
index 000000000000..a661a93dead8
--- /dev/null
+++ b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs.rej
@@ -0,0 +1,19 @@
+diff a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs	(rejected hunks)
+@@ -1,15 +1,15 @@
+-using Content.Server.Explosion.EntitySystems;
+ using Content.Server.Fluids.EntitySystems;
+ using Content.Server.Nutrition.Components;
+ using Content.Server.Popups;
+ using Content.Shared.Containers.ItemSlots;
+-using Content.Shared.Explosion.Components;
+ using Content.Shared.IdentityManagement;
+ using Content.Shared.Nutrition;
+ using Content.Shared.Nutrition.Components;
+ using Content.Shared.Nutrition.EntitySystems;
+ using Content.Shared.Rejuvenate;
+ using Content.Shared.Throwing;
++using Content.Shared.Trigger.Components;
++using Content.Shared.Trigger.Systems;
+ using Content.Shared.Chemistry.EntitySystems;
+ using JetBrains.Annotations;
+ using Robust.Shared.Audio;
diff --git a/Content.Server/Payload/EntitySystems/PayloadSystem.cs b/Content.Server/Payload/EntitySystems/PayloadSystem.cs
index f59883f18a7d..10076532a8d1 100644
--- a/Content.Server/Payload/EntitySystems/PayloadSystem.cs
+++ b/Content.Server/Payload/EntitySystems/PayloadSystem.cs
@@ -71,18 +71,22 @@ public IEnumerable<EntityUid> GetAllPayloads(EntityUid uid, ContainerManagerComp
 
     private void OnCaseTriggered(EntityUid uid, PayloadCaseComponent component, TriggerEvent args)
     {
+        // TODO: Adjust to the new trigger system
+
         if (!TryComp(uid, out ContainerManagerComponent? contMan))
             return;
 
         // Pass trigger event onto all contained payloads. Payload capacity configurable by construction graphs.
         foreach (var ent in GetAllPayloads(uid, contMan))
         {
-            RaiseLocalEvent(ent, args, false);
+            RaiseLocalEvent(ent, ref args, false);
         }
     }
 
     private void OnTriggerTriggered(EntityUid uid, PayloadTriggerComponent component, TriggerEvent args)
     {
+        // TODO: Adjust to the new trigger system
+
         if (!component.Active)
             return;
 
@@ -92,7 +96,7 @@ private void OnTriggerTriggered(EntityUid uid, PayloadTriggerComponent component
         // Ensure we don't enter a trigger-loop
         DebugTools.Assert(!_tagSystem.HasTag(uid, PayloadTag));
 
-        RaiseLocalEvent(parent, args, false);
+        RaiseLocalEvent(parent, ref args);
     }
 
     private void OnEntityInserted(EntityUid uid, PayloadCaseComponent _, EntInsertedIntoContainerMessage args)
@@ -163,6 +167,7 @@ private void OnExamined(EntityUid uid, PayloadCaseComponent component, ExaminedE
 
     private void HandleChemicalPayloadTrigger(Entity<ChemicalPayloadComponent> entity, ref TriggerEvent args)
     {
+        // TODO: Adjust to the new trigger system
         if (entity.Comp.BeakerSlotA.Item is not EntityUid beakerA
             || entity.Comp.BeakerSlotB.Item is not EntityUid beakerB
             || !TryComp(beakerA, out FitsInDispenserComponent? compA)
diff --git a/Content.Server/Payload/EntitySystems/PayloadSystem.cs.rej b/Content.Server/Payload/EntitySystems/PayloadSystem.cs.rej
new file mode 100644
index 000000000000..bceb6a8dbaef
--- /dev/null
+++ b/Content.Server/Payload/EntitySystems/PayloadSystem.cs.rej
@@ -0,0 +1,13 @@
+diff a/Content.Server/Payload/EntitySystems/PayloadSystem.cs b/Content.Server/Payload/EntitySystems/PayloadSystem.cs	(rejected hunks)
+@@ -1,10 +1,10 @@
+ using Content.Server.Administration.Logs;
+-using Content.Server.Explosion.EntitySystems;
+ using Content.Shared.Chemistry.Components;
+ using Content.Shared.Database;
+ using Content.Shared.Examine;
+ using Content.Shared.Payload.Components;
+ using Content.Shared.Tag;
++using Content.Shared.Trigger;
+ using Content.Shared.Chemistry.EntitySystems;
+ using Robust.Shared.Containers;
+ using Robust.Shared.Serialization.Manager;
diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index 942f25e2d8bc..02af584ae80b 100644
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -63,6 +63,7 @@
 using Content.Shared.Movement.Systems;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Systems;
+using Prometheus;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Player;
 using DroneConsoleComponent = Content.Server.Shuttles.DroneConsoleComponent;
@@ -73,6 +74,10 @@ namespace Content.Server.Physics.Controllers;
 
 public sealed class MoverController : SharedMoverController
 {
+    private static readonly Gauge ActiveMoverGauge = Metrics.CreateGauge(
+        "physics_active_mover_count",
+        "Active amount of InputMovers being processed by MoverController");
+
     [Dependency] private readonly ThrusterSystem _thruster = default!;
     [Dependency] private readonly SharedTransformSystem _xformSystem = default!;
 
@@ -153,6 +158,8 @@ public override void UpdateBeforeSolve(bool prediction, float frameTime)
             HandleMobMovement(mover, frameTime);
         }
 
+        ActiveMoverGauge.Set(_movers.Count);
+
         HandleShuttleMovement(frameTime);
     }
 
diff --git a/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs b/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
index dfbaec24bd9e..1ee78095ebfb 100644
--- a/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
+++ b/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
@@ -38,7 +38,6 @@
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Interaction;
 using Content.Shared.PneumaticCannon;
-using Content.Shared.StatusEffect;
 using Content.Shared.Tools.Systems;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
@@ -111,10 +110,9 @@ private void OnShoot(Entity<PneumaticCannonComponent> cannon, ref GunShotEvent a
         if (gas == null && component.GasUsage > 0f)
             return;
 
-        if (TryComp<StatusEffectsComponent>(args.User, out var status)
-            && component.Power == PneumaticCannonPower.High)
+        if (component.Power == PneumaticCannonPower.High
+            && _stun.TryUpdateParalyzeDuration(args.User, TimeSpan.FromSeconds(component.HighPowerStunTime)))
         {
-            _stun.TryParalyze(args.User, TimeSpan.FromSeconds(component.HighPowerStunTime), true, status);
             Popup.PopupEntity(Loc.GetString("pneumatic-cannon-component-power-stun",
                 ("cannon", uid)), cannon, args.User);
         }
diff --git a/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs.rej b/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs.rej
new file mode 100644
index 000000000000..19951bfb9a74
--- /dev/null
+++ b/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs.rej
@@ -0,0 +1,6 @@
+diff a/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs b/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs	(rejected hunks)
+@@ -1,4 +1,3 @@
+-using Content.Server.Atmos.Components;
+ using Content.Server.Atmos.EntitySystems;
+ using Content.Server.Storage.EntitySystems;
+ using Content.Server.Stunnable;
diff --git a/Content.Server/Polymorph/Components/PolymorphOnTriggerComponent.cs b/Content.Server/Polymorph/Components/PolymorphOnTriggerComponent.cs
deleted file mode 100644
index a11b4f4d4c0b..000000000000
--- a/Content.Server/Polymorph/Components/PolymorphOnTriggerComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared.Polymorph;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Polymorph.Components;
-
-/// <summary>
-/// Intended for use with the trigger system.
-/// Polymorphs the user of the trigger.
-/// </summary>
-[RegisterComponent]
-public sealed partial class PolymorphOnTriggerComponent : Component
-{
-    /// <summary>
-    /// Polymorph settings.
-    /// </summary>
-    [DataField(required: true)]
-    public ProtoId<PolymorphPrototype> Polymorph;
-}
diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.Trigger.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.Trigger.cs
deleted file mode 100644
index 452b0603153f..000000000000
--- a/Content.Server/Polymorph/Systems/PolymorphSystem.Trigger.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Content.Shared.Polymorph;
-using Content.Server.Polymorph.Components;
-using Content.Server.Explosion.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Polymorph.Systems;
-
-public sealed partial class PolymorphSystem
-{
-    /// <summary>
-    /// Need to do this so we don't get a collection enumeration error in physics by polymorphing
-    /// an entity we're colliding with in case of TriggerOnCollide.
-    /// Also makes sure other trigger effects don't activate in nullspace after we have polymorphed.
-    /// </summary>
-    private Queue<(EntityUid Ent, ProtoId<PolymorphPrototype> Polymorph)> _queuedPolymorphUpdates = new();
-
-    private void InitializeTrigger()
-    {
-        SubscribeLocalEvent<PolymorphOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(Entity<PolymorphOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (args.User == null)
-            return;
-
-        _queuedPolymorphUpdates.Enqueue((args.User.Value, ent.Comp.Polymorph));
-        args.Handled = true;
-    }
-
-    public void UpdateTrigger()
-    {
-        while (_queuedPolymorphUpdates.TryDequeue(out var data))
-        {
-            if (TerminatingOrDeleted(data.Item1))
-                continue;
-
-            PolymorphEntity(data.Item1, data.Item2);
-        }
-    }
-}
diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
index 8dc177c7f7d8..2209fddb10aa 100644
--- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs
+++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
@@ -221,8 +221,6 @@ public override void Update(float frameTime)
                 Revert((uid, comp));
             }
         }
-
-        UpdateTrigger();
     }
 
     private void OnComponentStartup(Entity<PolymorphableComponent> ent, ref ComponentStartup args)
diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs.rej b/Content.Server/Polymorph/Systems/PolymorphSystem.cs.rej
new file mode 100644
index 000000000000..085cedbed524
--- /dev/null
+++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs.rej
@@ -0,0 +1,29 @@
+diff a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs	(rejected hunks)
+@@ -1,10 +1,7 @@
+ using Content.Server.Actions;
+ using Content.Server.Humanoid;
+ using Content.Server.Inventory;
+-using Content.Server.Mind.Commands;
+ using Content.Server.Polymorph.Components;
+-using Content.Shared.Actions;
+-using Content.Shared.Actions.Components;
+ using Content.Shared.Buckle;
+ using Content.Shared.Coordinates;
+ using Content.Shared.Damage;
+@@ -61,7 +58,6 @@ public override void Initialize()
+         SubscribeLocalEvent<PolymorphedEntityComponent, DestructionEventArgs>(OnDestruction);
+ 
+         InitializeMap();
+-        InitializeTrigger();
+     }
+ 
+     public override void Update(float frameTime)
+@@ -210,7 +204,7 @@ private void OnDestruction(Entity<PolymorphedEntityComponent> ent, ref Destructi
+                 ("child", Identity.Entity(child, EntityManager))),
+                 child);
+ 
+-        MakeSentientCommand.MakeSentient(child, EntityManager);
++        _mindSystem.MakeSentient(child);
+ 
+         var polymorphedComp = Factory.GetComponent<PolymorphedEntityComponent>();
+         polymorphedComp.Parent = uid;
diff --git a/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs b/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs
index 6ce19cfaf6cf..33e3f8ff2c0b 100644
--- a/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs
+++ b/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs
@@ -1,4 +1,6 @@
-using Content.Server.Power.Components;
+using Content.Server.Administration.Logs;
+using Content.Server.Power.Components;
+using Content.Shared.Database;
 using Content.Shared.Power;
 using Robust.Server.GameObjects;
 
@@ -19,6 +21,7 @@ namespace Content.Server.Power.EntitySystems;
 /// </remarks>
 public sealed class BatteryInterfaceSystem : EntitySystem
 {
+    [Dependency] private readonly IAdminLogManager _adminLog = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = null!;
 
     public override void Initialize()
@@ -43,12 +46,16 @@ private void HandleSetInputBreaker(Entity<BatteryInterfaceComponent> ent, ref Ba
     {
         var netBattery = Comp<PowerNetworkBatteryComponent>(ent);
         netBattery.CanCharge = args.On;
+
+        _adminLog.Add(LogType.Action,$"{ToPrettyString(args.Actor):actor} set input breaker to {args.On} on {ToPrettyString(ent):target}");
     }
 
     private void HandleSetOutputBreaker(Entity<BatteryInterfaceComponent> ent, ref BatterySetOutputBreakerMessage args)
     {
         var netBattery = Comp<PowerNetworkBatteryComponent>(ent);
         netBattery.CanDischarge = args.On;
+
+        _adminLog.Add(LogType.Action,$"{ToPrettyString(args.Actor):actor} set output breaker to {args.On} on {ToPrettyString(ent):target}");
     }
 
     private void HandleSetChargeRate(Entity<BatteryInterfaceComponent> ent, ref BatterySetChargeRateMessage args)
diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs.rej b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs.rej
new file mode 100644
index 000000000000..a15026ea96ba
--- /dev/null
+++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs.rej
@@ -0,0 +1,19 @@
+diff a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs	(rejected hunks)
+@@ -2,15 +2,14 @@
+ using Content.Server.Chat.Systems;
+ using Content.Server.Interaction;
+ using Content.Server.Popups;
+-using Content.Server.Power.Components;
+ using Content.Server.Power.EntitySystems;
+ using Content.Server.Radio.Components;
+-using Content.Server.Speech;
+-using Content.Server.Speech.Components;
+ using Content.Shared.Examine;
+ using Content.Shared.Interaction;
+ using Content.Shared.Power;
+ using Content.Shared.Radio;
++using Content.Shared.Speech;
++using Content.Shared.Speech.Components;
+ using Content.Shared.Chat;
+ using Content.Shared.Radio.Components;
+ using Robust.Shared.Prototypes;
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
index 59ed1001f321..2227272bda73 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
@@ -195,7 +195,7 @@ private bool TryUseAbility(EntityUid uid, RevenantComponent component, FixedPoin
         ChangeEssenceAmount(uid, -abilityCost, component, false);
 
         _statusEffects.TryAddStatusEffect<CorporealComponent>(uid, "Corporeal", TimeSpan.FromSeconds(debuffs.Y), false);
-        _stun.TryStun(uid, TimeSpan.FromSeconds(debuffs.X), false);
+        _stun.TryAddStunDuration(uid, TimeSpan.FromSeconds(debuffs.X));
 
         return true;
     }
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs.rej b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs.rej
new file mode 100644
index 000000000000..1ffff85ca63b
--- /dev/null
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs.rej
@@ -0,0 +1,13 @@
+diff a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs	(rejected hunks)
+@@ -616,10 +616,7 @@ private void DoTheDinosaur(TransformComponent xform)
+         {
+             foreach (var child in toKnock)
+             {
+-                if (!_statusQuery.TryGetComponent(child, out var status))
+-                    continue;
+-
+-                _stuns.TryParalyze(child, _hyperspaceKnockdownTime, true, status);
++                _stuns.TryUpdateParalyzeDuration(child, _hyperspaceKnockdownTime);
+ 
+                 // If the guy we knocked down is on a spaced tile, throw them too
+                 if (grid != null)
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
index 6dfa9ed1bcf1..41d4c632311c 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
@@ -294,7 +294,7 @@ private void ThrowEntitiesOnGrid(EntityUid gridUid, TransformComponent xform, Ve
 
             if (direction.LengthSquared() > minsq)
             {
-                _stuns.TryKnockdown(uid, knockdownTime, true);
+                _stuns.TryUpdateKnockdownDuration(uid, knockdownTime);
                 _throwing.TryThrow(uid, direction, physics, Transform(uid), _projQuery, direction.Length(), playSound: false);
             }
             else
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs b/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
index 8cc8332d0c9c..3f4348faf710 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
@@ -167,7 +167,7 @@ private void Destroy(Entity<BorgTransponderComponent> ent)
 
         var message = Loc.GetString(ent.Comp.DestroyingPopup, ("name", Name(ent)));
         Popup.PopupEntity(message, ent);
-        _trigger.StartTimer(ent.Owner, user: null);
+        _trigger.ActivateTimerTrigger(ent.Owner);
 
         // prevent a shitter borg running into people
         RemComp<InputMoverComponent>(ent);
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs.rej b/Content.Server/Silicons/Borgs/BorgSystem.cs.rej
new file mode 100644
index 000000000000..2f8f90992f7f
--- /dev/null
+++ b/Content.Server/Silicons/Borgs/BorgSystem.cs.rej
@@ -0,0 +1,17 @@
+diff a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs	(rejected hunks)
+@@ -4,7 +4,6 @@
+ using Content.Server.Administration.Logs;
+ using Content.Server.Administration.Managers;
+ using Content.Server.DeviceNetwork.Systems;
+-using Content.Server.Explosion.EntitySystems;
+ using Content.Server.Hands.Systems;
+ using Content.Server.PowerCell;
+ using Content.Shared.Alert;
+@@ -25,6 +24,7 @@
+ using Content.Shared.Silicons.Borgs;
+ using Content.Shared.Silicons.Borgs.Components;
+ using Content.Shared.Throwing;
++using Content.Shared.Trigger.Systems;
+ using Content.Shared.Whitelist;
+ using Content.Shared.Wires;
+ using Robust.Server.GameObjects;
diff --git a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
index f30341ab738c..46a5ec717804 100644
--- a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
@@ -64,7 +64,6 @@
 using Content.Server.Weapons.Ranged.Systems;
 using Content.Shared.Database;
 using Content.Shared.DeviceLinking.Events;
-using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Lock;
 using Content.Shared.Popups;
@@ -72,9 +71,7 @@
 using Content.Shared.Projectiles;
 using Content.Shared.Singularity.Components;
 using Content.Shared.Singularity.EntitySystems;
-using Content.Shared.Verbs;
 using Content.Shared.Weapons.Ranged.Components;
-using JetBrains.Annotations;
 using Robust.Shared.Map;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
@@ -85,7 +82,6 @@
 
 namespace Content.Server.Singularity.EntitySystems
 {
-    [UsedImplicitly]
     public sealed class EmitterSystem : SharedEmitterSystem
     {
         [Dependency] private readonly IRobustRandom _random = default!;
@@ -103,8 +99,6 @@ public override void Initialize()
             SubscribeLocalEvent<EmitterComponent, PowerConsumerReceivedChanged>(ReceivedChanged);
             SubscribeLocalEvent<EmitterComponent, PowerChangedEvent>(OnApcChanged);
             SubscribeLocalEvent<EmitterComponent, ActivateInWorldEvent>(OnActivate);
-            SubscribeLocalEvent<EmitterComponent, GetVerbsEvent<Verb>>(OnGetVerb);
-            SubscribeLocalEvent<EmitterComponent, ExaminedEvent>(OnExamined);
             SubscribeLocalEvent<EmitterComponent, AnchorStateChangedEvent>(OnAnchorStateChanged);
             SubscribeLocalEvent<EmitterComponent, SignalReceivedEvent>(OnSignalReceived);
         }
@@ -156,47 +150,6 @@ private void OnActivate(EntityUid uid, EmitterComponent component, ActivateInWor
             }
         }
 
-        private void OnGetVerb(EntityUid uid, EmitterComponent component, GetVerbsEvent<Verb> args)
-        {
-            if (!args.CanAccess || !args.CanInteract || !args.CanComplexInteract || args.Hands == null)
-                return;
-
-            if (TryComp<LockComponent>(uid, out var lockComp) && lockComp.Locked)
-                return;
-
-            if (component.SelectableTypes.Count < 2)
-                return;
-
-            foreach (var type in component.SelectableTypes)
-            {
-                var proto = _prototype.Index<EntityPrototype>(type);
-
-                var v = new Verb
-                {
-                    Priority = 1,
-                    Category = VerbCategory.SelectType,
-                    Text = proto.Name,
-                    Disabled = type == component.BoltType,
-                    Impact = LogImpact.Medium,
-                    DoContactInteraction = true,
-                    Act = () =>
-                    {
-                        component.BoltType = type;
-                        _popup.PopupEntity(Loc.GetString("emitter-component-type-set", ("type", proto.Name)), uid);
-                    }
-                };
-                args.Verbs.Add(v);
-            }
-        }
-
-        private void OnExamined(EntityUid uid, EmitterComponent component, ExaminedEvent args)
-        {
-            if (component.SelectableTypes.Count < 2)
-                return;
-            var proto = _prototype.Index<EntityPrototype>(component.BoltType);
-            args.PushMarkup(Loc.GetString("emitter-component-current-type", ("type", proto.Name)));
-        }
-
         private void ReceivedChanged(
             EntityUid uid,
             EmitterComponent component,
diff --git a/Content.Server/Sound/EmitSoundSystem.cs b/Content.Server/Sound/EmitSoundSystem.cs
index b9e94528e157..fc60588478f2 100644
--- a/Content.Server/Sound/EmitSoundSystem.cs
+++ b/Content.Server/Sound/EmitSoundSystem.cs
@@ -92,16 +92,9 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<EmitSoundOnTriggerComponent, TriggerEvent>(HandleEmitSoundOnTrigger);
         SubscribeLocalEvent<SpamEmitSoundComponent, MapInitEvent>(HandleSpamEmitSoundMapInit);
     }
 
-    private void HandleEmitSoundOnTrigger(EntityUid uid, EmitSoundOnTriggerComponent component, TriggerEvent args)
-    {
-        TryEmitSound(uid, component, args.User, false);
-        args.Handled = true;
-    }
-
     private void HandleSpamEmitSoundMapInit(Entity<SpamEmitSoundComponent> entity, ref MapInitEvent args)
     {
         SpamEmitSoundReset(entity);
diff --git a/Content.Server/Sound/EmitSoundSystem.cs.rej b/Content.Server/Sound/EmitSoundSystem.cs.rej
new file mode 100644
index 000000000000..c0642be7a395
--- /dev/null
+++ b/Content.Server/Sound/EmitSoundSystem.cs.rej
@@ -0,0 +1,8 @@
+diff a/Content.Server/Sound/EmitSoundSystem.cs b/Content.Server/Sound/EmitSoundSystem.cs	(rejected hunks)
+@@ -1,6 +1,3 @@
+-using Content.Server.Explosion.EntitySystems;
+-using Content.Server.Sound.Components;
+-using Content.Shared.UserInterface;
+ using Content.Shared.Sound;
+ using Content.Shared.Sound.Components;
+ using Robust.Shared.Timing;
diff --git a/Content.Server/Speech/EntitySystems/BlockListeningSystem.cs.rej b/Content.Server/Speech/EntitySystems/BlockListeningSystem.cs.rej
new file mode 100644
index 000000000000..61b71c13a1aa
--- /dev/null
+++ b/Content.Server/Speech/EntitySystems/BlockListeningSystem.cs.rej
@@ -0,0 +1,7 @@
+diff a/Content.Server/Speech/EntitySystems/BlockListeningSystem.cs b/Content.Server/Speech/EntitySystems/BlockListeningSystem.cs	(rejected hunks)
+@@ -1,4 +1,5 @@
+ using Content.Server.Speech.Components;
++using Content.Shared.Speech;
+ 
+ namespace Content.Server.Speech.EntitySystems;
+ 
diff --git a/Content.Server/Speech/EntitySystems/ListeningSystem.cs.rej b/Content.Server/Speech/EntitySystems/ListeningSystem.cs.rej
new file mode 100644
index 000000000000..b43932137c2d
--- /dev/null
+++ b/Content.Server/Speech/EntitySystems/ListeningSystem.cs.rej
@@ -0,0 +1,9 @@
+diff a/Content.Server/Speech/EntitySystems/ListeningSystem.cs b/Content.Server/Speech/EntitySystems/ListeningSystem.cs	(rejected hunks)
+@@ -1,5 +1,6 @@
+ using Content.Server.Chat.Systems;
+-using Content.Server.Speech.Components;
++using Content.Shared.Speech;
++using Content.Shared.Speech.Components;
+ 
+ namespace Content.Server.Speech.EntitySystems;
+ 
diff --git a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
index 1ddbcf2e1bc9..deed1bc6b7bd 100644
--- a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
@@ -35,9 +35,21 @@ public sealed class ReplacementAccentSystem : EntitySystem
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly ILocalizationManager _loc = default!;
 
+        private readonly Dictionary<ProtoId<ReplacementAccentPrototype>, (Regex regex, string replacement)[]>
+            _cachedReplacements = new();
+
         public override void Initialize()
         {
             SubscribeLocalEvent<ReplacementAccentComponent, AccentGetEvent>(OnAccent);
+
+            _proto.PrototypesReloaded += OnPrototypesReloaded;
+        }
+
+        public override void Shutdown()
+        {
+            base.Shutdown();
+
+            _proto.PrototypesReloaded -= OnPrototypesReloaded;
         }
 
         private void OnAccent(EntityUid uid, ReplacementAccentComponent component, AccentGetEvent args)
@@ -64,27 +76,22 @@ public string ApplyReplacements(string message, string accent)
                 return prototype.FullReplacements.Length != 0 ? Loc.GetString(_random.Pick(prototype.FullReplacements)) : "";
             }
 
-            if (prototype.WordReplacements == null)
-                return message;
-
             // Prohibition of repeated word replacements.
             // All replaced words placed in the final message are placed here as dashes (___) with the same length.
             // The regex search goes through this buffer message, from which the already replaced words are crossed out,
             // ensuring that the replaced words cannot be replaced again.
             var maskMessage = message;
 
-            foreach (var (first, replace) in prototype.WordReplacements)
+            foreach (var (regex, replace) in GetCachedReplacements(prototype))
             {
-                var f = _loc.GetString(first);
-                var r = _loc.GetString(replace);
                 // this is kind of slow but its not that bad
                 // essentially: go over all matches, try to match capitalization where possible, then replace
                 // rather than using regex.replace
-                for (int i = Regex.Count(maskMessage, $@"(?<!\w){f}(?!\w)", RegexOptions.IgnoreCase); i > 0; i--)
+                for (int i = regex.Count(maskMessage); i > 0; i--)
                 {
                     // fetch the match again as the character indices may have changed
-                    Match match = Regex.Match(maskMessage, $@"(?<!\w){f}(?!\w)", RegexOptions.IgnoreCase);
-                    var replacement = r;
+                    Match match = regex.Match(maskMessage);
+                    var replacement = replace;
 
                     // Intelligently replace capitalization
                     // two cases where we will do so:
diff --git a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs.rej b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs.rej
new file mode 100644
index 000000000000..eaff320d4be7
--- /dev/null
+++ b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs.rej
@@ -0,0 +1,42 @@
+diff a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs	(rejected hunks)
+@@ -98,5 +105,40 @@ public string ApplyReplacements(string message, string accent)
+ 
+             return message;
+         }
++
++        private (Regex regex, string replacement)[] GetCachedReplacements(ReplacementAccentPrototype prototype)
++        {
++            if (!_cachedReplacements.TryGetValue(prototype.ID, out var replacements))
++            {
++                replacements = GenerateCachedReplacements(prototype);
++                _cachedReplacements.Add(prototype.ID, replacements);
++            }
++
++            return replacements;
++        }
++
++        private (Regex regex, string replacement)[] GenerateCachedReplacements(ReplacementAccentPrototype prototype)
++        {
++            if (prototype.WordReplacements is not { } replacements)
++                return [];
++
++            return replacements.Select(kv =>
++                {
++                    var (first, replace) = kv;
++                    var firstLoc = _loc.GetString(first);
++                    var replaceLoc = _loc.GetString(replace);
++
++                    var regex = new Regex($@"(?<!\w){firstLoc}(?!\w)", RegexOptions.IgnoreCase);
++
++                    return (regex, replaceLoc);
++
++                })
++                .ToArray();
++        }
++
++        private void OnPrototypesReloaded(PrototypesReloadedEventArgs obj)
++        {
++            _cachedReplacements.Clear();
++        }
+     }
+ }
diff --git a/Content.Server/Speech/Muting/MutingSystem.cs.rej b/Content.Server/Speech/Muting/MutingSystem.cs.rej
new file mode 100644
index 000000000000..844ad71d8596
--- /dev/null
+++ b/Content.Server/Speech/Muting/MutingSystem.cs.rej
@@ -0,0 +1,7 @@
+diff a/Content.Server/Speech/Muting/MutingSystem.cs b/Content.Server/Speech/Muting/MutingSystem.cs	(rejected hunks)
+@@ -1,4 +1,4 @@
+-using Content.Server.Abilities.Mime;
++using Content.Shared.Abilities.Mime;
+ using Content.Server.Chat.Systems;
+ using Content.Server.Popups;
+ using Content.Server.Speech.Components;
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index 5b6f662f7ee5..2331a6509a5a 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -139,6 +139,7 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
     [Dependency] private readonly MetaDataSystem _metaSystem = default!;
     [Dependency] private readonly PdaSystem _pdaSystem = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly MindSystem _mindSystem = default!;
 
     /// <summary>
     /// Attempts to spawn a player character onto the given station.
@@ -208,7 +209,7 @@ public EntityUid SpawnPlayerMob(
         {
             DebugTools.Assert(entity is null);
             var jobEntity = Spawn(prototype.JobEntity, coordinates);
-            MakeSentientCommand.MakeSentient(jobEntity, EntityManager);
+            _mindSystem.MakeSentient(jobEntity);
 
             // Make sure custom names get handled, what is gameticker control flow whoopy.
             if (loadout != null)
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs.rej b/Content.Server/Station/Systems/StationSpawningSystem.cs.rej
new file mode 100644
index 000000000000..f2ec64a69b3d
--- /dev/null
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs.rej
@@ -0,0 +1,10 @@
+diff a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs	(rejected hunks)
+@@ -1,7 +1,7 @@
+ using Content.Server.Access.Systems;
+ using Content.Server.Humanoid;
+ using Content.Server.IdentityManagement;
+-using Content.Server.Mind.Commands;
++using Content.Server.Mind;
+ using Content.Server.PDA;
+ using Content.Server.Station.Components;
+ using Content.Shared.Access.Components;
diff --git a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
index 23139a5651b3..fe3c367f374d 100644
--- a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
+++ b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
@@ -26,6 +26,7 @@ namespace Content.Server.Stunnable
     internal sealed class StunOnCollideSystem : EntitySystem
     {
         [Dependency] private readonly StunSystem _stunSystem = default!;
+        [Dependency] private readonly MovementModStatusSystem _movementMod = default!;
 
         public override void Initialize()
         {
diff --git a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs.rej b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs.rej
new file mode 100644
index 000000000000..a04801a80190
--- /dev/null
+++ b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs.rej
@@ -0,0 +1,37 @@
+diff a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs	(rejected hunks)
+@@ -1,8 +1,6 @@
+ using Content.Server.Stunnable.Components;
+-using Content.Shared.Standing;
+-using Content.Shared.StatusEffect;
++using Content.Shared.Movement.Systems;
+ using JetBrains.Annotations;
+-using Robust.Shared.Physics.Dynamics;
+ using Content.Shared.Throwing;
+ using Robust.Shared.Physics.Events;
+ 
+@@ -22,15 +21,19 @@ public override void Initialize()
+ 
+         private void TryDoCollideStun(EntityUid uid, StunOnCollideComponent component, EntityUid target)
+         {
+-            if (!TryComp<StatusEffectsComponent>(target, out var status))
+-                return;
+-
+-            _stunSystem.TryStun(target, component.StunAmount, component.Refresh, status);
++            _stunSystem.TryUpdateStunDuration(target, component.StunAmount);
+ 
+-            _stunSystem.TryKnockdown(target, component.KnockdownAmount, component.Refresh, component.AutoStand);
++            _stunSystem.TryKnockdown(target, component.KnockdownAmount, component.Refresh, component.AutoStand, force: true);
+ 
+-            _stunSystem.TrySlowdown(target, component.SlowdownAmount, component.Refresh, component.WalkSpeedModifier, component.SprintSpeedModifier, status);
++            _movementMod.TryUpdateMovementSpeedModDuration(
++                target,
++                MovementModStatusSystem.TaserSlowdown,
++                component.SlowdownAmount,
++                component.WalkSpeedModifier,
++                component.SprintSpeedModifier
++            );
+         }
++
+         private void HandleCollide(EntityUid uid, StunOnCollideComponent component, ref StartCollideEvent args)
+         {
+             if (args.OurFixtureId != component.FixtureID)
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs.rej b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs.rej
new file mode 100644
index 000000000000..6fe978566ee1
--- /dev/null
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs.rej
@@ -0,0 +1,10 @@
+diff a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs	(rejected hunks)
+@@ -1,6 +1,6 @@
+ using Content.Server.Chat.Systems;
+-using Content.Server.Speech;
+-using Content.Server.Speech.Components;
++using Content.Shared.Speech;
++using Content.Shared.Speech.Components;
+ using Content.Shared.Whitelist;
+ using Robust.Shared.Player;
+ using static Content.Server.Chat.Systems.ChatSystem;
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
index c0a3fd9d9c61..4f05b44d2edc 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
@@ -70,6 +70,8 @@ public sealed class SurveillanceCameraSystem : EntitySystem
     [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!;
     [Dependency] private readonly UserInterfaceSystem _userInterface = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+
 
     // Pings a surveillance camera subnet. All cameras will always respond
     // with a data message if they are on the same subnet.
@@ -228,6 +230,7 @@ private void OnSetName(EntityUid uid, SurveillanceCameraComponent component, Sur
         component.CameraId = args.Name;
         component.NameSet = true;
         UpdateSetupInterface(uid, component);
+        _adminLogger.Add(LogType.Chat, LogImpact.Low, $"{ToPrettyString(args.Actor)} set the name of {ToPrettyString(uid)} to \"{args.Name}.\"");
     }
 
     private void OnSetNetwork(EntityUid uid, SurveillanceCameraComponent component,
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs.rej b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs.rej
new file mode 100644
index 000000000000..a030c4d241c2
--- /dev/null
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs.rej
@@ -0,0 +1,10 @@
+diff a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs	(rejected hunks)
+@@ -1,6 +1,8 @@
++using Content.Server.Administration.Logs;
+ using Content.Server.DeviceNetwork.Systems;
+ using Content.Server.Emp;
+ using Content.Shared.ActionBlocker;
++using Content.Shared.Database;
+ using Content.Shared.DeviceNetwork;
+ using Content.Shared.DeviceNetwork.Events;
+ using Content.Shared.Power;
diff --git a/Content.Server/Tabletop/TabletopSystem.Map.cs b/Content.Server/Tabletop/TabletopSystem.Map.cs
index bca70177c644..dc2c8439233e 100644
--- a/Content.Server/Tabletop/TabletopSystem.Map.cs
+++ b/Content.Server/Tabletop/TabletopSystem.Map.cs
@@ -45,7 +45,7 @@ private void InitializeMap()
         /// <returns></returns>
         private Vector2 GetNextTabletopPosition()
         {
-            return UlamSpiral(_tabletops++) * TabletopSeparation;
+            return UlamSpiral(++_tabletops) * TabletopSeparation;
         }
 
         /// <summary>
@@ -70,11 +70,11 @@ private void EnsureTabletopMap()
         /// <summary>
         ///     Algorithm for mapping scalars to 2D positions in the same pattern as an Ulam Spiral.
         /// </summary>
-        /// <param name="n">Scalar to map to a 2D position.</param>
+        /// <param name="n">Scalar to map to a 2D position. Must be greater than or equal to 1.</param>
         /// <returns>The mapped 2D position for the scalar.</returns>
         private Vector2i UlamSpiral(int n)
         {
-            var k = (int)MathF.Ceiling(MathF.Sqrt(n) - 1) / 2;
+            var k = (int)MathF.Ceiling((MathF.Sqrt(n) - 1) / 2);
             var t = 2 * k + 1;
             var m = (int)MathF.Pow(t, 2);
             t--;
diff --git a/Content.Server/Telephone/TelephoneSystem.cs b/Content.Server/Telephone/TelephoneSystem.cs
index ab1c77bbccb9..21fc88ac5f2e 100644
--- a/Content.Server/Telephone/TelephoneSystem.cs
+++ b/Content.Server/Telephone/TelephoneSystem.cs
@@ -20,6 +20,7 @@
 using Content.Shared.Silicons.StationAi;
 using Content.Shared.Silicons.Borgs.Components;
 using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
 using Content.Shared.Telephone;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
diff --git a/Content.Server/Telephone/TelephoneSystem.cs.rej b/Content.Server/Telephone/TelephoneSystem.cs.rej
new file mode 100644
index 000000000000..84492931e53a
--- /dev/null
+++ b/Content.Server/Telephone/TelephoneSystem.cs.rej
@@ -0,0 +1,10 @@
+diff a/Content.Server/Telephone/TelephoneSystem.cs b/Content.Server/Telephone/TelephoneSystem.cs	(rejected hunks)
+@@ -3,8 +3,6 @@
+ using Content.Server.Chat.Systems;
+ using Content.Server.Interaction;
+ using Content.Server.Power.EntitySystems;
+-using Content.Server.Speech;
+-using Content.Server.Speech.Components;
+ using Content.Shared.Chat;
+ using Content.Shared.Database;
+ using Content.Shared.Labels.Components;
diff --git a/Content.Server/Tips/TipsSystem.cs b/Content.Server/Tips/TipsSystem.cs
index 077c69739653..9d11d196edd8 100644
--- a/Content.Server/Tips/TipsSystem.cs
+++ b/Content.Server/Tips/TipsSystem.cs
@@ -79,9 +79,13 @@ private CompletionResult SendTippyHelper(IConsoleShell shell, string[] args)
     {
         return args.Length switch
         {
-            1 => CompletionResult.FromHintOptions(CompletionHelper.SessionNames(), Loc.GetString("cmd-tippy-auto-1")),
+            1 => CompletionResult.FromHintOptions(
+                CompletionHelper.SessionNames(players: _playerManager),
+                Loc.GetString("cmd-tippy-auto-1")),
             2 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-2")),
-            3 => CompletionResult.FromHintOptions(CompletionHelper.PrototypeIDs<EntityPrototype>(), Loc.GetString("cmd-tippy-auto-3")),
+            3 => CompletionResult.FromHintOptions(
+                CompletionHelper.PrototypeIdsLimited<EntityPrototype>(args[2], _prototype),
+                Loc.GetString("cmd-tippy-auto-3")),
             4 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-4")),
             5 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-5")),
             6 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-6")),
diff --git a/Content.Server/Tools/ToolSystem.cs.rej b/Content.Server/Tools/ToolSystem.cs.rej
new file mode 100644
index 000000000000..5cc1bfe45250
--- /dev/null
+++ b/Content.Server/Tools/ToolSystem.cs.rej
@@ -0,0 +1,51 @@
+diff a/Content.Server/Tools/ToolSystem.cs b/Content.Server/Tools/ToolSystem.cs	(rejected hunks)
+@@ -1,47 +1,5 @@
+-using Content.Shared.Chemistry.Components.SolutionManager;
+-using Content.Shared.FixedPoint;
+-using Content.Shared.Tools.Components;
+-
+-using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
++using Content.Shared.Tools.Systems;
+ 
+ namespace Content.Server.Tools;
+ 
+-public sealed class ToolSystem : SharedToolSystem
+-{
+-    public override void Update(float frameTime)
+-    {
+-        base.Update(frameTime);
+-
+-        UpdateWelders(frameTime);
+-    }
+-
+-    //todo move to shared once you can remove reagents from shared without it freaking out.
+-    private void UpdateWelders(float frameTime)
+-    {
+-        var query = EntityQueryEnumerator<WelderComponent, SolutionContainerManagerComponent>();
+-        while (query.MoveNext(out var uid, out var welder, out var solutionContainer))
+-        {
+-            if (!welder.Enabled)
+-                continue;
+-
+-            welder.WelderTimer += frameTime;
+-
+-            if (welder.WelderTimer < welder.WelderUpdateTimer)
+-                continue;
+-
+-            if (!SolutionContainerSystem.TryGetSolution((uid, solutionContainer), welder.FuelSolutionName, out var solutionComp, out var solution))
+-                continue;
+-
+-            SolutionContainerSystem.RemoveReagent(solutionComp.Value, welder.FuelReagent, welder.FuelConsumption * welder.WelderTimer);
+-
+-            if (solution.GetTotalPrototypeQuantity(welder.FuelReagent) <= FixedPoint2.Zero)
+-            {
+-                ItemToggle.Toggle(uid, predicted: false);
+-            }
+-
+-            Dirty(uid, welder);
+-            welder.WelderTimer -= welder.WelderUpdateTimer;
+-        }
+-    }
+-}
+-
++public sealed class ToolSystem : SharedToolSystem;
diff --git a/Content.Server/AlertLevel/Systems/AlertLevelChangeOnTriggerSystem.cs b/Content.Server/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs
similarity index 74%
rename from Content.Server/AlertLevel/Systems/AlertLevelChangeOnTriggerSystem.cs
rename to Content.Server/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs
index 0c9734b943e5..1a3e49dd4411 100644
--- a/Content.Server/AlertLevel/Systems/AlertLevelChangeOnTriggerSystem.cs
+++ b/Content.Server/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs
@@ -1,8 +1,9 @@
 using Content.Server.AlertLevel;
-using Content.Server.Explosion.EntitySystems;
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
 using Content.Server.Station.Systems;
 
-namespace Content.Server.AlertLevel.Systems;
+namespace Content.Server.Trigger.Systems;
 
 public sealed class AlertLevelChangeOnTriggerSystem : EntitySystem
 {
@@ -18,10 +19,14 @@ public override void Initialize()
 
     private void OnTrigger(Entity<AlertLevelChangeOnTriggerComponent> ent, ref TriggerEvent args)
     {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
         var stationUid = _station.GetOwningStation(ent.Owner);
-        if (!stationUid.HasValue)
+        if (stationUid == null)
             return;
 
         _alertLevelSystem.SetLevel(stationUid.Value, ent.Comp.Level, ent.Comp.PlaySound, ent.Comp.Announce, ent.Comp.Force);
+        args.Handled = true;
     }
 }
diff --git a/Content.Server/Trigger/Systems/GhostKickUserOnTriggerSystem.cs b/Content.Server/Trigger/Systems/GhostKickUserOnTriggerSystem.cs
new file mode 100644
index 000000000000..0fae6ff1c517
--- /dev/null
+++ b/Content.Server/Trigger/Systems/GhostKickUserOnTriggerSystem.cs
@@ -0,0 +1,38 @@
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
+using Content.Server.GhostKick;
+using Robust.Shared.Player;
+
+namespace Content.Server.Trigger.Systems;
+
+public sealed class GhostKickUserOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly GhostKickManager _ghostKickManager = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GhostKickOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<GhostKickOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        if (!TryComp(target, out ActorComponent? actor))
+            return;
+
+        _ghostKickManager.DoDisconnect(
+            actor.PlayerSession.Channel,
+            Loc.GetString(ent.Comp.Reason));
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Server/IgnitionSource/IgniteOnTriggerSystem.cs b/Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs
similarity index 93%
rename from Content.Server/IgnitionSource/IgniteOnTriggerSystem.cs
rename to Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs
index b6bd418fd709..9e2a8dd07bad 100644
--- a/Content.Server/IgnitionSource/IgniteOnTriggerSystem.cs
+++ b/Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs
@@ -22,8 +22,6 @@ public sealed class IgniteOnTriggerSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly SharedIgnitionSourceSystem _source = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly UseDelaySystem _useDelay = default!;
 
     public override void Initialize()
     {
@@ -32,6 +30,8 @@ public override void Initialize()
         SubscribeLocalEvent<IgniteOnTriggerComponent, TriggerEvent>(OnTrigger);
     }
 
+    // TODO: move this into ignition source component
+    // it already has an update loop
     public override void Update(float deltaTime)
     {
         base.Update(deltaTime);
diff --git a/Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs.rej b/Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs.rej
new file mode 100644
index 000000000000..40321ed43e27
--- /dev/null
+++ b/Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs.rej
@@ -0,0 +1,39 @@
+diff a/Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs b/Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs	(rejected hunks)
+@@ -1,10 +1,9 @@
+-using Content.Server.Explosion.EntitySystems;
+ using Content.Shared.IgnitionSource;
+-using Content.Shared.Timing;
+-using Robust.Shared.Audio.Systems;
++using Content.Shared.Trigger;
++using Content.Shared.Trigger.Components.Effects;
+ using Robust.Shared.Timing;
+ 
+-namespace Content.Server.IgnitionSource;
++namespace Content.Server.Trigger.Systems;
+ 
+ /// <summary>
+ /// Handles igniting when triggered and stopping ignition after the delay.
+@@ -42,14 +41,18 @@ public override void Update(float deltaTime)
+ 
+     private void OnTrigger(Entity<IgniteOnTriggerComponent> ent, ref TriggerEvent args)
+     {
+-        // prevent spamming sound and ignition
+-        if (!TryComp(ent.Owner, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((ent.Owner, useDelay)))
++        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+             return;
+ 
+-        _source.SetIgnited(ent.Owner);
+-        _audio.PlayPvs(ent.Comp.IgniteSound, ent);
++        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+ 
+-        _useDelay.TryResetDelay((ent.Owner, useDelay));
++        if (target == null)
++            return;
++
++        _source.SetIgnited(target.Value);
+         ent.Comp.IgnitedUntil = _timing.CurTime + ent.Comp.IgnitedTime;
++        Dirty(ent);
++
++        args.Handled = true;
+     }
+ }
diff --git a/Content.Server/Trigger/Systems/PolymorphOnTriggerSystem.cs b/Content.Server/Trigger/Systems/PolymorphOnTriggerSystem.cs
new file mode 100644
index 000000000000..8b4741b9ad37
--- /dev/null
+++ b/Content.Server/Trigger/Systems/PolymorphOnTriggerSystem.cs
@@ -0,0 +1,51 @@
+using Content.Server.Polymorph.Systems;
+using Content.Shared.Polymorph;
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Trigger.Systems;
+
+public sealed partial class PolymorphOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly PolymorphSystem _polymorph = default!;
+
+    /// <summary>
+    /// Need to do this so we don't get a collection enumeration error in physics by polymorphing
+    /// an entity we're colliding with in case of TriggerOnCollide.
+    /// Also makes sure other trigger effects don't activate in nullspace after we have polymorphed.
+    /// </summary>
+    private Queue<(EntityUid Uid, ProtoId<PolymorphPrototype> Polymorph)> _queuedPolymorphUpdates = new();
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PolymorphOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<PolymorphOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        _queuedPolymorphUpdates.Enqueue((target.Value, ent.Comp.Polymorph));
+        args.Handled = true;
+    }
+
+    public override void Update(float frametime)
+    {
+        while (_queuedPolymorphUpdates.TryDequeue(out var data))
+        {
+            if (TerminatingOrDeleted(data.Uid))
+                continue;
+
+            _polymorph.PolymorphEntity(data.Uid, data.Polymorph);
+        }
+    }
+}
diff --git a/Content.Server/Trigger/Systems/RattleOnTriggerSystem.cs b/Content.Server/Trigger/Systems/RattleOnTriggerSystem.cs
new file mode 100644
index 000000000000..963ac36b7f4d
--- /dev/null
+++ b/Content.Server/Trigger/Systems/RattleOnTriggerSystem.cs
@@ -0,0 +1,49 @@
+using Content.Server.Radio.EntitySystems;
+using Content.Server.Pinpointer;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Trigger.Systems;
+
+public sealed class RattleOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly RadioSystem _radio = default!;
+    [Dependency] private readonly NavMapSystem _navMap = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RattleOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<RattleOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        if (!TryComp<MobStateComponent>(target.Value, out var mobstate))
+            return;
+
+        args.Handled = true;
+
+        if (!ent.Comp.Messages.TryGetValue(mobstate.CurrentState, out var messageId))
+            return;
+
+        // Gets the location of the user
+        var posText = FormattedMessage.RemoveMarkupOrThrow(_navMap.GetNearestBeaconString(target.Value));
+
+        var message = Loc.GetString(messageId, ("user", target.Value), ("position", posText));
+        // Sends a message to the radio channel specified by the implant
+        _radio.SendRadioMessage(ent.Owner, message, _prototypeManager.Index(ent.Comp.RadioChannel), ent.Owner);
+    }
+}
diff --git a/Content.Server/Trigger/Systems/ReleaseGasOnTriggerSystem.cs b/Content.Server/Trigger/Systems/ReleaseGasOnTriggerSystem.cs
new file mode 100644
index 000000000000..a38ca2a75987
--- /dev/null
+++ b/Content.Server/Trigger/Systems/ReleaseGasOnTriggerSystem.cs
@@ -0,0 +1,48 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Trigger.Components.Effects;
+using Content.Shared.Trigger.Systems;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Trigger.Systems;
+
+public sealed class ReleaseGasOnTriggerSystem : SharedReleaseGasOnTriggerSystem
+{
+    [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var curTime = _timing.CurTime;
+        var query = EntityQueryEnumerator<ReleaseGasOnTriggerComponent>();
+
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            if (!comp.Active || comp.NextReleaseTime > curTime)
+                continue;
+
+            var giverGasMix = comp.Air.Remove(comp.StartingTotalMoles * comp.RemoveFraction);
+            var environment = _atmosphereSystem.GetContainingMixture(uid, false, true);
+
+            if (environment == null)
+            {
+                _appearance.SetData(uid, ReleaseGasOnTriggerVisuals.Key, false);
+                RemCompDeferred<ReleaseGasOnTriggerComponent>(uid);
+                continue;
+            }
+
+            _atmosphereSystem.Merge(environment, giverGasMix);
+            comp.NextReleaseTime += comp.ReleaseInterval;
+
+            if (comp.PressureLimit != 0 && environment.Pressure >= comp.PressureLimit ||
+                comp.Air.TotalMoles <= 0)
+            {
+                _appearance.SetData(uid, ReleaseGasOnTriggerVisuals.Key, false);
+                RemCompDeferred<ReleaseGasOnTriggerComponent>(uid);
+            }
+        }
+    }
+}
diff --git a/Content.Server/Trigger/Systems/SmokeOnTriggerSystem.cs b/Content.Server/Trigger/Systems/SmokeOnTriggerSystem.cs
new file mode 100644
index 000000000000..97799b9cc6ce
--- /dev/null
+++ b/Content.Server/Trigger/Systems/SmokeOnTriggerSystem.cs
@@ -0,0 +1,68 @@
+using Content.Server.Fluids.EntitySystems;
+using Content.Server.Spreader;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Coordinates.Helpers;
+using Content.Shared.Maps;
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Server.GameObjects;
+using Robust.Shared.Map;
+
+namespace Content.Server.Trigger.Systems;
+
+/// <summary>
+/// Handles creating smoke when <see cref="SmokeOnTriggerComponent"/> is triggered.
+/// </summary>
+public sealed class SmokeOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly IMapManager _mapMan = default!;
+    [Dependency] private readonly MapSystem _map = default!;
+    [Dependency] private readonly SmokeSystem _smoke = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
+    [Dependency] private readonly SpreaderSystem _spreader = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SmokeOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<SmokeOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        // TODO: move all of this into an API function in SmokeSystem
+        var xform = Transform(target.Value);
+        var mapCoords = _transform.GetMapCoordinates(target.Value, xform);
+        if (!_mapMan.TryFindGridAt(mapCoords, out var gridUid, out var gridComp) ||
+            !_map.TryGetTileRef(gridUid, gridComp, xform.Coordinates, out var tileRef) ||
+            tileRef.Tile.IsEmpty)
+        {
+            return;
+        }
+
+        if (_spreader.RequiresFloorToSpread(ent.Comp.SmokePrototype.ToString()) && _turf.IsSpace(tileRef))
+            return;
+
+        var coords = _map.MapToGrid(gridUid, mapCoords);
+        var smoke = Spawn(ent.Comp.SmokePrototype, coords.SnapToGrid());
+        if (!TryComp<SmokeComponent>(smoke, out var smokeComp))
+        {
+            Log.Error($"Smoke prototype {ent.Comp.SmokePrototype} was missing SmokeComponent");
+            Del(smoke);
+            return;
+        }
+
+        _smoke.StartSmoke(smoke, ent.Comp.Solution, (float)ent.Comp.Duration.TotalSeconds, ent.Comp.SpreadAmount, smokeComp);
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Server/Chat/Systems/SpeakOnTriggerSystem.cs b/Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs
similarity index 71%
rename from Content.Server/Chat/Systems/SpeakOnTriggerSystem.cs
rename to Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs
index d2e23a608e4f..e37413778abc 100644
--- a/Content.Server/Chat/Systems/SpeakOnTriggerSystem.cs
+++ b/Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs
@@ -24,32 +24,34 @@ public sealed class SpeakOnTriggerSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<SpeakOnTriggerComponent, TriggerEvent>(OnTrigger);
     }
 
     private void OnTrigger(Entity<SpeakOnTriggerComponent> ent, ref TriggerEvent args)
     {
-        TrySpeak(ent);
-        args.Handled = true;
-    }
-
-    private void TrySpeak(Entity<SpeakOnTriggerComponent> ent)
-    {
-        // If it doesn't have the use delay component, still send the message.
-        if (TryComp<UseDelayComponent>(ent.Owner, out var useDelay) && _useDelay.IsDelayed((ent.Owner, useDelay)))
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
             return;
 
-        if (!_prototypeManager.TryIndex(ent.Comp.Pack, out var messagePack))
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
             return;
 
-        var message = Loc.GetString(_random.Pick(messagePack.Values));
+        string message;
+        if (ent.Comp.Text != null)
+            message = Loc.GetString(ent.Comp.Text);
+        else
+        {
+            if (!_prototypeManager.TryIndex(ent.Comp.Pack, out var messagePack))
+                return;
+            message = Loc.GetString(_random.Pick(messagePack.Values));
+        }
         // Chatcode moment: messages starting with "." are considered radio messages.
         // Prepending ">" forces the message to be spoken instead.
         // TODO chat refactor: remove this
         message = '>' + message;
-        _chat.TrySendInGameICMessage(ent.Owner, message, InGameICChatType.Speak, true);
-
-        if (useDelay != null)
-            _useDelay.TryResetDelay((ent.Owner, useDelay));
+        _chat.TrySendInGameICMessage(target.Value, message, InGameICChatType.Speak, true);
+        args.Handled = true;
     }
 }
diff --git a/Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs.rej b/Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs.rej
new file mode 100644
index 000000000000..5c0b5c0ec7c2
--- /dev/null
+++ b/Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs.rej
@@ -0,0 +1,19 @@
+diff a/Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs b/Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs	(rejected hunks)
+@@ -1,13 +1,13 @@
+-using Content.Server.Explosion.EntitySystems;
+-using Content.Shared.Timing;
++using Content.Server.Chat.Systems;
++using Content.Shared.Trigger;
++using Content.Shared.Trigger.Components.Effects;
+ using Robust.Shared.Prototypes;
+ using Robust.Shared.Random;
+ 
+-namespace Content.Server.Chat.Systems;
++namespace Content.Server.Trigger.Systems;
+ 
+ public sealed class SpeakOnTriggerSystem : EntitySystem
+ {
+-    [Dependency] private readonly UseDelaySystem _useDelay = default!;
+     [Dependency] private readonly IRobustRandom _random = default!;
+     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+     [Dependency] private readonly ChatSystem _chat = default!;
diff --git a/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs b/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs
index 81bbd48a0df0..ade861af9818 100644
--- a/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs
+++ b/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Inventory;
 using Content.Shared.Popups;
 using Content.Shared.Storage;
+using Content.Shared.Trigger;
 using Robust.Server.Containers;
 
 namespace Content.Server.VoiceTrigger;
diff --git a/Content.Server/Voting/VoteCommands.cs b/Content.Server/Voting/VoteCommands.cs
index 0be920e00a96..8a7438781050 100644
--- a/Content.Server/Voting/VoteCommands.cs
+++ b/Content.Server/Voting/VoteCommands.cs
@@ -138,12 +138,12 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
                 {
                     var ties = string.Join(", ", eventArgs.Winners.Select(c => args[(int) c]));
                     _adminLogger.Add(LogType.Vote, LogImpact.Medium, $"Custom vote {options.Title} finished as tie: {ties}");
-                    _chatManager.DispatchServerAnnouncement(Loc.GetString("cmd-customvote-on-finished-tie", ("ties", ties)));
+                    _chatManager.DispatchServerAnnouncement(Loc.GetString("cmd-customvote-on-finished-tie", ("title", options.Title), ("ties", ties)));
                 }
                 else
                 {
                     _adminLogger.Add(LogType.Vote, LogImpact.Medium, $"Custom vote {options.Title} finished: {args[(int) eventArgs.Winner]}");
-                    _chatManager.DispatchServerAnnouncement(Loc.GetString("cmd-customvote-on-finished-win", ("winner", args[(int) eventArgs.Winner])));
+                    _chatManager.DispatchServerAnnouncement(Loc.GetString("cmd-customvote-on-finished-win", ("title", options.Title), ("winner", args[(int) eventArgs.Winner])));
                 }
 
                 _voteWebhooks.UpdateWebhookIfConfigured(webhookState, eventArgs);
diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAETriggerExplosivesComponent.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAETriggerExplosivesComponent.cs
index b9e23f036b98..faef4d5078b2 100644
--- a/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAETriggerExplosivesComponent.cs
+++ b/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAETriggerExplosivesComponent.cs
@@ -1,9 +1,9 @@
-using Content.Shared.Explosion.Components.OnTrigger;
+using Content.Shared.Explosion.Components;
 
 namespace Content.Server.Xenoarchaeology.Artifact.XAE.Components;
 
 /// <summary>
-/// Activates 'trigger' for <see cref="ExplodeOnTriggerComponent"/>.
+/// Activates <see cref="ExplosiveComponent"/> to explode.
 /// </summary>
 [RegisterComponent, Access(typeof(XAETriggerExplosivesSystem))]
 public sealed partial class XAETriggerExplosivesComponent : Component;
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 198eea1074ff..69121bedf842 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -66,7 +66,6 @@
 using Content.Server.IdentityManagement;
 using Content.Server.Inventory;
 using Content.Server.Mind;
-using Content.Server.Mind.Commands;
 using Content.Server.NPC;
 using Content.Server.NPC.HTN;
 using Content.Server.NPC.Systems;
@@ -277,7 +276,7 @@ public void ZombifyEntity(EntityUid target, MobStateComponent? mobState = null)
         _popup.PopupEntity(Loc.GetString("zombie-transform", ("target", target)), target, PopupType.LargeCaution);
 
         //Make it sentient if it's an animal or something
-        MakeSentientCommand.MakeSentient(target, EntityManager);
+        _mind.MakeSentient(target);
 
         //Make the zombie not die in the cold. Good for space zombies
         if (TryComp<TemperatureComponent>(target, out var tempComp))
diff --git a/Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs b/Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs
index fdbb1803a434..0c42e819acca 100644
--- a/Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs
+++ b/Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs
@@ -39,7 +39,7 @@ private void OnSummonAction(GoliathSummonTentacleAction args)
         // TODO: animation
 
         _popup.PopupPredicted(Loc.GetString("tentacle-ability-use-popup", ("entity", args.Performer)), args.Performer, args.Performer, type: PopupType.SmallCaution);
-        _stun.TryStun(args.Performer, TimeSpan.FromSeconds(0.8f), false);
+        _stun.TryAddStunDuration(args.Performer, TimeSpan.FromSeconds(0.8f));
 
         var coords = args.Target;
         List<EntityCoordinates> spawnPos = new();
diff --git a/Content.Shared/Abilities/Mime/MimePowersComponent.cs b/Content.Shared/Abilities/Mime/MimePowersComponent.cs
new file mode 100644
index 000000000000..8414dd7a0dce
--- /dev/null
+++ b/Content.Shared/Abilities/Mime/MimePowersComponent.cs
@@ -0,0 +1,76 @@
+using Content.Shared.Alert;
+using Robust.Shared.Prototypes;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Abilities.Mime;
+
+/// <summary>
+/// Lets its owner entity use mime powers, like placing invisible walls.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[AutoGenerateComponentPause]
+public sealed partial class MimePowersComponent : Component
+{
+    /// <summary>
+    /// Whether this component is active or not.
+    /// </summarY>
+    [DataField, AutoNetworkedField]
+    public bool Enabled = true;
+
+    /// <summary>
+    /// The wall prototype to use.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntProtoId WallPrototype = "WallInvisible";
+
+    [DataField]
+    public EntProtoId? InvisibleWallAction = "ActionMimeInvisibleWall";
+
+    [DataField, AutoNetworkedField]
+    public EntityUid? InvisibleWallActionEntity;
+
+    // The vow zone lies below
+    [DataField, AutoNetworkedField]
+    public bool VowBroken = false;
+
+    /// <summary>
+    /// Whether this mime is ready to take the vow again.
+    /// Note that if they already have the vow, this is also false.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool ReadyToRepent = false;
+
+    /// <summary>
+    /// Time when the mime can repent their vow
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan VowRepentTime = TimeSpan.Zero;
+
+    /// <summary>
+    /// How long it takes the mime to get their powers back
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan VowCooldown = TimeSpan.FromMinutes(5);
+
+    [DataField]
+    public ProtoId<AlertPrototype> VowAlert = "VowOfSilence";
+
+    [DataField]
+    public ProtoId<AlertPrototype> VowBrokenAlert = "VowBroken";
+
+    /// <summary>
+    /// Does this component prevent the mime from writing on paper while their vow is active?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool PreventWriting = false;
+
+    /// <summary>
+    /// What message is displayed when the mime fails to write?
+    /// </summary>
+    [DataField]
+    public LocId FailWriteMessage = "paper-component-illiterate-mime";
+
+    public override bool SendOnlyToOwner => true;
+}
diff --git a/Content.Shared/Abilities/Mime/MimePowersSystem.cs b/Content.Shared/Abilities/Mime/MimePowersSystem.cs
new file mode 100644
index 000000000000..22ba7a359105
--- /dev/null
+++ b/Content.Shared/Abilities/Mime/MimePowersSystem.cs
@@ -0,0 +1,187 @@
+using Content.Shared.Popups;
+using Content.Shared.Actions;
+using Content.Shared.Actions.Events;
+using Content.Shared.Alert;
+using Content.Shared.Coordinates.Helpers;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Maps;
+using Content.Shared.Paper;
+using Content.Shared.Physics;
+using Content.Shared.Speech.Muting;
+using Robust.Shared.Containers;
+using Robust.Shared.Map;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Abilities.Mime;
+
+public sealed class MimePowersSystem : EntitySystem
+{
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly AlertsSystem _alertsSystem = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
+    [Dependency] private readonly IMapManager _mapMan = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<MimePowersComponent, ComponentInit>(OnComponentInit);
+        SubscribeLocalEvent<MimePowersComponent, ComponentShutdown>(OnComponentShutdown);
+        SubscribeLocalEvent<MimePowersComponent, InvisibleWallActionEvent>(OnInvisibleWall);
+
+        SubscribeLocalEvent<MimePowersComponent, BreakVowAlertEvent>(OnBreakVowAlert);
+        SubscribeLocalEvent<MimePowersComponent, RetakeVowAlertEvent>(OnRetakeVowAlert);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+        // Queue to track whether mimes can retake vows yet
+
+        var query = EntityQueryEnumerator<MimePowersComponent>();
+        while (query.MoveNext(out var uid, out var mime))
+        {
+            if (!mime.VowBroken || mime.ReadyToRepent)
+                continue;
+
+            if (_timing.CurTime < mime.VowRepentTime)
+                continue;
+
+            mime.ReadyToRepent = true;
+            Dirty(uid, mime);
+            _popupSystem.PopupClient(Loc.GetString("mime-ready-to-repent"), uid, uid);
+        }
+    }
+
+    private void OnComponentInit(Entity<MimePowersComponent> ent, ref ComponentInit args)
+    {
+        EnsureComp<MutedComponent>(ent);
+
+        if (ent.Comp.PreventWriting)
+        {
+            EnsureComp<BlockWritingComponent>(ent, out var illiterateComponent);
+            illiterateComponent.FailWriteMessage = ent.Comp.FailWriteMessage;
+            Dirty(ent, illiterateComponent);
+        }
+
+        _alertsSystem.ShowAlert(ent, ent.Comp.VowAlert);
+        _actionsSystem.AddAction(ent, ref ent.Comp.InvisibleWallActionEntity, ent.Comp.InvisibleWallAction);
+    }
+
+    private void OnComponentShutdown(Entity<MimePowersComponent> ent, ref ComponentShutdown args)
+    {
+        _actionsSystem.RemoveAction(ent.Owner, ent.Comp.InvisibleWallActionEntity);
+    }
+
+    /// <summary>
+    /// Creates an invisible wall in a free space after some checks.
+    /// </summary>
+    private void OnInvisibleWall(Entity<MimePowersComponent> ent, ref InvisibleWallActionEvent args)
+    {
+        if (!ent.Comp.Enabled)
+            return;
+
+        if (_container.IsEntityOrParentInContainer(ent))
+            return;
+
+        var xform = Transform(ent);
+        // Get the tile in front of the mime
+        var offsetValue = xform.LocalRotation.ToWorldVec();
+        var coords = xform.Coordinates.Offset(offsetValue).SnapToGrid(EntityManager, _mapMan);
+        var tile = _turf.GetTileRef(coords);
+        if (tile == null)
+            return;
+
+        // Check if the tile is blocked by a wall or mob, and don't create the wall if so
+        if (_turf.IsTileBlocked(tile.Value, CollisionGroup.Impassable | CollisionGroup.Opaque))
+        {
+            _popupSystem.PopupClient(Loc.GetString("mime-invisible-wall-failed"), ent, ent);
+            return;
+        }
+
+        var messageSelf = Loc.GetString("mime-invisible-wall-popup-self", ("mime", Identity.Entity(ent.Owner, EntityManager)));
+        var messageOthers = Loc.GetString("mime-invisible-wall-popup-others", ("mime", Identity.Entity(ent.Owner, EntityManager)));
+        _popupSystem.PopupPredicted(messageSelf, messageOthers, ent, ent);
+
+        // Make sure we set the invisible wall to despawn properly
+        PredictedSpawnAtPosition(ent.Comp.WallPrototype, _turf.GetTileCenter(tile.Value));
+        // Handle args so cooldown works
+        args.Handled = true;
+    }
+
+    private void OnBreakVowAlert(Entity<MimePowersComponent> ent, ref BreakVowAlertEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        BreakVow(ent, ent);
+        args.Handled = true;
+    }
+
+    private void OnRetakeVowAlert(Entity<MimePowersComponent> ent, ref RetakeVowAlertEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        RetakeVow(ent, ent);
+        args.Handled = true;
+    }
+
+    /// <summary>
+    /// Break this mime's vow to not speak.
+    /// </summary>
+    public void BreakVow(EntityUid uid, MimePowersComponent? mimePowers = null)
+    {
+        if (!Resolve(uid, ref mimePowers))
+            return;
+
+        if (mimePowers.VowBroken)
+            return;
+
+        mimePowers.Enabled = false;
+        mimePowers.VowBroken = true;
+        mimePowers.VowRepentTime = _timing.CurTime + mimePowers.VowCooldown;
+        Dirty(uid, mimePowers);
+        RemComp<MutedComponent>(uid);
+        if (mimePowers.PreventWriting)
+            RemComp<BlockWritingComponent>(uid);
+
+        _alertsSystem.ClearAlert(uid, mimePowers.VowAlert);
+        _alertsSystem.ShowAlert(uid, mimePowers.VowBrokenAlert);
+        _actionsSystem.RemoveAction(uid, mimePowers.InvisibleWallActionEntity);
+    }
+
+    /// <summary>
+    /// Retake this mime's vow to not speak.
+    /// </summary>
+    public void RetakeVow(EntityUid uid, MimePowersComponent? mimePowers = null)
+    {
+        if (!Resolve(uid, ref mimePowers))
+            return;
+
+        if (!mimePowers.ReadyToRepent)
+        {
+            _popupSystem.PopupClient(Loc.GetString("mime-not-ready-repent"), uid, uid);
+            return;
+        }
+
+        mimePowers.Enabled = true;
+        mimePowers.ReadyToRepent = false;
+        mimePowers.VowBroken = false;
+        Dirty(uid, mimePowers);
+        AddComp<MutedComponent>(uid);
+        if (mimePowers.PreventWriting)
+        {
+            EnsureComp<BlockWritingComponent>(uid, out var illiterateComponent);
+            illiterateComponent.FailWriteMessage = mimePowers.FailWriteMessage;
+            Dirty(uid, illiterateComponent);
+        }
+
+        _alertsSystem.ClearAlert(uid, mimePowers.VowBrokenAlert);
+        _alertsSystem.ShowAlert(uid, mimePowers.VowAlert);
+        _actionsSystem.AddAction(uid, ref mimePowers.InvisibleWallActionEntity, mimePowers.InvisibleWallAction, uid);
+    }
+}
diff --git a/Content.Shared/Actions/Components/TargetActionComponent.cs b/Content.Shared/Actions/Components/TargetActionComponent.cs
index be76366dca01..6bbf047ca4b2 100644
--- a/Content.Shared/Actions/Components/TargetActionComponent.cs
+++ b/Content.Shared/Actions/Components/TargetActionComponent.cs
@@ -42,6 +42,16 @@ public sealed partial class TargetActionComponent : Component
     [DataField]
     public bool CheckCanAccess = true;
 
+    /// <summary>
+    ///     The collision group to use to check for accessibility if <see cref="CheckCanAccess" /> is true.
+    /// </summary>
+    [DataField]
+    public CollisionGroup AccessMask = SharedInteractionSystem.InRangeUnobstructedMask;
+
+    /// <summary>
+    ///     The allowed range for a target to be. If zero or negative, the range check is skipped,
+    ///     unless <see cref="CheckCanAccess"/> is true.
+    /// </summary>
     [DataField]
     public float Range = SharedInteractionSystem.InteractionRange;
 
diff --git a/Content.Shared/Actions/Components/TargetActionComponent.cs.rej b/Content.Shared/Actions/Components/TargetActionComponent.cs.rej
new file mode 100644
index 000000000000..edea473e5d03
--- /dev/null
+++ b/Content.Shared/Actions/Components/TargetActionComponent.cs.rej
@@ -0,0 +1,11 @@
+diff a/Content.Shared/Actions/Components/TargetActionComponent.cs b/Content.Shared/Actions/Components/TargetActionComponent.cs	(rejected hunks)
+@@ -1,6 +1,6 @@
+-using Content.Shared.Actions;
+-using Content.Shared.Interaction;
+-using Robust.Shared.GameStates;
++using Content.Shared.Interaction;
++using Content.Shared.Physics;
++using Robust.Shared.GameStates;
+ using Robust.Shared.Prototypes;
+ 
+ namespace Content.Shared.Actions.Components;
diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index 1fde458745f7..48bb0cf0df87 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -540,13 +540,18 @@ public bool ValidateEntityTarget(EntityUid user, EntityUid target, Entity<Entity
             return comp.CanTargetSelf;
 
         var targetAction = Comp<TargetActionComponent>(uid);
+
         // not using the ValidateBaseTarget logic since its raycast fails if the target is e.g. a wall
         if (targetAction.CheckCanAccess)
-            return _interaction.InRangeAndAccessible(user, target, range: targetAction.Range);
+            return _interaction.InRangeAndAccessible(user, target, targetAction.Range, targetAction.AccessMask);
+
+        // Just check normal in range, allowing <= 0 range to mean infinite range.
+        if (targetAction.Range > 0
+            && !_transform.InRange(user, target, targetAction.Range))
+            return false;
 
-        // if not just checking pure range, let stored entities be targeted by actions
-        // if it's out of range it probably isn't stored anyway...
-        return _interaction.CanAccessViaStorage(user, target);
+        // If checkCanAccess isn't set, we allow targeting things in containers
+        return _interaction.IsAccessible(user, target);
     }
 
     public bool ValidateWorldTarget(EntityUid user, EntityCoordinates target, Entity<WorldTargetActionComponent> ent)
@@ -1185,6 +1190,7 @@ public bool SetEventTarget(EntityUid uid, EntityUid target)
     public bool IsCooldownActive(ActionComponent action, TimeSpan? curTime = null)
     {
         // TODO: Check for charge recovery timer
+        curTime ??= GameTiming.CurTime;
         return action.Cooldown.HasValue && action.Cooldown.Value.End > curTime;
     }
 
diff --git a/Content.Shared/Administration/AdminCameraEuiState.cs b/Content.Shared/Administration/AdminCameraEuiState.cs
new file mode 100644
index 000000000000..ae41f3aeb083
--- /dev/null
+++ b/Content.Shared/Administration/AdminCameraEuiState.cs
@@ -0,0 +1,27 @@
+using Content.Shared.Eui;
+using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Administration;
+
+[Serializable, NetSerializable]
+public sealed partial class AdminCameraEuiState(NetEntity? camera, string name, GameTick tick) : EuiStateBase
+{
+    /// <summary>
+    /// The camera entity we will use for the window.
+    /// </summary>
+    public readonly NetEntity? Camera = camera;
+
+    /// <summary>
+    /// The name of the observed entity.
+    /// </summary>
+    public readonly string Name = name;
+
+    /// <summary>
+    /// The current tick time, needed for cursed reasons.
+    /// </summary>
+    public readonly GameTick Tick = tick;
+}
+
+[Serializable, NetSerializable]
+public sealed partial class AdminCameraFollowMessage : EuiMessageBase;
diff --git a/Content.Server/Animals/Components/ParrotMemoryComponent.cs b/Content.Shared/Animals/Components/ParrotMemoryComponent.cs
similarity index 67%
rename from Content.Server/Animals/Components/ParrotMemoryComponent.cs
rename to Content.Shared/Animals/Components/ParrotMemoryComponent.cs
index 69908a0a9ecd..e1c5ba8ed912 100644
--- a/Content.Server/Animals/Components/ParrotMemoryComponent.cs
+++ b/Content.Shared/Animals/Components/ParrotMemoryComponent.cs
@@ -1,57 +1,61 @@
+using Content.Shared.Animals.Systems;
+using Robust.Shared.GameStates;
 using Robust.Shared.Network;
+using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.Animals.Components;
+namespace Content.Shared.Animals.Components;
 
 /// <summary>
-/// Makes an entity able to memorize chat/radio messages
+/// Makes an entity able to memorize chat/radio messages.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent]
 [AutoGenerateComponentPause]
 public sealed partial class ParrotMemoryComponent : Component
 {
     /// <summary>
-    /// List of SpeechMemory records this entity has learned
+    /// List of SpeechMemory records this entity has learned.
     /// </summary>
     [DataField]
-    public List<SpeechMemory> SpeechMemories = [];
+    public List<SpeechMemory> SpeechMemories = new();
 
     /// <summary>
-    /// The % chance an entity with this component learns a phrase when learning is off cooldown
+    /// The % chance an entity with this component learns a phrase when learning is off cooldown.
     /// </summary>
     [DataField]
     public float LearnChance = 0.6f;
 
     /// <summary>
-    /// Time after which another attempt can be made at learning a phrase
+    /// Time after which another attempt can be made at learning a phrase.
     /// </summary>
     [DataField]
     public TimeSpan LearnCooldown = TimeSpan.FromMinutes(1);
 
     /// <summary>
-    /// Next time at which the parrot can attempt to learn something
+    /// Next time at which the parrot can attempt to learn something.
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
     [AutoPausedField]
     public TimeSpan NextLearnInterval = TimeSpan.Zero;
 
     /// <summary>
-    /// The number of speech entries that are remembered
+    /// The number of speech entries that are remembered.
     /// </summary>
     [DataField]
     public int MaxSpeechMemory = 50;
 
     /// <summary>
-    /// Minimum length of a speech entry
+    /// Minimum length of a speech entry.
     /// </summary>
     [DataField]
     public int MinEntryLength = 4;
 
     /// <summary>
-    /// Maximum length of a speech entry
+    /// Maximum length of a speech entry.
     /// </summary>
     [DataField]
     public int MaxEntryLength = 50;
 }
 
+[Serializable, NetSerializable]
 public record struct SpeechMemory(NetUserId? NetUserId, string Message);
diff --git a/Content.Shared/Animals/Systems/SharedParrotMemorySystem.cs b/Content.Shared/Animals/Systems/SharedParrotMemorySystem.cs
new file mode 100644
index 000000000000..fb8e3309ea2f
--- /dev/null
+++ b/Content.Shared/Animals/Systems/SharedParrotMemorySystem.cs
@@ -0,0 +1,48 @@
+using Content.Shared.Administration.Managers;
+using Content.Shared.Animals.Components;
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+using Robust.Shared.Network;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Animals.Systems;
+
+public abstract class SharedParrotMemorySystem : EntitySystem
+{
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly ISharedAdminManager _admin = default!;
+    [Dependency] private readonly INetManager _net = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ParrotMemoryComponent, GetVerbsEvent<Verb>>(OnGetVerbs);
+    }
+
+    private void OnGetVerbs(Entity<ParrotMemoryComponent> entity, ref GetVerbsEvent<Verb> args)
+    {
+        var user = args.User;
+
+        // limit this to admins
+        if (!_admin.IsAdmin(user))
+            return;
+
+        // simple verb that just clears the memory list
+        var clearMemoryVerb = new Verb()
+        {
+            Text = Loc.GetString("parrot-verb-clear-memory"),
+            Category = VerbCategory.Admin,
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/clear-parrot.png")),
+            Act = () =>
+            {
+                _popup.PopupClient(Loc.GetString("parrot-popup-memory-cleared"), entity.Owner, user);
+
+                if (_net.IsServer)
+                    entity.Comp.SpeechMemories.Clear();
+            },
+        };
+
+        args.Verbs.Add(clearMemoryVerb);
+    }
+}
diff --git a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs b/Content.Shared/Anomaly/AnomalySynchronizerSystem.cs
similarity index 73%
rename from Content.Server/Anomaly/AnomalySynchronizerSystem.cs
rename to Content.Shared/Anomaly/AnomalySynchronizerSystem.cs
index 3f9dcb94006b..2d3b6c629746 100644
--- a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
+++ b/Content.Shared/Anomaly/AnomalySynchronizerSystem.cs
@@ -90,27 +90,41 @@ public override void Update(float frameTime)
     {
         base.Update(frameTime);
 
+        var curTime = _timing.CurTime;
         var query = EntityQueryEnumerator<AnomalySynchronizerComponent, TransformComponent>();
-        while (query.MoveNext(out var uid, out var sync, out var xform))
+        while (query.MoveNext(out var uid, out var sync, out var synchronizerTransform))
         {
-            if (sync.ConnectedAnomaly is null)
+            if (sync.ConnectedAnomaly == null)
                 continue;
 
-            if (_timing.CurTime < sync.NextCheckTime)
+            if (curTime < sync.NextCheckTime)
                 continue;
+
             sync.NextCheckTime += sync.CheckFrequency;
+            Dirty(uid, sync);
+
+            if (TerminatingOrDeleted(sync.ConnectedAnomaly))
+            {
+                DisconnectFromAnomaly((uid, sync));
+                continue;
+            }
 
-            if (Transform(sync.ConnectedAnomaly.Value).MapUid != Transform(uid).MapUid)
+            // Use TryComp instead of Transform(uid) to take care of cases where the anomaly is out of
+            // PVS range on the client, but the synchronizer isn't.
+            if (!TryComp(sync.ConnectedAnomaly.Value, out TransformComponent? anomalyTransform))
+                continue;
+
+            if (anomalyTransform.MapUid != synchronizerTransform.MapUid)
             {
-                DisconnectFromAnomaly((uid, sync), sync.ConnectedAnomaly.Value);
+                DisconnectFromAnomaly((uid, sync));
                 continue;
             }
 
-            if (!xform.Coordinates.TryDistance(EntityManager, Transform(sync.ConnectedAnomaly.Value).Coordinates, out var distance))
+            if (!synchronizerTransform.Coordinates.TryDistance(EntityManager, anomalyTransform.Coordinates, out var distance))
                 continue;
 
             if (distance > sync.AttachRange)
-                DisconnectFromAnomaly((uid, sync), sync.ConnectedAnomaly.Value);
+                DisconnectFromAnomaly((uid, sync));
         }
     }
 
@@ -119,11 +133,9 @@ public override void Update(float frameTime)
     /// </summary>
     public bool TryAttachNearbyAnomaly(Entity<AnomalySynchronizerComponent> ent, EntityUid? user = null)
     {
-        if (!_power.IsPowered(ent))
+        if (!_power.IsPowered(ent.Owner))
         {
-            if (user is not null)
-                _popup.PopupEntity(Loc.GetString("base-computer-ui-component-not-powered", ("machine", ent)), ent, user.Value);
-
+            _popup.PopupClient(Loc.GetString("base-computer-ui-component-not-powered", ("machine", ent)), ent, user);
             return false;
         }
 
@@ -132,13 +144,11 @@ public bool TryAttachNearbyAnomaly(Entity<AnomalySynchronizerComponent> ent, Ent
 
         if (anomaly.Owner is { Valid: false }) // no anomaly in range
         {
-            if (user is not null)
-                _popup.PopupEntity(Loc.GetString("anomaly-sync-no-anomaly"), ent, user.Value);
-
+            _popup.PopupClient(Loc.GetString("anomaly-sync-no-anomaly"), ent, user);
             return false;
         }
 
-        ConnectToAnomaly(ent, anomaly);
+        ConnectToAnomaly(ent, anomaly, user);
         return true;
     }
 
@@ -147,10 +157,10 @@ private void OnPowerChanged(Entity<AnomalySynchronizerComponent> ent, ref PowerC
         if (args.Powered)
             return;
 
-        if (ent.Comp.ConnectedAnomaly is null)
+        if (ent.Comp.ConnectedAnomaly == null)
             return;
 
-        DisconnectFromAnomaly(ent, ent.Comp.ConnectedAnomaly.Value);
+        DisconnectFromAnomaly(ent);
     }
 
     private void OnExamined(Entity<AnomalySynchronizerComponent> ent, ref ExaminedEvent args)
@@ -160,19 +170,29 @@ private void OnExamined(Entity<AnomalySynchronizerComponent> ent, ref ExaminedEv
 
     private void OnGetInteractionVerbs(Entity<AnomalySynchronizerComponent> ent, ref GetVerbsEvent<InteractionVerb> args)
     {
-        if (!args.CanAccess || !args.CanInteract || args.Hands is null || ent.Comp.ConnectedAnomaly.HasValue)
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null)
             return;
 
         var user = args.User;
-        args.Verbs.Add(new()
+
+        if (ent.Comp.ConnectedAnomaly == null)
+        {
+            args.Verbs.Add(new()
+            {
+                Act = () => TryAttachNearbyAnomaly(ent, user),
+                Message = Loc.GetString("anomaly-sync-connect-verb-message", ("machine", ent)),
+                Text = Loc.GetString("anomaly-sync-connect-verb-text"),
+            });
+        }
+        else
         {
-            Act = () =>
+            args.Verbs.Add(new()
             {
-                TryAttachNearbyAnomaly(ent, user);
-            },
-            Message = Loc.GetString("anomaly-sync-connect-verb-message", ("machine", ent)),
-            Text = Loc.GetString("anomaly-sync-connect-verb-text"),
-        });
+                Act = () => DisconnectFromAnomaly(ent, user),
+                Message = Loc.GetString("anomaly-sync-disconnect-verb-message", ("machine", ent)),
+                Text = Loc.GetString("anomaly-sync-disconnect-verb-text"),
+            });
+        }
     }
 
     private void OnInteractHand(Entity<AnomalySynchronizerComponent> ent, ref InteractHandEvent args)
@@ -180,12 +200,13 @@ private void OnInteractHand(Entity<AnomalySynchronizerComponent> ent, ref Intera
         TryAttachNearbyAnomaly(ent, args.User);
     }
 
-    private void ConnectToAnomaly(Entity<AnomalySynchronizerComponent> ent, Entity<AnomalyComponent> anomaly)
+    private void ConnectToAnomaly(Entity<AnomalySynchronizerComponent> ent, Entity<AnomalyComponent> anomaly, EntityUid? user = null)
     {
         if (ent.Comp.ConnectedAnomaly == anomaly)
             return;
 
         ent.Comp.ConnectedAnomaly = anomaly;
+        Dirty(ent);
         //move the anomaly to the center of the synchronizer, for aesthetics.
         var targetXform = _transform.GetWorldPosition(ent);
         _transform.SetWorldPosition(anomaly, targetXform);
@@ -193,27 +214,27 @@ private void ConnectToAnomaly(Entity<AnomalySynchronizerComponent> ent, Entity<A
         if (ent.Comp.PulseOnConnect)
             _anomaly.DoAnomalyPulse(anomaly, anomaly);
 
-        _popup.PopupEntity(Loc.GetString("anomaly-sync-connected"), ent, PopupType.Medium);
-        _audio.PlayPvs(ent.Comp.ConnectedSound, ent);
+        _popup.PopupPredicted(Loc.GetString("anomaly-sync-connected"), ent, user, PopupType.Medium);
+        _audio.PlayPredicted(ent.Comp.ConnectedSound, ent, user);
     }
 
     //TODO: disconnection from the anomaly should also be triggered if the anomaly is far away from the synchronizer.
     //Currently only bluespace anomaly can do this, but for some reason it is the only one that cannot be connected to the synchronizer.
-    private void DisconnectFromAnomaly(Entity<AnomalySynchronizerComponent> ent, EntityUid other)
+    private void DisconnectFromAnomaly(Entity<AnomalySynchronizerComponent> ent, EntityUid? user = null)
     {
         if (ent.Comp.ConnectedAnomaly == null)
             return;
 
-        if (TryComp<AnomalyComponent>(other, out var anomaly))
+        if (ent.Comp.PulseOnDisconnect && TryComp<AnomalyComponent>(ent.Comp.ConnectedAnomaly, out var anomaly))
         {
-            if (ent.Comp.PulseOnDisconnect)
-                _anomaly.DoAnomalyPulse(ent.Comp.ConnectedAnomaly.Value, anomaly);
+            _anomaly.DoAnomalyPulse(ent.Comp.ConnectedAnomaly.Value, anomaly);
         }
 
-        _popup.PopupEntity(Loc.GetString("anomaly-sync-disconnected"), ent, PopupType.Large);
-        _audio.PlayPvs(ent.Comp.ConnectedSound, ent);
+        _popup.PopupPredicted(Loc.GetString("anomaly-sync-disconnected"), ent, user, PopupType.Large);
+        _audio.PlayPredicted(ent.Comp.DisconnectedSound, ent, user);
 
         ent.Comp.ConnectedAnomaly = null;
+        Dirty(ent);
     }
 
     private void OnAnomalyPulse(ref AnomalyPulseEvent args)
@@ -227,19 +248,19 @@ private void OnAnomalyPulse(ref AnomalyPulseEvent args)
             if (!_power.IsPowered(uid))
                 continue;
 
-            _signal.InvokePort(uid, component.PulsePort);
+            _deviceLink.InvokePort(uid, component.PulsePort);
         }
     }
 
     private void OnAnomalySeverityChanged(ref AnomalySeverityChangedEvent args)
     {
         var query = EntityQueryEnumerator<AnomalySynchronizerComponent>();
-        while (query.MoveNext(out var ent, out var component))
+        while (query.MoveNext(out var uid, out var component))
         {
             if (args.Anomaly != component.ConnectedAnomaly)
                 continue;
 
-            if (!_power.IsPowered(ent))
+            if (!_power.IsPowered(uid))
                 continue;
 
             //The superscritical port is invoked not at the AnomalySupercriticalEvent,
@@ -247,34 +268,34 @@ private void OnAnomalySeverityChanged(ref AnomalySeverityChangedEvent args)
             //ATTENTION! the console command supercriticalanomaly does not work here,
             //as it forcefully causes growth to start without increasing severity.
             if (args.Severity >= 1)
-                _signal.InvokePort(ent, component.SupercritPort);
+                _deviceLink.InvokePort(uid, component.SupercritPort);
         }
     }
 
     private void OnAnomalyStabilityChanged(ref AnomalyStabilityChangedEvent args)
     {
-        Entity<AnomalyComponent> anomaly = (args.Anomaly, Comp<AnomalyComponent>(args.Anomaly));
+        var anomaly = Comp<AnomalyComponent>(args.Anomaly);
 
         var query = EntityQueryEnumerator<AnomalySynchronizerComponent>();
-        while (query.MoveNext(out var ent, out var component))
+        while (query.MoveNext(out var uid, out var sync))
         {
-            if (component.ConnectedAnomaly != anomaly)
+            if (sync.ConnectedAnomaly != args.Anomaly)
                 continue;
 
-            if (!_power.IsPowered(ent))
+            if (!_power.IsPowered(uid))
                 continue;
 
-            if (args.Stability < anomaly.Comp.DecayThreshold)
+            if (args.Stability < anomaly.DecayThreshold)
             {
-                _signal.InvokePort(ent, component.DecayingPort);
+                _deviceLink.InvokePort(uid, sync.DecayingPort);
             }
-            else if (args.Stability > anomaly.Comp.GrowthThreshold)
+            else if (args.Stability > anomaly.GrowthThreshold)
             {
-                _signal.InvokePort(ent, component.GrowingPort);
+                _deviceLink.InvokePort(uid, sync.GrowingPort);
             }
             else
             {
-                _signal.InvokePort(ent, component.StabilizePort);
+                _deviceLink.InvokePort(uid, sync.StabilizePort);
             }
         }
     }
diff --git a/Content.Shared/Anomaly/AnomalySynchronizerSystem.cs.rej b/Content.Shared/Anomaly/AnomalySynchronizerSystem.cs.rej
new file mode 100644
index 000000000000..4ee55101d545
--- /dev/null
+++ b/Content.Shared/Anomaly/AnomalySynchronizerSystem.cs.rej
@@ -0,0 +1,46 @@
+diff a/Content.Shared/Anomaly/AnomalySynchronizerSystem.cs b/Content.Shared/Anomaly/AnomalySynchronizerSystem.cs	(rejected hunks)
+@@ -1,33 +1,30 @@
+ using System.Linq;
+-using System.Numerics;
+-using Content.Server.Anomaly.Components;
+-using Content.Server.DeviceLinking.Systems;
+-using Content.Server.Power.Components;
+-using Content.Server.Power.EntitySystems;
+ using Content.Shared.Anomaly.Components;
++using Content.Shared.DeviceLinking;
+ using Content.Shared.Examine;
+ using Content.Shared.Interaction;
+ using Content.Shared.Popups;
+ using Content.Shared.Power;
+-using Robust.Shared.Audio.Systems;
++using Content.Shared.Power.EntitySystems;
+ using Content.Shared.Verbs;
++using Robust.Shared.Audio.Systems;
+ using Robust.Shared.Timing;
+ 
+-namespace Content.Server.Anomaly;
++namespace Content.Shared.Anomaly;
+ 
+ /// <summary>
+-/// a device that allows you to translate anomaly activity into multitool signals.
++/// A device that allows you to translate anomaly activity into multitool signals.
+ /// </summary>
+ public sealed partial class AnomalySynchronizerSystem : EntitySystem
+ {
+-    [Dependency] private readonly AnomalySystem _anomaly = default!;
+-    [Dependency] private readonly SharedAudioSystem _audio = default!;
+     [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
+-    [Dependency] private readonly DeviceLinkSystem _signal = default!;
+-    [Dependency] private readonly SharedTransformSystem _transform = default!;
+-    [Dependency] private readonly SharedPopupSystem _popup = default!;
+-    [Dependency] private readonly PowerReceiverSystem _power = default!;
+     [Dependency] private readonly IGameTiming _timing = default!;
++    [Dependency] private readonly SharedAnomalySystem _anomaly = default!;
++    [Dependency] private readonly SharedAudioSystem _audio = default!;
++    [Dependency] private readonly SharedDeviceLinkSystem _deviceLink = default!;
++    [Dependency] private readonly SharedPopupSystem _popup = default!;
++    [Dependency] private readonly SharedPowerReceiverSystem _power = default!;
++    [Dependency] private readonly SharedTransformSystem _transform = default!;
+ 
+     public override void Initialize()
+     {
diff --git a/Content.Server/Anomaly/Components/AnomalySynchronizerComponent.cs b/Content.Shared/Anomaly/Components/AnomalySynchronizerComponent.cs
similarity index 100%
rename from Content.Server/Anomaly/Components/AnomalySynchronizerComponent.cs
rename to Content.Shared/Anomaly/Components/AnomalySynchronizerComponent.cs
diff --git a/Content.Shared/Anomaly/Components/AnomalySynchronizerComponent.cs.rej b/Content.Shared/Anomaly/Components/AnomalySynchronizerComponent.cs.rej
new file mode 100644
index 000000000000..0bba31dc358a
--- /dev/null
+++ b/Content.Shared/Anomaly/Components/AnomalySynchronizerComponent.cs.rej
@@ -0,0 +1,76 @@
+diff a/Content.Shared/Anomaly/Components/AnomalySynchronizerComponent.cs b/Content.Shared/Anomaly/Components/AnomalySynchronizerComponent.cs	(rejected hunks)
+@@ -1,46 +1,51 @@
+ using Content.Shared.DeviceLinking;
+ using Robust.Shared.Audio;
++using Robust.Shared.GameStates;
+ using Robust.Shared.Prototypes;
++using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+ 
+-namespace Content.Server.Anomaly.Components;
++namespace Content.Shared.Anomaly.Components;
+ 
+ /// <summary>
+-/// a device that allows you to translate anomaly activity into multitool signals.
++/// A device that allows you to translate anomaly activity into multitool signals.
+ /// </summary>
+-[RegisterComponent, AutoGenerateComponentPause, Access(typeof(AnomalySynchronizerSystem))]
++[RegisterComponent, NetworkedComponent]
++[AutoGenerateComponentState, AutoGenerateComponentPause]
++[Access(typeof(AnomalySynchronizerSystem))]
+ public sealed partial class AnomalySynchronizerComponent : Component
+ {
+     /// <summary>
+     /// The uid of the anomaly to which the synchronizer is connected.
+     /// </summary>
+-    [DataField, ViewVariables(VVAccess.ReadWrite)]
++    [DataField, AutoNetworkedField]
+     public EntityUid? ConnectedAnomaly;
+ 
+     /// <summary>
+     /// Should the anomaly pulse when connected to the synchronizer?
+     /// </summary>
+-    [DataField]
++    [DataField, AutoNetworkedField]
+     public bool PulseOnConnect = true;
+ 
+     /// <summary>
+     /// Should the anomaly pulse when disconnected from synchronizer?
+     /// </summary>
+-    [DataField]
++    [DataField, AutoNetworkedField]
+     public bool PulseOnDisconnect = false;
+ 
+     /// <summary>
+-    /// minimum distance from the synchronizer to the anomaly to be attached
++    /// Minimum distance from the synchronizer to the anomaly to be attached.
+     /// </summary>
+-    [DataField]
++    [DataField, AutoNetworkedField]
+     public float AttachRange = 0.4f;
+ 
+     /// <summary>
+-    /// Periodicheski checks to see if the anomaly has moved to disconnect it.
++    /// Periodically checks to see if the anomaly has moved to disconnect it.
+     /// </summary>
+-    [DataField]
++    [DataField, AutoNetworkedField]
+     public TimeSpan CheckFrequency = TimeSpan.FromSeconds(1f);
+ 
+-    [DataField, AutoPausedField]
++    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
++    [AutoNetworkedField, AutoPausedField]
+     public TimeSpan NextCheckTime = TimeSpan.Zero;
+ 
+     [DataField]
+@@ -58,9 +63,9 @@ public sealed partial class AnomalySynchronizerComponent : Component
+     [DataField]
+     public ProtoId<SourcePortPrototype> SupercritPort = "Supercritical";
+ 
+-    [DataField, ViewVariables(VVAccess.ReadWrite)]
++    [DataField]
+     public SoundSpecifier ConnectedSound = new SoundPathSpecifier("/Audio/Machines/anomaly_sync_connect.ogg");
+ 
+-    [DataField, ViewVariables(VVAccess.ReadWrite)]
++    [DataField]
+     public SoundSpecifier DisconnectedSound = new SoundPathSpecifier("/Audio/Machines/anomaly_sync_connect.ogg");
+ }
diff --git a/Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleComponent.cs b/Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleComponent.cs
index f43161016d85..e2ab3f65b100 100644
--- a/Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleComponent.cs
+++ b/Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleComponent.cs
@@ -239,9 +239,9 @@ public AtmosMonitoringConsoleEntry
 /// </summary>
 /// <param name="NetId">The associated network ID.</param>
 /// <param name="PipeLayer">The associated pipe layer.</param>
-/// <param name="HexCode">The color of the pipe.</param>
+/// <param name="Color">The color of the pipe.</param>
 [Serializable, NetSerializable]
-public record AtmosMonitoringConsoleSubnet(int NetId, AtmosPipeLayer PipeLayer, string HexCode);
+public record AtmosMonitoringConsoleSubnet(int NetId, AtmosPipeLayer PipeLayer, Color Color);
 
 public enum AtmosPipeChunkDataFacing : byte
 {
diff --git a/Content.Shared/Atmos/Monitor/AtmosAlarmThreshold.cs b/Content.Shared/Atmos/Monitor/AtmosAlarmThreshold.cs
index 2b3cb16a02f5..0eae7a897ce5 100644
--- a/Content.Shared/Atmos/Monitor/AtmosAlarmThreshold.cs
+++ b/Content.Shared/Atmos/Monitor/AtmosAlarmThreshold.cs
@@ -398,9 +398,21 @@ public enum AtmosMonitorLimitType //<todo.eoin Very similar to the above...
 // fields you can find this prototype in
 public enum AtmosMonitorThresholdType
 {
-    Temperature,
-    Pressure,
-    Gas
+    Temperature = 0,
+    Pressure = 1,
+    Gas = 2
+}
+
+/// <summary>
+/// Bitflags version of <see cref="AtmosMonitorThresholdType"/>
+/// </summary>
+[Flags]
+public enum AtmosMonitorThresholdTypeFlags
+{
+    None = 0,
+    Temperature = 1 << 0,
+    Pressure = 1 << 1,
+    Gas = 1 << 2,
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs
index 2efcef7a5c33..c595e664c4a2 100644
--- a/Content.Shared/Bed/Sleep/SleepingSystem.cs
+++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs
@@ -59,7 +59,6 @@
 using Content.Shared.Sound;
 using Content.Shared.Sound.Components;
 using Content.Shared.Speech;
-using Content.Shared.StatusEffect;
 using Content.Shared.StatusEffectNew;
 using Content.Shared.Stunnable;
 using Content.Shared.Traits.Assorted;
@@ -79,8 +78,8 @@ public sealed partial class SleepingSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedEmitSoundSystem _emitSound = default!;
-    [Dependency] private readonly StatusEffect.StatusEffectsSystem _statusEffectOld = default!;
-    [Dependency] private readonly StatusEffectNew.StatusEffectsSystem _statusEffectNew = default!;
+    [Dependency] private readonly StatusEffectsSystem _statusEffect = default!;
+    [Dependency] private readonly SharedStunSystem _stun = default!;
 
     public static readonly EntProtoId SleepActionId = "ActionSleep";
     public static readonly EntProtoId WakeActionId = "ActionWake";
@@ -108,6 +107,8 @@ public override void Initialize()
         SubscribeLocalEvent<SleepingComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<SleepingComponent, GetVerbsEvent<AlternativeVerb>>(AddWakeVerb);
         SubscribeLocalEvent<SleepingComponent, InteractHandEvent>(OnInteractHand);
+        SubscribeLocalEvent<SleepingComponent, StunEndAttemptEvent>(OnStunEndAttempt);
+        SubscribeLocalEvent<SleepingComponent, StandUpAttemptEvent>(OnStandUpAttempt);
 
         SubscribeLocalEvent<ForcedSleepingStatusEffectComponent, StatusEffectAppliedEvent>(OnStatusEffectApplied);
         SubscribeLocalEvent<SleepingComponent, UnbuckleAttemptEvent>(OnUnbuckleAttempt);
@@ -170,8 +171,9 @@ private void OnSleepStateChanged(Entity<MobStateComponent> ent, ref SleepStateCh
             return;
         }
 
-        RemComp<StunnedComponent>(ent);
-        RemComp<KnockedDownComponent>(ent);
+        _stun.TryUnstun(ent.Owner);
+        _stun.TryStanding(ent.Owner);
+
         RemComp<SpamEmitSoundComponent>(ent);
     }
 
@@ -216,6 +218,17 @@ private void OnConsciousAttempt(Entity<SleepingComponent> ent, ref ConsciousAtte
         args.Cancelled = true;
     }
 
+    private void OnStunEndAttempt(Entity<SleepingComponent> ent, ref StunEndAttemptEvent args)
+    {
+        args.Cancelled = true;
+    }
+
+    private void OnStandUpAttempt(Entity<SleepingComponent> ent, ref StandUpAttemptEvent args)
+    {
+        // Shh the Urist McHands is sleeping...
+        args.Cancelled = true;
+    }
+
     private void OnExamined(Entity<SleepingComponent> ent, ref ExaminedEvent args)
     {
         if (args.IsInDetailsRange)
@@ -229,7 +242,6 @@ private void AddWakeVerb(Entity<SleepingComponent> ent, ref GetVerbsEvent<Altern
         if (!args.CanInteract || !args.CanAccess)
             return;
 
-        var target = args.Target;
         var user = args.User;
         AlternativeVerb verb = new()
         {
@@ -301,7 +313,10 @@ private void OnMobStateChanged(Entity<SleepingComponent> ent, ref MobStateChange
 
     private void OnStatusEffectApplied(Entity<ForcedSleepingStatusEffectComponent> ent, ref StatusEffectAppliedEvent args)
     {
-        TrySleeping(args.Target);
+        // Applying state check needed so we don't add SleepingComp during
+        // entity reset due to the status effect getting inserted
+        if (!_gameTiming.ApplyingState)
+            TrySleeping(args.Target);
     }
 
     private void Wake(Entity<SleepingComponent> ent)
@@ -358,7 +373,7 @@ public bool TryWaking(Entity<SleepingComponent?> ent, bool force = false, Entity
         if (!Resolve(ent, ref ent.Comp, false))
             return false;
 
-        if (!force && _statusEffectNew.HasEffectComp<ForcedSleepingStatusEffectComponent>(ent))
+        if (!force && _statusEffect.HasEffectComp<ForcedSleepingStatusEffectComponent>(ent))
         {
             if (user != null)
             {
diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs.rej b/Content.Shared/Bed/Sleep/SleepingSystem.cs.rej
new file mode 100644
index 000000000000..93e3ce5dbf60
--- /dev/null
+++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs.rej
@@ -0,0 +1,12 @@
+diff a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs	(rejected hunks)
+@@ -106,9 +107,7 @@ private void OnSleepStateChanged(Entity<MobStateComponent> ent, ref SleepStateCh
+     {
+         if (args.FellAsleep)
+         {
+-            // Expiring status effects would remove the components needed for sleeping
+-            _statusEffectOld.TryRemoveStatusEffect(ent.Owner, "Stun");
+-
++            // Just in case we're not using the sleeping status
+             EnsureComp<StunnedComponent>(ent);
+             EnsureComp<KnockedDownComponent>(ent);
+ 
diff --git a/Content.Shared/CCVar/CCVars.Viewport.cs.rej b/Content.Shared/CCVar/CCVars.Viewport.cs.rej
new file mode 100644
index 000000000000..974ba5742de0
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Viewport.cs.rej
@@ -0,0 +1,9 @@
+diff a/Content.Shared/CCVar/CCVars.Viewport.cs b/Content.Shared/CCVar/CCVars.Viewport.cs	(rejected hunks)
+@@ -30,4 +30,7 @@ public sealed partial class CCVars
+ 
+     public static readonly CVarDef<bool> ViewportVerticalFit =
+         CVarDef.Create("viewport.vertical_fit", true, CVar.CLIENTONLY | CVar.ARCHIVE);
++
++    public static readonly CVarDef<string> ViewportScalingFilterMode =
++        CVarDef.Create("viewport.scaling_filter", "nearest", CVar.CLIENTONLY | CVar.ARCHIVE);
+ }
diff --git a/Content.Shared/CCVar/CCVars.cs.rej b/Content.Shared/CCVar/CCVars.cs.rej
new file mode 100644
index 000000000000..9c0b886bc32d
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.cs.rej
@@ -0,0 +1,8 @@
+diff a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs	(rejected hunks)
+@@ -36,5 +36,5 @@ public sealed partial class CCVars : CVars
+     /// Set to true to disable parallel processing in the pow3r solver.
+     /// </summary>
+     public static readonly CVarDef<bool> DebugPow3rDisableParallel =
+-        CVarDef.Create("debug.pow3r_disable_parallel", true, CVar.SERVERONLY);
++        CVarDef.Create("debug.pow3r_disable_parallel", false, CVar.SERVERONLY);
+ }
diff --git a/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs b/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs
index 78323a4b649a..3f6824ae0db5 100644
--- a/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs
+++ b/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs
@@ -20,11 +20,20 @@ namespace Content.Shared.Chat.Prototypes;
 ///     Different entities may use different sounds collections.
 /// </summary>
 [Prototype]
-public sealed partial class EmoteSoundsPrototype : IPrototype
+public sealed partial class EmoteSoundsPrototype : IPrototype, IInheritingPrototype
 {
     [IdDataField]
     public string ID { get; private set; } = default!;
 
+    /// <inheritdoc/>
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<EmoteSoundsPrototype>))]
+    public string[]? Parents { get; private set; }
+
+    /// <inheritdoc/>
+    [AbstractDataField]
+    [NeverPushInheritance]
+    public bool Abstract { get; }
+
     /// <summary>
     ///     Optional fallback sound that will play if collection
     ///     doesn't have specific sound for this emote id.
diff --git a/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs.rej b/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs.rej
new file mode 100644
index 000000000000..9bfe222fa619
--- /dev/null
+++ b/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs.rej
@@ -0,0 +1,20 @@
+diff a/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs b/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs	(rejected hunks)
+@@ -1,7 +1,6 @@
+ using Robust.Shared.Audio;
+ using Robust.Shared.Prototypes;
+-using Robust.Shared.Serialization;
+-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
++using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
+ 
+ namespace Content.Shared.Chat.Prototypes;
+ 
+@@ -32,6 +40,7 @@ public sealed partial class EmoteSoundsPrototype : IPrototype
+     /// <summary>
+     ///     Collection of emote prototypes and their sounds.
+     /// </summary>
+-    [DataField("sounds", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<SoundSpecifier, EmotePrototype>))]
+-    public Dictionary<string, SoundSpecifier> Sounds = new();
++    [DataField]
++    [AlwaysPushInheritance]
++    public Dictionary<ProtoId<EmotePrototype>, SoundSpecifier> Sounds = new();
+ }
diff --git a/Content.Shared/Chat/SharedChatSystem.cs.rej b/Content.Shared/Chat/SharedChatSystem.cs.rej
new file mode 100644
index 000000000000..9c0f92deecae
--- /dev/null
+++ b/Content.Shared/Chat/SharedChatSystem.cs.rej
@@ -0,0 +1,13 @@
+diff a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs	(rejected hunks)
+@@ -24,6 +24,11 @@ public abstract class SharedChatSystem : EntitySystem
+     public const char WhisperPrefix = ',';
+     public const char DefaultChannelKey = 'h';
+ 
++    public const int VoiceRange = 10; // how far voice goes in world units
++    public const int WhisperClearRange = 2; // how far whisper goes while still being understandable, in world units
++    public const int WhisperMuffledRange = 5; // how far whisper goes at all, in world units
++    public const string DefaultAnnouncementSound = "/Audio/Announcements/announce.ogg";
++
+     public static readonly ProtoId<RadioChannelPrototype> CommonChannel = "Common";
+ 
+     public static readonly string DefaultChannelPrefix = $"{RadioChannelPrefix}{DefaultChannelKey}";
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
index 0374f773ab71..de2ab633ef3e 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
@@ -624,20 +624,20 @@ public bool TryAddReagent(Entity<SolutionComponent> soln, ReagentId reagentId, F
     ///     Removes reagent from a container.
     /// </summary>
     /// <param name="targetUid"></param>
-    /// <param name="container">Solution container from which we are removing reagent</param>
+    /// <param name="container">Solution container from which we are removing reagent.</param>
     /// <param name="reagentQuantity">The reagent to remove.</param>
-    /// <returns>If the reagent to remove was found in the container.</returns>
-    public bool RemoveReagent(Entity<SolutionComponent> soln, ReagentQuantity reagentQuantity)
+    /// <returns>The amount of reagent that was removed.</returns>
+    public FixedPoint2 RemoveReagent(Entity<SolutionComponent> soln, ReagentQuantity reagentQuantity)
     {
         var (uid, comp) = soln;
         var solution = comp.Solution;
 
         var quant = solution.RemoveReagent(reagentQuantity);
         if (quant <= FixedPoint2.Zero)
-            return false;
+            return FixedPoint2.Zero;
 
         UpdateChemicals(soln);
-        return true;
+        return quant;
     }
 
     /// <summary>
@@ -647,8 +647,8 @@ public bool RemoveReagent(Entity<SolutionComponent> soln, ReagentQuantity reagen
     /// <param name="container">Solution container from which we are removing reagent</param>
     /// <param name="prototype">The Id of the reagent to remove.</param>
     /// <param name="quantity">The amount of reagent to remove.</param>
-    /// <returns>If the reagent to remove was found in the container.</returns>
-    public bool RemoveReagent(Entity<SolutionComponent> soln, string prototype, FixedPoint2 quantity, List<ReagentData>? data = null)
+    /// <returns>The amount of reagent that was removed.</returns>
+    public FixedPoint2 RemoveReagent(Entity<SolutionComponent> soln, string prototype, FixedPoint2 quantity, List<ReagentData>? data = null)
     {
         return RemoveReagent(soln, new ReagentQuantity(prototype, quantity, data));
     }
@@ -660,8 +660,8 @@ public bool RemoveReagent(Entity<SolutionComponent> soln, string prototype, Fixe
     /// <param name="container">Solution container from which we are removing reagent</param>
     /// <param name="reagentId">The reagent to remove.</param>
     /// <param name="quantity">The amount of reagent to remove.</param>
-    /// <returns>If the reagent to remove was found in the container.</returns>
-    public bool RemoveReagent(Entity<SolutionComponent> soln, ReagentId reagentId, FixedPoint2 quantity)
+    /// <returns>The amount of reagent that was removed.</returns>
+    public FixedPoint2 RemoveReagent(Entity<SolutionComponent> soln, ReagentId reagentId, FixedPoint2 quantity)
     {
         return RemoveReagent(soln, new ReagentQuantity(reagentId, quantity));
     }
diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs
index 56d58b8125cd..01a95c2a6e83 100644
--- a/Content.Shared/Climbing/Systems/ClimbSystem.cs
+++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs
@@ -627,7 +627,7 @@ private void OnGlassClimbed(EntityUid uid, GlassTableComponent component, ref Cl
 
         _damageableSystem.TryChangeDamage(args.Climber, component.ClimberDamage, origin: args.Climber);
         _damageableSystem.TryChangeDamage(uid, component.TableDamage, origin: args.Climber);
-        _stunSystem.TryParalyze(args.Climber, TimeSpan.FromSeconds(component.StunTime), true);
+        _stunSystem.TryUpdateParalyzeDuration(args.Climber, TimeSpan.FromSeconds(component.StunTime));
 
         // Not shown to the user, since they already get a 'you climb on the glass table' popup
         _popupSystem.PopupEntity(
diff --git a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
index 25ed7598d73b..e91f467ee1f8 100644
--- a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
@@ -41,11 +41,11 @@ public sealed partial class FoldableClothingComponent : Component
     /// Which layers does this hide when Unfolded? See <see cref="HumanoidVisualLayers"/> and <see cref="HideLayerClothingComponent"/>
     /// </summary>
     [DataField]
-    public HashSet<HumanoidVisualLayers>? UnfoldedHideLayers = new();
+    public HashSet<HumanoidVisualLayers> UnfoldedHideLayers = new();
 
     /// <summary>
     /// Which layers does this hide when folded? See <see cref="HumanoidVisualLayers"/> and <see cref="HideLayerClothingComponent"/>
     /// </summary>
     [DataField]
-    public HashSet<HumanoidVisualLayers>? FoldedHideLayers = new();
+    public HashSet<HumanoidVisualLayers> FoldedHideLayers = new();
 }
diff --git a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
index ab9cd5ecaef2..5d31ee5572dd 100644
--- a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
@@ -58,7 +58,7 @@ private void OnFoldAttempt(Entity<FoldableClothingComponent> ent, ref FoldAttemp
         }
 
         // Setting hidden layers while equipped is not currently supported.
-        if (ent.Comp.FoldedHideLayers != null || ent.Comp.UnfoldedHideLayers != null)
+        if (ent.Comp.FoldedHideLayers.Count != 0|| ent.Comp.UnfoldedHideLayers.Count != 0)
             args.Cancelled = true;
     }
 
@@ -86,7 +86,7 @@ private void OnFolded(Entity<FoldableClothingComponent> ent, ref FoldedEvent arg
             // This should instead work via an event or something that gets raised to optionally modify the currently hidden layers.
             // Or at the very least it should stash the old layers and restore them when unfolded.
             // TODO CLOTHING fix this.
-            if (ent.Comp.FoldedHideLayers != null && TryComp<HideLayerClothingComponent>(ent.Owner, out var hideLayerComp))
+            if (ent.Comp.FoldedHideLayers.Count != 0 && TryComp<HideLayerClothingComponent>(ent.Owner, out var hideLayerComp))
                 hideLayerComp.Slots = ent.Comp.FoldedHideLayers;
 
         }
@@ -102,7 +102,7 @@ private void OnFolded(Entity<FoldableClothingComponent> ent, ref FoldedEvent arg
                 _itemSystem.SetHeldPrefix(ent.Owner, null, false, itemComp);
 
             // TODO CLOTHING fix this.
-            if (ent.Comp.UnfoldedHideLayers != null && TryComp<HideLayerClothingComponent>(ent.Owner, out var hideLayerComp))
+            if (ent.Comp.UnfoldedHideLayers.Count != 0 && TryComp<HideLayerClothingComponent>(ent.Owner, out var hideLayerComp))
                 hideLayerComp.Slots = ent.Comp.UnfoldedHideLayers;
 
         }
diff --git a/Content.Shared/Clumsy/ClumsySystem.cs b/Content.Shared/Clumsy/ClumsySystem.cs
index 34cce75bd242..3d255f5686aa 100644
--- a/Content.Shared/Clumsy/ClumsySystem.cs
+++ b/Content.Shared/Clumsy/ClumsySystem.cs
@@ -140,7 +140,7 @@ private void BeforeGunShotEvent(Entity<ClumsyComponent> ent, ref SelfBeforeGunSh
         if (ent.Comp.GunShootFailDamage != null)
             _damageable.TryChangeDamage(ent, ent.Comp.GunShootFailDamage, origin: ent);
 
-        _stun.TryParalyze(ent, ent.Comp.GunShootFailStunTime, true);
+        _stun.TryUpdateParalyzeDuration(ent, ent.Comp.GunShootFailStunTime);
 
         // Apply salt to the wound ("Honk!") (No idea what this comment means)
         _audio.PlayPvs(ent.Comp.GunShootFailSound, ent);
@@ -213,7 +213,7 @@ public void HitHeadClumsy(Entity<ClumsyComponent> target, EntityUid table)
                 _damageable.TryChangeDamage(target, bonkComp.BonkDamage, true);
         }
 
-        _stun.TryParalyze(target, stunTime, true);
+        _stun.TryUpdateParalyzeDuration(target, stunTime);
     }
     #endregion
 }
diff --git a/Content.Shared/Cuffs/Components/HandcuffComponent.cs.rej b/Content.Shared/Cuffs/Components/HandcuffComponent.cs.rej
new file mode 100644
index 000000000000..6df7b7f3802e
--- /dev/null
+++ b/Content.Shared/Cuffs/Components/HandcuffComponent.cs.rej
@@ -0,0 +1,31 @@
+diff a/Content.Shared/Cuffs/Components/HandcuffComponent.cs b/Content.Shared/Cuffs/Components/HandcuffComponent.cs	(rejected hunks)
+@@ -1,4 +1,3 @@
+-using Content.Shared.Damage;
+ using Robust.Shared.Audio;
+ using Robust.Shared.GameStates;
+ using Robust.Shared.Prototypes;
+@@ -33,24 +32,6 @@ public sealed partial class HandcuffComponent : Component
+     [DataField, ViewVariables(VVAccess.ReadWrite)]
+     public float StunBonus = 2f;
+ 
+-    /// <summary>
+-    ///     Modifier for the amount of time it takes an entity to stand up if cuffed.
+-    /// </summary>
+-    [DataField]
+-    public float StandupMod = 5f;
+-
+-    /// <summary>
+-    ///     Modifier to the speed of an entity who is cuffed, does not stack with KnockedMovementMod
+-    /// </summary>
+-    [DataField]
+-    public float MovementMod = 1f;
+-
+-    /// <summary>
+-    ///     Modifier to the knocked down speed of an entity who is cuffed
+-    /// </summary>
+-    [DataField]
+-    public float KnockedMovementMod = 0.4f;
+-
+     /// <summary>
+     ///     Will the cuffs break when removed?
+     /// </summary>
diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs.rej b/Content.Shared/Cuffs/SharedCuffableSystem.cs.rej
new file mode 100644
index 000000000000..fffe20563491
--- /dev/null
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs.rej
@@ -0,0 +1,135 @@
+diff a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs	(rejected hunks)
+@@ -21,7 +21,6 @@
+ using Content.Shared.Item;
+ using Content.Shared.Movement.Events;
+ using Content.Shared.Movement.Pulling.Events;
+-using Content.Shared.Movement.Systems;
+ using Content.Shared.Popups;
+ using Content.Shared.Pulling.Events;
+ using Content.Shared.Rejuvenate;
+@@ -46,7 +45,6 @@ public abstract partial class SharedCuffableSystem : EntitySystem
+         [Dependency] private readonly ISharedAdminLogManager _adminLog = default!;
+         [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+         [Dependency] private readonly AlertsSystem _alerts = default!;
+-        [Dependency] private readonly MovementSpeedModifierSystem _move = default!;
+         [Dependency] private readonly SharedAudioSystem _audio = default!;
+         [Dependency] private readonly SharedContainerSystem _container = default!;
+         [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+@@ -58,14 +56,10 @@ public abstract partial class SharedCuffableSystem : EntitySystem
+         [Dependency] private readonly UseDelaySystem _delay = default!;
+         [Dependency] private readonly SharedCombatModeSystem _combatMode = default!;
+ 
+-        private EntityQuery<HandcuffComponent> _cuffQuery;
+-
+         public override void Initialize()
+         {
+             base.Initialize();
+ 
+-            _cuffQuery = GetEntityQuery<HandcuffComponent>();
+-
+             SubscribeLocalEvent<CuffableComponent, HandCountChangedEvent>(OnHandCountChanged);
+             SubscribeLocalEvent<UncuffAttemptEvent>(OnUncuffAttempt);
+ 
+@@ -95,9 +89,6 @@ public override void Initialize()
+             SubscribeLocalEvent<HandcuffComponent, MeleeHitEvent>(OnCuffMeleeHit);
+             SubscribeLocalEvent<HandcuffComponent, AddCuffDoAfterEvent>(OnAddCuffDoAfter);
+             SubscribeLocalEvent<HandcuffComponent, VirtualItemDeletedEvent>(OnCuffVirtualItemDeleted);
+-            SubscribeLocalEvent<CuffableComponent, GetStandUpTimeEvent>(OnCuffableStandupArgs);
+-            SubscribeLocalEvent<CuffableComponent, KnockedDownRefreshEvent>(OnCuffableKnockdownRefresh);
+-            SubscribeLocalEvent<CuffableComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeedModifiers);
+         }
+ 
+         private void CheckInteract(Entity<CuffableComponent> ent, ref InteractionAttemptEvent args)
+@@ -375,9 +366,6 @@ private void OnAddCuffDoAfter(EntityUid uid, HandcuffComponent component, AddCuf
+                     _adminLog.Add(LogType.Action, LogImpact.High,
+                         $"{ToPrettyString(user):player} has cuffed {ToPrettyString(target):player}");
+                 }
+-
+-                if (!MathHelper.CloseTo(component.MovementMod, 1f))
+-                    _move.RefreshMovementSpeedModifiers(target);
+             }
+             else
+             {
+@@ -432,72 +420,6 @@ private void OnHandCountChanged(Entity<CuffableComponent> ent, ref HandCountChan
+             }
+         }
+ 
+-        /// <summary>
+-        ///     Takes longer to stand up when cuffed
+-        /// </summary>
+-        private void OnCuffableStandupArgs(Entity<CuffableComponent> ent, ref GetStandUpTimeEvent time)
+-        {
+-            if (!HasComp<KnockedDownComponent>(ent) || !IsCuffed(ent))
+-                return;
+-
+-            var cuffs = GetAllCuffs(ent.Comp);
+-            var mod = 1f;
+-
+-            if (cuffs.Count == 0)
+-                return;
+-
+-            foreach (var cuff in cuffs)
+-            {
+-                if (!_cuffQuery.TryComp(cuff, out var comp))
+-                    continue;
+-
+-                // Get the worst modifier
+-                mod = Math.Max(mod, comp.StandupMod);
+-            }
+-
+-            time.DoAfterTime *= mod;
+-        }
+-
+-        private void OnCuffableKnockdownRefresh(Entity<CuffableComponent> ent, ref KnockedDownRefreshEvent args)
+-        {
+-            var cuffs = GetAllCuffs(ent.Comp);
+-            var mod = 1f;
+-
+-            if (cuffs.Count == 0)
+-                return;
+-
+-            foreach (var cuff in cuffs)
+-            {
+-                if (!_cuffQuery.TryComp(cuff, out var comp))
+-                    continue;
+-
+-                // Get the worst modifier
+-                mod = Math.Min(mod, comp.KnockedMovementMod);
+-            }
+-
+-            args.SpeedModifier *= mod;
+-        }
+-
+-        private void OnRefreshMovementSpeedModifiers(Entity<CuffableComponent> ent, ref RefreshMovementSpeedModifiersEvent args)
+-        {
+-            var cuffs = GetAllCuffs(ent.Comp);
+-            var mod = 1f;
+-
+-            if (cuffs.Count == 0)
+-                return;
+-
+-            foreach (var cuff in cuffs)
+-            {
+-                if (!_cuffQuery.TryComp(cuff, out var comp))
+-                    continue;
+-
+-                // Get the worst modifier
+-                mod = Math.Min(mod, comp.MovementMod);
+-            }
+-
+-            args.ModifySpeed(mod);
+-        }
+-
+         /// <summary>
+         ///     Adds virtual cuff items to the user's hands.
+         /// </summary>
+@@ -814,9 +736,6 @@ public void Uncuff(EntityUid target, EntityUid? user, EntityUid cuffsToRemove, C
+                 shoved = true;
+             }
+ 
+-            if (!MathHelper.CloseTo(cuff.MovementMod, 1f))
+-                _move.RefreshMovementSpeedModifiers(target);
+-
+             if (cuffable.CuffedHandCount == 0)
+             {
+                 if (user != null)
diff --git a/Content.Shared/Damage/Systems/DamageOnHighSpeedImpactSystem.cs b/Content.Shared/Damage/Systems/DamageOnHighSpeedImpactSystem.cs
index f2fff86b6bcc..2ddc7bcc8db7 100644
--- a/Content.Shared/Damage/Systems/DamageOnHighSpeedImpactSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageOnHighSpeedImpactSystem.cs
@@ -89,7 +89,7 @@ private void HandleCollide(EntityUid uid, DamageOnHighSpeedImpactComponent compo
         component.LastHit = _gameTiming.CurTime;
 
         if (_robustRandom.Prob(component.StunChance))
-            _stun.TryStun(uid, TimeSpan.FromSeconds(component.StunSeconds), true);
+            _stun.TryUpdateStunDuration(uid, TimeSpan.FromSeconds(component.StunSeconds));
 
         var damageScale = component.SpeedDamageFactor * speed / component.MinimumSpeed;
 
diff --git a/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
index 4231c24b3de4..ef3df2be523b 100644
--- a/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
@@ -187,7 +187,7 @@ private void OnHandInteract(Entity<DamageOnInteractComponent> entity, ref Intera
 
             // Attempt to paralyze the user after they have taken damage
             if (_random.Prob(entity.Comp.StunChance))
-                _stun.TryParalyze(args.User, TimeSpan.FromSeconds(entity.Comp.StunSeconds), true);
+                _stun.TryUpdateParalyzeDuration(args.User, TimeSpan.FromSeconds(entity.Comp.StunSeconds));
         }
         // Check if the entity's Throw bool is false, or if the entity has the PullableComponent, then if the entity is currently being pulled.
         // BeingPulled must be checked because the entity will be spastically thrown around without this.
diff --git a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
index 31dba26febcb..1488fdfbfc86 100644
--- a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
+++ b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
@@ -29,6 +29,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<GodmodeComponent, BeforeDamageChangedEvent>(OnBeforeDamageChanged);
         SubscribeLocalEvent<GodmodeComponent, BeforeStatusEffectAddedEvent>(OnBeforeStatusEffect);
+        SubscribeLocalEvent<GodmodeComponent, BeforeOldStatusEffectAddedEvent>(OnBeforeOldStatusEffect);
         SubscribeLocalEvent<GodmodeComponent, BeforeStaminaDamageEvent>(OnBeforeStaminaDamage);
         SubscribeLocalEvent<GodmodeComponent, SlipAttemptEvent>(OnSlipAttempt);
         SubscribeLocalEvent<GodmodeComponent, DestructionAttemptEvent>(OnDestruction);
@@ -46,6 +47,13 @@ private void OnBeforeDamageChanged(EntityUid uid, GodmodeComponent component, re
 
     private void OnBeforeStatusEffect(EntityUid uid, GodmodeComponent component, ref BeforeStatusEffectAddedEvent args)
     {
+        if (_protoMan.Index(args.Effect).HasComponent<RejuvenateRemovedStatusEffectComponent>(Factory))
+            args.Cancelled = true;
+    }
+
+    private void OnBeforeOldStatusEffect(Entity<GodmodeComponent> ent, ref BeforeOldStatusEffectAddedEvent args)
+    {
+        // Old status effect system doesn't distinguish between good and bad status effects
         args.Cancelled = true;
     }
 
diff --git a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs.rej b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs.rej
new file mode 100644
index 000000000000..3799ec5bc4f8
--- /dev/null
+++ b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs.rej
@@ -0,0 +1,21 @@
+diff a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs	(rejected hunks)
+@@ -1,14 +1,19 @@
+ using Content.Shared.Damage.Components;
+ using Content.Shared.Damage.Events;
+ using Content.Shared.Destructible;
++using Content.Shared.Prototypes;
+ using Content.Shared.Rejuvenate;
+ using Content.Shared.Slippery;
++using Content.Shared.StatusEffect;
+ using Content.Shared.StatusEffectNew;
++using Content.Shared.StatusEffectNew.Components;
++using Robust.Shared.Prototypes;
+ 
+ namespace Content.Shared.Damage.Systems;
+ 
+ public abstract class SharedGodmodeSystem : EntitySystem
+ {
++    [Dependency] private readonly IPrototypeManager _protoMan = default!;
+     [Dependency] private readonly DamageableSystem _damageable = default!;
+ 
+     public override void Initialize()
diff --git a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
index ef9458ecd790..5edbd46df32d 100644
--- a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
+++ b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
@@ -182,8 +182,9 @@ private void OnRejuvenate(Entity<StaminaComponent> entity, ref RejuvenateEvent a
         }
 
         entity.Comp.StaminaDamage = 0;
-        AdjustSlowdown(entity.Owner);
+        AdjustStatus(entity.Owner);
         RemComp<ActiveStaminaComponent>(entity);
+        _status.TryRemoveStatusEffect(entity, StaminaLow);
         UpdateStaminaVisuals(entity);
         Dirty(entity);
     }
@@ -402,6 +403,7 @@ public void TakeStaminaDamage(EntityUid uid, float value, StaminaComponent? comp
         if (component.AfterCritical && oldDamage > component.StaminaDamage && component.StaminaDamage <= 0f)
         {
             component.AfterCritical = false; // Since the recovery from the crit has been completed, we are no longer 'after crit'
+            _status.TryRemoveStatusEffect(uid, StaminaLow);
         }
 
         if (!component.Critical)
diff --git a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs.rej b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs.rej
new file mode 100644
index 000000000000..d113eec6ab28
--- /dev/null
+++ b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs.rej
@@ -0,0 +1,97 @@
+diff a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs	(rejected hunks)
+@@ -8,9 +8,12 @@
+ using Content.Shared.Database;
+ using Content.Shared.Effects;
+ using Content.Shared.FixedPoint;
++using Content.Shared.Movement.Components;
++using Content.Shared.Movement.Systems;
+ using Content.Shared.Projectiles;
+ using Content.Shared.Rejuvenate;
+ using Content.Shared.Rounding;
++using Content.Shared.StatusEffectNew;
+ using Content.Shared.Stunnable;
+ using Content.Shared.Throwing;
+ using Content.Shared.Weapons.Melee.Events;
+@@ -20,6 +23,7 @@
+ using Robust.Shared.Configuration;
+ using Robust.Shared.Network;
+ using Robust.Shared.Player;
++using Robust.Shared.Prototypes;
+ using Robust.Shared.Serialization;
+ using Robust.Shared.Timing;
+ 
+@@ -27,15 +31,19 @@ namespace Content.Shared.Damage.Systems;
+ 
+ public abstract partial class SharedStaminaSystem : EntitySystem
+ {
++    public static readonly EntProtoId StaminaLow = "StatusEffectStaminaLow";
++
++    [Dependency] private readonly IConfigurationManager _config = default!;
+     [Dependency] protected readonly IGameTiming Timing = default!;
+     [Dependency] private readonly INetManager _net = default!;
+     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+     [Dependency] private readonly AlertsSystem _alerts = default!;
+     [Dependency] private readonly MetaDataSystem _metadata = default!;
++    [Dependency] private readonly MovementModStatusSystem _movementMod = default!;
++    [Dependency] private readonly SharedAudioSystem _audio = default!;
+     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
++    [Dependency] private readonly StatusEffectsSystem _status = default!;
+     [Dependency] protected readonly SharedStunSystem StunSystem = default!;
+-    [Dependency] private readonly SharedAudioSystem _audio = default!;
+-    [Dependency] private readonly IConfigurationManager _config = default!;
+ 
+     /// <summary>
+     /// How much of a buffer is there between the stun duration and when stuns can be re-applied.
+@@ -284,7 +293,7 @@ public void TakeStaminaDamage(EntityUid uid, float value, StaminaComponent? comp
+                 component.NextUpdate = nextUpdate;
+         }
+ 
+-        AdjustSlowdown(uid);
++        AdjustStatus(uid);
+ 
+         UpdateStaminaVisuals((uid, component));
+ 
+@@ -384,7 +394,7 @@ private void EnterStamCrit(EntityUid uid, StaminaComponent? component = null)
+         component.Critical = true;
+         component.StaminaDamage = component.CritThreshold;
+ 
+-        if (StunSystem.TryParalyze(uid, component.StunTime, true))
++        if (StunSystem.TryUpdateParalyzeDuration(uid, component.StunTime))
+             StunSystem.TrySeeingStars(uid);
+ 
+         // Give them buffer before being able to be re-stunned
+@@ -412,18 +422,19 @@ private void ExitStamCrit(EntityUid uid, StaminaComponent? component = null)
+     }
+ 
+     /// <summary>
+-    /// Adjusts the movement speed of an entity based on its current <see cref="StaminaComponent.StaminaDamage"/> value.
+-    /// If the entity has a <see cref="SlowOnDamageComponent"/>, its custom damage-to-speed thresholds are used,
+-    /// otherwise, a default set of thresholds is applied.
+-    /// The method determines the closest applicable damage threshold below the crit limit and applies the corresponding
+-    /// speed modifier using the stun system. If no threshold is met then the entity's speed is restored to normal.
++    /// Adjusts the modifiers of the <see cref="StaminaLow"/> status effect entity and applies relevant statuses.
++    /// System iterates through the <see cref="StaminaComponent.StunModifierThresholds"/> to find correct movement modifer.
++    /// This modifier is saved to the Stamina Low Status Effect entity's <see cref="MovementModStatusEffectComponent"/>.
+     /// </summary>
+     /// <param name="ent">Entity to update</param>
+-    private void AdjustSlowdown(Entity<StaminaComponent?> ent)
++    private void AdjustStatus(Entity<StaminaComponent?> ent)
+     {
+         if (!Resolve(ent, ref ent.Comp))
+             return;
+ 
++        if (!_status.TrySetStatusEffectDuration(ent, StaminaLow, out var status))
++            return;
++
+         var closest = FixedPoint2.Zero;
+ 
+         // Iterate through the dictionary in the similar way as in Damage.SlowOnDamageSystem.OnRefreshMovespeed
+@@ -435,7 +446,7 @@ private void AdjustSlowdown(Entity<StaminaComponent?> ent)
+                 closest = thres.Key;
+         }
+ 
+-        StunSystem.UpdateStunModifiers(ent, ent.Comp.StunModifierThresholds[closest]);
++        _movementMod.TryUpdateMovementStatus(ent.Owner, status.Value, ent.Comp.StunModifierThresholds[closest]);
+     }
+ 
+     [Serializable, NetSerializable]
diff --git a/Content.Shared/DisplacementMap/DisplacementData.cs.rej b/Content.Shared/DisplacementMap/DisplacementData.cs.rej
new file mode 100644
index 000000000000..d40e81a564d7
--- /dev/null
+++ b/Content.Shared/DisplacementMap/DisplacementData.cs.rej
@@ -0,0 +1,11 @@
+diff a/Content.Shared/DisplacementMap/DisplacementData.cs b/Content.Shared/DisplacementMap/DisplacementData.cs	(rejected hunks)
+@@ -1,6 +1,8 @@
++using Robust.Shared.Serialization;
++
+ namespace Content.Shared.DisplacementMap;
+ 
+-[DataDefinition]
++[DataDefinition, Serializable, NetSerializable]
+ public sealed partial class DisplacementData
+ {
+     /// <summary>
diff --git a/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs b/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs
index 06a0a0106caf..98e3dc68468c 100644
--- a/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs
+++ b/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs
@@ -148,6 +148,7 @@
 using Content.Shared.Popups;
 using Content.Shared.Power;
 using Content.Shared.Power.EntitySystems;
+using Content.Shared.Storage.Components;
 using Content.Shared.Throwing;
 using Content.Shared.Verbs;
 using Content.Shared.Whitelist;
@@ -223,6 +224,9 @@ public override void Initialize()
         SubscribeLocalEvent<DisposalUnitComponent, AfterInteractUsingEvent>(OnAfterInteractUsing);
         SubscribeLocalEvent<DisposalUnitComponent, DragDropTargetEvent>(OnDragDropOn);
         SubscribeLocalEvent<DisposalUnitComponent, ContainerRelayMovementEntityEvent>(OnMovement);
+
+        SubscribeLocalEvent<DisposalUnitComponent, GetDumpableVerbEvent>(OnGetDumpableVerb);
+        SubscribeLocalEvent<DisposalUnitComponent, DumpEvent>(OnDump);
     }
 
     private void AddDisposalAltVerbs(Entity<DisposalUnitComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
@@ -924,4 +928,23 @@ private void AddClimbInsideVerb(EntityUid uid, DisposalUnitComponent component,
         // See also, medical scanner. Also maybe add verbs for entering lockers/body bags?
         args.Verbs.Add(verb);
     }
+
+    private void OnGetDumpableVerb(Entity<DisposalUnitComponent> ent, ref GetDumpableVerbEvent args)
+    {
+        args.Verb = Loc.GetString("dump-disposal-verb-name", ("unit", ent));
+    }
+
+    private void OnDump(Entity<DisposalUnitComponent> ent, ref DumpEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        args.Handled = true;
+        args.PlaySound = true;
+
+        foreach (var entity in args.DumpQueue)
+        {
+            DoInsertDisposalUnit(ent, entity, args.User);
+        }
+    }
 }
diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
index 6775976dd439..1c1192d49c7c 100644
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -600,7 +600,7 @@ public void Crush(EntityUid uid, DoorComponent? door = null, PhysicsComponent? p
             if (door.CrushDamage != null)
                 _damageableSystem.TryChangeDamage(entity, door.CrushDamage, origin: uid);
 
-            _stunSystem.TryParalyze(entity, stunTime, true);
+            _stunSystem.TryUpdateParalyzeDuration(entity, stunTime);
         }
 
         if (door.CurrentlyCrushing.Count == 0)
diff --git a/Content.Shared/Emp/SharedEmpSystem.cs.rej b/Content.Shared/Emp/SharedEmpSystem.cs.rej
new file mode 100644
index 000000000000..17525bee9899
--- /dev/null
+++ b/Content.Shared/Emp/SharedEmpSystem.cs.rej
@@ -0,0 +1,22 @@
+diff a/Content.Shared/Emp/SharedEmpSystem.cs b/Content.Shared/Emp/SharedEmpSystem.cs	(rejected hunks)
+@@ -1,3 +1,4 @@
++using Robust.Shared.Map;
+ using Robust.Shared.Timing;
+ 
+ namespace Content.Shared.Emp;
+@@ -7,4 +8,15 @@ public abstract class SharedEmpSystem : EntitySystem
+     [Dependency] protected readonly IGameTiming Timing = default!;
+ 
+     protected const string EmpDisabledEffectPrototype = "EffectEmpDisabled";
++
++    /// <summary>
++    /// Triggers an EMP pulse at the given location, by first raising an <see cref="EmpAttemptEvent"/>, then a raising <see cref="EmpPulseEvent"/> on all entities in range.
++    /// </summary>
++    /// <param name="coordinates">The location to trigger the EMP pulse at.</param>
++    /// <param name="range">The range of the EMP pulse.</param>
++    /// <param name="energyConsumption">The amount of energy consumed by the EMP pulse.</param>
++    /// <param name="duration">The duration of the EMP effects.</param>
++    public virtual void EmpPulse(MapCoordinates coordinates, float range, float energyConsumption, float duration)
++    {
++    }
+ }
diff --git a/Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs.rej b/Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs.rej
new file mode 100644
index 000000000000..f1b07d0f8696
--- /dev/null
+++ b/Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs.rej
@@ -0,0 +1,12 @@
+diff a/Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs b/Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs	(rejected hunks)
+@@ -112,4 +112,10 @@ public sealed partial class ScatteringGrenadeComponent : Component
+     /// We need to store this because we are only allowed to spawn and trigger timed entities on the next available frame update
+     /// </summary>
+     public bool IsTriggered = false;
++
++    /// <summary>
++    /// The trigger key that will activate the grenade.
++    /// </summary>
++    [DataField]
++    public string TriggerKey = "timer";
+ }
diff --git a/Content.Shared/Explosion/EntitySystems/SharedReleaseGasOnTriggerSystem.cs b/Content.Shared/Explosion/EntitySystems/SharedReleaseGasOnTriggerSystem.cs
deleted file mode 100644
index 5027b04517cc..000000000000
--- a/Content.Shared/Explosion/EntitySystems/SharedReleaseGasOnTriggerSystem.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Content.Shared.Explosion.EntitySystems;
-
-public abstract partial class SharedReleaseGasOnTriggerSystem : EntitySystem;
-
-// I have dreams of Atmos in shared.
diff --git a/Content.Shared/Explosion/EntitySystems/SharedRepulseAttractOnTriggerSystem.cs b/Content.Shared/Explosion/EntitySystems/SharedRepulseAttractOnTriggerSystem.cs
deleted file mode 100644
index 386024fbeb63..000000000000
--- a/Content.Shared/Explosion/EntitySystems/SharedRepulseAttractOnTriggerSystem.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Content.Shared.Explosion.EntitySystems;
-
-public abstract class SharedRepulseAttractOnTriggerSystem : EntitySystem;
diff --git a/Content.Shared/Eye/VisibilityFlags.cs.rej b/Content.Shared/Eye/VisibilityFlags.cs.rej
new file mode 100644
index 000000000000..9ae950f19176
--- /dev/null
+++ b/Content.Shared/Eye/VisibilityFlags.cs.rej
@@ -0,0 +1,15 @@
+diff a/Content.Shared/Eye/VisibilityFlags.cs b/Content.Shared/Eye/VisibilityFlags.cs	(rejected hunks)
+@@ -6,9 +6,10 @@ namespace Content.Shared.Eye
+     [FlagsFor(typeof(VisibilityMaskLayer))]
+     public enum VisibilityFlags : int
+     {
+-        None   = 0,
++        None = 0,
+         Normal = 1 << 0,
+-        Ghost  = 1 << 1,
+-        Subfloor = 1 << 2,
++        Ghost = 1 << 1, // Observers and revenants.
++        Subfloor = 1 << 2, // Pipes, disposal chutes, cables etc. while hidden under tiles. Can be revealed with a t-ray.
++        Admin = 1 << 3, // Reserved for admins in stealth mode and admin tools.
+     }
+ }
diff --git a/Content.Shared/Flash/SharedFlashSystem.cs b/Content.Shared/Flash/SharedFlashSystem.cs
index a508f6f239cc..b942da91d778 100644
--- a/Content.Shared/Flash/SharedFlashSystem.cs
+++ b/Content.Shared/Flash/SharedFlashSystem.cs
@@ -50,6 +50,7 @@ public abstract class SharedFlashSystem : EntitySystem
     [Dependency] private readonly ExamineSystemShared _examine = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedStunSystem _stun = default!;
+    [Dependency] private readonly MovementModStatusSystem _movementMod = default!;
     [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
diff --git a/Content.Shared/Flash/SharedFlashSystem.cs.rej b/Content.Shared/Flash/SharedFlashSystem.cs.rej
new file mode 100644
index 000000000000..79a43779bf91
--- /dev/null
+++ b/Content.Shared/Flash/SharedFlashSystem.cs.rej
@@ -0,0 +1,21 @@
+diff a/Content.Shared/Flash/SharedFlashSystem.cs b/Content.Shared/Flash/SharedFlashSystem.cs	(rejected hunks)
+@@ -20,6 +20,7 @@
+ using Robust.Shared.Random;
+ using Robust.Shared.Timing;
+ using System.Linq;
++using Content.Shared.Movement.Systems;
+ 
+ namespace Content.Shared.Flash;
+ 
+@@ -163,9 +165,9 @@ public void Flash(
+             return;
+ 
+         if (stunDuration != null)
+-            _stun.TryParalyze(target, stunDuration.Value, true);
++            _stun.TryUpdateParalyzeDuration(target, stunDuration.Value);
+         else
+-            _stun.TrySlowdown(target, flashDuration, true, slowTo, slowTo);
++            _movementMod.TryUpdateMovementSpeedModDuration(target, MovementModStatusSystem.FlashSlowdown, flashDuration, slowTo);
+ 
+         if (displayPopup && user != null && target != user && Exists(user.Value))
+         {
diff --git a/Content.Shared/Follower/FollowerSystem.cs b/Content.Shared/Follower/FollowerSystem.cs
index ebeae80ed0f7..0834a3b84d9d 100644
--- a/Content.Shared/Follower/FollowerSystem.cs
+++ b/Content.Shared/Follower/FollowerSystem.cs
@@ -218,6 +218,9 @@ private void OnFollowedStationAiRemoteEntityReplaced(Entity<FollowedComponent> e
     /// <param name="entity">The entity to be followed</param>
     public void StartFollowingEntity(EntityUid follower, EntityUid entity)
     {
+        if (follower == entity || TerminatingOrDeleted(entity))
+            return;
+
         // No recursion for you
         var targetXform = Transform(entity);
         while (targetXform.ParentUid.IsValid())
diff --git a/Content.Shared/Glue/GlueComponent.cs.rej b/Content.Shared/Glue/GlueComponent.cs.rej
new file mode 100644
index 000000000000..7434ea557ce7
--- /dev/null
+++ b/Content.Shared/Glue/GlueComponent.cs.rej
@@ -0,0 +1,55 @@
+diff a/Content.Shared/Glue/GlueComponent.cs b/Content.Shared/Glue/GlueComponent.cs	(rejected hunks)
+@@ -2,41 +2,44 @@
+ using Content.Shared.FixedPoint;
+ using Robust.Shared.Audio;
+ using Robust.Shared.GameStates;
+-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
++using Robust.Shared.Prototypes;
+ 
+ namespace Content.Shared.Glue;
+ 
+-[RegisterComponent, NetworkedComponent]
+-[Access(typeof(SharedGlueSystem))]
++/// <summary>
++/// This component indicates that an item is glue and can be used as such.
++/// </summary>
++[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
++[Access(typeof(GlueSystem))]
+ public sealed partial class GlueComponent : Component
+ {
+     /// <summary>
+     /// Noise made when glue applied.
+     /// </summary>
+-    [DataField("squeeze")]
++    [DataField, AutoNetworkedField]
+     public SoundSpecifier Squeeze = new SoundPathSpecifier("/Audio/Items/squeezebottle.ogg");
+ 
+     /// <summary>
+     /// Solution on the entity that contains the glue.
+     /// </summary>
+-    [DataField("solution")]
++    [DataField, AutoNetworkedField]
+     public string Solution = "drink";
+ 
+     /// <summary>
+     /// Reagent that will be used as glue.
+     /// </summary>
+-    [DataField("reagent", customTypeSerializer: typeof(PrototypeIdSerializer<ReagentPrototype>))]
+-    public string Reagent = "SpaceGlue";
++    [DataField, AutoNetworkedField]
++    public ProtoId<ReagentPrototype> Reagent = "SpaceGlue";
+ 
+     /// <summary>
+     /// Reagent consumption per use.
+     /// </summary>
+-    [DataField("consumptionUnit"), ViewVariables(VVAccess.ReadWrite)]
++    [DataField, AutoNetworkedField]
+     public FixedPoint2 ConsumptionUnit = FixedPoint2.New(5);
+ 
+     /// <summary>
+     /// Duration per unit
+     /// </summary>
+-    [DataField("durationPerUnit"), ViewVariables(VVAccess.ReadWrite)]
++    [DataField, AutoNetworkedField]
+     public TimeSpan DurationPerUnit = TimeSpan.FromSeconds(6);
+ }
diff --git a/Content.Server/Glue/GlueSystem.cs b/Content.Shared/Glue/GlueSystem.cs
similarity index 82%
rename from Content.Server/Glue/GlueSystem.cs
rename to Content.Shared/Glue/GlueSystem.cs
index 32cd52126fda..fdcd43f9825c 100644
--- a/Content.Server/Glue/GlueSystem.cs
+++ b/Content.Shared/Glue/GlueSystem.cs
@@ -34,17 +34,17 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Glue;
+namespace Content.Shared.Glue;
 
-public sealed class GlueSystem : SharedGlueSystem
+public sealed class GlueSystem : EntitySystem
 {
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly NameModifierSystem _nameMod = default!;
+    [Dependency] private readonly OpenableSystem _openable = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly OpenableSystem _openable = default!;
-    [Dependency] private readonly NameModifierSystem _nameMod = default!;
 
     public override void Initialize()
     {
@@ -83,7 +83,7 @@ private void OnUtilityVerb(Entity<GlueComponent> entity, ref GetVerbsEvent<Utili
             Act = () => TryGlue(entity, target, user),
             IconEntity = GetNetEntity(entity),
             Text = Loc.GetString("glue-verb-text"),
-            Message = Loc.GetString("glue-verb-message")
+            Message = Loc.GetString("glue-verb-message"),
         };
 
         args.Verbs.Add(verb);
@@ -93,26 +93,29 @@ private bool TryGlue(Entity<GlueComponent> entity, EntityUid target, EntityUid a
     {
         // if item is glued then don't apply glue again so it can be removed for reasonable time
         // If glue is applied to an unremoveable item, the component will disappear after the duration.
-        // This effecitvely means any unremoveable item could be removed with a bottle of glue.
+        // This effectively means any unremoveable item could be removed with a bottle of glue.
         if (HasComp<GluedComponent>(target) || !HasComp<ItemComponent>(target) || HasComp<UnremoveableComponent>(target))
         {
-            _popup.PopupEntity(Loc.GetString("glue-failure", ("target", target)), actor, actor, PopupType.Medium);
+            _popup.PopupClient(Loc.GetString("glue-failure", ("target", target)), actor, actor, PopupType.Medium);
             return false;
         }
 
-        if (HasComp<ItemComponent>(target) && _solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var solution))
+        if (HasComp<ItemComponent>(target) && _solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out var solutionEntity, out _))
         {
-            var quantity = solution.RemoveReagent(entity.Comp.Reagent, entity.Comp.ConsumptionUnit);
+            var quantity = _solutionContainer.RemoveReagent(solutionEntity.Value, entity.Comp.Reagent, entity.Comp.ConsumptionUnit);
             if (quantity > 0)
             {
-                EnsureComp<GluedComponent>(target).Duration = quantity.Double() * entity.Comp.DurationPerUnit;
+                _audio.PlayPredicted(entity.Comp.Squeeze, entity.Owner, actor);
+                _popup.PopupClient(Loc.GetString("glue-success", ("target", target)), actor, actor, PopupType.Medium);
                 _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(actor):actor} glued {ToPrettyString(target):subject} with {ToPrettyString(entity.Owner):tool}");
-                _audio.PlayPvs(entity.Comp.Squeeze, entity.Owner);
-                _popup.PopupEntity(Loc.GetString("glue-success", ("target", target)), actor, actor, PopupType.Medium);
+                var gluedComp = EnsureComp<GluedComponent>(target);
+                gluedComp.Duration = quantity.Double() * entity.Comp.DurationPerUnit;
+                Dirty(target, gluedComp);
                 return true;
             }
         }
-        _popup.PopupEntity(Loc.GetString("glue-failure", ("target", target)), actor, actor, PopupType.Medium);
+
+        _popup.PopupClient(Loc.GetString("glue-failure", ("target", target)), actor, actor, PopupType.Medium);
         return false;
     }
 
@@ -140,9 +143,16 @@ private void OnGluedInit(Entity<GluedComponent> entity, ref ComponentInit args)
 
     private void OnHandPickUp(Entity<GluedComponent> entity, ref GotEquippedHandEvent args)
     {
+        // When predicting dropping a glued item prediction will reinsert the item into the hand when rerolling the state to a previous one.
+        // So dropping the item would add UnRemoveableComponent on the client without this guard statement.
+        if (_timing.ApplyingState)
+            return;
+
         var comp = EnsureComp<UnremoveableComponent>(entity);
         comp.DeleteOnDrop = false;
         entity.Comp.Until = _timing.CurTime + entity.Comp.Duration;
+        Dirty(entity.Owner, comp);
+        Dirty(entity);
     }
 
     private void OnRefreshNameModifiers(Entity<GluedComponent> entity, ref RefreshNameModifiersEvent args)
diff --git a/Content.Shared/Glue/GlueSystem.cs.rej b/Content.Shared/Glue/GlueSystem.cs.rej
new file mode 100644
index 000000000000..f8eb558e7a3f
--- /dev/null
+++ b/Content.Shared/Glue/GlueSystem.cs.rej
@@ -0,0 +1,10 @@
+diff a/Content.Shared/Glue/GlueSystem.cs b/Content.Shared/Glue/GlueSystem.cs	(rejected hunks)
+@@ -1,7 +1,6 @@
+-using Content.Server.Administration.Logs;
++using Content.Shared.Administration.Logs;
+ using Content.Shared.Chemistry.EntitySystems;
+ using Content.Shared.Database;
+-using Content.Shared.Glue;
+ using Content.Shared.Hands;
+ using Content.Shared.Interaction;
+ using Content.Shared.Interaction.Components;
diff --git a/Content.Shared/Glue/GluedComponent.cs.rej b/Content.Shared/Glue/GluedComponent.cs.rej
new file mode 100644
index 000000000000..53db490fe169
--- /dev/null
+++ b/Content.Shared/Glue/GluedComponent.cs.rej
@@ -0,0 +1,33 @@
+diff a/Content.Shared/Glue/GluedComponent.cs b/Content.Shared/Glue/GluedComponent.cs	(rejected hunks)
+@@ -1,15 +1,26 @@
++using Robust.Shared.GameStates;
+ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+ 
+ namespace Content.Shared.Glue;
+ 
+-[RegisterComponent]
+-[Access(typeof(SharedGlueSystem))]
++/// <summary>
++/// This component gets attached to an item that has been glued.
++/// </summary>
++[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
++[Access(typeof(GlueSystem))]
+ public sealed partial class GluedComponent : Component
+ {
+-
+-    [DataField("until", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
++    /// <summary>
++    /// The TimeSpan this effect expires at.
++    /// </summary>
++    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
++    [AutoNetworkedField, AutoPausedField]
+     public TimeSpan Until;
+ 
+-    [DataField("duration", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
++    /// <summary>
++    /// The duration this effect will last. Determined by the quantity of the reagent that is applied.
++    /// </summary>
++    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
++    [AutoNetworkedField]
+     public TimeSpan Duration;
+ }
diff --git a/Content.Shared/HotPotato/ActiveHotPotatoComponent.cs b/Content.Shared/HotPotato/ActiveHotPotatoComponent.cs
index 8a709a58c62d..68a0c7d382d5 100644
--- a/Content.Shared/HotPotato/ActiveHotPotatoComponent.cs
+++ b/Content.Shared/HotPotato/ActiveHotPotatoComponent.cs
@@ -19,7 +19,7 @@ public sealed partial class ActiveHotPotatoComponent : Component
     /// <summary>
     /// Hot potato effect spawn cooldown in seconds
     /// </summary>
-    [DataField("effectCooldown"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float EffectCooldown = 0.3f;
 
     /// <summary>
diff --git a/Content.Shared/HotPotato/HotPotatoComponent.cs.rej b/Content.Shared/HotPotato/HotPotatoComponent.cs.rej
new file mode 100644
index 000000000000..19d6d7a9e5d2
--- /dev/null
+++ b/Content.Shared/HotPotato/HotPotatoComponent.cs.rej
@@ -0,0 +1,10 @@
+diff a/Content.Shared/HotPotato/HotPotatoComponent.cs b/Content.Shared/HotPotato/HotPotatoComponent.cs	(rejected hunks)
+@@ -14,7 +14,6 @@ public sealed partial class HotPotatoComponent : Component
+     /// <summary>
+     /// If set to true entity can be removed by hitting entities if they have hands
+     /// </summary>
+-    [DataField("canTransfer"), ViewVariables(VVAccess.ReadWrite)]
+-    [AutoNetworkedField]
++    [DataField, AutoNetworkedField]
+     public bool CanTransfer = true;
+ }
diff --git a/Content.Shared/HotPotato/SharedHotPotatoSystem.cs.rej b/Content.Shared/HotPotato/SharedHotPotatoSystem.cs.rej
new file mode 100644
index 000000000000..ee144a3ab9f8
--- /dev/null
+++ b/Content.Shared/HotPotato/SharedHotPotatoSystem.cs.rej
@@ -0,0 +1,83 @@
+diff a/Content.Shared/HotPotato/SharedHotPotatoSystem.cs b/Content.Shared/HotPotato/SharedHotPotatoSystem.cs	(rejected hunks)
+@@ -1,18 +1,79 @@
++using Content.Shared.Audio;
++using Content.Shared.Damage.Systems;
++using Content.Shared.Hands.Components;
++using Content.Shared.Hands.EntitySystems;
++using Content.Shared.IdentityManagement;
++using Content.Shared.Popups;
++using Content.Shared.Trigger;
++using Content.Shared.Weapons.Melee.Events;
+ using Robust.Shared.Containers;
++using Robust.Shared.Timing;
+ 
+ namespace Content.Shared.HotPotato;
+ 
+ public abstract class SharedHotPotatoSystem : EntitySystem
+ {
++    [Dependency] private readonly SharedHandsSystem _hands = default!;
++    [Dependency] private readonly SharedPopupSystem _popup = default!;
++    [Dependency] private readonly SharedAmbientSoundSystem _ambientSound = default!;
++    [Dependency] private readonly DamageOnHoldingSystem _damageOnHolding = default!;
++    [Dependency] private readonly IGameTiming _timing = default!;
++
++
+     public override void Initialize()
+     {
+         base.Initialize();
++
+         SubscribeLocalEvent<HotPotatoComponent, ContainerGettingRemovedAttemptEvent>(OnRemoveAttempt);
++        SubscribeLocalEvent<HotPotatoComponent, ActiveTimerTriggerEvent>(OnActiveTimer);
++        SubscribeLocalEvent<HotPotatoComponent, MeleeHitEvent>(OnMeleeHit);
+     }
+ 
+-    private void OnRemoveAttempt(EntityUid uid, HotPotatoComponent comp, ContainerGettingRemovedAttemptEvent args)
++    private void OnRemoveAttempt(Entity<HotPotatoComponent> ent, ref ContainerGettingRemovedAttemptEvent args)
+     {
+-        if (!comp.CanTransfer)
++        if (!_timing.ApplyingState && !ent.Comp.CanTransfer)
+             args.Cancel();
+     }
++
++    private void OnActiveTimer(Entity<HotPotatoComponent> ent, ref ActiveTimerTriggerEvent args)
++    {
++        EnsureComp<ActiveHotPotatoComponent>(ent);
++        ent.Comp.CanTransfer = false;
++        _ambientSound.SetAmbience(ent.Owner, true);
++        _damageOnHolding.SetEnabled(ent.Owner, true);
++        Dirty(ent);
++    }
++
++    private void OnMeleeHit(Entity<HotPotatoComponent> ent, ref MeleeHitEvent args)
++    {
++        if (!HasComp<ActiveHotPotatoComponent>(ent))
++            return;
++
++        ent.Comp.CanTransfer = true;
++        foreach (var hitEntity in args.HitEntities)
++        {
++            if (!TryComp<HandsComponent>(hitEntity, out var hands))
++                continue;
++
++            if (!_hands.IsHolding((hitEntity, hands), ent.Owner, out _) && _hands.TryForcePickupAnyHand(hitEntity, ent.Owner, handsComp: hands))
++            {
++                _popup.PopupPredicted(
++                    Loc.GetString("hot-potato-passed", ("from", Identity.Entity(args.User, EntityManager)), ("to", Identity.Entity(hitEntity, EntityManager))),
++                    ent.Owner,
++                    args.User,
++                    PopupType.Medium);
++                break;
++            }
++
++            _popup.PopupClient(
++                Loc.GetString("hot-potato-failed", ("to", Identity.Entity(hitEntity, EntityManager))),
++                ent.Owner,
++                args.User,
++                PopupType.Medium);
++
++            break;
++        }
++
++        ent.Comp.CanTransfer = false;
++    }
+ }
diff --git a/Content.Shared/Humanoid/SkinColor.cs.rej b/Content.Shared/Humanoid/SkinColor.cs.rej
new file mode 100644
index 000000000000..978243df2e22
--- /dev/null
+++ b/Content.Shared/Humanoid/SkinColor.cs.rej
@@ -0,0 +1,6 @@
+diff a/Content.Shared/Humanoid/SkinColor.cs b/Content.Shared/Humanoid/SkinColor.cs	(rejected hunks)
+@@ -1,3 +1,4 @@
++using System.Numerics;
+ using System.Security.Cryptography;
+ using Microsoft.VisualBasic.CompilerServices;
+ 
diff --git a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
index f94613326a15..8485c7b62db1 100644
--- a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
+++ b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
@@ -205,7 +205,7 @@ private void RelayToImplantEvent<T>(EntityUid uid, ImplantedComponent component,
         if (!_container.TryGetContainer(uid, ImplanterComponent.ImplantSlotId, out var implantContainer))
             return;
 
-        var relayEv = new ImplantRelayEvent<T>(args);
+        var relayEv = new ImplantRelayEvent<T>(args, uid);
         foreach (var implant in implantContainer.ContainedEntities)
         {
             if (args is HandledEntityEventArgs { Handled : true })
@@ -220,9 +220,12 @@ public sealed class ImplantRelayEvent<T> where T : notnull
 {
     public readonly T Event;
 
-    public ImplantRelayEvent(T ev)
+    public readonly EntityUid ImplantedEntity;
+
+    public ImplantRelayEvent(T ev, EntityUid implantedEntity)
     {
         Event = ev;
+        ImplantedEntity = implantedEntity;
     }
 }
 
diff --git a/Content.Shared/Interaction/Components/UnremoveableComponent.cs.rej b/Content.Shared/Interaction/Components/UnremoveableComponent.cs.rej
new file mode 100644
index 000000000000..37e74abe6135
--- /dev/null
+++ b/Content.Shared/Interaction/Components/UnremoveableComponent.cs.rej
@@ -0,0 +1,29 @@
+diff a/Content.Shared/Interaction/Components/UnremoveableComponent.cs b/Content.Shared/Interaction/Components/UnremoveableComponent.cs	(rejected hunks)
+@@ -1,17 +1,14 @@
+-using Content.Shared.Whitelist;
+ using Robust.Shared.GameStates;
+ 
+-namespace Content.Shared.Interaction.Components
++namespace Content.Shared.Interaction.Components;
++
++[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
++public sealed partial class UnremoveableComponent : Component
+ {
+-    [RegisterComponent]
+-    [NetworkedComponent]
+-    public sealed partial class UnremoveableComponent : Component
+-    {
+-        /// <summary>
+-        /// If this is true then unremovable items that are removed from inventory are deleted (typically from corpse gibbing).
+-        /// Items within unremovable containers are not deleted when removed.
+-        /// </summary>
+-        [DataField("deleteOnDrop")]
+-        public bool DeleteOnDrop = true;
+-    }
++    /// <summary>
++    /// If this is true then unremovable items that are removed from inventory are deleted (typically from corpse gibbing).
++    /// Items within unremovable containers are not deleted when removed.
++    /// </summary>
++    [DataField, AutoNetworkedField]
++    public bool DeleteOnDrop = true;
+ }
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index a468cd7e5733..a2dbace9c01a 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -221,7 +221,11 @@ public abstract partial class SharedInteractionSystem : EntitySystem
         private EntityQuery<UseDelayComponent> _delayQuery;
         private EntityQuery<ActivatableUIComponent> _uiQuery;
 
-        private const CollisionGroup InRangeUnobstructedMask = CollisionGroup.Impassable | CollisionGroup.InteractImpassable;
+        /// <summary>
+        /// The collision mask used by default for
+        /// <see cref="InRangeUnobstructed(MapCoordinates,MapCoordinates,float,CollisionGroup,Ignored?,bool)" />
+        /// </summary>
+        public const CollisionGroup InRangeUnobstructedMask = CollisionGroup.Impassable | CollisionGroup.InteractImpassable;
 
         public const float InteractionRange = 1.5f;
         public const float InteractionRangeSquared = InteractionRange * InteractionRange;
diff --git a/Content.Shared/Inventory/InventoryComponent.cs b/Content.Shared/Inventory/InventoryComponent.cs
index f0b229714bf8..aab58a326f20 100644
--- a/Content.Shared/Inventory/InventoryComponent.cs
+++ b/Content.Shared/Inventory/InventoryComponent.cs
@@ -28,28 +28,46 @@ namespace Content.Shared.Inventory;
 [AutoGenerateComponentState(true)]
 public sealed partial class InventoryComponent : Component
 {
-    [DataField("templateId", customTypeSerializer: typeof(PrototypeIdSerializer<InventoryTemplatePrototype>))]
-    [AutoNetworkedField]
-    public string TemplateId { get; set; } = "human";
+    /// <summary>
+    /// The template defining how the inventory layout will look like.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    [ViewVariables] // use the API method
+    public ProtoId<InventoryTemplatePrototype> TemplateId = "human";
 
-    [DataField("speciesId")] public string? SpeciesId { get; set; }
+    /// <summary>
+    /// For setting the TemplateId.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public ProtoId<InventoryTemplatePrototype> TemplateIdVV
+    {
+        get => TemplateId;
+        set => IoCManager.Resolve<IEntityManager>().System<InventorySystem>().SetTemplateId((Owner, this), value);
+    }
 
+    [DataField, AutoNetworkedField]
+    public string? SpeciesId;
+
+
+    [ViewVariables]
     public SlotDefinition[] Slots = Array.Empty<SlotDefinition>();
+
+    [ViewVariables]
     public ContainerSlot[] Containers = Array.Empty<ContainerSlot>();
 
-    [DataField]
+    [DataField, AutoNetworkedField]
     public Dictionary<string, DisplacementData> Displacements = new();
 
     /// <summary>
     /// Alternate displacement maps, which if available, will be selected for the player of the appropriate gender.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public Dictionary<string, DisplacementData> FemaleDisplacements = new();
 
     /// <summary>
     /// Alternate displacement maps, which if available, will be selected for the player of the appropriate gender.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public Dictionary<string, DisplacementData> MaleDisplacements = new();
 }
 
diff --git a/Content.Shared/Inventory/InventoryComponent.cs.rej b/Content.Shared/Inventory/InventoryComponent.cs.rej
new file mode 100644
index 000000000000..f2d2b2a2e996
--- /dev/null
+++ b/Content.Shared/Inventory/InventoryComponent.cs.rej
@@ -0,0 +1,10 @@
+diff a/Content.Shared/Inventory/InventoryComponent.cs b/Content.Shared/Inventory/InventoryComponent.cs	(rejected hunks)
+@@ -1,7 +1,7 @@
+ using Content.Shared.DisplacementMap;
+ using Robust.Shared.Containers;
+ using Robust.Shared.GameStates;
+-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
++using Robust.Shared.Prototypes;
+ 
+ namespace Content.Shared.Inventory;
+ 
diff --git a/Content.Shared/Inventory/InventorySystem.Slots.cs b/Content.Shared/Inventory/InventorySystem.Slots.cs
index 82146d73e825..44e9c02774ed 100644
--- a/Content.Shared/Inventory/InventorySystem.Slots.cs
+++ b/Content.Shared/Inventory/InventorySystem.Slots.cs
@@ -130,7 +130,7 @@ public bool TryGetInventoryEntity<T>(Entity<InventoryComponent?> entity, out Ent
                 if (!TryComp<T>(item, out var required))
                     continue;
 
-                if ((((IClothingSlots) required).Slots & slot.SlotFlags) == 0x0)
+                if ((((IClothingSlots)required).Slots & slot.SlotFlags) == 0x0)
                     continue;
 
                 target = (item, required);
@@ -142,20 +142,9 @@ public bool TryGetInventoryEntity<T>(Entity<InventoryComponent?> entity, out Ent
         return false;
     }
 
-    protected virtual void OnInit(EntityUid uid, InventoryComponent component, ComponentInit args)
+    private void OnInit(Entity<InventoryComponent> ent, ref ComponentInit args)
     {
-        if (!_prototypeManager.TryIndex(component.TemplateId, out InventoryTemplatePrototype? invTemplate))
-            return;
-
-        component.Slots = invTemplate.Slots;
-        component.Containers = new ContainerSlot[component.Slots.Length];
-        for (var i = 0; i < component.Containers.Length; i++)
-        {
-            var slot = component.Slots[i];
-            var container = _containerSystem.EnsureContainer<ContainerSlot>(uid, slot.Name);
-            container.OccludesLight = false;
-            component.Containers[i] = container;
-        }
+        UpdateInventoryTemplate(ent);
     }
 
     private void AfterAutoState(Entity<InventoryComponent> ent, ref AfterAutoHandleStateEvent args)
@@ -165,18 +154,31 @@ private void AfterAutoState(Entity<InventoryComponent> ent, ref AfterAutoHandleS
 
     protected virtual void UpdateInventoryTemplate(Entity<InventoryComponent> ent)
     {
-        if (ent.Comp.LifeStage < ComponentLifeStage.Initialized)
+        if (!_prototypeManager.Resolve(ent.Comp.TemplateId, out var invTemplate))
             return;
 
-        if (!_prototypeManager.TryIndex(ent.Comp.TemplateId, out InventoryTemplatePrototype? invTemplate))
-            return;
+        // Remove any containers that aren't in the new template.
+        foreach (var container in ent.Comp.Containers)
+        {
+            if (invTemplate.Slots.Any(s => s.Name == container.ID))
+                continue;
 
-        DebugTools.Assert(ent.Comp.Slots.Length == invTemplate.Slots.Length);
+            // Empty container before deletion so the contents don't get deleted.
+            // For cases when we update the template while items are already worn.
+            _containerSystem.EmptyContainer(container);
+            _containerSystem.ShutdownContainer(container);
+        }
 
+        // Ensure the containers from the template.
         ent.Comp.Slots = invTemplate.Slots;
-
-        var ev = new InventoryTemplateUpdated();
-        RaiseLocalEvent(ent, ref ev);
+        ent.Comp.Containers = new ContainerSlot[ent.Comp.Slots.Length];
+        for (var i = 0; i < ent.Comp.Containers.Length; i++)
+        {
+            var slot = ent.Comp.Slots[i];
+            var container = _containerSystem.EnsureContainer<ContainerSlot>(ent.Owner, slot.Name);
+            container.OccludesLight = false;
+            ent.Comp.Containers[i] = container;
+        }
     }
 
     private void OnOpenSlotStorage(OpenSlotStorageNetworkMessage ev, EntitySessionEventArgs args)
@@ -282,27 +284,21 @@ private IEnumerable<string> ListViewVariablesSlots(EntityUid uid, InventoryCompo
     }
 
     /// <summary>
-    /// Change the inventory template ID an entity is using. The new template must be compatible.
+    /// Change the inventory template ID an entity is using
+    /// and drop any item that does not have a slot according to the new template.
+    /// This will update the client-side UI accordingly.
     /// </summary>
     /// <remarks>
-    /// <para>
-    /// For an inventory template to be compatible with another, it must have exactly the same slot names.
-    /// All other changes are rejected.
-    /// </para>
     /// </remarks>
     /// <param name="ent">The entity to update.</param>
     /// <param name="newTemplate">The ID of the new inventory template prototype.</param>
-    /// <exception cref="ArgumentException">
-    /// Thrown if the new template is not compatible with the existing one.
-    /// </exception>
     public void SetTemplateId(Entity<InventoryComponent> ent, ProtoId<InventoryTemplatePrototype> newTemplate)
     {
-        var newPrototype = _prototypeManager.Index(newTemplate);
-
-        if (!newPrototype.Slots.Select(x => x.Name).SequenceEqual(ent.Comp.Slots.Select(x => x.Name)))
-            throw new ArgumentException("Incompatible inventory template!");
+        if (ent.Comp.TemplateId == newTemplate)
+            return;
 
         ent.Comp.TemplateId = newTemplate;
+        UpdateInventoryTemplate(ent);
         Dirty(ent);
     }
 
@@ -318,12 +314,12 @@ public struct InventorySlotEnumerator
         private int _nextIdx = 0;
         public static InventorySlotEnumerator Empty = new(Array.Empty<SlotDefinition>(), Array.Empty<ContainerSlot>());
 
-        public InventorySlotEnumerator(InventoryComponent inventory,  SlotFlags flags = SlotFlags.All)
+        public InventorySlotEnumerator(InventoryComponent inventory, SlotFlags flags = SlotFlags.All)
             : this(inventory.Slots, inventory.Containers, flags)
         {
         }
 
-        public InventorySlotEnumerator(SlotDefinition[] slots, ContainerSlot[] containers,  SlotFlags flags = SlotFlags.All)
+        public InventorySlotEnumerator(SlotDefinition[] slots, ContainerSlot[] containers, SlotFlags flags = SlotFlags.All)
         {
             DebugTools.Assert(flags != SlotFlags.NONE);
             DebugTools.AssertEqual(slots.Length, containers.Length);
diff --git a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
index 9f02d9cac969..a5391dba166b 100644
--- a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
+++ b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
@@ -102,25 +102,37 @@ public sealed partial class ItemToggleComponent : Component
     /// /// <remarks>
     /// If server-side systems affect the item's toggle, like charge/fuel systems, then the item is not predictable.
     /// </remarks>
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool Predictable = true;
 
     /// <summary>
     ///     The noise this item makes when it is toggled on.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public SoundSpecifier? SoundActivate;
 
     /// <summary>
     ///     The noise this item makes when it is toggled off.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public SoundSpecifier? SoundDeactivate;
 
+    /// <summary>
+    ///     The popup to show to someone activating this item.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId? PopupActivate;
+
+    /// <summary>
+    ///     The popup to show to someone deactivating this item.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId? PopupDeactivate;
+
     /// <summary>
     ///     The noise this item makes when it is toggled on.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public SoundSpecifier? SoundFailToActivate;
 }
 
diff --git a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
index fae94099beb3..0e7e7199259c 100644
--- a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
+++ b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
@@ -164,30 +164,30 @@ private void OnActivate(Entity<ItemToggleComponent> ent, ref ActivateInWorldEven
     /// Sets its state to the opposite of what it is.
     /// </summary>
     /// <returns>Same as <see cref="TrySetActive"/></returns>
-    public bool Toggle(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true)
+    public bool Toggle(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true, bool showPopup = true)
     {
         if (!_query.Resolve(ent, ref ent.Comp, false))
             return false;
 
-        return TrySetActive(ent, !ent.Comp.Activated, user, predicted);
+        return TrySetActive(ent, !ent.Comp.Activated, user, predicted, showPopup);
     }
 
     /// <summary>
     /// Tries to set the activated bool from a value.
     /// </summary>
     /// <returns>false if the attempt fails for any reason</returns>
-    public bool TrySetActive(Entity<ItemToggleComponent?> ent, bool active, EntityUid? user = null, bool predicted = true)
+    public bool TrySetActive(Entity<ItemToggleComponent?> ent, bool active, EntityUid? user = null, bool predicted = true, bool showPopup = true)
     {
         if (active)
-            return TryActivate(ent, user, predicted: predicted);
+            return TryActivate(ent, user, predicted: predicted, showPopup);
         else
-            return TryDeactivate(ent, user, predicted: predicted);
+            return TryDeactivate(ent, user, predicted: predicted, showPopup);
     }
 
     /// <summary>
     /// Used when an item is attempting to be activated. It returns false if the attempt fails any reason, interrupting the activation.
     /// </summary>
-    public bool TryActivate(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true)
+    public bool TryActivate(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true, bool showPopup = true)
     {
         if (!_query.Resolve(ent, ref ent.Comp, false))
             return false;
@@ -216,7 +216,7 @@ public bool TryActivate(Entity<ItemToggleComponent?> ent, EntityUid? user = null
             else
                 _audio.PlayPvs(comp.SoundFailToActivate, uid);
 
-            if (attempt.Popup != null && user != null)
+            if (showPopup && attempt.Popup != null && user != null)
             {
                 if (predicted)
                     _popup.PopupClient(attempt.Popup, uid, user.Value);
@@ -227,14 +227,14 @@ public bool TryActivate(Entity<ItemToggleComponent?> ent, EntityUid? user = null
             return false;
         }
 
-        Activate((uid, comp), predicted, user);
+        Activate((uid, comp), predicted, user, showPopup);
         return true;
     }
 
     /// <summary>
     /// Used when an item is attempting to be deactivated. It returns false if the attempt fails any reason, interrupting the deactivation.
     /// </summary>
-    public bool TryDeactivate(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true)
+    public bool TryDeactivate(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true, bool showPopup = true)
     {
         if (!_query.Resolve(ent, ref ent.Comp, false))
             return false;
@@ -258,7 +258,7 @@ public bool TryDeactivate(Entity<ItemToggleComponent?> ent, EntityUid? user = nu
             if (attempt.Silent)
                 return false;
 
-            if (attempt.Popup != null && user != null)
+            if (showPopup && attempt.Popup != null && user != null)
             {
                 if (predicted)
                     _popup.PopupClient(attempt.Popup, uid, user.Value);
@@ -269,18 +269,26 @@ public bool TryDeactivate(Entity<ItemToggleComponent?> ent, EntityUid? user = nu
             return false;
         }
 
-        Deactivate((uid, comp), predicted, user);
+        Deactivate((uid, comp), predicted, user, showPopup);
         return true;
     }
 
-    private void Activate(Entity<ItemToggleComponent> ent, bool predicted, EntityUid? user = null)
+    private void Activate(Entity<ItemToggleComponent> ent, bool predicted, EntityUid? user = null, bool showPopup = true)
     {
         var (uid, comp) = ent;
         var soundToPlay = comp.SoundActivate;
         if (predicted)
+        {
             _audio.PlayPredicted(soundToPlay, uid, user);
+            if (showPopup && ent.Comp.PopupActivate != null && user != null)
+                _popup.PopupClient(Loc.GetString(ent.Comp.PopupActivate), user.Value, user.Value);
+        }
         else
+        {
             _audio.PlayPvs(soundToPlay, uid);
+            if (showPopup && ent.Comp.PopupActivate != null && user != null)
+                _popup.PopupEntity(Loc.GetString(ent.Comp.PopupActivate), user.Value, user.Value);
+        }
 
         comp.Activated = true;
         UpdateVisuals((uid, comp));
@@ -293,14 +301,22 @@ private void Activate(Entity<ItemToggleComponent> ent, bool predicted, EntityUid
     /// <summary>
     /// Used to make the actual changes to the item's components on deactivation.
     /// </summary>
-    private void Deactivate(Entity<ItemToggleComponent> ent, bool predicted, EntityUid? user = null)
+    private void Deactivate(Entity<ItemToggleComponent> ent, bool predicted, EntityUid? user = null, bool showPopup = true)
     {
         var (uid, comp) = ent;
         var soundToPlay = comp.SoundDeactivate;
         if (predicted)
+        {
             _audio.PlayPredicted(soundToPlay, uid, user);
+            if (showPopup && ent.Comp.PopupDeactivate != null && user != null)
+                _popup.PopupClient(Loc.GetString(ent.Comp.PopupDeactivate), user.Value, user.Value);
+        }
         else
+        {
             _audio.PlayPvs(soundToPlay, uid);
+            if (showPopup && ent.Comp.PopupDeactivate != null && user != null)
+                _popup.PopupEntity(Loc.GetString(ent.Comp.PopupDeactivate), user.Value, user.Value);
+        }
 
         comp.Activated = false;
         UpdateVisuals((uid, comp));
diff --git a/Content.Shared/Magic/SharedMagicSystem.cs.rej b/Content.Shared/Magic/SharedMagicSystem.cs.rej
new file mode 100644
index 000000000000..2b9d705b22ca
--- /dev/null
+++ b/Content.Shared/Magic/SharedMagicSystem.cs.rej
@@ -0,0 +1,12 @@
+diff a/Content.Shared/Magic/SharedMagicSystem.cs b/Content.Shared/Magic/SharedMagicSystem.cs	(rejected hunks)
+@@ -510,8 +510,8 @@ private void OnMindSwapSpell(MindSwapSpellEvent ev)
+             _mind.TransferTo(tarMind, ev.Performer);
+         }
+ 
+-        _stun.TryParalyze(ev.Target, ev.TargetStunDuration, true);
+-        _stun.TryParalyze(ev.Performer, ev.PerformerStunDuration, true);
++        _stun.TryUpdateParalyzeDuration(ev.Target, ev.TargetStunDuration);
++        _stun.TryUpdateParalyzeDuration(ev.Performer, ev.PerformerStunDuration);
+     }
+ 
+     #endregion
diff --git a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
index c27c12c06b45..268d64f0a34e 100644
--- a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
+++ b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
@@ -37,10 +37,12 @@ public abstract partial class SharedCryoPodSystem: EntitySystem
     [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
     [Dependency] private readonly StandingStateSystem _standingStateSystem = default!;
     [Dependency] private readonly EmagSystem _emag = default!;
+    [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
     [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
     [Dependency] private readonly SharedPointLightSystem _light = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
 
     public override void Initialize()
@@ -48,9 +50,26 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<CryoPodComponent, CanDropTargetEvent>(OnCryoPodCanDropOn);
+        SubscribeLocalEvent<CryoPodComponent, ExaminedEvent>(OnExamined);
         InitializeInsideCryoPod();
     }
 
+    private void OnExamined(Entity<CryoPodComponent> entity, ref ExaminedEvent args)
+    {
+        var container = _itemSlotsSystem.GetItemOrNull(entity.Owner, entity.Comp.SolutionContainerName);
+        if (args.IsInDetailsRange && container != null && _solutionContainerSystem.TryGetFitsInDispenser(container.Value, out _, out var containerSolution))
+        {
+            using (args.PushGroup(nameof(CryoPodComponent)))
+            {
+                args.PushMarkup(Loc.GetString("cryo-pod-examine", ("beaker", Name(container.Value))));
+                if (containerSolution.Volume == 0)
+                {
+                    args.PushMarkup(Loc.GetString("cryo-pod-empty-beaker"));
+                }
+            }
+        }
+    }
+
     private void OnCryoPodCanDropOn(EntityUid uid, CryoPodComponent component, ref CanDropTargetEvent args)
     {
         if (args.Handled)
diff --git a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs.rej b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs.rej
new file mode 100644
index 000000000000..77cbca87953a
--- /dev/null
+++ b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs.rej
@@ -0,0 +1,14 @@
+diff a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs	(rejected hunks)
+@@ -1,9 +1,12 @@
+ using Content.Shared.Administration.Logs;
+ using Content.Shared.Body.Components;
++using Content.Shared.Chemistry.EntitySystems;
++using Content.Shared.Containers.ItemSlots;
+ using Content.Shared.Database;
+ using Content.Shared.DoAfter;
+ using Content.Shared.DragDrop;
+ using Content.Shared.Emag.Systems;
++using Content.Shared.Examine;
+ using Content.Shared.Mobs.Components;
+ using Content.Shared.Mobs.Systems;
+ using Content.Shared.Popups;
diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs
index 8f64fd6f062f..01afeaaf2a90 100644
--- a/Content.Shared/Mind/SharedMindSystem.cs
+++ b/Content.Shared/Mind/SharedMindSystem.cs
@@ -726,6 +726,31 @@ public HashSet<Entity<MindComponent>> GetAliveHumans(EntityUid? exclude = null,
 
         return allHumans;
     }
+
+    /// <summary>
+    /// Give sentience to a target entity by attaching necessary components.
+    /// </summary>
+    /// <param name="uid">Uid of the target entity.</param>
+    /// <param name="allowMovement">Whether the target entity should be able to move.</param>
+    /// <param name="allowSpeech">Whether the target entity should be able to talk.</param>
+    public void MakeSentient(EntityUid uid, bool allowMovement = true, bool allowSpeech = true)
+    {
+        EnsureComp<MindContainerComponent>(uid);
+        if (allowMovement)
+        {
+            EnsureComp<InputMoverComponent>(uid);
+            EnsureComp<MobMoverComponent>(uid);
+            EnsureComp<MovementSpeedModifierComponent>(uid);
+        }
+
+        if (allowSpeech)
+        {
+            EnsureComp<SpeechComponent>(uid);
+            EnsureComp<EmotingComponent>(uid);
+        }
+
+        EnsureComp<ExaminerComponent>(uid);
+    }
 }
 
 /// <summary>
diff --git a/Content.Shared/Mind/SharedMindSystem.cs.rej b/Content.Shared/Mind/SharedMindSystem.cs.rej
new file mode 100644
index 000000000000..967334862e56
--- /dev/null
+++ b/Content.Shared/Mind/SharedMindSystem.cs.rej
@@ -0,0 +1,21 @@
+diff a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs	(rejected hunks)
+@@ -2,15 +2,19 @@
+ using System.Linq;
+ using Content.Shared.Administration.Logs;
+ using Content.Shared.Database;
++using Content.Shared.Emoting;
+ using Content.Shared.Examine;
+ using Content.Shared.GameTicking;
+ using Content.Shared.Humanoid;
+ using Content.Shared.Interaction.Events;
++using Content.Shared.Movement.Components;
+ using Content.Shared.Mind.Components;
+ using Content.Shared.Mobs.Components;
+ using Content.Shared.Mobs.Systems;
+ using Content.Shared.Objectives.Systems;
+ using Content.Shared.Players;
++using Content.Shared.Speech;
++
+ using Content.Shared.Whitelist;
+ using Robust.Shared.Map;
+ using Robust.Shared.Network;
diff --git a/Content.Shared/Mousetrap/MousetrapComponent.cs.rej b/Content.Shared/Mousetrap/MousetrapComponent.cs.rej
new file mode 100644
index 000000000000..fb87643a094a
--- /dev/null
+++ b/Content.Shared/Mousetrap/MousetrapComponent.cs.rej
@@ -0,0 +1,33 @@
+diff a/Content.Shared/Mousetrap/MousetrapComponent.cs b/Content.Shared/Mousetrap/MousetrapComponent.cs	(rejected hunks)
+@@ -2,20 +2,20 @@
+ 
+ namespace Content.Shared.Mousetrap;
+ 
+-[RegisterComponent, NetworkedComponent]
++/// <summary>
++/// Component inteded to be used for mouse traps.
++/// Will stop step triggers from happening unless armed via <see cref="Item.ItemToggle.Components.ItemToggleComponent"/>
++/// and will scale damage taken from <see cref="Trigger.Components.Effects.DamageOnTriggerComponent"/>
++/// depending on mass.
++/// </summary>
++[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+ public sealed partial class MousetrapComponent : Component
+ {
+-    [ViewVariables]
+-    [DataField("isActive")]
+-    public bool IsActive = false;
+-
+     /// <summary>
+-    ///     Set this to change where the
+-    ///     inflection point in the scaling
+-    ///     equation will occur.
+-    ///     The default is 10.
++    /// Set this to change where the
++    /// inflection point in the damage scaling
++    /// equation will occur.
+     /// </summary>
+-    [ViewVariables(VVAccess.ReadWrite)]
+-    [DataField("massBalance")]
++    [DataField, AutoNetworkedField]
+     public int MassBalance = 10;
+ }
diff --git a/Content.Shared/Mousetrap/MousetrapSystem.cs b/Content.Shared/Mousetrap/MousetrapSystem.cs
new file mode 100644
index 000000000000..96f74114b2cf
--- /dev/null
+++ b/Content.Shared/Mousetrap/MousetrapSystem.cs
@@ -0,0 +1,42 @@
+using Content.Shared.Item.ItemToggle.Components;
+using Content.Shared.Trigger.Systems;
+using Content.Shared.StepTrigger.Systems;
+using Robust.Shared.Physics.Components;
+
+namespace Content.Shared.Mousetrap;
+
+public sealed class MousetrapSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<MousetrapComponent, BeforeDamageOnTriggerEvent>(BeforeDamageOnTrigger);
+        SubscribeLocalEvent<MousetrapComponent, StepTriggerAttemptEvent>(OnStepTriggerAttempt);
+    }
+
+    // only allow step triggers to trigger if the trap is armed
+    // TODO: refactor Steptriggers to get rid of this
+    // they should just use the new trigger conditions
+    private void OnStepTriggerAttempt(Entity<MousetrapComponent> ent, ref StepTriggerAttemptEvent args)
+    {
+        if (!TryComp<ItemToggleComponent>(ent, out var toggle))
+            return;
+
+        args.Continue |= toggle.Activated;
+    }
+
+    // scale the damage according to mass
+    private void BeforeDamageOnTrigger(Entity<MousetrapComponent> ent, ref BeforeDamageOnTriggerEvent args)
+    {
+        if (TryComp(args.Tripper, out PhysicsComponent? physics) && physics.Mass != 0)
+        {
+            // The idea here is inverse,
+            // Small - big damage,
+            // Large - small damage
+            // yes i punched numbers into a calculator until the graph looked right
+            var scaledDamage = -50 * Math.Atan(physics.Mass - ent.Comp.MassBalance) + 25 * Math.PI;
+            args.Damage *= scaledDamage;
+        }
+    }
+}
diff --git a/Content.Shared/Movement/Components/MovementModStatusEffectComponent.cs b/Content.Shared/Movement/Components/MovementModStatusEffectComponent.cs
new file mode 100644
index 000000000000..22b196d12768
--- /dev/null
+++ b/Content.Shared/Movement/Components/MovementModStatusEffectComponent.cs
@@ -0,0 +1,25 @@
+using Content.Shared.Movement.Systems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Movement.Components;
+
+/// <summary>
+/// This is used to store a movement speed modifier attached to a status effect entity so it can be applied via statuses.
+/// To be used in conjunction with <see cref="MovementModStatusSystem"/>.
+/// See <see cref="MovementModStatusComponent"/> for the component applied to the entity.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(MovementModStatusSystem))]
+public sealed partial class MovementModStatusEffectComponent : Component
+{
+    /// <summary>
+    /// Multiplicative sprint modifier, with bounds of [0, 1)
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float SprintSpeedModifier = 0.5f;
+
+    /// <summary>
+    /// Multiplicative walk modifier, with bounds of [0, 1)
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float WalkSpeedModifier = 0.5f;
+}
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index 077329efe757..bb4eb3036cf6 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -193,6 +193,8 @@ public abstract partial class SharedMoverController : VirtualController
     /// </summary>
     public Dictionary<EntityUid, bool> UsedMobMovement = new();
 
+    private readonly HashSet<EntityUid> _aroundColliderSet = [];
+
     public override void Initialize()
     {
         UpdatesBefore.Add(typeof(TileFrictionController));
@@ -620,7 +622,9 @@ private bool IsAroundCollider(EntityLookupSystem lookupSystem, Entity<PhysicsCom
         var (uid, collider, mover, transform) = entity;
         var enlargedAABB = _lookup.GetWorldAABB(entity.Owner, transform).Enlarged(mover.GrabRange);
 
-        foreach (var otherEntity in lookupSystem.GetEntitiesIntersecting(transform.MapID, enlargedAABB))
+        _aroundColliderSet.Clear();
+        lookupSystem.GetEntitiesIntersecting(transform.MapID, enlargedAABB, _aroundColliderSet);
+        foreach (var otherEntity in _aroundColliderSet)
         {
             if (otherEntity == uid)
                 continue; // Don't try to push off of yourself!
diff --git a/Content.Shared/Ninja/Components/SpiderChargeComponent.cs.rej b/Content.Shared/Ninja/Components/SpiderChargeComponent.cs.rej
new file mode 100644
index 000000000000..de6d93adcc18
--- /dev/null
+++ b/Content.Shared/Ninja/Components/SpiderChargeComponent.cs.rej
@@ -0,0 +1,25 @@
+diff a/Content.Shared/Ninja/Components/SpiderChargeComponent.cs b/Content.Shared/Ninja/Components/SpiderChargeComponent.cs	(rejected hunks)
+@@ -10,11 +10,21 @@ namespace Content.Shared.Ninja.Components;
+ [RegisterComponent, NetworkedComponent, Access(typeof(SharedSpiderChargeSystem))]
+ public sealed partial class SpiderChargeComponent : Component
+ {
+-    /// Range for planting within the target area
++    /// <summary>
++    /// Range for planting within the target area.
++    /// </summary>
+     [DataField]
+     public float Range = 10f;
+ 
+-    /// The ninja that planted this charge
++    /// <summary>
++    /// The ninja that planted this charge.
++    /// </summary>
+     [DataField]
+     public EntityUid? Planter;
++
++    /// <summary>
++    /// The trigger that will mark the objective as successful.
++    /// </summary>
++    [DataField]
++    public string TriggerKey = "timer";
+ }
diff --git a/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs b/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs
index 1d7095645041..68729fb7b3de 100644
--- a/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs
@@ -83,7 +83,7 @@ private void OnCreamPiedHitBy(EntityUid uid, CreamPiedComponent creamPied, Throw
 
             CreamedEntity(uid, creamPied, args);
 
-            _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(creamPie.ParalyzeTime), true);
+            _stunSystem.TryUpdateParalyzeDuration(uid, TimeSpan.FromSeconds(creamPie.ParalyzeTime));
         }
 
         protected virtual void CreamedEntity(EntityUid uid, CreamPiedComponent creamPied, ThrowHitByEvent args) {}
diff --git a/Content.Shared/Payload/Components/PayloadTriggerComponent.cs b/Content.Shared/Payload/Components/PayloadTriggerComponent.cs
index 2941b7552a69..fb893f2e1767 100644
--- a/Content.Shared/Payload/Components/PayloadTriggerComponent.cs
+++ b/Content.Shared/Payload/Components/PayloadTriggerComponent.cs
@@ -55,7 +55,7 @@ namespace Content.Shared.Payload.Components;
 /// <remarks>
 ///     This component performs two functions. Firstly, it will add or remove other components to some entity when this
 ///     item is installed inside of it. This is intended for use with constructible grenades. For example, this allows
-///     you to add things like <see cref="OnUseTimerTriggerComponent"/>, or <see cref="TriggerOnProximityComponent"/>.
+///     you to add things like <see cref="TimerTriggerComponent"/>, or <see cref="TriggerOnProximityComponent"/>.
 ///     This is required because otherwise you would have to forward arbitrary interaction directed at the casing
 ///     through to the trigger, which would be quite complicated. Also proximity triggers don't really work inside of
 ///     containers.
@@ -74,7 +74,7 @@ public sealed partial class PayloadTriggerComponent : Component
     /// <summary>
     ///     List of components to add or remove from an entity when this trigger is (un)installed.
     /// </summary>
-    [DataField("components", serverOnly:true, readOnly: true)]
+    [DataField(serverOnly: true, readOnly: true)]
     public ComponentRegistry? Components = null;
 
     /// <summary>
diff --git a/Content.Shared/Payload/Components/PayloadTriggerComponent.cs.rej b/Content.Shared/Payload/Components/PayloadTriggerComponent.cs.rej
new file mode 100644
index 000000000000..5b84dc1e2a1a
--- /dev/null
+++ b/Content.Shared/Payload/Components/PayloadTriggerComponent.cs.rej
@@ -0,0 +1,16 @@
+diff a/Content.Shared/Payload/Components/PayloadTriggerComponent.cs b/Content.Shared/Payload/Components/PayloadTriggerComponent.cs	(rejected hunks)
+@@ -1,4 +1,5 @@
+-using Content.Shared.Explosion.Components;
++using Content.Shared.Trigger.Components;
++using Content.Shared.Trigger.Components.Triggers;
+ using Robust.Shared.GameStates;
+ using Robust.Shared.Prototypes;
+ 
+@@ -41,6 +42,6 @@ public sealed partial class PayloadTriggerComponent : Component
+     ///     when removing the component, to ensure that removal of this trigger only removes the components that it was
+     ///     responsible for adding.
+     /// </remarks>
+-    [DataField("grantedComponents", serverOnly: true)]
++    [DataField(serverOnly: true)]
+     public HashSet<Type> GrantedComponents = new();
+ }
diff --git a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
index 908ebae12cbb..91d4c66609db 100644
--- a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
+++ b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
@@ -21,11 +21,13 @@
 using Content.Shared.Interaction;
 using Content.Shared.Storage;
 using Content.Shared.Storage.Components;
+using Robust.Shared.Random;
 
 namespace Content.Shared.Placeable;
 
 public sealed class PlaceableSurfaceSystem : EntitySystem
 {
+    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
@@ -37,6 +39,8 @@ public override void Initialize()
         SubscribeLocalEvent<PlaceableSurfaceComponent, StorageInteractUsingAttemptEvent>(OnStorageInteractUsingAttempt);
         SubscribeLocalEvent<PlaceableSurfaceComponent, StorageAfterOpenEvent>(OnStorageAfterOpen);
         SubscribeLocalEvent<PlaceableSurfaceComponent, StorageAfterCloseEvent>(OnStorageAfterClose);
+        SubscribeLocalEvent<PlaceableSurfaceComponent, GetDumpableVerbEvent>(OnGetDumpableVerb);
+        SubscribeLocalEvent<PlaceableSurfaceComponent, DumpEvent>(OnDump);
     }
 
     public void SetPlaceable(EntityUid uid, bool isPlaceable, PlaceableSurfaceComponent? surface = null)
diff --git a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs.rej b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs.rej
new file mode 100644
index 000000000000..f2077b924047
--- /dev/null
+++ b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs.rej
@@ -0,0 +1,27 @@
+diff a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs	(rejected hunks)
+@@ -87,4 +91,25 @@ private void OnStorageAfterClose(Entity<PlaceableSurfaceComponent> ent, ref Stor
+     {
+         SetPlaceable(ent.Owner, false, ent.Comp);
+     }
++
++    private void OnGetDumpableVerb(Entity<PlaceableSurfaceComponent> ent, ref GetDumpableVerbEvent args)
++    {
++        args.Verb = Loc.GetString("dump-placeable-verb-name", ("surface", ent));
++    }
++
++    private void OnDump(Entity<PlaceableSurfaceComponent> ent, ref DumpEvent args)
++    {
++        if (args.Handled)
++            return;
++
++        args.Handled = true;
++        args.PlaySound = true;
++
++        var (targetPos, targetRot) = _transformSystem.GetWorldPositionRotation(ent);
++
++        foreach (var entity in args.DumpQueue)
++        {
++            _transformSystem.SetWorldPositionRotation(entity, targetPos + _random.NextVector2Box() / 4, targetRot);
++        }
++    }
+ }
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 26d63bb7aada..de55fc390089 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -793,10 +793,17 @@ public static string GetName(string species, Gender gender)
             var namingSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<NamingSystem>();
             return namingSystem.GetName(species, gender);
         }
+        public bool Equals(HumanoidCharacterProfile? other)
+        {
+            if (other is null)
+                return false;
+
+            return ReferenceEquals(this, other) || MemberwiseEquals(other);
+        }
 
         public override bool Equals(object? obj)
         {
-            return ReferenceEquals(this, obj) || obj is HumanoidCharacterProfile other && Equals(other);
+            return obj is HumanoidCharacterProfile other && Equals(other);
         }
 
         public override int GetHashCode()
diff --git a/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs b/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs
index 3740db8fc242..3b5ac9d1b60f 100644
--- a/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs
+++ b/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs
@@ -57,7 +57,7 @@ private void MindShieldImplanted(EntityUid uid, MindShieldComponent comp, MapIni
             var stunTime = TimeSpan.FromSeconds(4);
             var name = Identity.Entity(uid, EntityManager);
             RemComp<RevolutionaryComponent>(uid);
-            _sharedStun.TryParalyze(uid, stunTime, true);
+            _sharedStun.TryUpdateParalyzeDuration(uid, stunTime);
             _popupSystem.PopupEntity(Loc.GetString("rev-break-control", ("name", name)), uid);
         }
     }
diff --git a/Content.Shared/Rootable/SharedRootableSystem.cs b/Content.Shared/Rootable/SharedRootableSystem.cs
index 14480c3cf358..5eceb9c7f0dc 100644
--- a/Content.Shared/Rootable/SharedRootableSystem.cs
+++ b/Content.Shared/Rootable/SharedRootableSystem.cs
@@ -14,6 +14,7 @@
 using Content.Shared.Movement.Systems;
 using Content.Shared.Slippery;
 using Content.Shared.Toggleable;
+using Content.Shared.Trigger.Components.Effects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
@@ -132,7 +133,7 @@ private void OnSlipAttempt(Entity<RootableComponent> ent, ref SlipAttemptEvent a
         if (!ent.Comp.Rooted)
             return;
 
-        if (args.SlipCausingEntity != null && HasComp<DamageUserOnTriggerComponent>(args.SlipCausingEntity))
+        if (args.SlipCausingEntity != null && HasComp<DamageOnTriggerComponent>(args.SlipCausingEntity))
             return;
 
         args.NoSlip = true;
diff --git a/Content.Shared/Rootable/SharedRootableSystem.cs.rej b/Content.Shared/Rootable/SharedRootableSystem.cs.rej
new file mode 100644
index 000000000000..6ea1092d673e
--- /dev/null
+++ b/Content.Shared/Rootable/SharedRootableSystem.cs.rej
@@ -0,0 +1,8 @@
+diff a/Content.Shared/Rootable/SharedRootableSystem.cs b/Content.Shared/Rootable/SharedRootableSystem.cs	(rejected hunks)
+@@ -1,5 +1,4 @@
+-using Content.Shared.Damage.Components;
+-using Content.Shared.Actions;
++using Content.Shared.Actions;
+ using Content.Shared.Actions.Components;
+ using Content.Shared.Alert;
+ using Content.Shared.Coordinates;
diff --git a/Content.Shared/Rotatable/FlippableComponent.cs b/Content.Shared/Rotatable/FlippableComponent.cs
new file mode 100644
index 000000000000..fdc8c15c8a54
--- /dev/null
+++ b/Content.Shared/Rotatable/FlippableComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Rotatable;
+
+/// <summary>
+/// Allows an entity to be flipped (mirrored) by using a verb.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class FlippableComponent : Component
+{
+    /// <summary>
+    /// Entity to replace this entity with when the current one is 'flipped'.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public EntProtoId MirrorEntity = default!;
+}
diff --git a/Content.Shared/Rotatable/RotatableComponent.cs.rej b/Content.Shared/Rotatable/RotatableComponent.cs.rej
new file mode 100644
index 000000000000..8fd5b2112e8f
--- /dev/null
+++ b/Content.Shared/Rotatable/RotatableComponent.cs.rej
@@ -0,0 +1,53 @@
+diff a/Content.Shared/Rotatable/RotatableComponent.cs b/Content.Shared/Rotatable/RotatableComponent.cs	(rejected hunks)
+@@ -1,27 +1,28 @@
+-namespace Content.Shared.Rotatable
++using Robust.Shared.GameStates;
++
++namespace Content.Shared.Rotatable;
++
++/// <summary>
++/// Allows an entity to be rotated by using a verb.
++/// </summary>
++[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
++public sealed partial class RotatableComponent : Component
+ {
+-    [RegisterComponent]
+-    public sealed partial class RotatableComponent : Component
+-    {
+-        /// <summary>
+-        ///     If true, this entity can be rotated even while anchored.
+-        /// </summary>
+-        [ViewVariables(VVAccess.ReadWrite)]
+-        [DataField("rotateWhileAnchored")]
+-        public bool RotateWhileAnchored { get; private set; }
++    /// <summary>
++    /// If true, this entity can be rotated even while anchored.
++    /// </summary>
++    [DataField, AutoNetworkedField]
++    public bool RotateWhileAnchored;
+ 
+-        /// <summary>
+-        ///     If true, will rotate entity in players direction when pulled
+-        /// </summary>
+-        [ViewVariables(VVAccess.ReadWrite)]
+-        [DataField("rotateWhilePulling")]
+-        public bool RotateWhilePulling { get; private set; } = true;
++    /// <summary>
++    /// If true, will rotate entity in players direction when pulled
++    /// </summary>
++    [DataField, AutoNetworkedField]
++    public bool RotateWhilePulling = true;
+ 
+-        /// <summary>
+-        ///     The angular value to change when using the rotate verbs.
+-        /// </summary>
+-        [ViewVariables(VVAccess.ReadWrite)]
+-        [DataField("increment")]
+-        public Angle Increment { get; private set; } = Angle.FromDegrees(90);
+-    }
++    /// <summary>
++    /// The angular value to change when using the rotate verbs.
++    /// </summary>
++    [DataField, AutoNetworkedField]
++    public Angle Increment = Angle.FromDegrees(90);
+ }
diff --git a/Content.Shared/Rotatable/RotatableSystem.cs b/Content.Shared/Rotatable/RotatableSystem.cs
new file mode 100644
index 000000000000..94d9206247ae
--- /dev/null
+++ b/Content.Shared/Rotatable/RotatableSystem.cs
@@ -0,0 +1,213 @@
+using Content.Shared.ActionBlocker;
+using Content.Shared.Input;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Map;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Player;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Rotatable;
+
+/// <summary>
+/// Handles verbs for the <see cref="RotatableComponent"/> and <see cref="FlippableComponent"/> components.
+/// </summary>
+public sealed class RotatableSystem : EntitySystem
+{
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<FlippableComponent, GetVerbsEvent<Verb>>(AddFlipVerb);
+        SubscribeLocalEvent<RotatableComponent, GetVerbsEvent<Verb>>(AddRotateVerbs);
+
+        CommandBinds.Builder
+            .Bind(ContentKeyFunctions.RotateObjectClockwise, new PointerInputCmdHandler(HandleRotateObjectClockwise))
+            .Bind(ContentKeyFunctions.RotateObjectCounterclockwise, new PointerInputCmdHandler(HandleRotateObjectCounterclockwise))
+            .Bind(ContentKeyFunctions.FlipObject, new PointerInputCmdHandler(HandleFlipObject))
+            .Register<RotatableSystem>();
+    }
+
+    private void AddFlipVerb(EntityUid uid, FlippableComponent component, GetVerbsEvent<Verb> args)
+    {
+        if (!args.CanAccess
+            || !args.CanInteract
+            || !args.CanComplexInteract)
+            return;
+
+        // Check if the object is anchored.
+        if (TryComp<PhysicsComponent>(uid, out var physics) && physics.BodyType == BodyType.Static)
+            return;
+
+        Verb verb = new()
+        {
+            Act = () => Flip(uid, component),
+            Text = Loc.GetString("flippable-verb-get-data-text"),
+            Category = VerbCategory.Rotate,
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/flip.svg.192dpi.png")),
+            Priority = -3, // show flip last
+            DoContactInteraction = true
+        };
+        args.Verbs.Add(verb);
+    }
+
+    private void AddRotateVerbs(EntityUid uid, RotatableComponent component, GetVerbsEvent<Verb> args)
+    {
+        if (!args.CanAccess
+            || !args.CanInteract
+            || !args.CanComplexInteract
+            || Transform(uid).NoLocalRotation) // Good ol prototype inheritance, eh?
+            return;
+
+        // Check if the object is anchored, and whether we are still allowed to rotate it.
+        if (!component.RotateWhileAnchored &&
+            TryComp<PhysicsComponent>(uid, out var physics) &&
+            physics.BodyType == BodyType.Static)
+            return;
+
+        Verb resetRotation = new()
+        {
+            DoContactInteraction = true,
+            Act = () => ResetRotation(uid),
+            Category = VerbCategory.Rotate,
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/refresh.svg.192dpi.png")),
+            Text = Loc.GetString("rotate-reset-verb-get-data-text"),
+            Priority = -2, // show CCW, then CW, then reset
+            CloseMenu = false,
+        };
+        args.Verbs.Add(resetRotation);
+
+        // rotate clockwise
+        Verb rotateCW = new()
+        {
+            Act = () => Rotate(uid, -component.Increment),
+            Category = VerbCategory.Rotate,
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/rotate_cw.svg.192dpi.png")),
+            Text = Loc.GetString("rotate-verb-get-data-text"),
+            Priority = -1,
+            CloseMenu = false, // allow for easy double rotations.
+        };
+        args.Verbs.Add(rotateCW);
+
+        // rotate counter-clockwise
+        Verb rotateCCW = new()
+        {
+            Act = () => Rotate(uid, component.Increment),
+            Category = VerbCategory.Rotate,
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/rotate_ccw.svg.192dpi.png")),
+            Text = Loc.GetString("rotate-counter-verb-get-data-text"),
+            Priority = 0,
+            CloseMenu = false, // allow for easy double rotations.
+        };
+        args.Verbs.Add(rotateCCW);
+    }
+
+    /// <summary>
+    /// Replace a flippable entity with it's flipped / mirror-symmetric entity.
+    /// </summary>
+    public void Flip(EntityUid uid, FlippableComponent component)
+    {
+        var oldTransform = Comp<TransformComponent>(uid);
+        var entity = PredictedSpawnAtPosition(component.MirrorEntity, oldTransform.Coordinates);
+        var newTransform = Comp<TransformComponent>(entity);
+        _transform.SetLocalRotation(entity, oldTransform.LocalRotation);
+        _transform.Unanchor(entity, newTransform);
+        PredictedDel(uid);
+    }
+
+    private bool HandleRotateObjectClockwise(ICommonSession? playerSession, EntityCoordinates coordinates, EntityUid entity)
+    {
+        if (playerSession?.AttachedEntity is not { Valid: true } player || !Exists(player))
+            return false;
+
+        if (!TryComp<RotatableComponent>(entity, out var rotatableComp))
+            return false;
+
+        if (!_actionBlocker.CanInteract(player, entity)
+            || !_actionBlocker.CanComplexInteract(player)
+            || !_interaction.InRangeAndAccessible(player, entity))
+            return false;
+
+        // Check if the object is anchored, and whether we are still allowed to rotate it.
+        if (!rotatableComp.RotateWhileAnchored && TryComp<PhysicsComponent>(entity, out var physics) &&
+            physics.BodyType == BodyType.Static)
+        {
+            _popup.PopupClient(Loc.GetString("rotatable-component-try-rotate-stuck"), entity, player);
+            return false;
+        }
+
+        Rotate(entity, -rotatableComp.Increment);
+        return false;
+    }
+
+    private bool HandleRotateObjectCounterclockwise(ICommonSession? playerSession, EntityCoordinates coordinates, EntityUid entity)
+    {
+        if (playerSession?.AttachedEntity is not { Valid: true } player || !Exists(player))
+            return false;
+
+        if (!TryComp<RotatableComponent>(entity, out var rotatableComp))
+            return false;
+
+        if (!_actionBlocker.CanInteract(player, entity)
+            || !_actionBlocker.CanComplexInteract(player)
+            || !_interaction.InRangeAndAccessible(player, entity))
+            return false;
+
+        // Check if the object is anchored, and whether we are still allowed to rotate it.
+        if (!rotatableComp.RotateWhileAnchored && TryComp<PhysicsComponent>(entity, out var physics) &&
+            physics.BodyType == BodyType.Static)
+        {
+            _popup.PopupClient(Loc.GetString("rotatable-component-try-rotate-stuck"), entity, player);
+            return false;
+        }
+
+        Rotate(entity, rotatableComp.Increment);
+        return false;
+    }
+
+    private bool HandleFlipObject(ICommonSession? playerSession, EntityCoordinates coordinates, EntityUid entity)
+    {
+        if (playerSession?.AttachedEntity is not { Valid: true } player || !Exists(player))
+            return false;
+
+        if (!TryComp<FlippableComponent>(entity, out var flippableComp))
+            return false;
+
+        if (!_actionBlocker.CanInteract(player, entity)
+            || !_actionBlocker.CanComplexInteract(player)
+            || !_interaction.InRangeAndAccessible(player, entity))
+            return false;
+
+        // Check if the object is anchored.
+        if (TryComp<PhysicsComponent>(entity, out var physics) && physics.BodyType == BodyType.Static)
+        {
+            _popup.PopupClient(Loc.GetString("flippable-component-try-flip-is-stuck"), entity, player);
+            return false;
+        }
+
+        Flip(entity, flippableComp);
+        return false;
+    }
+
+    private void Rotate(Entity<TransformComponent?> ent, Angle angle)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return;
+
+        _transform.SetLocalRotation(ent.Owner, ent.Comp.LocalRotation + angle);
+    }
+
+    private void ResetRotation(Entity<TransformComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return;
+
+        _transform.SetLocalRotation(ent.Owner, Angle.Zero);
+    }
+}
diff --git a/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs.rej b/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs.rej
new file mode 100644
index 000000000000..9111139fffbb
--- /dev/null
+++ b/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs.rej
@@ -0,0 +1,56 @@
+diff a/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs b/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs	(rejected hunks)
+@@ -1,29 +1,49 @@
++using Content.Shared.CCVar;
+ using Content.Shared.StatusIcon;
+ using Robust.Shared.GameStates;
+ using Robust.Shared.Prototypes;
+-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
++using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+ 
+ namespace Content.Shared.SSDIndicator;
+ 
+ /// <summary>
+-///     Shows status icon when player in SSD
++/// Shows status icon when an entity is SSD, based on if a player is attached or not.
+ /// </summary>
+ [RegisterComponent, NetworkedComponent]
+ [AutoGenerateComponentState, AutoGenerateComponentPause]
+ public sealed partial class SSDIndicatorComponent : Component
+ {
+-    [DataField, ViewVariables(VVAccess.ReadOnly)]
++    /// <summary>
++    /// Whether or not the entity is SSD.
++    /// </summary>
+     [AutoNetworkedField]
++    [DataField, ViewVariables(VVAccess.ReadOnly)]
+     public bool IsSSD = true;
+ 
++    /// <summary>
++    /// The icon displayed next to the associated entity when it is SSD.
++    /// </summary>
+     [DataField]
+     public ProtoId<SsdIconPrototype> Icon = "SSDIcon";
+ 
+     /// <summary>
+-    ///     When the entity should fall asleep
++    /// The time at which the entity will fall asleep, if <see cref="CCVars.ICSSDSleep"/> is true.
+     /// </summary>
+-    [DataField]
+     [AutoNetworkedField, AutoPausedField]
+     [Access(typeof(SSDIndicatorSystem))]
++    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+     public TimeSpan FallAsleepTime = TimeSpan.Zero;
++
++    /// <summary>
++    /// The next time this component will be updated.
++    /// </summary>
++    [AutoNetworkedField, AutoPausedField]
++    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
++    public TimeSpan NextUpdate = TimeSpan.Zero;
++
++    /// <summary>
++    /// The time between updates checking if the entity should be force slept.
++    /// </summary>
++    [DataField]
++    public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
+ }
diff --git a/Content.Shared/SSDIndicator/SSDIndicatorSystem.cs b/Content.Shared/SSDIndicator/SSDIndicatorSystem.cs
index 69153c80b0ef..c2f8a6c0c85c 100644
--- a/Content.Shared/SSDIndicator/SSDIndicatorSystem.cs
+++ b/Content.Shared/SSDIndicator/SSDIndicatorSystem.cs
@@ -68,12 +68,12 @@ private void OnPlayerDetached(EntityUid uid, SSDIndicatorComponent component, Pl
     // Prevents mapped mobs to go to sleep immediately
     private void OnMapInit(EntityUid uid, SSDIndicatorComponent component, MapInitEvent args)
     {
-        if (_icSsdSleep &&
-            component.IsSSD &&
-            component.FallAsleepTime == TimeSpan.Zero)
-        {
-            component.FallAsleepTime = _timing.CurTime + TimeSpan.FromSeconds(_icSsdSleepTime);
-        }
+        if (!_icSsdSleep || !component.IsSSD)
+            return;
+
+        component.FallAsleepTime = _timing.CurTime + TimeSpan.FromSeconds(_icSsdSleepTime);
+        component.NextUpdate = _timing.CurTime + component.UpdateInterval;
+        Dirty(uid, component);
     }
 
     public override void Update(float frameTime)
@@ -83,17 +83,21 @@ public override void Update(float frameTime)
         if (!_icSsdSleep)
             return;
 
+        var curTime = _timing.CurTime;
         var query = EntityQueryEnumerator<SSDIndicatorComponent>();
 
         while (query.MoveNext(out var uid, out var ssd))
         {
             // Forces the entity to sleep when the time has come
-            if (ssd.IsSSD &&
-                ssd.FallAsleepTime <= _timing.CurTime &&
-                !TerminatingOrDeleted(uid))
-            {
-                _statusEffects.TrySetStatusEffectDuration(uid, StatusEffectSSDSleeping, null);
-            }
+            if (!ssd.IsSSD
+                || ssd.NextUpdate > curTime
+                || ssd.FallAsleepTime > curTime
+                || TerminatingOrDeleted(uid))
+                continue;
+
+            _statusEffects.TryUpdateStatusEffectDuration(uid, StatusEffectSSDSleeping);
+            ssd.NextUpdate += ssd.UpdateInterval;
+            Dirty(uid, ssd);
         }
     }
 }
diff --git a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs
index cf0796c6993d..0b49f5ce9417 100644
--- a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs
+++ b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs
@@ -91,7 +91,7 @@ private void OnGotEmagged(EntityUid uid, EmagSiliconLawComponent component, ref
         if(_mind.TryGetMind(uid, out var mindId, out _))
             EnsureSubvertedSiliconRole(mindId);
 
-        _stunSystem.TryParalyze(uid, component.StunTime, true);
+        _stunSystem.TryUpdateParalyzeDuration(uid, component.StunTime);
 
         args.Handled = true;
     }
diff --git a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs.rej b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs.rej
new file mode 100644
index 000000000000..717fc49e8f20
--- /dev/null
+++ b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs.rej
@@ -0,0 +1,7 @@
+diff a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs	(rejected hunks)
+@@ -1,4 +1,4 @@
+-using Content.Shared.Emag.Systems;
++using Content.Shared.Emag.Systems;
+ using Content.Shared.Mind;
+ using Content.Shared.Popups;
+ using Content.Shared.Silicons.Laws.Components;
diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
index 01388d7d646e..21ae7123b7b2 100644
--- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
+++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
@@ -509,6 +509,9 @@ private void AttachEye(Entity<StationAiCoreComponent> ent)
         }
 
         _mover.SetRelay(user, ent.Comp.RemoteEntity.Value);
+
+        var eyeName = Loc.GetString("station-ai-eye-name", ("name", Name(user)));
+        _metadata.SetEntityName(ent.Comp.RemoteEntity.Value, eyeName);
     }
 
     private EntityUid? GetInsertedAI(Entity<StationAiCoreComponent> ent)
diff --git a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
index eb5afc68a4bf..e6ae24adf0dd 100644
--- a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
+++ b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
@@ -21,12 +21,10 @@
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
 
 namespace Content.Shared.Singularity.Components;
 
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitterComponent : Component
 {
     public CancellationTokenSource? TimerCancel;
@@ -45,8 +43,8 @@ public sealed partial class EmitterComponent : Component
     /// <summary>
     /// The entity that is spawned when the emitter fires.
     /// </summary>
-    [DataField("boltType", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string BoltType = "EmitterBolt";
+    [DataField, AutoNetworkedField]
+    public EntProtoId BoltType = "EmitterBolt";
 
     [DataField]
     public List<EntProtoId> SelectableTypes = new();
@@ -54,68 +52,68 @@ public sealed partial class EmitterComponent : Component
     /// <summary>
     /// The current amount of power being used.
     /// </summary>
-    [DataField("powerUseActive")]
+    [DataField]
     public int PowerUseActive = 600;
 
     /// <summary>
     /// The amount of shots that are fired in a single "burst"
     /// </summary>
-    [DataField("fireBurstSize")]
+    [DataField]
     public int FireBurstSize = 3;
 
     /// <summary>
     /// The time between each shot during a burst.
     /// </summary>
-    [DataField("fireInterval")]
+    [DataField]
     public TimeSpan FireInterval = TimeSpan.FromSeconds(2);
 
     /// <summary>
     /// The current minimum delay between bursts.
     /// </summary>
-    [DataField("fireBurstDelayMin")]
+    [DataField]
     public TimeSpan FireBurstDelayMin = TimeSpan.FromSeconds(4);
 
     /// <summary>
     /// The current maximum delay between bursts.
     /// </summary>
-    [DataField("fireBurstDelayMax")]
+    [DataField]
     public TimeSpan FireBurstDelayMax = TimeSpan.FromSeconds(10);
 
     /// <summary>
     /// The visual state that is set when the emitter is turned on
     /// </summary>
-    [DataField("onState")]
+    [DataField]
     public string? OnState = "beam";
 
     /// <summary>
     /// The visual state that is set when the emitter doesn't have enough power.
     /// </summary>
-    [DataField("underpoweredState")]
+    [DataField]
     public string? UnderpoweredState = "underpowered";
 
     /// <summary>
     /// Signal port that turns on the emitter.
     /// </summary>
-    [DataField("onPort", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
-    public string OnPort = "On";
+    [DataField]
+    public ProtoId<SinkPortPrototype> OnPort = "On";
 
     /// <summary>
     /// Signal port that turns off the emitter.
     /// </summary>
-    [DataField("offPort", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
-    public string OffPort = "Off";
+    [DataField]
+    public ProtoId<SinkPortPrototype> OffPort = "Off";
 
     /// <summary>
     /// Signal port that toggles the emitter on or off.
     /// </summary>
-    [DataField("togglePort", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
-    public string TogglePort = "Toggle";
+    [DataField]
+    public ProtoId<SinkPortPrototype> TogglePort = "Toggle";
 
     /// <summary>
     /// Map of signal ports to entity prototype IDs of the entity that will be fired.
     /// </summary>
-    [DataField("setTypePorts", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<string, SinkPortPrototype>))]
-    public Dictionary<string, string> SetTypePorts = new();
+    [DataField]
+    public Dictionary<ProtoId<SinkPortPrototype>, EntProtoId> SetTypePorts = new();
 }
 
 [NetSerializable, Serializable]
diff --git a/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs.rej b/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs.rej
new file mode 100644
index 000000000000..b68dc99749a6
--- /dev/null
+++ b/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs.rej
@@ -0,0 +1,69 @@
+diff a/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs b/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs	(rejected hunks)
+@@ -1,6 +1,66 @@
+-namespace Content.Shared.Singularity.EntitySystems;
++using Content.Shared.Database;
++using Content.Shared.Examine;
++using Content.Shared.Lock;
++using Content.Shared.Popups;
++using Content.Shared.Singularity.Components;
++using Content.Shared.Verbs;
++using Robust.Shared.Prototypes;
++
++namespace Content.Shared.Singularity.EntitySystems;
+ 
+ public abstract class SharedEmitterSystem : EntitySystem
+ {
++    [Dependency] private readonly IPrototypeManager _prototype = default!;
++    [Dependency] private readonly SharedPopupSystem _popup = default!;
++
++    public override void Initialize()
++    {
++        base.Initialize();
++
++        SubscribeLocalEvent<EmitterComponent, ExaminedEvent>(OnExamined);
++        SubscribeLocalEvent<EmitterComponent, GetVerbsEvent<Verb>>(OnGetVerb);
++    }
++
++    private void OnGetVerb(Entity<EmitterComponent> ent, ref GetVerbsEvent<Verb> args)
++    {
++        if (!args.CanAccess || !args.CanInteract || !args.CanComplexInteract || args.Hands == null)
++            return;
++
++        if (TryComp<LockComponent>(ent.Owner, out var lockComp) && lockComp.Locked)
++            return;
++
++        if (ent.Comp.SelectableTypes.Count < 2)
++            return;
++
++        foreach (var type in ent.Comp.SelectableTypes)
++        {
++            var proto = _prototype.Index(type);
++
++            var v = new Verb
++            {
++                Priority = 1,
++                Category = VerbCategory.SelectType,
++                Text = proto.Name,
++                Disabled = type == ent.Comp.BoltType,
++                Impact = LogImpact.Medium,
++                DoContactInteraction = true,
++                Act = () =>
++                {
++                    ent.Comp.BoltType = type;
++                    Dirty(ent);
++                    _popup.PopupClient(Loc.GetString("emitter-component-type-set", ("type", proto.Name)), ent.Owner);
++                },
++            };
++            args.Verbs.Add(v);
++        }
++    }
++
++    private void OnExamined(Entity<EmitterComponent> ent, ref ExaminedEvent args)
++    {
++        if (ent.Comp.SelectableTypes.Count < 2)
++            return;
+ 
++        var proto = _prototype.Index(ent.Comp.BoltType);
++        args.PushMarkup(Loc.GetString("emitter-component-current-type", ("type", proto.Name)));
++    }
+ }
diff --git a/Content.Shared/Slippery/SlipperySystem.cs.rej b/Content.Shared/Slippery/SlipperySystem.cs.rej
new file mode 100644
index 000000000000..4c3b91c73e79
--- /dev/null
+++ b/Content.Shared/Slippery/SlipperySystem.cs.rej
@@ -0,0 +1,63 @@
+diff a/Content.Shared/Slippery/SlipperySystem.cs b/Content.Shared/Slippery/SlipperySystem.cs	(rejected hunks)
+@@ -2,11 +2,9 @@
+ using Content.Shared.Damage.Systems;
+ using Content.Shared.Database;
+ using Content.Shared.Inventory;
+-using Robust.Shared.Network;
+ using Content.Shared.Movement.Components;
+ using Content.Shared.Movement.Systems;
+-using Content.Shared.Popups;
+-using Content.Shared.StatusEffect;
++using Content.Shared.StatusEffectNew;
+ using Content.Shared.StepTrigger.Systems;
+ using Content.Shared.Stunnable;
+ using Content.Shared.Throwing;
+@@ -16,7 +14,6 @@
+ using Robust.Shared.Physics.Components;
+ using Robust.Shared.Physics.Systems;
+ using Robust.Shared.Physics.Events;
+-using Robust.Shared.Utility;
+ 
+ namespace Content.Shared.Slippery;
+ 
+@@ -27,8 +24,8 @@ public sealed class SlipperySystem : EntitySystem
+     [Dependency] private readonly MovementModStatusSystem _movementMod = default!;
+     [Dependency] private readonly SharedAudioSystem _audio = default!;
+     [Dependency] private readonly SharedStunSystem _stun = default!;
++    [Dependency] private readonly StatusEffectsSystem _status = default!;
+     [Dependency] private readonly SharedStaminaSystem _stamina = default!;
+-    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
+     [Dependency] private readonly SharedContainerSystem _container = default!;
+     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+     [Dependency] private readonly SpeedModifierContactsSystem _speedModifier = default!;
+@@ -90,7 +87,7 @@ private void OnEntityExit(EntityUid uid, SlipperyComponent component, ref EndCol
+     private bool CanSlip(EntityUid uid, EntityUid toSlip)
+     {
+         return !_container.IsEntityInContainer(uid)
+-                && _statusEffects.CanApplyEffect(toSlip, "Stun"); //Should be KnockedDown instead?
++                && _status.CanAddStatusEffect(toSlip, SharedStunSystem.StunId); //Should be KnockedDown instead?
+     }
+ 
+     public void TrySlip(EntityUid uid, SlipperyComponent component, EntityUid other, bool requiresContact = true)
+@@ -125,12 +122,18 @@ public void TrySlip(EntityUid uid, SlipperyComponent component, EntityUid other,
+         // Preventing from playing the slip sound and stunning when you are already knocked down.
+         if (!HasComp<KnockedDownComponent>(other))
+         {
+-            _stun.TryStun(other, component.SlipData.StunTime, true);
++            _stun.TryUpdateStunDuration(other, component.SlipData.StunTime);
+             _stamina.TakeStaminaDamage(other, component.StaminaDamage); // Note that this can stamCrit
+-            _movementMod.TryFriction(other, component.FrictionStatusTime, true, component.SlipData.SlipFriction, component.SlipData.SlipFriction);
++            _movementMod.TryUpdateFrictionModDuration(
++                other,
++                component.FrictionStatusTime,
++                component.SlipData.SlipFriction,
++                component.SlipData.SlipFriction
++            );
+             _audio.PlayPredicted(component.SlipSound, other, other);
+         }
+-        _stun.TryKnockdown(other, component.SlipData.KnockdownTime, true, true);
++
++        _stun.TryKnockdown(other, component.SlipData.KnockdownTime, true, force: true);
+ 
+         _adminLogger.Add(LogType.Slip, LogImpact.Low, $"{ToPrettyString(other):mob} slipped on collision with {ToPrettyString(uid):entity}");
+     }
diff --git a/Content.Shared/SmartFridge/SmartFridgeComponent.cs b/Content.Shared/SmartFridge/SmartFridgeComponent.cs
new file mode 100644
index 000000000000..db132c586dd6
--- /dev/null
+++ b/Content.Shared/SmartFridge/SmartFridgeComponent.cs
@@ -0,0 +1,99 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.Analyzers;
+using Robust.Shared.Audio;
+using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.SmartFridge;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+[Access(typeof(SmartFridgeSystem))]
+public sealed partial class SmartFridgeComponent : Component
+{
+    /// <summary>
+    /// The container ID that this SmartFridge stores its inventory in
+    /// </summary>
+    [DataField]
+    public string Container = "smart_fridge_inventory";
+
+    /// <summary>
+    /// Whitelist for what entities can be inserted
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Whitelist;
+
+    /// <summary>
+    /// Blacklist for what entities can be inserted
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist;
+
+    /// <summary>
+    /// The sound played on inserting an item into the fridge
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? InsertSound = new SoundCollectionSpecifier("MachineInsert");
+
+    /// <summary>
+    /// A list of entries to display in the UI
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<SmartFridgeEntry> Entries = new();
+
+    /// <summary>
+    /// A mapping of smart fridge entries to the actual contained contents
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    [Access(typeof(SmartFridgeSystem), Other = AccessPermissions.ReadExecute)]
+    public Dictionary<SmartFridgeEntry, HashSet<NetEntity>> ContainedEntries = new();
+
+    /// <summary>
+    /// The flavour text displayed at the bottom of the SmartFridge's UI
+    /// </summary>
+    [DataField]
+    public LocId FlavorText = "smart-fridge-request-generic";
+
+    /// <summary>
+    /// Sound that plays when ejecting an item
+    /// </summary>
+    [DataField]
+    public SoundSpecifier SoundVend = new SoundCollectionSpecifier("VendingDispense")
+    {
+        Params = new AudioParams
+        {
+            Volume = -4f,
+            Variation = 0.15f
+        }
+    };
+
+    /// <summary>
+    /// Sound that plays when an item can't be ejected
+    /// </summary>
+    [DataField]
+    public SoundSpecifier SoundDeny = new SoundCollectionSpecifier("VendingDeny");
+}
+
+[Serializable, NetSerializable, DataRecord]
+public record struct SmartFridgeEntry
+{
+    public string Name;
+
+    public SmartFridgeEntry(string name)
+    {
+        Name = name;
+    }
+}
+
+[Serializable, NetSerializable]
+public enum SmartFridgeUiKey : byte
+{
+    Key,
+}
+
+[Serializable, NetSerializable]
+public sealed class SmartFridgeDispenseItemMessage(SmartFridgeEntry entry) : BoundUserInterfaceMessage
+{
+    public SmartFridgeEntry Entry = entry;
+}
diff --git a/Content.Shared/SmartFridge/SmartFridgeSystem.cs b/Content.Shared/SmartFridge/SmartFridgeSystem.cs
new file mode 100644
index 000000000000..1341f6cd03c8
--- /dev/null
+++ b/Content.Shared/SmartFridge/SmartFridgeSystem.cs
@@ -0,0 +1,157 @@
+using Content.Shared.Access.Components;
+using Content.Shared.Access.Systems;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.Storage.Components;
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.SmartFridge;
+
+public sealed class SmartFridgeSystem : EntitySystem
+{
+    [Dependency] private readonly AccessReaderSystem _accessReader = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SmartFridgeComponent, InteractUsingEvent>(OnInteractUsing);
+        SubscribeLocalEvent<SmartFridgeComponent, EntRemovedFromContainerMessage>(OnItemRemoved);
+
+        SubscribeLocalEvent<SmartFridgeComponent, GetDumpableVerbEvent>(OnGetDumpableVerb);
+        SubscribeLocalEvent<SmartFridgeComponent, DumpEvent>(OnDump);
+
+        Subs.BuiEvents<SmartFridgeComponent>(SmartFridgeUiKey.Key,
+            sub =>
+            {
+                sub.Event<SmartFridgeDispenseItemMessage>(OnDispenseItem);
+            });
+    }
+
+    private bool DoInsert(Entity<SmartFridgeComponent> ent, EntityUid user, IEnumerable<EntityUid> usedItems, bool playSound)
+    {
+        if (!_container.TryGetContainer(ent, ent.Comp.Container, out var container))
+            return false;
+
+        if (!Allowed(ent, user))
+            return true;
+
+        bool anyInserted = false;
+        foreach (var used in usedItems)
+        {
+            if (!_whitelist.CheckBoth(used, ent.Comp.Blacklist, ent.Comp.Whitelist))
+                continue;
+            anyInserted = true;
+
+            _container.Insert(used, container);
+            var key = new SmartFridgeEntry(Identity.Name(used, EntityManager));
+            if (!ent.Comp.Entries.Contains(key))
+                ent.Comp.Entries.Add(key);
+
+            ent.Comp.ContainedEntries.TryAdd(key, new());
+            var entries = ent.Comp.ContainedEntries[key];
+            if (!entries.Contains(GetNetEntity(used)))
+                entries.Add(GetNetEntity(used));
+
+            Dirty(ent);
+        }
+
+        if (anyInserted && playSound)
+        {
+            _audio.PlayPredicted(ent.Comp.InsertSound, ent, user);
+        }
+
+        return anyInserted;
+    }
+
+    private void OnInteractUsing(Entity<SmartFridgeComponent> ent, ref InteractUsingEvent args)
+    {
+        if (!_hands.CanDrop(args.User, args.Used))
+            return;
+
+        args.Handled = DoInsert(ent, args.User, [args.Used], true);
+    }
+
+    private void OnItemRemoved(Entity<SmartFridgeComponent> ent, ref EntRemovedFromContainerMessage args)
+    {
+        var key = new SmartFridgeEntry(Identity.Name(args.Entity, EntityManager));
+
+        if (ent.Comp.ContainedEntries.TryGetValue(key, out var contained))
+        {
+            contained.Remove(GetNetEntity(args.Entity));
+        }
+
+        Dirty(ent);
+    }
+
+    private bool Allowed(Entity<SmartFridgeComponent> machine, EntityUid user)
+    {
+        if (_accessReader.IsAllowed(user, machine))
+            return true;
+
+        _popup.PopupPredicted(Loc.GetString("smart-fridge-component-try-eject-access-denied"), machine, user);
+        _audio.PlayPredicted(machine.Comp.SoundDeny, machine, user);
+        return false;
+    }
+
+    private void OnDispenseItem(Entity<SmartFridgeComponent> ent, ref SmartFridgeDispenseItemMessage args)
+    {
+        if (!_timing.IsFirstTimePredicted)
+            return;
+
+        if (!Allowed(ent, args.Actor))
+            return;
+
+        if (!ent.Comp.ContainedEntries.TryGetValue(args.Entry, out var contained))
+        {
+            _audio.PlayPredicted(ent.Comp.SoundDeny, ent, args.Actor);
+            _popup.PopupPredicted(Loc.GetString("smart-fridge-component-try-eject-unknown-entry"), ent, args.Actor);
+            return;
+        }
+
+        foreach (var item in contained)
+        {
+            if (!_container.TryRemoveFromContainer(GetEntity(item)))
+                continue;
+
+            _audio.PlayPredicted(ent.Comp.SoundVend, ent, args.Actor);
+            contained.Remove(item);
+            Dirty(ent);
+            return;
+        }
+
+        _audio.PlayPredicted(ent.Comp.SoundDeny, ent, args.Actor);
+        _popup.PopupPredicted(Loc.GetString("smart-fridge-component-try-eject-out-of-stock"), ent, args.Actor);
+    }
+
+    private void OnGetDumpableVerb(Entity<SmartFridgeComponent> ent, ref GetDumpableVerbEvent args)
+    {
+        if (_accessReader.IsAllowed(args.User, ent))
+        {
+            args.Verb = Loc.GetString("dump-smartfridge-verb-name", ("unit", ent));
+        }
+    }
+
+    private void OnDump(Entity<SmartFridgeComponent> ent, ref DumpEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        args.Handled = true;
+        args.PlaySound = true;
+
+        DoInsert(ent, args.User, args.DumpQueue, false);
+    }
+}
diff --git a/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs b/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs
index 58513c876965..2fb1340e8b6e 100644
--- a/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs
+++ b/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs
@@ -84,25 +84,13 @@ public abstract partial class BaseEmitSoundComponent : Component
     /// <summary>
     /// The <see cref="SoundSpecifier"/> to play.
     /// </summary>
-    [DataField(required: true)]
+    [DataField(required: true), AutoNetworkedField]
     public SoundSpecifier? Sound;
 
     /// <summary>
     /// Play the sound at the position instead of parented to the source entity.
     /// Useful if the entity is deleted after.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool Positional;
 }
-
-/// <summary>
-/// Represents the state of <see cref="BaseEmitSoundComponent"/>.
-/// </summary>
-/// <remarks>This is obviously very cursed, but since the BaseEmitSoundComponent is abstract, we cannot network it.
-/// AutoGenerateComponentState attribute won't work here, and since everything revolves around inheritance for some fucking reason,
-/// there's no better way of doing this.</remarks>
-[Serializable, NetSerializable]
-public struct EmitSoundComponentState(SoundSpecifier? sound) : IComponentState
-{
-    public SoundSpecifier? Sound { get; } = sound;
-}
diff --git a/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs.rej b/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs.rej
new file mode 100644
index 000000000000..03c67cf10564
--- /dev/null
+++ b/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs.rej
@@ -0,0 +1,8 @@
+diff a/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs b/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs	(rejected hunks)
+@@ -1,6 +1,4 @@
+ using Robust.Shared.Audio;
+-using Robust.Shared.GameStates;
+-using Robust.Shared.Serialization;
+ 
+ namespace Content.Shared.Sound.Components;
+ 
diff --git a/Content.Shared/Sound/Components/EmitSoundOnActivateComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnActivateComponent.cs
index cd4d7b323e4c..5ca743cdf81c 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnActivateComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnActivateComponent.cs
@@ -17,7 +17,7 @@ namespace Content.Shared.Sound.Components;
 /// <summary>
 /// Simple sound emitter that emits sound on ActivateInWorld
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnActivateComponent : BaseEmitSoundComponent
 {
     /// <summary>
diff --git a/Content.Shared/Sound/Components/EmitSoundOnCollideComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnCollideComponent.cs
index 0f6438a5945c..49a20c92f99b 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnCollideComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnCollideComponent.cs
@@ -11,7 +11,7 @@
 
 namespace Content.Shared.Sound.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnCollideComponent : BaseEmitSoundComponent
 {
     public static readonly TimeSpan CollideCooldown = TimeSpan.FromSeconds(0.2);
diff --git a/Content.Shared/Sound/Components/EmitSoundOnDropComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnDropComponent.cs
index fd5f6cdbb83a..7ce712217395 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnDropComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnDropComponent.cs
@@ -17,5 +17,5 @@ namespace Content.Shared.Sound.Components;
 /// <summary>
 /// Simple sound emitter that emits sound on entity drop
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnDropComponent : BaseEmitSoundComponent;
diff --git a/Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs
index 92c282c5539c..64a4f58c4760 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs
@@ -13,7 +13,7 @@ namespace Content.Shared.Sound.Components;
 /// <summary>
 /// Whenever this item is used upon by an entity, with a tag or component within a whitelist, in the hand of a user, play a sound
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnInteractUsingComponent : BaseEmitSoundComponent
 {
     /// <summary>
diff --git a/Content.Shared/Sound/Components/EmitSoundOnLandComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnLandComponent.cs
index 536121906113..4edfcc18a96f 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnLandComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnLandComponent.cs
@@ -16,5 +16,5 @@ namespace Content.Shared.Sound.Components;
 /// <summary>
 /// Simple sound emitter that emits sound on LandEvent
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnLandComponent : BaseEmitSoundComponent;
diff --git a/Content.Shared/Sound/Components/EmitSoundOnPickupComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnPickupComponent.cs
index 180e48ad97b9..6eefb6d21996 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnPickupComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnPickupComponent.cs
@@ -13,5 +13,5 @@ namespace Content.Shared.Sound.Components;
 /// <summary>
 /// Simple sound emitter that emits sound on entity pickup
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnPickupComponent : BaseEmitSoundComponent;
diff --git a/Content.Shared/Sound/Components/EmitSoundOnSpawnComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnSpawnComponent.cs
index 6e1d4ef04429..dd09a26d29f5 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnSpawnComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnSpawnComponent.cs
@@ -12,5 +12,5 @@ namespace Content.Shared.Sound.Components;
 /// <summary>
 ///     Simple sound emitter that emits sound on entity spawn.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnSpawnComponent : BaseEmitSoundComponent;
diff --git a/Content.Shared/Sound/Components/EmitSoundOnThrowComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnThrowComponent.cs
index 646953e411e8..8efebf31bed1 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnThrowComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnThrowComponent.cs
@@ -30,5 +30,5 @@ namespace Content.Shared.Sound.Components;
 /// <summary>
 /// Simple sound emitter that emits sound on ThrowEvent
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnThrowComponent : BaseEmitSoundComponent;
diff --git a/Content.Shared/Sound/Components/EmitSoundOnUIOpenComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnUIOpenComponent.cs
index d198da71e409..2715fe768a42 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnUIOpenComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnUIOpenComponent.cs
@@ -51,7 +51,7 @@ namespace Content.Shared.Sound.Components;
 /// <summary>
 /// Simple sound emitter that emits sound on AfterActivatableUIOpenEvent
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnUIOpenComponent : BaseEmitSoundComponent
 {
     /// <summary>
diff --git a/Content.Shared/Sound/Components/EmitSoundOnUseComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnUseComponent.cs
index d0d589caae5e..63435be04401 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnUseComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnUseComponent.cs
@@ -32,7 +32,7 @@ namespace Content.Shared.Sound.Components;
 /// <summary>
 /// Simple sound emitter that emits sound on UseInHand
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnUseComponent : BaseEmitSoundComponent
 {
     /// <summary>
diff --git a/Content.Shared/Sound/SharedEmitSoundSystem.cs b/Content.Shared/Sound/SharedEmitSoundSystem.cs
index 302b1ebe414b..c67d3633be55 100644
--- a/Content.Shared/Sound/SharedEmitSoundSystem.cs
+++ b/Content.Shared/Sound/SharedEmitSoundSystem.cs
@@ -116,47 +116,6 @@ public override void Initialize()
         SubscribeLocalEvent<EmitSoundOnCollideComponent, StartCollideEvent>(OnEmitSoundOnCollide);
 
         SubscribeLocalEvent<SoundWhileAliveComponent, MobStateChangedEvent>(OnMobState);
-
-        // We need to handle state manually here
-        // BaseEmitSoundComponent isn't registered so we have to subscribe to each one
-        // TODO: Make it use autonetworking instead of relying on inheritance
-        SubscribeEmitComponent<EmitSoundOnActivateComponent>();
-        SubscribeEmitComponent<EmitSoundOnCollideComponent>();
-        SubscribeEmitComponent<EmitSoundOnDropComponent>();
-        SubscribeEmitComponent<EmitSoundOnInteractUsingComponent>();
-        SubscribeEmitComponent<EmitSoundOnLandComponent>();
-        SubscribeEmitComponent<EmitSoundOnPickupComponent>();
-        SubscribeEmitComponent<EmitSoundOnSpawnComponent>();
-        SubscribeEmitComponent<EmitSoundOnThrowComponent>();
-        SubscribeEmitComponent<EmitSoundOnUIOpenComponent>();
-        SubscribeEmitComponent<EmitSoundOnUseComponent>();
-
-        // Helper method so it's a little less ugly
-        void SubscribeEmitComponent<T>() where T : BaseEmitSoundComponent
-        {
-            SubscribeLocalEvent<T, ComponentGetState>(GetBaseEmitState);
-            SubscribeLocalEvent<T, ComponentHandleState>(HandleBaseEmitState);
-        }
-    }
-
-    private static void GetBaseEmitState<T>(Entity<T> ent, ref ComponentGetState args) where T : BaseEmitSoundComponent
-    {
-        args.State = new EmitSoundComponentState(ent.Comp.Sound);
-    }
-
-    private static void HandleBaseEmitState<T>(Entity<T> ent, ref ComponentHandleState args) where T : BaseEmitSoundComponent
-    {
-        if (args.Current is not EmitSoundComponentState state)
-            return;
-
-        ent.Comp.Sound = state.Sound switch
-        {
-            SoundPathSpecifier pathSpec => new SoundPathSpecifier(pathSpec.Path, pathSpec.Params),
-            SoundCollectionSpecifier collectionSpec => collectionSpec.Collection != null
-                ? new SoundCollectionSpecifier(collectionSpec.Collection, collectionSpec.Params)
-                : null,
-            _ => null,
-        };
     }
 
     private void HandleEmitSoundOnUIOpen(EntityUid uid, EmitSoundOnUIOpenComponent component, AfterActivatableUIOpenEvent args)
diff --git a/Content.Shared/Species/Systems/ReformSystem.cs b/Content.Shared/Species/Systems/ReformSystem.cs
index fa3fa2de83b6..4525e6c7f6a0 100644
--- a/Content.Shared/Species/Systems/ReformSystem.cs
+++ b/Content.Shared/Species/Systems/ReformSystem.cs
@@ -76,7 +76,7 @@ private void OnReform(EntityUid uid, ReformComponent comp, ReformEvent args)
     {
         // Stun them when they use the action for the amount of reform time.
         if (comp.ShouldStun)
-            _stunSystem.TryStun(uid, TimeSpan.FromSeconds(comp.ReformTime), true);
+            _stunSystem.TryUpdateStunDuration(uid, TimeSpan.FromSeconds(comp.ReformTime));
         _popupSystem.PopupClient(Loc.GetString(comp.PopupText, ("name", uid)), uid, uid);
 
         // Create a doafter & start it
diff --git a/Content.Shared/Speech/Components/ActiveListenerComponent.cs b/Content.Shared/Speech/Components/ActiveListenerComponent.cs
new file mode 100644
index 000000000000..fde108a8170f
--- /dev/null
+++ b/Content.Shared/Speech/Components/ActiveListenerComponent.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Chat;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// This component is used to relay speech events to other systems.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ActiveListenerComponent : Component
+{
+    /// <summary>
+    /// The range in which to listen to speech.
+    /// </summary>
+    [DataField]
+    public float Range = SharedChatSystem.VoiceRange;
+}
diff --git a/Content.Server/Speech/ListenEvent.cs b/Content.Shared/Speech/ListenEvent.cs
similarity index 100%
rename from Content.Server/Speech/ListenEvent.cs
rename to Content.Shared/Speech/ListenEvent.cs
diff --git a/Content.Shared/Speech/ListenEvent.cs.rej b/Content.Shared/Speech/ListenEvent.cs.rej
new file mode 100644
index 000000000000..183140a44343
--- /dev/null
+++ b/Content.Shared/Speech/ListenEvent.cs.rej
@@ -0,0 +1,7 @@
+diff a/Content.Shared/Speech/ListenEvent.cs b/Content.Shared/Speech/ListenEvent.cs	(rejected hunks)
+@@ -1,4 +1,4 @@
+-namespace Content.Server.Speech;
++namespace Content.Shared.Speech;
+ 
+ public sealed class ListenEvent : EntityEventArgs
+ {
diff --git a/Content.Shared/StatusEffect/StatusEffectsSystem.cs.rej b/Content.Shared/StatusEffect/StatusEffectsSystem.cs.rej
new file mode 100644
index 000000000000..f179720059ac
--- /dev/null
+++ b/Content.Shared/StatusEffect/StatusEffectsSystem.cs.rej
@@ -0,0 +1,24 @@
+diff a/Content.Shared/StatusEffect/StatusEffectsSystem.cs b/Content.Shared/StatusEffect/StatusEffectsSystem.cs	(rejected hunks)
+@@ -353,7 +353,7 @@ public bool CanApplyEffect(EntityUid uid, string key, StatusEffectsComponent? st
+             if (!Resolve(uid, ref status, false))
+                 return false;
+ 
+-            var ev = new BeforeStatusEffectAddedEvent(key);
++            var ev = new BeforeOldStatusEffectAddedEvent(key);
+             RaiseLocalEvent(uid, ref ev);
+             if (ev.Cancelled)
+                 return false;
+@@ -481,6 +481,13 @@ public bool TryGetTime(EntityUid uid, string key,
+         }
+     }
+ 
++    /// <summary>
++    /// Raised on an entity before a status effect is added to determine if adding it should be cancelled.
++    /// Obsolete version of <see cref="BeforeStatusEffectAddedEvent" />
++    /// </summary>
++    [ByRefEvent, Obsolete("Migration to StatusEffectNew.StatusEffectsSystem is required")]
++    public record struct BeforeOldStatusEffectAddedEvent(string EffectKey, bool Cancelled = false);
++
+     public readonly struct StatusEffectAddedEvent
+     {
+         public readonly EntityUid Uid;
diff --git a/Content.Shared/StatusEffectNew/Components/RejuvenateRemovedStatusEffectComponent.cs b/Content.Shared/StatusEffectNew/Components/RejuvenateRemovedStatusEffectComponent.cs
new file mode 100644
index 000000000000..808830f7e24a
--- /dev/null
+++ b/Content.Shared/StatusEffectNew/Components/RejuvenateRemovedStatusEffectComponent.cs
@@ -0,0 +1,14 @@
+using Content.Shared.Damage.Components;
+using Content.Shared.Rejuvenate;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.StatusEffectNew.Components;
+
+/// <summary>
+/// Marker component for a status effect that should be removed on rejuvenation
+/// and should not be applied on targets with <see cref="GodmodeComponent" />.
+/// Only applies to effects using the new <see cref="StatusEffectsSystem" />.
+/// </summary>
+/// <seealso cref="RejuvenateEvent"/>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class RejuvenateRemovedStatusEffectComponent : Component;
diff --git a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
index d508ea8b739b..d30ab79c2b47 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
@@ -31,7 +31,7 @@ TimeSpan duration
     }
 
 
-    ///<inheritdoc cref="TryAddStatusEffectDuration(Robust.Shared.GameObjects.EntityUid,Robust.Shared.Prototypes.EntProtoId,out Robust.Shared.GameObjects.EntityUid?,System.TimeSpan)"/>
+    ///<inheritdoc cref="TryAddStatusEffectDuration(EntityUid,EntProtoId,out EntityUid?,TimeSpan)"/>
     public bool TryAddStatusEffectDuration(EntityUid target, EntProtoId effectProto, TimeSpan duration)
     {
         return TryAddStatusEffectDuration(target, effectProto, out _, duration);
@@ -61,7 +61,7 @@ public bool TrySetStatusEffectDuration(
         return true;
     }
 
-    /// <inheritdoc cref="TrySetStatusEffectDuration(Robust.Shared.GameObjects.EntityUid,Robust.Shared.Prototypes.EntProtoId,out Robust.Shared.GameObjects.EntityUid?,System.TimeSpan?)"/>
+    /// <inheritdoc cref="TrySetStatusEffectDuration(EntityUid,EntProtoId,out EntityUid?,TimeSpan?)"/>
     public bool TrySetStatusEffectDuration(EntityUid target, EntProtoId effectProto, TimeSpan? duration = null)
     {
         return TrySetStatusEffectDuration(target, effectProto, out _, duration);
@@ -91,7 +91,7 @@ public bool TryUpdateStatusEffectDuration(
         return true;
     }
 
-    /// <inheritdoc cref="TryUpdateStatusEffectDuration(Robust.Shared.GameObjects.EntityUid,Robust.Shared.Prototypes.EntProtoId,out Robust.Shared.GameObjects.EntityUid?,System.TimeSpan?)"/>
+    /// <inheritdoc cref="TryUpdateStatusEffectDuration(EntityUid,EntProtoId,out EntityUid?,TimeSpan?)"/>
     public bool TryUpdateStatusEffectDuration(EntityUid target, EntProtoId effectProto, TimeSpan? duration = null)
     {
         return TryUpdateStatusEffectDuration(target, effectProto, out _, duration);
diff --git a/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs.rej b/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs.rej
new file mode 100644
index 000000000000..4b6fe33aa333
--- /dev/null
+++ b/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs.rej
@@ -0,0 +1,27 @@
+diff a/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs b/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs	(rejected hunks)
+@@ -1,6 +1,8 @@
+ using Content.Shared.Movement.Events;
+ using Content.Shared.Movement.Systems;
++using Content.Shared.Rejuvenate;
+ using Content.Shared.StatusEffectNew.Components;
++using Content.Shared.Stunnable;
+ using Robust.Shared.Player;
+ 
+ namespace Content.Shared.StatusEffectNew;
+@@ -11,9 +13,16 @@ private void InitializeRelay()
+     {
+         SubscribeLocalEvent<StatusEffectContainerComponent, LocalPlayerAttachedEvent>(RelayStatusEffectEvent);
+         SubscribeLocalEvent<StatusEffectContainerComponent, LocalPlayerDetachedEvent>(RelayStatusEffectEvent);
++        SubscribeLocalEvent<StatusEffectContainerComponent, RejuvenateEvent>(RelayStatusEffectEvent);
++
++        SubscribeLocalEvent<StatusEffectContainerComponent, RefreshMovementSpeedModifiersEvent>(RelayStatusEffectEvent);
++        SubscribeLocalEvent<StatusEffectContainerComponent, UpdateCanMoveEvent>(RelayStatusEffectEvent);
+ 
+         SubscribeLocalEvent<StatusEffectContainerComponent, RefreshFrictionModifiersEvent>(RefRelayStatusEffectEvent);
+         SubscribeLocalEvent<StatusEffectContainerComponent, TileFrictionEvent>(RefRelayStatusEffectEvent);
++
++        SubscribeLocalEvent<StatusEffectContainerComponent, StandUpAttemptEvent>(RefRelayStatusEffectEvent);
++        SubscribeLocalEvent<StatusEffectContainerComponent, StunEndAttemptEvent>(RefRelayStatusEffectEvent);
+     }
+ 
+     private void RefRelayStatusEffectEvent<T>(EntityUid uid, StatusEffectContainerComponent component, ref T args) where T : struct
diff --git a/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
index 7f39a1f7c543..7f8eef5102f5 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Rejuvenate;
 using Content.Shared.StatusEffectNew.Components;
 using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
@@ -32,6 +33,8 @@ public override void Initialize()
         SubscribeLocalEvent<StatusEffectContainerComponent, EntInsertedIntoContainerMessage>(OnEntityInserted);
         SubscribeLocalEvent<StatusEffectContainerComponent, EntRemovedFromContainerMessage>(OnEntityRemoved);
 
+        SubscribeLocalEvent<RejuvenateRemovedStatusEffectComponent, StatusEffectRelayedEvent<RejuvenateEvent>>(OnRejuvenate);
+
         _containerQuery = GetEntityQuery<StatusEffectContainerComponent>();
         _effectQuery = GetEntityQuery<StatusEffectComponent>();
     }
@@ -115,6 +118,12 @@ private void OnEntityRemoved(Entity<StatusEffectContainerComponent> ent, ref Ent
         Dirty(args.Entity, statusComp);
     }
 
+    private void OnRejuvenate(Entity<RejuvenateRemovedStatusEffectComponent> ent,
+        ref StatusEffectRelayedEvent<RejuvenateEvent> args)
+    {
+        PredictedQueueDel(ent.Owner);
+    }
+
     private void SetStatusEffectTime(EntityUid effect, TimeSpan? duration)
     {
         if (!_effectQuery.TryComp(effect, out var effectComp))
@@ -156,7 +165,7 @@ private void UpdateStatusEffectTime(EntityUid effect, TimeSpan? duration)
         Dirty(effect, effectComp);
     }
 
-    private bool CanAddStatusEffect(EntityUid uid, EntProtoId effectProto)
+    public bool CanAddStatusEffect(EntityUid uid, EntProtoId effectProto)
     {
         if (!_proto.TryIndex(effectProto, out var effectProtoData))
             return false;
diff --git a/Content.Shared/Sticky/Components/StickyComponent.cs.rej b/Content.Shared/Sticky/Components/StickyComponent.cs.rej
new file mode 100644
index 000000000000..69d579fe3ed5
--- /dev/null
+++ b/Content.Shared/Sticky/Components/StickyComponent.cs.rej
@@ -0,0 +1,8 @@
+diff a/Content.Shared/Sticky/Components/StickyComponent.cs b/Content.Shared/Sticky/Components/StickyComponent.cs	(rejected hunks)
+@@ -1,5 +1,5 @@
+ using Content.Shared.Sticky.Systems;
+-using Content.Shared.Whitelist;
++using Content.Shared.Whitelist;
+ using Robust.Shared.GameStates;
+ using Robust.Shared.Utility;
+ 
diff --git a/Content.Shared/Storage/Components/DumpableComponent.cs.rej b/Content.Shared/Storage/Components/DumpableComponent.cs.rej
new file mode 100644
index 000000000000..ee2684437723
--- /dev/null
+++ b/Content.Shared/Storage/Components/DumpableComponent.cs.rej
@@ -0,0 +1,17 @@
+diff a/Content.Shared/Storage/Components/DumpableComponent.cs b/Content.Shared/Storage/Components/DumpableComponent.cs	(rejected hunks)
+@@ -33,3 +33,15 @@ public sealed partial class DumpableComponent : Component
+     [DataField("multiplier"), AutoNetworkedField]
+     public float Multiplier = 1.0f;
+ }
++
++/// <summary>
++/// Event raised on Dumpable entities to get the verb for dumping
++/// </summary>
++[ByRefEvent]
++public record struct GetDumpableVerbEvent(EntityUid User, string? Verb);
++
++/// <summary>
++/// Event raised on Dumpable entities to complete the dump
++/// </summary>
++[ByRefEvent]
++public record struct DumpEvent(Queue<EntityUid> DumpQueue, EntityUid User, bool PlaySound, bool Handled);
diff --git a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
index 4c271bca9772..8f5cc73f84ee 100644
--- a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
@@ -130,10 +130,12 @@ public override void Initialize()
 
     private void OnAfterInteract(EntityUid uid, DumpableComponent component, AfterInteractEvent args)
     {
-        if (!args.CanReach || args.Handled)
+        if (!args.CanReach || args.Handled || args.Target is not { } target)
             return;
 
-        if (!HasComp<DisposalUnitComponent>(args.Target) && !HasComp<PlaceableSurfaceComponent>(args.Target))
+        var evt = new GetDumpableVerbEvent(args.User, null);
+        RaiseLocalEvent(target, ref evt);
+        if (evt.Verb is null)
             return;
 
         if (!TryComp<StorageComponent>(uid, out var storage))
@@ -142,7 +144,7 @@ private void OnAfterInteract(EntityUid uid, DumpableComponent component, AfterIn
         if (!storage.Container.ContainedEntities.Any())
             return;
 
-        StartDoAfter(uid, args.Target.Value, args.User, component);
+        StartDoAfter(uid, target, args.User, component);
         args.Handled = true;
     }
 
diff --git a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs.rej b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs.rej
new file mode 100644
index 000000000000..418093bbcb1a
--- /dev/null
+++ b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs.rej
@@ -0,0 +1,120 @@
+diff a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs	(rejected hunks)
+@@ -1,11 +1,7 @@
+ using System.Linq;
+-using Content.Shared.Disposal;
+-using Content.Shared.Disposal.Components;
+-using Content.Shared.Disposal.Unit;
+ using Content.Shared.DoAfter;
+ using Content.Shared.Interaction;
+ using Content.Shared.Item;
+-using Content.Shared.Placeable;
+ using Content.Shared.Storage.Components;
+ using Content.Shared.Verbs;
+ using Robust.Shared.Audio.Systems;
+@@ -21,7 +17,6 @@ public sealed class DumpableSystem : EntitySystem
+     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+     [Dependency] private readonly IRobustRandom _random = default!;
+     [Dependency] private readonly SharedAudioSystem _audio = default!;
+-    [Dependency] private readonly SharedDisposalUnitSystem _disposalUnitSystem = default!;
+     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
+ 
+@@ -83,33 +80,22 @@ private void AddUtilityVerbs(EntityUid uid, DumpableComponent dumpable, GetVerbs
+         if (!TryComp<StorageComponent>(uid, out var storage) || !storage.Container.ContainedEntities.Any())
+             return;
+ 
+-        if (HasComp<DisposalUnitComponent>(args.Target))
+-        {
+-            UtilityVerb verb = new()
+-            {
+-                Act = () =>
+-                {
+-                    StartDoAfter(uid, args.Target, args.User, dumpable);
+-                },
+-                Text = Loc.GetString("dump-disposal-verb-name", ("unit", args.Target)),
+-                IconEntity = GetNetEntity(uid)
+-            };
+-            args.Verbs.Add(verb);
+-        }
++        var evt = new GetDumpableVerbEvent(args.User, null);
++        RaiseLocalEvent(args.Target, ref evt);
+ 
+-        if (HasComp<PlaceableSurfaceComponent>(args.Target))
++        if (evt.Verb is not { } verbText)
++            return;
++
++        UtilityVerb verb = new()
+         {
+-            UtilityVerb verb = new()
++            Act = () =>
+             {
+-                Act = () =>
+-                {
+-                    StartDoAfter(uid, args.Target, args.User, dumpable);
+-                },
+-                Text = Loc.GetString("dump-placeable-verb-name", ("surface", args.Target)),
+-                IconEntity = GetNetEntity(uid)
+-            };
+-            args.Verbs.Add(verb);
+-        }
++                StartDoAfter(uid, args.Target, args.User, dumpable);
++            },
++            Text = verbText,
++            IconEntity = GetNetEntity(uid)
++        };
++        args.Verbs.Add(verb);
+     }
+ 
+     private void StartDoAfter(EntityUid storageUid, EntityUid targetUid, EntityUid userUid, DumpableComponent dumpable)
+@@ -141,34 +127,15 @@ private void StartDoAfter(EntityUid storageUid, EntityUid targetUid, EntityUid u
+ 
+     private void OnDoAfter(EntityUid uid, DumpableComponent component, DumpableDoAfterEvent args)
+     {
+-        if (args.Handled || args.Cancelled || !TryComp<StorageComponent>(uid, out var storage) || storage.Container.ContainedEntities.Count == 0)
++        if (args.Handled || args.Cancelled || !TryComp<StorageComponent>(uid, out var storage) || storage.Container.ContainedEntities.Count == 0 || args.Args.Target is not { } target)
+             return;
+ 
+         var dumpQueue = new Queue<EntityUid>(storage.Container.ContainedEntities);
+ 
+-        var dumped = false;
++        var evt = new DumpEvent(dumpQueue, args.Args.User, false, false);
++        RaiseLocalEvent(target, ref evt);
+ 
+-        if (HasComp<DisposalUnitComponent>(args.Args.Target))
+-        {
+-            dumped = true;
+-
+-            foreach (var entity in dumpQueue)
+-            {
+-                _disposalUnitSystem.DoInsertDisposalUnit(args.Args.Target.Value, entity, args.Args.User);
+-            }
+-        }
+-        else if (HasComp<PlaceableSurfaceComponent>(args.Args.Target))
+-        {
+-            dumped = true;
+-
+-            var (targetPos, targetRot) = _transformSystem.GetWorldPositionRotation(args.Args.Target.Value);
+-
+-            foreach (var entity in dumpQueue)
+-            {
+-                _transformSystem.SetWorldPositionRotation(entity, targetPos + _random.NextVector2Box() / 4, targetRot);
+-            }
+-        }
+-        else
++        if (!evt.Handled)
+         {
+             var targetPos = _transformSystem.GetWorldPosition(uid);
+ 
+@@ -177,9 +144,11 @@ private void OnDoAfter(EntityUid uid, DumpableComponent component, DumpableDoAft
+                 var transform = Transform(entity);
+                 _transformSystem.SetWorldPositionRotation(entity, targetPos + _random.NextVector2Box() / 4, _random.NextAngle(), transform);
+             }
++
++            return;
+         }
+ 
+-        if (dumped)
++        if (evt.PlaySound)
+         {
+             _audio.PlayPredicted(component.DumpSound, uid, args.User);
+         }
diff --git a/Content.Shared/Stunnable/KnockdownStatusEffectComponent.cs b/Content.Shared/Stunnable/KnockdownStatusEffectComponent.cs
new file mode 100644
index 000000000000..79b2fb695b93
--- /dev/null
+++ b/Content.Shared/Stunnable/KnockdownStatusEffectComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Stunnable;
+
+/// <summary>
+/// Knockdown as a status effect.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedStunSystem))]
+public sealed partial class KnockdownStatusEffectComponent : Component;
diff --git a/Content.Shared/Stunnable/SharedStunSystem.cs b/Content.Shared/Stunnable/SharedStunSystem.cs
index 82552c19f805..05194bdabbfd 100644
--- a/Content.Shared/Stunnable/SharedStunSystem.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.cs
@@ -159,10 +159,6 @@ private void OnAttemptInteract(Entity<StunnedComponent> ent, ref InteractionAtte
 
     private void OnMobStateChanged(EntityUid uid, MobStateComponent component, MobStateChangedEvent args)
     {
-        if (!TryComp<StatusEffectsComponent>(uid, out var status))
-        {
-            return;
-        }
         switch (args.NewMobState)
         {
             case MobState.Alive:
@@ -171,12 +167,12 @@ private void OnMobStateChanged(EntityUid uid, MobStateComponent component, MobSt
                 }
             case MobState.Critical:
                 {
-                    _statusEffect.TryRemoveStatusEffect(uid, "Stun");
+                    _status.TryRemoveStatusEffect(uid, StunId);
                     break;
                 }
             case MobState.Dead:
                 {
-                    _statusEffect.TryRemoveStatusEffect(uid, "Stun");
+                    _status.TryRemoveStatusEffect(uid, StunId);
                     break;
                 }
             case MobState.Invalid:
diff --git a/Content.Shared/Stunnable/SharedStunSystem.cs.rej b/Content.Shared/Stunnable/SharedStunSystem.cs.rej
new file mode 100644
index 000000000000..1347489a2572
--- /dev/null
+++ b/Content.Shared/Stunnable/SharedStunSystem.cs.rej
@@ -0,0 +1,373 @@
+diff a/Content.Shared/Stunnable/SharedStunSystem.cs b/Content.Shared/Stunnable/SharedStunSystem.cs	(rejected hunks)
+@@ -4,7 +4,6 @@
+ using Content.Shared.Interaction.Events;
+ using Content.Shared.Inventory.Events;
+ using Content.Shared.Item;
+-using Content.Shared.Damage.Components;
+ using Content.Shared.Damage.Systems;
+ using Content.Shared.Database;
+ using Content.Shared.DoAfter;
+@@ -14,35 +13,35 @@
+ using Content.Shared.Movement.Events;
+ using Content.Shared.Movement.Systems;
+ using Content.Shared.Standing;
+-using Content.Shared.StatusEffect;
++using Content.Shared.StatusEffectNew;
+ using Content.Shared.Throwing;
+ using Content.Shared.Whitelist;
+ using Robust.Shared.Audio.Systems;
+ using Robust.Shared.Physics.Events;
++using Robust.Shared.Prototypes;
+ using Robust.Shared.Timing;
+ 
+ namespace Content.Shared.Stunnable;
+ 
+ public abstract partial class SharedStunSystem : EntitySystem
+ {
+-    [Dependency] protected readonly ActionBlockerSystem Blocker = default!;
+-    [Dependency] protected readonly AlertsSystem Alerts = default!;
++    public static readonly EntProtoId StunId = "StatusEffectStunned";
++    public static readonly EntProtoId KnockdownId = "StatusEffectKnockdown";
++
+     [Dependency] protected readonly IGameTiming GameTiming = default!;
+     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
++    [Dependency] protected readonly ActionBlockerSystem Blocker = default!;
++    [Dependency] protected readonly AlertsSystem Alerts = default!;
+     [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!;
+     [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
+     [Dependency] private readonly SharedAudioSystem _audio = default!;
+     [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
+     [Dependency] protected readonly SharedDoAfterSystem DoAfter = default!;
+     [Dependency] protected readonly SharedStaminaSystem Stamina = default!;
+-    [Dependency] private readonly StatusEffectsSystem _statusEffect = default!;
++    [Dependency] private readonly StatusEffectsSystem _status = default!;
+ 
+     public override void Initialize()
+     {
+-        SubscribeLocalEvent<SlowedDownComponent, ComponentInit>(OnSlowInit);
+-        SubscribeLocalEvent<SlowedDownComponent, ComponentShutdown>(OnSlowRemove);
+-        SubscribeLocalEvent<SlowedDownComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
+-
+         SubscribeLocalEvent<StunnedComponent, ComponentStartup>(UpdateCanMove);
+         SubscribeLocalEvent<StunnedComponent, ComponentShutdown>(OnStunShutdown);
+ 
+@@ -61,6 +60,14 @@ public override void Initialize()
+         SubscribeLocalEvent<StunnedComponent, IsUnequippingAttemptEvent>(OnUnequipAttempt);
+         SubscribeLocalEvent<MobStateComponent, MobStateChangedEvent>(OnMobStateChanged);
+ 
++        // New Status Effect subscriptions
++        SubscribeLocalEvent<StunnedStatusEffectComponent, StatusEffectAppliedEvent>(OnStunEffectApplied);
++        SubscribeLocalEvent<StunnedStatusEffectComponent, StatusEffectRemovedEvent>(OnStunStatusRemoved);
++        SubscribeLocalEvent<StunnedStatusEffectComponent, StatusEffectRelayedEvent<StunEndAttemptEvent>>(OnStunEndAttempt);
++
++        SubscribeLocalEvent<KnockdownStatusEffectComponent, StatusEffectRelayedEvent<StandUpAttemptEvent>>(OnStandUpAttempt);
++
++        // Stun Appearance Data
+         InitializeKnockdown();
+         InitializeAppearance();
+     }
+@@ -119,71 +122,95 @@ private void OnStunOnContactCollide(Entity<StunOnContactComponent> ent, ref Star
+         if (_entityWhitelist.IsBlacklistPass(ent.Comp.Blacklist, args.OtherEntity))
+             return;
+ 
+-        if (!TryComp<StatusEffectsComponent>(args.OtherEntity, out var status))
+-            return;
+-
+-        TryStun(args.OtherEntity, ent.Comp.Duration, true, status);
+-        TryKnockdown(args.OtherEntity, ent.Comp.Duration, ent.Comp.Refresh, ent.Comp.AutoStand);
++        TryUpdateStunDuration(args.OtherEntity, ent.Comp.Duration);
++        TryKnockdown(args.OtherEntity, ent.Comp.Duration, true, force: true);
+     }
+ 
+-    private void OnSlowInit(EntityUid uid, SlowedDownComponent component, ComponentInit args)
++    // TODO STUN: Make events for different things. (Getting modifiers, attempt events, informative events...)
++    public bool TryAddStunDuration(EntityUid uid, TimeSpan duration)
+     {
+-        _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
++        if (!_status.TryAddStatusEffectDuration(uid, StunId, duration))
++            return false;
++
++        OnStunnedSuccessfully(uid, duration);
++        return true;
+     }
+ 
+-    private void OnSlowRemove(EntityUid uid, SlowedDownComponent component, ComponentShutdown args)
++    public bool TryUpdateStunDuration(EntityUid uid, TimeSpan? duration)
+     {
+-        component.SprintSpeedModifier = 1f;
+-        component.WalkSpeedModifier = 1f;
+-        _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
+-    }
++        if (!_status.TryUpdateStatusEffectDuration(uid, StunId, duration))
++            return false;
+ 
+-    // TODO STUN: Make events for different things. (Getting modifiers, attempt events, informative events...)
++        OnStunnedSuccessfully(uid, duration);
++        return true;
++    }
+ 
+-    /// <summary>
+-    ///     Stuns the entity, disallowing it from doing many interactions temporarily.
+-    /// </summary>
+-    public bool TryStun(EntityUid uid, TimeSpan time, bool refresh, StatusEffectsComponent? status = null)
++    private void OnStunnedSuccessfully(EntityUid uid, TimeSpan? duration)
+     {
+-        if (time <= TimeSpan.Zero)
+-            return false;
++        var ev = new StunnedEvent(); // todo: rename event or change how it is raised - this event is raised each time duration of stun was externally changed
++        RaiseLocalEvent(uid, ref ev);
+ 
+-        if (!Resolve(uid, ref status, false))
+-            return false;
++        var timeForLogs = duration.HasValue
++            ? duration.Value.Seconds.ToString()
++            : "Infinite";
++        _adminLogger.Add(LogType.Stamina, LogImpact.Medium, $"{ToPrettyString(uid):user} stunned for {timeForLogs} seconds");
++    }
+ 
+-        if (!_statusEffect.TryAddStatusEffect<StunnedComponent>(uid, "Stun", time, refresh))
++    public bool TryAddKnockdownDuration(EntityUid uid, TimeSpan duration)
++    {
++        if (!_status.TryAddStatusEffectDuration(uid, KnockdownId, duration))
+             return false;
+ 
+-        var ev = new StunnedEvent();
+-        RaiseLocalEvent(uid, ref ev);
++        TryKnockdown(uid, duration, true, force: true);
+ 
+-        _adminLogger.Add(LogType.Stamina, LogImpact.Medium, $"{ToPrettyString(uid):user} stunned for {time.Seconds} seconds");
+         return true;
++
++    }
++
++    public bool TryUpdateKnockdownDuration(EntityUid uid, TimeSpan? duration)
++    {
++        if (!_status.TryUpdateStatusEffectDuration(uid, KnockdownId, duration))
++            return false;
++
++        return TryKnockdown(uid, duration, true, force: true);
+     }
+ 
+     /// <summary>
+     ///     Knocks down the entity, making it fall to the ground.
+     /// </summary>
+-    public bool TryKnockdown(EntityUid uid, TimeSpan time, bool refresh, bool autoStand = true, bool drop = true)
++    public bool TryKnockdown(Entity<StandingStateComponent?> entity, TimeSpan? time, bool refresh, bool autoStand = true, bool drop = true, bool force = false)
+     {
+         if (time <= TimeSpan.Zero)
+             return false;
+ 
+         // Can't fall down if you can't actually be downed.
+-        if (!HasComp<StandingStateComponent>(uid))
++        if (!Resolve(entity, ref entity.Comp, false))
+             return false;
+ 
+-        var evAttempt = new KnockDownAttemptEvent(autoStand, drop);
+-        RaiseLocalEvent(uid, ref evAttempt);
++        if (!force)
++        {
++            var evAttempt = new KnockDownAttemptEvent(autoStand, drop);
++            RaiseLocalEvent(entity, ref evAttempt);
+ 
+-        if (evAttempt.Cancelled)
+-            return false;
++            if (evAttempt.Cancelled)
++                return false;
+ 
++            autoStand = evAttempt.AutoStand;
++            drop = evAttempt.Drop;
++        }
++
++        Knockdown(entity!, time, refresh, autoStand, drop);
++
++        return true;
++    }
++
++    private void Knockdown(Entity<StandingStateComponent> entity, TimeSpan? time, bool refresh, bool autoStand, bool drop)
++    {
+         // Initialize our component with the relevant data we need if we don't have it
+-        if (EnsureComp<KnockedDownComponent>(uid, out var component))
++        if (EnsureComp<KnockedDownComponent>(entity, out var component))
+         {
+-            RefreshKnockedMovement((uid, component));
+-            CancelKnockdownDoAfter((uid, component));
++            RefreshKnockedMovement((entity, component));
++            CancelKnockdownDoAfter((entity, component));
+         }
+         else
+         {
+@@ -191,126 +218,86 @@ public bool TryKnockdown(EntityUid uid, TimeSpan time, bool refresh, bool autoSt
+             if (drop)
+             {
+                 var ev = new DropHandItemsEvent();
+-                RaiseLocalEvent(uid, ref ev);
++                RaiseLocalEvent(entity, ref ev);
+             }
+ 
+             // Only update Autostand value if it's our first time being knocked down...
+-            SetAutoStand((uid, component), evAttempt.AutoStand);
++            SetAutoStand((entity, component), autoStand);
+         }
+ 
+         var knockedEv = new KnockedDownEvent(time);
+-        RaiseLocalEvent(uid, ref knockedEv);
+-
+-        UpdateKnockdownTime((uid, component), knockedEv.Time, refresh);
++        RaiseLocalEvent(entity, ref knockedEv);
+ 
+-        Alerts.ShowAlert(uid, KnockdownAlert, null, (GameTiming.CurTime, component.NextUpdate));
+-
+-        _adminLogger.Add(LogType.Stamina, LogImpact.Medium, $"{ToPrettyString(uid):user} knocked down for {time.Seconds} seconds");
++        if (time != null)
++        {
++            UpdateKnockdownTime((entity, component), time.Value, refresh);
++            _adminLogger.Add(LogType.Stamina, LogImpact.Medium, $"{ToPrettyString(entity):user} knocked down for {time.Value.Seconds} seconds");
++        }
++        else
++            _adminLogger.Add(LogType.Stamina, LogImpact.Medium, $"{ToPrettyString(entity):user} knocked down for an indefinite amount of time");
+ 
+-        return true;
++        Alerts.ShowAlert(entity, KnockdownAlert, null, (GameTiming.CurTime, component.NextUpdate));
+     }
+ 
+-    /// <summary>
+-    ///     Applies knockdown and stun to the entity temporarily.
+-    /// </summary>
+-    public bool TryParalyze(EntityUid uid, TimeSpan time, bool refresh,
+-        StatusEffectsComponent? status = null)
++    public bool TryAddParalyzeDuration(EntityUid uid, TimeSpan duration)
+     {
+-        if (!Resolve(uid, ref status, false))
+-            return false;
++        var knockdown = TryAddKnockdownDuration(uid, duration);
++        var stunned = TryAddStunDuration(uid, duration);
+ 
+-        return TryKnockdown(uid, time, refresh) && TryStun(uid, time, refresh, status);
++        return knockdown || stunned;
+     }
+ 
+-    /// <summary>
+-    ///     Slows down the mob's walking/running speed temporarily
+-    /// </summary>
+-    public bool TrySlowdown(EntityUid uid, TimeSpan time, bool refresh,
+-        float walkSpeedMod = 1f, float sprintSpeedMod = 1f,
+-        StatusEffectsComponent? status = null)
++    public bool TryUpdateParalyzeDuration(EntityUid uid, TimeSpan? duration)
+     {
+-        if (!Resolve(uid, ref status, false))
+-            return false;
+-
+-        if (time <= TimeSpan.Zero)
+-            return false;
++        var knockdown = TryUpdateKnockdownDuration(uid, duration);
++        var stunned = TryUpdateStunDuration(uid, duration);
+ 
+-        if (_statusEffect.TryAddStatusEffect<SlowedDownComponent>(uid, "SlowedDown", time, refresh, status))
+-        {
+-            var slowed = Comp<SlowedDownComponent>(uid);
+-            // Doesn't make much sense to have the "TrySlowdown" method speed up entities now does it?
+-            walkSpeedMod = Math.Clamp(walkSpeedMod, 0f, 1f);
+-            sprintSpeedMod = Math.Clamp(sprintSpeedMod, 0f, 1f);
+-
+-            slowed.WalkSpeedModifier *= walkSpeedMod;
+-            slowed.SprintSpeedModifier *= sprintSpeedMod;
++        return knockdown || stunned;
++    }
+ 
+-            _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
++    public bool TryUnstun(Entity<StunnedComponent?> entity)
++    {
++        if (!Resolve(entity, ref entity.Comp, logMissing: false))
+             return true;
+-        }
+ 
+-        return false;
++        var ev = new StunEndAttemptEvent();
++        RaiseLocalEvent(entity, ref ev);
++
++        return !ev.Cancelled && RemComp<StunnedComponent>(entity);
+     }
+ 
+-    /// <summary>
+-    /// Updates the movement speed modifiers of an entity by applying or removing the <see cref="SlowedDownComponent"/>.
+-    /// If both walk and run modifiers are approximately 1 (i.e. normal speed) and <see cref="StaminaComponent.StaminaDamage"/> is 0,
+-    /// or if the both modifiers are 0, the slowdown component is removed to restore normal movement.
+-    /// Otherwise, the slowdown component is created or updated with the provided modifiers,
+-    /// and the movement speed is refreshed accordingly.
+-    /// </summary>
+-    /// <param name="ent">Entity whose movement speed should be updated.</param>
+-    /// <param name="walkSpeedModifier">New walk speed modifier. Default is 1f (normal speed).</param>
+-    /// <param name="runSpeedModifier">New run (sprint) speed modifier. Default is 1f (normal speed).</param>
+-    public void UpdateStunModifiers(Entity<StaminaComponent?> ent,
+-        float walkSpeedModifier = 1f,
+-        float runSpeedModifier = 1f)
++    private void OnStunEffectApplied(Entity<StunnedStatusEffectComponent> entity, ref StatusEffectAppliedEvent args)
+     {
+-        if (!Resolve(ent, ref ent.Comp))
+-            return;
+-
+-        if (
+-            (MathHelper.CloseTo(walkSpeedModifier, 1f) && MathHelper.CloseTo(runSpeedModifier, 1f) && ent.Comp.StaminaDamage == 0f) ||
+-            (walkSpeedModifier == 0f && runSpeedModifier == 0f)
+-        )
+-        {
+-            RemComp<SlowedDownComponent>(ent);
++        if (GameTiming.ApplyingState)
+             return;
+-        }
+-
+-        EnsureComp<SlowedDownComponent>(ent, out var comp);
+-
+-        comp.WalkSpeedModifier = walkSpeedModifier;
+-
+-        comp.SprintSpeedModifier = runSpeedModifier;
+-
+-        _movementSpeedModifier.RefreshMovementSpeedModifiers(ent);
+ 
+-        Dirty(ent);
++        EnsureComp<StunnedComponent>(args.Target);
+     }
+ 
+-    /// <summary>
+-    /// A convenience overload of <see cref="UpdateStunModifiers(EntityUid, float, float, StaminaComponent?)"/> that sets both
+-    /// walk and run speed modifiers to the same value.
+-    /// </summary>
+-    /// <param name="ent">Entity whose movement speed should be updated.</param>
+-    /// <param name="speedModifier">New walk and run speed modifier. Default is 1f (normal speed).</param>
+-    /// <param name="component">
+-    /// Optional <see cref="StaminaComponent"/> of the entity.
+-    /// </param>
+-    public void UpdateStunModifiers(Entity<StaminaComponent?> ent, float speedModifier = 1f)
++    private void OnStunStatusRemoved(Entity<StunnedStatusEffectComponent> entity, ref StatusEffectRemovedEvent args)
+     {
+-        UpdateStunModifiers(ent, speedModifier, speedModifier);
++        TryUnstun(args.Target);
+     }
+ 
+-    #region friction and movement listeners
+-
+-    private void OnRefreshMovespeed(EntityUid ent, SlowedDownComponent comp, RefreshMovementSpeedModifiersEvent args)
++    private void OnStunEndAttempt(Entity<StunnedStatusEffectComponent> entity, ref StatusEffectRelayedEvent<StunEndAttemptEvent> args)
+     {
+-        args.ModifySpeed(comp.WalkSpeedModifier, comp.SprintSpeedModifier);
++        if (args.Args.Cancelled)
++            return;
++
++        var ev = args.Args;
++        ev.Cancelled = true;
++        args.Args = ev;
+     }
+ 
+-    #endregion
++    private void OnStandUpAttempt(Entity<KnockdownStatusEffectComponent> entity, ref StatusEffectRelayedEvent<StandUpAttemptEvent> args)
++    {
++        if (args.Args.Cancelled)
++            return;
++
++        var ev = args.Args;
++        ev.Cancelled = true;
++        args.Args = ev;
++    }
+ 
+     #region Attempt Event Handling
+ 
diff --git a/Content.Shared/Stunnable/StunnedComponent.cs b/Content.Shared/Stunnable/StunnedComponent.cs
index 6b66c07f6f27..932af451c1d6 100644
--- a/Content.Shared/Stunnable/StunnedComponent.cs
+++ b/Content.Shared/Stunnable/StunnedComponent.cs
@@ -13,5 +13,8 @@
 
 namespace Content.Shared.Stunnable;
 
+/// <summary>
+/// This is used to temporarily prevent an entity from moving or acting.
+/// </summary>
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedStunSystem))]
 public sealed partial class StunnedComponent : Component;
diff --git a/Content.Shared/Stunnable/StunnedStatusEffectComponent.cs b/Content.Shared/Stunnable/StunnedStatusEffectComponent.cs
new file mode 100644
index 000000000000..62b34967e5c5
--- /dev/null
+++ b/Content.Shared/Stunnable/StunnedStatusEffectComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Stunnable;
+
+/// <summary>
+/// Stun as a status effect.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedStunSystem))]
+public sealed partial class StunnedStatusEffectComponent : Component;
diff --git a/Content.Shared/Tiles/ProtectedGridSystem.cs b/Content.Shared/Tiles/ProtectedGridSystem.cs
index 0d6f5b7a6dae..f90b0a52de4f 100644
--- a/Content.Shared/Tiles/ProtectedGridSystem.cs
+++ b/Content.Shared/Tiles/ProtectedGridSystem.cs
@@ -62,7 +62,7 @@ private void OnFloorTileAttempt(Entity<ProtectedGridComponent> ent, ref FloorTil
             return;
         }
 
-        if (SharedMapSystem.FromBitmask(args.GridIndices, data))
+        if (!SharedMapSystem.FromBitmask(args.GridIndices, data))
         {
             args.Cancelled = true;
         }
diff --git a/Content.Shared/Timing/UseDelaySystem.cs b/Content.Shared/Timing/UseDelaySystem.cs
index 87acef383c99..6907527c8022 100644
--- a/Content.Shared/Timing/UseDelaySystem.cs
+++ b/Content.Shared/Timing/UseDelaySystem.cs
@@ -24,7 +24,7 @@ public sealed class UseDelaySystem : EntitySystem
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly MetaDataSystem _metadata = default!;
 
-    private const string DefaultId = "default";
+    public const string DefaultId = "default";
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Tools/Components/WelderComponent.cs.rej b/Content.Shared/Tools/Components/WelderComponent.cs.rej
new file mode 100644
index 000000000000..28a2441a6811
--- /dev/null
+++ b/Content.Shared/Tools/Components/WelderComponent.cs.rej
@@ -0,0 +1,90 @@
+diff a/Content.Shared/Tools/Components/WelderComponent.cs b/Content.Shared/Tools/Components/WelderComponent.cs	(rejected hunks)
+@@ -1,58 +1,76 @@
+-using Content.Shared.Chemistry.Components;
+ using Content.Shared.Chemistry.Reagent;
+ using Content.Shared.FixedPoint;
+ using Content.Shared.Tools.Systems;
+ using Robust.Shared.Audio;
+ using Robust.Shared.GameStates;
+ using Robust.Shared.Prototypes;
++using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+ 
+ namespace Content.Shared.Tools.Components;
+ 
+-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), Access(typeof(SharedToolSystem))]
++/// <summary>
++/// Handles fuel consumption for the tool and allows it to explode welding fuel tanks.
++/// </summary>
++/// <summary>
++/// TODO: De-hardcode welder bombing.
++/// </summary>
++[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), AutoGenerateComponentPause]
++[Access(typeof(SharedToolSystem))]
+ public sealed partial class WelderComponent : Component
+ {
++    /// <summary>
++    /// Is the welder currently enabled?
++    /// </summary>
+     [DataField, AutoNetworkedField]
+     public bool Enabled;
+ 
++    /// <summary>
++    /// Timestamp for the next update loop update.
++    /// </summary>
++    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
++    [AutoNetworkedField, AutoPausedField]
++    public TimeSpan NextUpdate;
++
++    /// <summary>
++    /// Delay between updates.
++    /// </summary>
+     [DataField]
+-    public float WelderTimer;
++    public TimeSpan WelderUpdateTimer = TimeSpan.FromSeconds(1);
+ 
+     /// <summary>
+-    ///     Name of <see cref="FuelSolution"/>.
++    /// Name of the fuel solution.
+     /// </summary>
+     [DataField]
+     public string FuelSolutionName = "Welder";
+ 
+     /// <summary>
+-    ///     Reagent that will be used as fuel for welding.
++    /// Reagent that will be used as fuel for welding.
+     /// </summary>
+     [DataField]
+     public ProtoId<ReagentPrototype> FuelReagent = "WeldingFuel";
+ 
+     /// <summary>
+-    ///     Fuel consumption per second while the welder is active.
++    /// Fuel consumption per second while the welder is active.
++    /// In u/s
+     /// </summary>
+     [DataField, AutoNetworkedField]
+     public FixedPoint2 FuelConsumption = FixedPoint2.New(1.0f);
+ 
+     /// <summary>
+-    ///     A fuel amount to be consumed when the welder goes from being unlit to being lit.
++    /// A fuel amount to be consumed when the welder goes from being unlit to being lit.
+     /// </summary>
+     [DataField, AutoNetworkedField]
+     public FixedPoint2 FuelLitCost = FixedPoint2.New(0.5f);
+ 
+     /// <summary>
+-    ///     Sound played when refilling the welder.
++    /// Sound played when refilling the welder.
+     /// </summary>
+     [DataField]
+     public SoundSpecifier WelderRefill = new SoundPathSpecifier("/Audio/Effects/refill.ogg");
+ 
+     /// <summary>
+-    ///     Whether the item is safe to refill while lit without exploding the tank.
++    /// Whether the item is safe to refill while lit without exploding the tank.
+     /// </summary>
+     [DataField]
+     public bool TankSafe;
+-
+-    [DataField]
+-    public float WelderUpdateTimer = 1f;
+ }
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs b/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs
index 0f9e8f92f59e..749b06f7c594 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs
@@ -26,13 +26,16 @@ public abstract partial class SharedToolSystem
 
     public void InitializeWelder()
     {
+        SubscribeLocalEvent<WelderComponent, MapInitEvent>(OnWelderInit);
         SubscribeLocalEvent<WelderComponent, ExaminedEvent>(OnWelderExamine);
         SubscribeLocalEvent<WelderComponent, AfterInteractEvent>(OnWelderAfterInteract);
 
-        SubscribeLocalEvent<WelderComponent, ToolUseAttemptEvent>((uid, comp, ev) => {
+        SubscribeLocalEvent<WelderComponent, ToolUseAttemptEvent>((uid, comp, ev) =>
+        {
             CanCancelWelderUse((uid, comp), ev.User, ev.Fuel, ev);
         });
-        SubscribeLocalEvent<WelderComponent, DoAfterAttemptEvent<ToolDoAfterEvent>>((uid, comp, ev) => {
+        SubscribeLocalEvent<WelderComponent, DoAfterAttemptEvent<ToolDoAfterEvent>>((uid, comp, ev) =>
+        {
             CanCancelWelderUse((uid, comp), ev.Event.User, ev.Event.Fuel, ev);
         });
         SubscribeLocalEvent<WelderComponent, ToolDoAfterEvent>(OnWelderDoAfter);
@@ -80,6 +83,12 @@ public void TurnOff(Entity<WelderComponent> entity, EntityUid? user)
         return (fuelSolution.GetTotalPrototypeQuantity(welder.FuelReagent), fuelSolution.MaxVolume);
     }
 
+    private void OnWelderInit(Entity<WelderComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextUpdate = _timing.CurTime + ent.Comp.WelderUpdateTimer;
+        Dirty(ent);
+    }
+
     private void OnWelderExamine(Entity<WelderComponent> entity, ref ExaminedEvent args)
     {
         using (args.PushGroup(nameof(WelderComponent)))
@@ -178,7 +187,8 @@ private void OnToggle(Entity<WelderComponent> entity, ref ItemToggledEvent args)
 
     private void OnActivateAttempt(Entity<WelderComponent> entity, ref ItemToggleActivateAttemptEvent args)
     {
-        if (args.User != null && !_actionBlocker.CanComplexInteract(args.User.Value)) {
+        if (args.User != null && !_actionBlocker.CanComplexInteract(args.User.Value))
+        {
             args.Cancelled = true;
             return;
         }
@@ -200,9 +210,34 @@ private void OnActivateAttempt(Entity<WelderComponent> entity, ref ItemToggleAct
 
     private void OnDeactivateAttempt(Entity<WelderComponent> entity, ref ItemToggleDeactivateAttemptEvent args)
     {
-        if (args.User != null && !_actionBlocker.CanComplexInteract(args.User.Value)) {
+        if (args.User != null && !_actionBlocker.CanComplexInteract(args.User.Value))
+        {
             args.Cancelled = true;
-            return;
+        }
+    }
+
+    private void UpdateWelders()
+    {
+        var query = EntityQueryEnumerator<WelderComponent, SolutionContainerManagerComponent>();
+        var curTime = _timing.CurTime;
+        while (query.MoveNext(out var uid, out var welder, out var solutionContainer))
+        {
+            if (curTime < welder.NextUpdate)
+                continue;
+
+            welder.NextUpdate += welder.WelderUpdateTimer;
+            Dirty(uid, welder);
+
+            if (!welder.Enabled)
+                continue;
+
+            if (!SolutionContainerSystem.TryGetSolution((uid, solutionContainer), welder.FuelSolutionName, out var solutionComp, out var solution))
+                continue;
+
+            SolutionContainerSystem.RemoveReagent(solutionComp.Value, welder.FuelReagent, welder.FuelConsumption * welder.WelderUpdateTimer.TotalSeconds);
+
+            if (solution.GetTotalPrototypeQuantity(welder.FuelReagent) <= FixedPoint2.Zero)
+                ItemToggle.Toggle(uid);
         }
     }
 }
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.cs b/Content.Shared/Tools/Systems/SharedToolSystem.cs
index a82cd7bf8df9..89c9227679cf 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.cs
@@ -90,12 +90,14 @@
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Tools.Systems;
 
 public abstract partial class SharedToolSystem : EntitySystem
 {
+    [Dependency] private   readonly IGameTiming _timing = default!;
     [Dependency] private   readonly IMapManager _mapManager = default!;
     [Dependency] private   readonly IPrototypeManager _protoMan = default!;
     [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!;
@@ -345,6 +347,13 @@ private bool CanStartToolUse(EntityUid tool, EntityUid user, EntityUid? target,
         return !beforeAttempt.Cancelled;
     }
 
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        UpdateWelders();
+    }
+
     #region DoAfterEvents
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Trigger/Components/ActiveTimerTriggerComponent.cs b/Content.Shared/Trigger/Components/ActiveTimerTriggerComponent.cs
new file mode 100644
index 000000000000..d7da5cecdeb4
--- /dev/null
+++ b/Content.Shared/Trigger/Components/ActiveTimerTriggerComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components;
+
+/// <summary>
+/// Component used for tracking active timers triggers.
+/// Used internally for performance reasons.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ActiveTimerTriggerComponent : Component;
diff --git a/Content.Shared/Trigger/Components/ActiveTwoStageTriggerComponent.cs b/Content.Shared/Trigger/Components/ActiveTwoStageTriggerComponent.cs
new file mode 100644
index 000000000000..bddbbd402e12
--- /dev/null
+++ b/Content.Shared/Trigger/Components/ActiveTwoStageTriggerComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components;
+
+/// <summary>
+/// Component used for tracking active two-stage triggers.
+/// Used internally for performance reasons.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ActiveTwoStageTriggerComponent : Component;
diff --git a/Content.Shared/Trigger/Components/Conditions/BaseTriggerConditionComponent.cs b/Content.Shared/Trigger/Components/Conditions/BaseTriggerConditionComponent.cs
new file mode 100644
index 000000000000..7e77c99d93a3
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Conditions/BaseTriggerConditionComponent.cs
@@ -0,0 +1,15 @@
+using Content.Shared.Trigger.Systems;
+
+namespace Content.Shared.Trigger.Components.Conditions;
+
+/// <summary>
+/// Base class for components that add a condition to triggers.
+/// </summary>
+public abstract partial class BaseTriggerConditionComponent : Component
+{
+    /// <summary>
+    /// The keys that are checked for the condition.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public HashSet<string> Keys = new() { TriggerSystem.DefaultTriggerKey };
+}
diff --git a/Content.Shared/Trigger/Components/Conditions/ToggleTriggerConditionComponent.cs b/Content.Shared/Trigger/Components/Conditions/ToggleTriggerConditionComponent.cs
new file mode 100644
index 000000000000..478f06602dc2
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Conditions/ToggleTriggerConditionComponent.cs
@@ -0,0 +1,34 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Conditions;
+
+/// <summary>
+/// Adds an alt verb that can be used to toggle a trigger.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ToggleTriggerConditionComponent : BaseTriggerConditionComponent
+{
+    /// <summary>
+    /// Is the component currently enabled?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Enabled = true;
+
+    /// <summary>
+    /// The text of the toggle verb.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId ToggleVerb = "toggle-trigger-condition-default-verb";
+
+    /// <summary>
+    /// The popup to show when toggled on.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId ToggleOn = "toggle-trigger-condition-default-on";
+
+    /// <summary>
+    /// The popup to show when toggled off.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId ToggleOff = "toggle-trigger-condition-default-off";
+}
diff --git a/Content.Shared/Trigger/Components/Conditions/UseDelayTriggerConditionComponent.cs b/Content.Shared/Trigger/Components/Conditions/UseDelayTriggerConditionComponent.cs
new file mode 100644
index 000000000000..70a331227e4f
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Conditions/UseDelayTriggerConditionComponent.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Timing;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Conditions;
+
+/// <summary>
+/// Checks if the triggered entity has an active UseDelay.
+/// </summary>
+/// <remarks>
+/// TODO: Support specific UseDelay IDs for each trigger key.
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class UseDelayTriggerConditionComponent : BaseTriggerConditionComponent
+{
+    /// <summary>
+    /// Checks if the triggered entity has an active UseDelay.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string UseDelayId = UseDelaySystem.DefaultId;
+}
diff --git a/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs b/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs
new file mode 100644
index 000000000000..a2779f79c6f9
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs
@@ -0,0 +1,24 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Conditions;
+
+/// <summary>
+/// Checks if the user of a trigger satisfies a whitelist and blacklist condition for the triggered entity or the one triggering it.
+/// Cancels the trigger otherwise.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class WhitelistTriggerConditionComponent : BaseTriggerConditionComponent
+{
+    /// <summary>
+    /// Whitelist for what entites can cause this trigger.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? UserWhitelist;
+
+    /// <summary>
+    /// Blacklist for what entites can cause this trigger.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? UserBlacklist;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/AddComponentsOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/AddComponentsOnTriggerComponent.cs
new file mode 100644
index 000000000000..06f5258fbef7
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/AddComponentsOnTriggerComponent.cs
@@ -0,0 +1,37 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Adds the specified components when triggered.
+/// If TargetUser is true they will be added to the user.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class AddComponentsOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The list of components that will be added.
+    /// </summary>
+    [DataField(required: true)]
+    public ComponentRegistry Components = new();
+
+    /// <summary>
+    /// If this component has been triggered at least once already.
+    /// If this is true the components have been added.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Triggered = false;
+
+    /// <summary>
+    /// If this effect can only be triggered once.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool TriggerOnce = false;
+
+    /// <summary>
+    /// Should components that already exist on the entity be overwritten?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool RemoveExisting = false;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/AlertLevelChangeOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/AlertLevelChangeOnTriggerComponent.cs
new file mode 100644
index 000000000000..0d161344d8c0
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/AlertLevelChangeOnTriggerComponent.cs
@@ -0,0 +1,34 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Changes the alert level of the station when triggered.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class AlertLevelChangeOnTriggerComponent : BaseXOnTriggerComponent
+{
+    ///<summary>
+    /// The alert level to change to when triggered.
+    ///</summary>
+    [DataField, AutoNetworkedField]
+    public string Level = "blue";
+
+    /// <summary>
+    /// Whether to play the sound when the alert level changes.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool PlaySound = true;
+
+    /// <summary>
+    /// Whether to say the announcement when the alert level changes.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Announce = true;
+
+    /// <summary>
+    /// Force the alert change. This applies if the alert level is not selectable or not.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Force = false;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/AnchorOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/AnchorOnTriggerComponent.cs
new file mode 100644
index 000000000000..ed61876f1564
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/AnchorOnTriggerComponent.cs
@@ -0,0 +1,34 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will (un)anchor the entity when triggered.
+/// If TargetUser is true they will be (un)anchored instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class AnchorOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Anchor the entity on trigger if it is currently unanchored?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CanAnchor = true;
+
+    /// <summary>
+    /// Unanchor the entity on trigger if it is currently anchored?
+    /// If both this and CanAnchor are true then the trigger will toggle between states.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CanUnanchor = false;
+
+    /// <summary>
+    /// Removes this component when triggered so it can only be activated once.
+    /// </summary>
+    /// <remarks>
+    /// TODO: Make this a generic thing for all triggers.
+    /// Or just add a RemoveComponentsOnTriggerComponent.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public bool RemoveOnTrigger = true;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/BaseXOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/BaseXOnTriggerComponent.cs
new file mode 100644
index 000000000000..cf93ad6c4a9c
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/BaseXOnTriggerComponent.cs
@@ -0,0 +1,22 @@
+using Content.Shared.Trigger.Systems;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Base class for components that do something when triggered.
+/// </summary>
+public abstract partial class BaseXOnTriggerComponent : Component
+{
+    /// <summary>
+    /// The keys that will activate the effect.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public HashSet<string> KeysIn = new() { TriggerSystem.DefaultTriggerKey };
+
+    /// <summary>
+    /// Set to true to make the user of the trigger the effect target.
+    /// Set to false to make the owner of this component the target.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool TargetUser = false;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/DamageOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/DamageOnTriggerComponent.cs
new file mode 100644
index 000000000000..8d35b019b4f1
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/DamageOnTriggerComponent.cs
@@ -0,0 +1,25 @@
+using Content.Shared.Damage;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will damage an entity when triggered.
+/// If TargetUser is true it the user will take damage instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class DamageOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Should the damage ignore resistances?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool IgnoreResistances;
+
+    /// <summary>
+    /// The base damage amount that is dealt.
+    /// May be further modified by <see cref="Systems.BeforeDamageOnTriggerEvent"/> subscriptions.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public DamageSpecifier Damage = default!;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/DeleteOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/DeleteOnTriggerComponent.cs
new file mode 100644
index 000000000000..9d0a5b751764
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/DeleteOnTriggerComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will delete the entity when triggered.
+/// If TargetUser is true it will delete them instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class DeleteOnTriggerComponent : BaseXOnTriggerComponent;
diff --git a/Content.Shared/Trigger/Components/Effects/EmitSoundOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/EmitSoundOnTriggerComponent.cs
new file mode 100644
index 000000000000..f3870225e204
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/EmitSoundOnTriggerComponent.cs
@@ -0,0 +1,31 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will play a sound in PVS range when triggered.
+/// If TargetUser is true it will be played at their position.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class EmitSoundOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The <see cref="SoundSpecifier"/> to play.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public SoundSpecifier? Sound;
+
+    /// <summary>
+    /// Play the sound at the position instead of parented to the source entity.
+    /// Useful if the entity is deleted after.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Positional;
+
+    /// <summary>
+    /// Should this sound be predicted for the User?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Predicted;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/EmpOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/EmpOnTriggerComponent.cs
new file mode 100644
index 000000000000..327e9f57db19
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/EmpOnTriggerComponent.cs
@@ -0,0 +1,29 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will cause an EMP at the entity's location when triggered.
+/// If TargetUser is true then it will be spawned at their position.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class EmpOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// EMP range.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Range = 1.0f;
+
+    /// <summary>
+    /// How much energy (in Joules) will be consumed per battery in range.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float EnergyConsumption;
+
+    /// <summary>
+    /// How long it disables targets.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan DisableDuration = TimeSpan.FromSeconds(60);
+}
diff --git a/Content.Shared/Trigger/Components/Effects/ExplodeOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/ExplodeOnTriggerComponent.cs
new file mode 100644
index 000000000000..2a1af40a2cd5
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/ExplodeOnTriggerComponent.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will explode using the entity's <see cref="ExplosiveComponent"/> when triggered.
+/// TargetUser will only work of the user has ExplosiveComponent as well.
+/// The User will be logged in the admin logs.
+/// </summary>
+/// <summary>
+/// TODO: Allow this to work without an ExplosiveComponent on the user via QueueExplosion.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ExplodeOnTriggerComponent : BaseXOnTriggerComponent;
diff --git a/Content.Shared/Trigger/Components/Effects/FlashOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/FlashOnTriggerComponent.cs
new file mode 100644
index 000000000000..8b75417031fd
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/FlashOnTriggerComponent.cs
@@ -0,0 +1,29 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will cause a flash in an area around the entity when triggered.
+/// If TargetUser is true then their location will be used.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class FlashOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The range in which to flash entities in.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Range = 1.0f;
+
+    /// <summary>
+    /// The duration of the status effect.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan Duration = TimeSpan.FromSeconds(8);
+
+    /// <summary>
+    /// The probability to apply the status effect.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Probability = 1.0f;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/GhostKickOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/GhostKickOnTriggerComponent.cs
new file mode 100644
index 000000000000..16c1365c0503
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/GhostKickOnTriggerComponent.cs
@@ -0,0 +1,19 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will kick a player from the server as if their connection dropped if triggered.
+/// Yes, really. Don't use this component.
+/// If TargetUser is true then the user of the trigger will be kicked, otherwise the entity itself.
+/// <see cref="Server.GhostKick.GhostKickManager"/>
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class GhostKickOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The reason that will be displayed in the server log when a player is kicked.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId Reason = "ghost-kick-on-trigger-default";
+}
diff --git a/Content.Shared/Trigger/Components/Effects/GibOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/GibOnTriggerComponent.cs
new file mode 100644
index 000000000000..b3475ac447ef
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/GibOnTriggerComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will gib the entity when triggered.
+/// If TargetUser is true the user will be gibbed instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class GibOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Should gibbing also delete the owners items?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool DeleteItems = false;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/IgniteOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/IgniteOnTriggerComponent.cs
new file mode 100644
index 000000000000..36273ef1b216
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/IgniteOnTriggerComponent.cs
@@ -0,0 +1,27 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will ignite for a certain length of time when triggered.
+/// Requires <see cref="IgnitionSourceComponent"/> along with triggering components.
+/// The if TargetUser is true they will be ignited instead (they need IgnitionSourceComponent as well).
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class IgniteOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Once ignited, the time it will unignite at.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan IgnitedUntil = TimeSpan.Zero;
+
+    /// <summary>
+    /// How long the ignition source is active for after triggering.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan IgnitedTime = TimeSpan.FromSeconds(0.5);
+}
diff --git a/Content.Shared/Trigger/Components/Effects/ItemToggleOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/ItemToggleOnTriggerComponent.cs
new file mode 100644
index 000000000000..4c5360f4d230
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/ItemToggleOnTriggerComponent.cs
@@ -0,0 +1,37 @@
+using Content.Shared.Item.ItemToggle.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will toggle an item when triggered. Requires <see cref="ItemToggleComponent"/>.
+/// If TargetUser is true and they have that component they will be toggled instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ItemToggleOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Can the item be toggled on using the trigger?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CanActivate = true;
+
+    /// <summary>
+    /// Can the item be toggled on using the trigger?
+    /// If both this and CanActivate are true then the trigger will toggle between states.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CanDeactivate = true;
+
+    /// <summary>
+    /// Can the audio and popups be predicted?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Predicted = true;
+
+    /// <summary>
+    /// Show a popup to the user when toggling the item?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool ShowPopup = true;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/PolymorphOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/PolymorphOnTriggerComponent.cs
new file mode 100644
index 000000000000..3d2021e42569
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/PolymorphOnTriggerComponent.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Polymorph;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Polymorphs the enity when triggered.
+/// If TargetUser is true it will polymorph the user instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class PolymorphOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Polymorph settings.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<PolymorphPrototype> Polymorph;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/RattleOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/RattleOnTriggerComponent.cs
new file mode 100644
index 000000000000..599a64339a16
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/RattleOnTriggerComponent.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Mobs;
+using Content.Shared.Radio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Sends an emergency message over coms when triggered giving information about the entity's mob status.
+/// If TargetUser is true then the user's mob state will be used instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class RattleOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The radio channel the message will be sent to.
+    /// </summary>
+    [DataField]
+    public ProtoId<RadioChannelPrototype> RadioChannel = "Syndicate";
+
+    /// <summary>
+    /// The message to be send depending on the target's current mob state.
+    /// </summary>
+    [DataField]
+    public Dictionary<MobState, LocId> Messages = new()
+    {
+        {MobState.Critical, "deathrattle-implant-critical-message"},
+        {MobState.Dead, "deathrattle-implant-dead-message"}
+    };
+}
diff --git a/Content.Shared/Explosion/Components/OnTrigger/ReleaseGasOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/ReleaseGasOnTriggerComponent.cs
similarity index 90%
rename from Content.Shared/Explosion/Components/OnTrigger/ReleaseGasOnTriggerComponent.cs
rename to Content.Shared/Trigger/Components/Effects/ReleaseGasOnTriggerComponent.cs
index 28a5c5cf8135..4edd5f83f440 100644
--- a/Content.Shared/Explosion/Components/OnTrigger/ReleaseGasOnTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/Effects/ReleaseGasOnTriggerComponent.cs
@@ -1,18 +1,16 @@
 using Content.Shared.Atmos;
-using Content.Shared.Explosion.EntitySystems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Shared.Explosion.Components.OnTrigger;
+namespace Content.Shared.Trigger.Components.Effects;
 
 /// <summary>
 /// Contains a GasMixture that will release its contents to the atmosphere when triggered.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentPause]
-[Access(typeof(SharedReleaseGasOnTriggerSystem))]
-public sealed partial class ReleaseGasOnTriggerComponent : Component
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class ReleaseGasOnTriggerComponent : BaseXOnTriggerComponent
 {
     /// <summary>
     /// Whether this grenade is active and releasing gas.
diff --git a/Content.Shared/Explosion/Components/OnTrigger/SharedRepulseAttractOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/RepulseAttractOnTriggerComponent.cs
similarity index 57%
rename from Content.Shared/Explosion/Components/OnTrigger/SharedRepulseAttractOnTriggerComponent.cs
rename to Content.Shared/Trigger/Components/Effects/RepulseAttractOnTriggerComponent.cs
index 43febff03bd7..68af0bb544f8 100644
--- a/Content.Shared/Explosion/Components/OnTrigger/SharedRepulseAttractOnTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/Effects/RepulseAttractOnTriggerComponent.cs
@@ -1,37 +1,39 @@
 using Content.Shared.Physics;
 using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
 
-namespace Content.Shared.Explosion.Components.OnTrigger;
+namespace Content.Shared.Trigger.Components.Effects;
 
 /// <summary>
-/// Generates a gravity pulse/repulse using the RepulseAttractComponent when the entity is triggered
+/// Generates a gravity pulse/repulse using the RepulseAttractComponent around the entity when triggered.
+/// If TargetUser is true their location will be used instead.
 /// </summary>
-[RegisterComponent]
-public sealed partial class SharedRepulseAttractOnTriggerComponent : Component
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class RepulseAttractOnTriggerComponent : BaseXOnTriggerComponent
 {
     /// <summary>
     /// How fast should the Repulsion/Attraction be?
-    /// A positive value will repulse objects, a negative value will attract
+    /// A positive value will repulse objects, a negative value will attract.
     /// </summary>
-    [DataField]
-    public float Speed;
+    [DataField, AutoNetworkedField]
+    public float Speed = 5.0f;
 
     /// <summary>
     /// How close do the entities need to be?
     /// </summary>
-    [DataField]
-    public float Range;
+    [DataField, AutoNetworkedField]
+    public float Range = 5.0f;
 
     /// <summary>
     /// What kind of entities should this effect apply to?
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public EntityWhitelist? Whitelist;
 
     /// <summary>
     /// What collision layers should be excluded?
     /// The default excludes ghost mobs, revenants, the AI camera etc.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public CollisionGroup CollisionMask = CollisionGroup.GhostImpassable;
 }
diff --git a/Content.Shared/Trigger/Components/Effects/ShockOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/ShockOnTriggerComponent.cs
new file mode 100644
index 000000000000..e7da7a3801c1
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/ShockOnTriggerComponent.cs
@@ -0,0 +1,34 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will electrocute the entity when triggered.
+/// If TargetUser is true it will electrocute the user instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ShockOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Electrocute entity containing this entity instead (for example for wearable clothing).
+    /// Has priority over TargetUser.
+    /// </summary>
+    /// <remarks>
+    /// TODO: Make this more generic so it can be used for all triggers.
+    /// Maybe a BeforeTriggerEvent where we modify the target.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public bool TargetContainer;
+
+    /// <summary>
+    /// The force of an electric shock when the trigger is triggered.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int Damage = 5;
+
+    /// <summary>
+    /// Duration of electric shock when the trigger is triggered.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan Duration = TimeSpan.FromSeconds(2);
+}
diff --git a/Content.Shared/Trigger/Components/Effects/SignalOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/SignalOnTriggerComponent.cs
new file mode 100644
index 000000000000..0698f2ca3317
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/SignalOnTriggerComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.DeviceLinking;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Sends a device link signal when triggered.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class SignalOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The port that gets signaled when the switch turns on.
+    /// </summary>
+    [DataField]
+    public ProtoId<SourcePortPrototype> Port = "Trigger";
+}
diff --git a/Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/SmokeOnTriggerComponent.cs
similarity index 100%
rename from Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs
rename to Content.Shared/Trigger/Components/Effects/SmokeOnTriggerComponent.cs
diff --git a/Content.Shared/Trigger/Components/Effects/SmokeOnTriggerComponent.cs.rej b/Content.Shared/Trigger/Components/Effects/SmokeOnTriggerComponent.cs.rej
new file mode 100644
index 000000000000..b0fe3d092f79
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/SmokeOnTriggerComponent.cs.rej
@@ -0,0 +1,54 @@
+diff a/Content.Shared/Trigger/Components/Effects/SmokeOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/SmokeOnTriggerComponent.cs	(rejected hunks)
+@@ -1,34 +1,34 @@
+-using Content.Shared.Explosion.EntitySystems;
+ using Content.Shared.Chemistry.Components;
+ using Robust.Shared.GameStates;
+ using Robust.Shared.Prototypes;
+ 
+-namespace Content.Shared.Explosion.Components;
++namespace Content.Shared.Trigger.Components.Effects;
+ 
+ /// <summary>
+ /// Creates a smoke cloud when triggered, with an optional solution to include in it.
+-/// No sound is played incase a grenade is stealthy, use <see cref="SoundOnTriggerComponent"/> if you want a sound.
++/// No sound is played incase a grenade is stealthy, use <see cref="EmitSoundOnTriggerComponent"/> if you want a sound.
++/// If TargetUser is true the smoke is spawned at their location.
+ /// </summary>
+-[RegisterComponent, NetworkedComponent, Access(typeof(SharedSmokeOnTriggerSystem))]
+-public sealed partial class SmokeOnTriggerComponent : Component
++[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
++public sealed partial class SmokeOnTriggerComponent : BaseXOnTriggerComponent
+ {
+     /// <summary>
+-    /// How long the smoke stays for, after it has spread.
++    /// How long the smoke stays for, after it has spread (in seconds).
+     /// </summary>
+-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+-    public float Duration = 10;
++    [DataField, AutoNetworkedField]
++    public TimeSpan Duration = TimeSpan.FromSeconds(10);
+ 
+     /// <summary>
+     /// How much the smoke will spread.
+     /// </summary>
+-    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
++    [DataField(required: true), AutoNetworkedField]
+     public int SpreadAmount;
+ 
+     /// <summary>
+     /// Smoke entity to spawn.
+     /// Defaults to smoke but you can use foam if you want.
+     /// </summary>
+-    [DataField, ViewVariables(VVAccess.ReadWrite)]
++    [DataField, AutoNetworkedField]
+     public EntProtoId SmokePrototype = "Smoke";
+ 
+     /// <summary>
+@@ -37,6 +37,6 @@ public sealed partial class SmokeOnTriggerComponent : Component
+     /// <remarks>
+     /// When using repeating trigger this essentially gets multiplied so dont do anything crazy like omnizine or lexorin.
+     /// </remarks>
+-    [DataField, ViewVariables(VVAccess.ReadWrite)]
++    [DataField, AutoNetworkedField]
+     public Solution Solution = new();
+ }
diff --git a/Content.Shared/Trigger/Components/Effects/SpawnOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/SpawnOnTriggerComponent.cs
new file mode 100644
index 000000000000..782626f479be
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/SpawnOnTriggerComponent.cs
@@ -0,0 +1,31 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Spawns a protoype when triggered.
+/// If TargetUser is true it will be spawned at their location.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class SpawnOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The prototype to spawn.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public EntProtoId Proto = string.Empty;
+
+    /// <summary>
+    /// Use MapCoordinates for spawning?
+    /// Set to true if you don't want the new entity parented to the spawner.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool UseMapCoords;
+
+    /// <summary>
+    /// Whether or not to use predicted spawning.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Predicted;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/SpeakOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/SpeakOnTriggerComponent.cs
new file mode 100644
index 000000000000..8fe6927046bc
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/SpeakOnTriggerComponent.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Dataset;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Makes the entity speak a message when triggered.
+/// If TargetUser is true then they will be forced to speak instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class SpeakOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The text to speak. This has priority over Pack.
+    /// </summary>
+    [DataField]
+    public LocId? Text;
+
+    /// <summary>
+    /// The identifier for the dataset prototype containing messages to be spoken by this entity.
+    /// The spoken text will be picked randomly from it.
+    /// </summary>
+    [DataField]
+    public ProtoId<LocalizedDatasetPrototype>? Pack;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/UseDelayOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/UseDelayOnTriggerComponent.cs
new file mode 100644
index 000000000000..4d43c2860bea
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/UseDelayOnTriggerComponent.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Timing;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will activate an UseDelay on the target when triggered.
+/// </summary>
+/// <remarks>
+/// TODO: Support specific UseDelay IDs for each trigger key.
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class UseDelayOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The UseDelay Id to delay.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string UseDelayId = UseDelaySystem.DefaultId;
+
+    /// <summary>
+    /// If true ongoing delays won't be reset.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CheckDelayed;
+}
diff --git a/Content.Server/Explosion/Components/RandomTimerTriggerComponent.cs b/Content.Shared/Trigger/Components/RandomTimerTriggerComponent.cs
similarity index 100%
rename from Content.Server/Explosion/Components/RandomTimerTriggerComponent.cs
rename to Content.Shared/Trigger/Components/RandomTimerTriggerComponent.cs
diff --git a/Content.Shared/Trigger/Components/RandomTimerTriggerComponent.cs.rej b/Content.Shared/Trigger/Components/RandomTimerTriggerComponent.cs.rej
new file mode 100644
index 000000000000..3cb8f765c091
--- /dev/null
+++ b/Content.Shared/Trigger/Components/RandomTimerTriggerComponent.cs.rej
@@ -0,0 +1,30 @@
+diff a/Content.Shared/Trigger/Components/RandomTimerTriggerComponent.cs b/Content.Shared/Trigger/Components/RandomTimerTriggerComponent.cs	(rejected hunks)
+@@ -1,22 +1,22 @@
+-using Content.Server.Explosion.EntitySystems;
++using Robust.Shared.GameStates;
+ 
+-namespace Content.Server.Explosion.Components;
++namespace Content.Shared.Trigger.Components;
+ 
+ /// <summary>
+-/// This is used for randomizing a <see cref="RandomTimerTriggerComponent"/> on MapInit
++/// This is used for randomizing a <see cref="TimerTriggerComponent"/> on MapInit.
+ /// </summary>
+-[RegisterComponent, Access(typeof(TriggerSystem))]
++[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+ public sealed partial class RandomTimerTriggerComponent : Component
+ {
+     /// <summary>
+     /// The minimum random trigger time.
+     /// </summary>
+-    [DataField]
++    [DataField, AutoNetworkedField]
+     public float Min;
+ 
+     /// <summary>
+     /// The maximum random trigger time.
+     /// </summary>
+-    [DataField]
++    [DataField, AutoNetworkedField]
+     public float Max;
+ }
diff --git a/Content.Shared/Trigger/Components/TimerTriggerComponent.cs b/Content.Shared/Trigger/Components/TimerTriggerComponent.cs
new file mode 100644
index 000000000000..9cc58d3cda5f
--- /dev/null
+++ b/Content.Shared/Trigger/Components/TimerTriggerComponent.cs
@@ -0,0 +1,109 @@
+using Content.Shared.Guidebook;
+using Content.Shared.Trigger.Systems;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+using System.Linq;
+
+namespace Content.Shared.Trigger.Components;
+
+/// <summary>
+/// Starts a timer when activated by a trigger.
+/// Will cause a different trigger once the time is over.
+/// Can play a sound while the timer is active.
+/// The time can be set by other components, for example <see cref="RandomTimerTriggerComponent"/>.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class TimerTriggerComponent : Component
+{
+    /// <summary>
+    /// The keys that will activate the timer.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<string> KeysIn = new() { TriggerSystem.DefaultTriggerKey };
+
+    /// <summary>
+    /// The key that will trigger once the timer is finished.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string? KeyOut = "timer";
+
+    /// <summary>
+    /// The time after which this timer will trigger after it is activated.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan Delay = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// If not empty, a user can use verbs to configure the delay to one of these options.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<TimeSpan> DelayOptions = new();
+
+    /// <summary>
+    /// The time at which this trigger will activate.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextTrigger = TimeSpan.Zero;
+
+    /// <summary>
+    /// Time of the next beeping sound.
+    /// </summary>
+    /// <remarks>
+    /// Not networked because it's only used server side.
+    /// </remarks>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
+    public TimeSpan NextBeep = TimeSpan.Zero;
+
+    /// <summary>
+    /// Initial beep delay.
+    /// Defaults to a single BeepInterval if null.
+    /// </summary>
+    /// <remarks>
+    /// Not networked because it's only used server side.
+    /// </remarks>
+    [DataField]
+    public TimeSpan? InitialBeepDelay;
+
+    /// <summary>
+    /// The time between beeps.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan BeepInterval = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// The entity that activated this trigger.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? User;
+
+    /// <summary>
+    /// The beeping sound, if any.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? BeepSound;
+
+    /// <summary>
+    /// Whether you can examine the item to see its timer or not.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Examinable = true;
+
+    /// <summary>
+    /// The popup to show the user when starting the timer, if any.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId? Popup = "timer-trigger-activated";
+
+    #region GuidebookData
+
+    [GuidebookData]
+    public float? ShortestDelayOption => DelayOptions.Count == 0 ? null : (float)DelayOptions.Min().TotalSeconds;
+
+    [GuidebookData]
+    public float? LongestDelayOption => DelayOptions.Count == 0 ? null : (float)DelayOptions.Max().TotalSeconds;
+
+    #endregion GuidebookData
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/ActiveTriggerOnTimedCollideComponent.cs b/Content.Shared/Trigger/Components/Triggers/ActiveTriggerOnTimedCollideComponent.cs
new file mode 100644
index 000000000000..88b68913f026
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/ActiveTriggerOnTimedCollideComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ActiveTriggerOnTimedCollideComponent : Component;
diff --git a/Content.Shared/Trigger/Components/Triggers/BaseTriggerOnXComponent.cs b/Content.Shared/Trigger/Components/Triggers/BaseTriggerOnXComponent.cs
new file mode 100644
index 000000000000..1f4807f25367
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/BaseTriggerOnXComponent.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Trigger.Systems;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Base class for components that cause a trigger to be activated.
+/// </summary>
+public abstract partial class BaseTriggerOnXComponent : Component
+{
+    /// <summary>
+    /// The key that the trigger will activate.
+    /// null will activate all triggers.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string? KeyOut = TriggerSystem.DefaultTriggerKey;
+}
diff --git a/Content.Server/Explosion/Components/RepeatingTriggerComponent.cs b/Content.Shared/Trigger/Components/Triggers/RepeatingTriggerComponent.cs
similarity index 100%
rename from Content.Server/Explosion/Components/RepeatingTriggerComponent.cs
rename to Content.Shared/Trigger/Components/Triggers/RepeatingTriggerComponent.cs
diff --git a/Content.Shared/Trigger/Components/Triggers/RepeatingTriggerComponent.cs.rej b/Content.Shared/Trigger/Components/Triggers/RepeatingTriggerComponent.cs.rej
new file mode 100644
index 000000000000..3fb763ffa9db
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/RepeatingTriggerComponent.cs.rej
@@ -0,0 +1,36 @@
+diff a/Content.Shared/Trigger/Components/Triggers/RepeatingTriggerComponent.cs b/Content.Shared/Trigger/Components/Triggers/RepeatingTriggerComponent.cs	(rejected hunks)
+@@ -1,25 +1,26 @@
+-using Content.Server.Explosion.EntitySystems;
++using Robust.Shared.GameStates;
+ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+ 
+-namespace Content.Server.Explosion.Components;
++namespace Content.Shared.Trigger.Components.Triggers;
+ 
+ /// <summary>
+ /// Constantly triggers after being added to an entity.
+ /// </summary>
+-[RegisterComponent, Access(typeof(TriggerSystem))]
+-[AutoGenerateComponentPause]
+-public sealed partial class RepeatingTriggerComponent : Component
++[RegisterComponent, NetworkedComponent]
++[AutoGenerateComponentState, AutoGenerateComponentPause]
++public sealed partial class RepeatingTriggerComponent : BaseTriggerOnXComponent
+ {
+     /// <summary>
+     /// How long to wait between triggers.
+     /// The first trigger starts this long after the component is added.
+     /// </summary>
+-    [DataField]
++    [DataField, AutoNetworkedField]
+     public TimeSpan Delay = TimeSpan.FromSeconds(1);
+ 
+     /// <summary>
+     /// When the next trigger will be.
+     /// </summary>
+-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
+-    public TimeSpan NextTrigger;
++    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
++    [AutoNetworkedField, AutoPausedField]
++    public TimeSpan NextTrigger = TimeSpan.Zero;
+ }
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateComponent.cs
new file mode 100644
index 000000000000..9dd145bb2650
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when activated in hand or by clicking on the entity.
+/// The user is the player activating it.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnActivateComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// Is this interaction a complex interaction?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool RequireComplex = true;
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateImplantComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateImplantComponent.cs
new file mode 100644
index 000000000000..b26f3b6875a9
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateImplantComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when activating an action granted by an implant.
+/// The user is the player activating it.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnActivateImplantComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnCollideComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnCollideComponent.cs
new file mode 100644
index 000000000000..a1e234bd7a60
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnCollideComponent.cs
@@ -0,0 +1,23 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when colliding with another entity.
+/// The user is the entity collided with.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnCollideComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// The fixture with which to collide.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public string FixtureID = string.Empty;
+
+    /// <summary>
+    /// Doesn't trigger if the other colliding fixture is nonhard.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool IgnoreOtherNonHard = true;
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnEmptyGunshotComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnEmptyGunshotComponent.cs
new file mode 100644
index 000000000000..40d468ec306d
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnEmptyGunshotComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when attempting to shoot a gun while it's empty.
+/// The user is the player holding the gun.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnEmptyGunshotComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnMobstateChangeComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnMobstateChangeComponent.cs
new file mode 100644
index 000000000000..a8dab4e6cd73
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnMobstateChangeComponent.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Mobs;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when this entity's mob state changes.
+/// The user is the entity that caused the state change or the owner depending on the settings.
+/// If added to an implant it will trigger when the implanted entity's mob state changes.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnMobstateChangeComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// What states should trigger this?
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public List<MobState> MobState = new();
+
+    /// <summary>
+    /// If true, prevents suicide attempts for the trigger to prevent cheese.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool PreventSuicide = false;
+
+    /// <summary>
+    /// If false, the trigger user will be the entity that caused the mobstate to change.
+    /// If true, the trigger user will the entity that changed its mob state.
+    /// </summary>
+    /// <summary>
+    /// Set this to true for implants that apply an effect on the implanted entity.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool TargetMobstateEntity = true;
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnProximityComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnProximityComponent.cs
new file mode 100644
index 000000000000..047d6f037484
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnProximityComponent.cs
@@ -0,0 +1,91 @@
+using Content.Shared.Physics;
+using Robust.Shared.GameStates;
+using Robust.Shared.Physics.Collision.Shapes;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Dynamics;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers whenever an entity collides with a fixture attached to the owner of this component.
+/// The user is the entity that collided with the fixture.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class TriggerOnProximityComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// The ID if the fixture that is observed for collisions.
+    /// </summary>
+    public const string FixtureID = "trigger-on-proximity-fixture";
+
+    /// <summary>
+    /// Currently colliding entities.
+    /// </summary>
+    [ViewVariables]
+    public readonly Dictionary<EntityUid, PhysicsComponent> Colliding = new();
+
+    /// <summary>
+    /// What is the shape of the proximity fixture?
+    /// </summary>
+    [ViewVariables]
+    [DataField]
+    public IPhysShape Shape = new PhysShapeCircle(2f);
+
+    /// <summary>
+    /// How long the the proximity trigger animation plays for.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan AnimationDuration = TimeSpan.FromSeconds(0.6f);
+
+    /// <summary>
+    /// Whether the entity needs to be anchored for the proximity to work.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool RequiresAnchored = true;
+
+    /// <summary>
+    /// Whether the proximity trigger is currently enabled.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Enabled = true;
+
+    /// <summary>
+    /// The minimum delay between repeating triggers.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan Cooldown = TimeSpan.FromSeconds(5);
+
+    /// <summary>
+    /// When can the trigger run again?
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextTrigger = TimeSpan.Zero;
+
+    /// <summary>
+    /// When will the visual state be updated again after activation?
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextVisualUpdate = TimeSpan.Zero;
+
+    /// <summary>
+    /// What speed should the other object be moving at to trigger the proximity fixture?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float TriggerSpeed = 3.5f;
+
+    /// <summary>
+    /// If this proximity is triggered should we continually repeat it?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Repeating = true;
+
+    /// <summary>
+    /// What layer is the trigger fixture on?
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(FlagSerializer<CollisionLayer>))]
+    public int Layer = (int)(CollisionGroup.MidImpassable | CollisionGroup.LowImpassable | CollisionGroup.HighImpassable);
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnSignalComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnSignalComponent.cs
new file mode 100644
index 000000000000..6ed81c5fcf4e
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnSignalComponent.cs
@@ -0,0 +1,19 @@
+using Content.Shared.DeviceLinking;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Sends a trigger when signal is received.
+/// The user is the sender of the signal.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnSignalComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// The sink port prototype we can connect devices to.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ProtoId<SinkPortPrototype> Port = "Trigger";
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnSlipComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnSlipComponent.cs
new file mode 100644
index 000000000000..b0381ee74ed4
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnSlipComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers an entity when someone slipped on it.
+/// The user is the entity that was slipped.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnSlipComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnSpawnComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnSpawnComponent.cs
new file mode 100644
index 000000000000..c718a2014863
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnSpawnComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when the entity is initialized.
+/// The user is null.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnSpawnComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnStepTriggerComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnStepTriggerComponent.cs
new file mode 100644
index 000000000000..70d33a11796f
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnStepTriggerComponent.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers if a StepTrigger is activated by someone stepping on this entity.
+/// The user is the mob who stepped on it.
+/// </summary>
+/// <remarks>
+/// This is used for entities that want the more generic 'trigger' behavior after a step trigger occurs.
+/// Not done by default, since it's not useful for everything and might cause weird behavior. But it is useful for a lot of stuff like mousetraps.
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnStepTriggerComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnStuckComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnStuckComponent.cs
new file mode 100644
index 000000000000..073a64f66ec1
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnStuckComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Sticky.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when an entity with <see cref="StickyComponent"/> is stuck to something.
+/// The user is the player doing so.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnStuckComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnTimedCollideComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnTimedCollideComponent.cs
new file mode 100644
index 000000000000..185ea7dbe407
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnTimedCollideComponent.cs
@@ -0,0 +1,26 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when the entity is overlapped for the specified duration.
+/// The user is the entity that passes the time threshold while colliding.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnTimedCollideComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// The time an entity has to collide until the trigger is activated.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan Threshold = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// A collection of entities that are currently colliding with this, and their own unique accumulator.
+    /// </summary>
+    /// <remarks>
+    /// TODO: Add AutoPausedField and (de)serialize values as time offsets when https://github.com/space-wizards/RobustToolbox/issues/3768 is fixed.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public Dictionary<EntityUid, TimeSpan> Colliding = new();
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnUseComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnUseComponent.cs
new file mode 100644
index 000000000000..71d289741e5e
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnUseComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers on use in hand.
+/// The user is the player holding the item.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnUseComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnVerb.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnVerb.cs
new file mode 100644
index 000000000000..463860f07700
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnVerb.cs
@@ -0,0 +1,20 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Starts a trigger when a verb is selected.
+/// The user is the player selecting the verb.
+/// </summary>
+/// <remarks>
+/// TODO: Support multiple verbs and trigger keys.
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnVerbComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// The text to display in the verb.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId Text = "trigger-on-verb-default";
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnVoiceComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnVoiceComponent.cs
new file mode 100644
index 000000000000..a36992d7da8d
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnVoiceComponent.cs
@@ -0,0 +1,47 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Sends a trigger when the keyphrase is heard.
+/// The User is the speaker.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnVoiceComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// Whether or not the component is actively listening at the moment.
+    /// </summary>
+    [ViewVariables]
+    public bool IsListening => IsRecording || !string.IsNullOrWhiteSpace(KeyPhrase);
+
+    /// <summary>
+    /// The keyphrase that has been set to trigger it.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string? KeyPhrase;
+
+    /// <summary>
+    /// Range in which we listen for the keyphrase.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int ListenRange = 4;
+
+    /// <summary>
+    /// Whether we are currently recording a new keyphrase.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool IsRecording;
+
+    /// <summary>
+    /// Minimum keyphrase length.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int MinLength = 3;
+
+    /// <summary>
+    /// Maximum keyphrase length.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int MaxLength = 50;
+}
diff --git a/Content.Shared/Trigger/Components/TwoStageTriggerComponent.cs b/Content.Shared/Trigger/Components/TwoStageTriggerComponent.cs
new file mode 100644
index 000000000000..f0161c71755f
--- /dev/null
+++ b/Content.Shared/Trigger/Components/TwoStageTriggerComponent.cs
@@ -0,0 +1,58 @@
+using Content.Shared.Trigger.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Trigger.Components;
+
+/// <summary>
+/// After being triggered applies the specified components and runs triggers again.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class TwoStageTriggerComponent : Component
+{
+    /// <summary>
+    /// The keys that will activate the timer and add the given components (first stage).
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<string> KeysIn = new() { TriggerSystem.DefaultTriggerKey };
+
+    /// <summary>
+    /// The key that will trigger once the timer is finished (second stage).
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string? KeyOut = "stageTwo";
+
+    /// <summary>
+    /// How long it takes for the second stage to be triggered.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan TriggerDelay = TimeSpan.FromSeconds(10);
+
+    /// <summary>
+    /// This list of components that will be added on the first trigger.
+    /// </summary>
+    [DataField(required: true)]
+    public ComponentRegistry Components = new();
+
+    /// <summary>
+    /// The time at which the second stage will trigger.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan? NextTriggerTime;
+
+    /// <summary>
+    /// Has this entity been triggered already?
+    /// Used to prevent the components from being added multiple times.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Triggered = false;
+
+    /// <summary>
+    /// The entity that activated this trigger.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? User;
+}
diff --git a/Content.Shared/Trigger/Systems/AddComponentsOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/AddComponentsOnTriggerSystem.cs
new file mode 100644
index 000000000000..908307dad0ad
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/AddComponentsOnTriggerSystem.cs
@@ -0,0 +1,33 @@
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class AddComponentsOnTriggerSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AddComponentsOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<AddComponentsOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        if (ent.Comp.TriggerOnce && ent.Comp.Triggered)
+            return;
+
+        EntityManager.AddComponents(target.Value, ent.Comp.Components, ent.Comp.RemoveExisting);
+        ent.Comp.Triggered = true;
+        Dirty(ent);
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs
new file mode 100644
index 000000000000..8f30c852ea84
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs
@@ -0,0 +1,40 @@
+using Content.Shared.Damage;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class DamageOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DamageOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<DamageOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        var damage = new DamageSpecifier(ent.Comp.Damage);
+        var ev = new BeforeDamageOnTriggerEvent(damage, target.Value);
+        RaiseLocalEvent(ent.Owner, ref ev);
+
+        args.Handled |= _damageableSystem.TryChangeDamage(target, ev.Damage, ent.Comp.IgnoreResistances, origin: ent.Owner) is not null;
+    }
+}
+
+/// <summary>
+/// Raised on an entity before it deals damage using DamageOnTriggerComponent.
+/// Used to modify the damage that will be dealt.
+/// </summary>
+[ByRefEvent]
+public record struct BeforeDamageOnTriggerEvent(DamageSpecifier Damage, EntityUid Tripper);
diff --git a/Content.Shared/Trigger/Systems/EmitSoundOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/EmitSoundOnTriggerSystem.cs
new file mode 100644
index 000000000000..e296ccc17792
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/EmitSoundOnTriggerSystem.cs
@@ -0,0 +1,55 @@
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class EmitSoundOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly INetManager _netMan = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EmitSoundOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<EmitSoundOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        args.Handled |= TryEmitSound(ent, target.Value, args.User);
+    }
+
+    private bool TryEmitSound(Entity<EmitSoundOnTriggerComponent> ent, EntityUid target, EntityUid? user = null)
+    {
+        if (ent.Comp.Sound == null)
+            return false;
+
+        if (ent.Comp.Positional)
+        {
+            var coords = Transform(target).Coordinates;
+            if (ent.Comp.Predicted)
+                _audio.PlayPredicted(ent.Comp.Sound, coords, user);
+            else if (_netMan.IsServer)
+                _audio.PlayPvs(ent.Comp.Sound, coords);
+        }
+        else
+        {
+            if (ent.Comp.Predicted)
+                _audio.PlayPredicted(ent.Comp.Sound, target, user);
+            else if (_netMan.IsServer)
+                _audio.PlayPvs(ent.Comp.Sound, target);
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs
new file mode 100644
index 000000000000..136c4474a225
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Emp;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class EmpOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedEmpSystem _emp = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EmpOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<EmpOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        _emp.EmpPulse(_transform.GetMapCoordinates(target.Value), ent.Comp.Range, ent.Comp.EnergyConsumption, (float)ent.Comp.DisableDuration.TotalSeconds);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/ExplodeOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/ExplodeOnTriggerSystem.cs
new file mode 100644
index 000000000000..1c773b79a623
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/ExplodeOnTriggerSystem.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Explosion.EntitySystems;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class ExplodeOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedExplosionSystem _explosion = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ExplodeOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<ExplodeOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        _explosion.TriggerExplosive(target.Value, user: args.User);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/FlashOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/FlashOnTriggerSystem.cs
new file mode 100644
index 000000000000..6153e228bf52
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/FlashOnTriggerSystem.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Flash;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class FlashOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedFlashSystem _flash = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<FlashOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<FlashOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        _flash.FlashArea(target.Value, args.User, ent.Comp.Range, ent.Comp.Duration, probability: ent.Comp.Probability);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs
new file mode 100644
index 000000000000..95ef5ec1db45
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs
@@ -0,0 +1,40 @@
+using Content.Shared.Body.Systems;
+using Content.Shared.Inventory;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class GibOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedBodySystem _body = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GibOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<GibOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        if (ent.Comp.DeleteItems)
+        {
+            var items = _inventory.GetHandOrInventoryEntities(target.Value);
+            foreach (var item in items)
+            {
+                PredictedQueueDel(item);
+            }
+        }
+        _body.GibBody(target.Value, true);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/RepulseAttractOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/RepulseAttractOnTriggerSystem.cs
new file mode 100644
index 000000000000..9bedc87b6b9d
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/RepulseAttractOnTriggerSystem.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
+using Content.Shared.RepulseAttract;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class RepulseAttractOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly RepulseAttractSystem _repulse = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RepulseAttractOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<RepulseAttractOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        var position = _transform.GetMapCoordinates(target.Value);
+        _repulse.TryRepulseAttract(position, args.User, ent.Comp.Speed, ent.Comp.Range, ent.Comp.Whitelist, ent.Comp.CollisionMask);
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/SharedReleaseGasOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/SharedReleaseGasOnTriggerSystem.cs
new file mode 100644
index 000000000000..e1871e043510
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/SharedReleaseGasOnTriggerSystem.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Trigger.Systems;
+
+/// <summary>
+/// Releases a gas mixture to the atmosphere when triggered.
+/// Can also release gas over a set timespan to prevent trolling people
+/// with the instant-wall-of-pressure-inator.
+/// </summary>
+public abstract class SharedReleaseGasOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ReleaseGasOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    /// <summary>
+    /// Shrimply sets the component to active when triggered, allowing it to release over time.
+    /// </summary>
+    private void OnTrigger(Entity<ReleaseGasOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        ent.Comp.Active = true;
+        ent.Comp.NextReleaseTime = _timing.CurTime;
+        ent.Comp.StartingTotalMoles = ent.Comp.Air.TotalMoles;
+        _appearance.SetData(ent, ReleaseGasOnTriggerVisuals.Key, true);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/ShockOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/ShockOnTriggerSystem.cs
new file mode 100644
index 000000000000..c4d34af7e1a9
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/ShockOnTriggerSystem.cs
@@ -0,0 +1,44 @@
+using Content.Shared.Electrocution;
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Containers;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class ShockOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly SharedElectrocutionSystem _electrocution = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ShockOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<ShockOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        EntityUid? target;
+        if (ent.Comp.TargetContainer)
+        {
+            // shock whoever is wearing this clothing item
+            if (!_container.TryGetContainingContainer(ent.Owner, out var container))
+                return;
+            target = container.Owner;
+        }
+        else
+        {
+            target = ent.Comp.TargetUser ? args.User : ent.Owner;
+        }
+
+        if (target == null)
+            return;
+
+        _electrocution.TryDoElectrocution(target.Value, null, ent.Comp.Damage, ent.Comp.Duration, true, ignoreInsulation: true);
+        args.Handled = true;
+    }
+
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerOnActivateImplantSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnActivateImplantSystem.cs
new file mode 100644
index 000000000000..382570855012
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerOnActivateImplantSystem.cs
@@ -0,0 +1,22 @@
+using Content.Shared.Implants.Components;
+using Content.Shared.Trigger.Components.Triggers;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerOnActivateImplantSystem : EntitySystem
+{
+    [Dependency] private readonly TriggerSystem _trigger = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TriggerOnActivateImplantComponent, ActivateImplantEvent>(OnActivateImplant);
+    }
+
+    private void OnActivateImplant(Entity<TriggerOnActivateImplantComponent> ent, ref ActivateImplantEvent args)
+    {
+        _trigger.Trigger(ent.Owner, args.Performer, ent.Comp.KeyOut);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerOnEmptyGunshotSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnEmptyGunshotSystem.cs
new file mode 100644
index 000000000000..cc23fa2b8418
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerOnEmptyGunshotSystem.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.Weapons.Ranged.Events;
+
+namespace Content.Shared.Trigger.Systems;
+public sealed partial class TriggerOnEmptyGunshotSystem : EntitySystem
+{
+    [Dependency] private readonly TriggerSystem _trigger = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TriggerOnEmptyGunshotComponent, OnEmptyGunShotEvent>(OnEmptyGunShot);
+    }
+
+    private void OnEmptyGunShot(Entity<TriggerOnEmptyGunshotComponent> ent, ref OnEmptyGunShotEvent args)
+    {
+        _trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+    }
+}
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs b/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs
similarity index 84%
rename from Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs
rename to Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs
index 6413313e226b..332f0bd880d5 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs
+++ b/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs
@@ -38,25 +38,21 @@ private void OnMobStateChanged(EntityUid uid, TriggerOnMobstateChangeComponent c
         if (!component.MobState.Contains(args.NewMobState))
             return;
 
-        //This chains Mobstate Changed triggers with OnUseTimerTrigger if they have it
-        //Very useful for things that require a mobstate change and a timer
-        if (TryComp<OnUseTimerTriggerComponent>(uid, out var timerTrigger))
-        {
-            HandleTimerTrigger(
-                uid,
-                args.Origin,
-                timerTrigger.Delay,
-                timerTrigger.BeepInterval,
-                timerTrigger.InitialBeepDelay,
-                timerTrigger.BeepSound);
-        }
-        else
-            Trigger(uid);
+        _trigger.Trigger(uid, component.TargetMobstateEntity ? uid : args.Origin, component.KeyOut);
+    }
+
+    private void OnMobStateRelay(EntityUid uid, TriggerOnMobstateChangeComponent component, ImplantRelayEvent<MobStateChangedEvent> args)
+    {
+        if (!component.MobState.Contains(args.Event.NewMobState))
+            return;
+
+        _trigger.Trigger(uid, component.TargetMobstateEntity ? args.ImplantedEntity : args.Event.Origin, component.KeyOut);
     }
 
     /// <summary>
     /// Checks if the user has any implants that prevent suicide to avoid some cheesy strategies
     /// Prevents suicide by handling the event without killing the user
+    /// TODO: This doesn't seem to work at the moment as the event is never checked for being handled.
     /// </summary>
     private void OnSuicide(EntityUid uid, TriggerOnMobstateChangeComponent component, SuicideEvent args)
     {
diff --git a/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs.rej b/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs.rej
new file mode 100644
index 000000000000..7ec99383d800
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs.rej
@@ -0,0 +1,60 @@
+diff a/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs	(rejected hunks)
+@@ -1,20 +1,25 @@
+-using Content.Server.Explosion.Components;
+-using Content.Shared.Explosion.Components;
+-using Content.Shared.Implants;
++using Content.Shared.Implants;
+ using Content.Shared.Interaction.Events;
+ using Content.Shared.Mobs;
++using Content.Shared.Popups;
++using Content.Shared.Trigger.Components.Triggers;
+ 
+-namespace Content.Server.Explosion.EntitySystems;
++namespace Content.Shared.Trigger.Systems;
+ 
+-public sealed partial class TriggerSystem
++public sealed partial class TriggerOnMobstateChangeSystem : EntitySystem
+ {
+-    private void InitializeMobstate()
++    [Dependency] private readonly TriggerSystem _trigger = default!;
++    [Dependency] private readonly SharedPopupSystem _popup = default!;
++
++    public override void Initialize()
+     {
++        base.Initialize();
++
+         SubscribeLocalEvent<TriggerOnMobstateChangeComponent, MobStateChangedEvent>(OnMobStateChanged);
+         SubscribeLocalEvent<TriggerOnMobstateChangeComponent, SuicideEvent>(OnSuicide);
+ 
+-        SubscribeLocalEvent<TriggerOnMobstateChangeComponent, ImplantRelayEvent<SuicideEvent>>(OnSuicideRelay);
+         SubscribeLocalEvent<TriggerOnMobstateChangeComponent, ImplantRelayEvent<MobStateChangedEvent>>(OnMobStateRelay);
++        SubscribeLocalEvent<TriggerOnMobstateChangeComponent, ImplantRelayEvent<SuicideEvent>>(OnSuicideRelay);
+     }
+ 
+     private void OnMobStateChanged(EntityUid uid, TriggerOnMobstateChangeComponent component, MobStateChangedEvent args)
+@@ -50,17 +51,19 @@ private void OnSuicide(EntityUid uid, TriggerOnMobstateChangeComponent component
+         if (!component.PreventSuicide)
+             return;
+ 
+-        _popupSystem.PopupEntity(Loc.GetString("suicide-prevented"), args.Victim, args.Victim);
++        _popup.PopupClient(Loc.GetString("suicide-prevented"), args.Victim);
+         args.Handled = true;
+     }
+ 
+     private void OnSuicideRelay(EntityUid uid, TriggerOnMobstateChangeComponent component, ImplantRelayEvent<SuicideEvent> args)
+     {
+-        OnSuicide(uid, component, args.Event);
+-    }
++        if (args.Event.Handled)
++            return;
+ 
+-    private void OnMobStateRelay(EntityUid uid, TriggerOnMobstateChangeComponent component, ImplantRelayEvent<MobStateChangedEvent> args)
+-    {
+-        OnMobStateChanged(uid, component, args.Event);
++        if (!component.PreventSuicide)
++            return;
++
++        _popup.PopupClient(Loc.GetString("suicide-prevented"), args.Event.Victim);
++        args.Event.Handled = true;
+     }
+ }
diff --git a/Content.Shared/Trigger/Systems/TriggerOnSlipSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnSlipSystem.cs
new file mode 100644
index 000000000000..6940ea52e293
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerOnSlipSystem.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Slippery;
+using Content.Shared.Trigger.Components.Triggers;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerOnSlipSystem : EntitySystem
+{
+    [Dependency] private readonly TriggerSystem _trigger = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TriggerOnSlipComponent, SlipEvent>(OnSlip);
+    }
+
+    private void OnSlip(Entity<TriggerOnSlipComponent> ent, ref SlipEvent args)
+    {
+        _trigger.Trigger(ent.Owner, args.Slipped, ent.Comp.KeyOut);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerOnStuckSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnStuckSystem.cs
new file mode 100644
index 000000000000..d364adccff20
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerOnStuckSystem.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Sticky;
+using Content.Shared.Trigger.Components.Triggers;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class TriggerOnStuckSystem : EntitySystem
+{
+    [Dependency] private readonly TriggerSystem _trigger = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TriggerOnStuckComponent, EntityStuckEvent>(OnStuck);
+    }
+
+    private void OnStuck(Entity<TriggerOnStuckComponent> ent, ref EntityStuckEvent args)
+    {
+        _trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerOnVerbSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnVerbSystem.cs
new file mode 100644
index 000000000000..d5830dd75d24
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerOnVerbSystem.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Verbs;
+using Content.Shared.Trigger.Components.Triggers;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerOnVerbSystem : EntitySystem
+{
+    [Dependency] private readonly TriggerSystem _trigger = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TriggerOnVerbComponent, GetVerbsEvent<AlternativeVerb>>(OnGetAltVerbs);
+    }
+
+    private void OnGetAltVerbs(Entity<TriggerOnVerbComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess || args.Hands == null)
+            return;
+
+        var user = args.User;
+
+        args.Verbs.Add(new AlternativeVerb
+        {
+            Text = Loc.GetString(ent.Comp.Text),
+            Act = () => _trigger.Trigger(ent.Owner, user, ent.Comp.KeyOut),
+            Priority = 2 // should be above any timer settings
+        });
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Collide.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Collide.cs
new file mode 100644
index 000000000000..5243b13742a1
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Collide.cs
@@ -0,0 +1,73 @@
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.StepTrigger.Systems;
+using Robust.Shared.Physics.Events;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeCollide()
+    {
+        SubscribeLocalEvent<TriggerOnCollideComponent, StartCollideEvent>(OnCollide);
+        SubscribeLocalEvent<TriggerOnStepTriggerComponent, StepTriggeredOffEvent>(OnStepTriggered);
+
+        SubscribeLocalEvent<TriggerOnTimedCollideComponent, StartCollideEvent>(OnTimedCollide);
+        SubscribeLocalEvent<TriggerOnTimedCollideComponent, EndCollideEvent>(OnTimedEndCollide);
+        SubscribeLocalEvent<TriggerOnTimedCollideComponent, ComponentShutdown>(OnTimedShutdown);
+    }
+
+    private void OnCollide(Entity<TriggerOnCollideComponent> ent, ref StartCollideEvent args)
+    {
+        if (args.OurFixtureId == ent.Comp.FixtureID && (!ent.Comp.IgnoreOtherNonHard || args.OtherFixture.Hard))
+            Trigger(ent.Owner, args.OtherEntity, ent.Comp.KeyOut);
+    }
+
+    private void OnStepTriggered(Entity<TriggerOnStepTriggerComponent> ent, ref StepTriggeredOffEvent args)
+    {
+        Trigger(ent, args.Tripper, ent.Comp.KeyOut);
+    }
+
+    private void OnTimedCollide(Entity<TriggerOnTimedCollideComponent> ent, ref StartCollideEvent args)
+    {
+        //Ensures the trigger entity will have an active component
+        EnsureComp<ActiveTriggerOnTimedCollideComponent>(ent);
+        var otherUID = args.OtherEntity;
+        if (ent.Comp.Colliding.ContainsKey(otherUID))
+            return;
+        ent.Comp.Colliding.Add(otherUID, _timing.CurTime + ent.Comp.Threshold);
+        Dirty(ent);
+    }
+
+    private void OnTimedEndCollide(Entity<TriggerOnTimedCollideComponent> ent, ref EndCollideEvent args)
+    {
+        var otherUID = args.OtherEntity;
+        ent.Comp.Colliding.Remove(otherUID);
+        Dirty(ent);
+
+        if (ent.Comp.Colliding.Count == 0)
+            RemComp<ActiveTriggerOnTimedCollideComponent>(ent);
+    }
+
+    private void OnTimedShutdown(Entity<TriggerOnTimedCollideComponent> ent, ref ComponentShutdown args)
+    {
+        RemComp<ActiveTriggerOnTimedCollideComponent>(ent);
+    }
+
+    private void UpdateTimedCollide()
+    {
+        var curTime = _timing.CurTime;
+        var query = EntityQueryEnumerator<ActiveTriggerOnTimedCollideComponent, TriggerOnTimedCollideComponent>();
+        while (query.MoveNext(out var uid, out _, out var triggerOnTimedCollide))
+        {
+            foreach (var (collidingEntity, collidingTime) in triggerOnTimedCollide.Colliding)
+            {
+                if (curTime > collidingTime)
+                {
+                    triggerOnTimedCollide.Colliding[collidingEntity] += triggerOnTimedCollide.Threshold;
+                    Dirty(uid, triggerOnTimedCollide);
+                    Trigger(uid, collidingEntity, triggerOnTimedCollide.KeyOut);
+                }
+            }
+        }
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
new file mode 100644
index 000000000000..a917f1ad48c1
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
@@ -0,0 +1,57 @@
+using Content.Shared.Trigger.Components.Conditions;
+using Content.Shared.Verbs;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeCondition()
+    {
+        SubscribeLocalEvent<WhitelistTriggerConditionComponent, AttemptTriggerEvent>(OnWhitelistTriggerAttempt);
+
+        SubscribeLocalEvent<UseDelayTriggerConditionComponent, AttemptTriggerEvent>(OnUseDelayTriggerAttempt);
+
+        SubscribeLocalEvent<ToggleTriggerConditionComponent, AttemptTriggerEvent>(OnToggleTriggerAttempt);
+        SubscribeLocalEvent<ToggleTriggerConditionComponent, GetVerbsEvent<AlternativeVerb>>(OnToggleGetAltVerbs);
+    }
+
+    private void OnWhitelistTriggerAttempt(Entity<WhitelistTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
+    {
+        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
+            args.Cancelled |= !_whitelist.CheckBoth(args.User, ent.Comp.UserBlacklist, ent.Comp.UserWhitelist);
+    }
+
+    private void OnUseDelayTriggerAttempt(Entity<UseDelayTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
+    {
+        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
+            args.Cancelled |= _useDelay.IsDelayed(ent.Owner, ent.Comp.UseDelayId);
+    }
+
+    private void OnToggleTriggerAttempt(Entity<ToggleTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
+    {
+        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
+            args.Cancelled |= !ent.Comp.Enabled;
+    }
+
+    private void OnToggleGetAltVerbs(Entity<ToggleTriggerConditionComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess || args.Hands == null)
+            return;
+
+        var user = args.User;
+
+        args.Verbs.Add(new AlternativeVerb()
+        {
+            Text = Loc.GetString(ent.Comp.ToggleVerb),
+            Act = () => Toggle(ent, user)
+        });
+    }
+
+    private void Toggle(Entity<ToggleTriggerConditionComponent> ent, EntityUid user)
+    {
+        var msg = ent.Comp.Enabled ? ent.Comp.ToggleOff : ent.Comp.ToggleOn;
+        _popup.PopupPredicted(Loc.GetString(msg), ent.Owner, user);
+        ent.Comp.Enabled = !ent.Comp.Enabled;
+        Dirty(ent);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Interaction.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Interaction.cs
new file mode 100644
index 000000000000..f50690976043
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Interaction.cs
@@ -0,0 +1,96 @@
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Item.ItemToggle.Components;
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeInteraction()
+    {
+        SubscribeLocalEvent<TriggerOnActivateComponent, ActivateInWorldEvent>(OnActivate);
+        SubscribeLocalEvent<TriggerOnUseComponent, UseInHandEvent>(OnUse);
+
+        SubscribeLocalEvent<ItemToggleOnTriggerComponent, TriggerEvent>(HandleItemToggleOnTrigger);
+        SubscribeLocalEvent<AnchorOnTriggerComponent, TriggerEvent>(HandleAnchorOnTrigger);
+        SubscribeLocalEvent<UseDelayOnTriggerComponent, TriggerEvent>(HandleUseDelayOnTrigger);
+    }
+
+    private void OnActivate(Entity<TriggerOnActivateComponent> ent, ref ActivateInWorldEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        if (ent.Comp.RequireComplex && !args.Complex)
+            return;
+
+        Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+        args.Handled = true;
+    }
+
+    private void OnUse(Entity<TriggerOnUseComponent> ent, ref UseInHandEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+        args.Handled = true;
+    }
+
+    private void HandleItemToggleOnTrigger(Entity<ItemToggleOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (!TryComp<ItemToggleComponent>(target, out var itemToggle))
+            return;
+
+        var handled = false;
+        if (itemToggle.Activated && ent.Comp.CanDeactivate)
+            handled = _itemToggle.TryDeactivate((target.Value, itemToggle), args.User, ent.Comp.Predicted, ent.Comp.ShowPopup);
+        else if (ent.Comp.CanActivate)
+            handled = _itemToggle.TryActivate((target.Value, itemToggle), args.User, ent.Comp.Predicted, ent.Comp.ShowPopup);
+
+        args.Handled |= handled;
+    }
+
+    private void HandleAnchorOnTrigger(Entity<AnchorOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        var xform = Transform(target.Value);
+
+        if (xform.Anchored && ent.Comp.CanUnanchor)
+            _transform.Unanchor(target.Value, xform);
+        else if (ent.Comp.CanAnchor)
+            _transform.AnchorEntity(target.Value, xform);
+
+        if (ent.Comp.RemoveOnTrigger)
+            RemCompDeferred<AnchorOnTriggerComponent>(target.Value);
+
+        args.Handled = true;
+    }
+
+    private void HandleUseDelayOnTrigger(Entity<UseDelayOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        args.Handled |= _useDelay.TryResetDelay(target.Value, ent.Comp.CheckDelayed);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Proximity.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Proximity.cs
new file mode 100644
index 000000000000..cf7c11369bb9
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Proximity.cs
@@ -0,0 +1,138 @@
+using Content.Shared.Trigger.Components.Triggers;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Events;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeProximity()
+    {
+        SubscribeLocalEvent<TriggerOnProximityComponent, StartCollideEvent>(OnProximityStartCollide);
+        SubscribeLocalEvent<TriggerOnProximityComponent, EndCollideEvent>(OnProximityEndCollide);
+        SubscribeLocalEvent<TriggerOnProximityComponent, MapInitEvent>(OnMapInit);
+        // Shouldn't need re-anchoring.
+        SubscribeLocalEvent<TriggerOnProximityComponent, AnchorStateChangedEvent>(OnProximityAnchor);
+    }
+
+    private void OnProximityAnchor(Entity<TriggerOnProximityComponent> ent, ref AnchorStateChangedEvent args)
+    {
+        ent.Comp.Enabled = !ent.Comp.RequiresAnchored || args.Anchored;
+
+        SetProximityAppearance(ent);
+
+        if (!ent.Comp.Enabled)
+        {
+            ent.Comp.Colliding.Clear();
+        }
+        // Re-check for contacts as we cleared them.
+        else if (TryComp<PhysicsComponent>(ent, out var body))
+        {
+            _physics.RegenerateContacts((ent.Owner, body));
+        }
+
+        Dirty(ent);
+    }
+
+    private void OnMapInit(Entity<TriggerOnProximityComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.Enabled = !ent.Comp.RequiresAnchored || Transform(ent).Anchored;
+
+        SetProximityAppearance(ent);
+
+        if (!TryComp<PhysicsComponent>(ent, out var body))
+            return;
+
+        _fixture.TryCreateFixture(
+            ent.Owner,
+            ent.Comp.Shape,
+            TriggerOnProximityComponent.FixtureID,
+            hard: false,
+            body: body,
+            collisionLayer: ent.Comp.Layer);
+
+        Dirty(ent);
+    }
+
+    private void OnProximityStartCollide(EntityUid uid, TriggerOnProximityComponent component, ref StartCollideEvent args)
+    {
+        if (args.OurFixtureId != TriggerOnProximityComponent.FixtureID)
+            return;
+
+        component.Colliding[args.OtherEntity] = args.OtherBody;
+    }
+
+    private static void OnProximityEndCollide(EntityUid uid, TriggerOnProximityComponent component, ref EndCollideEvent args)
+    {
+        if (args.OurFixtureId != TriggerOnProximityComponent.FixtureID)
+            return;
+
+        component.Colliding.Remove(args.OtherEntity);
+    }
+
+    private void SetProximityAppearance(Entity<TriggerOnProximityComponent> ent)
+    {
+        _appearance.SetData(ent.Owner, ProximityTriggerVisualState.State, ent.Comp.Enabled ? ProximityTriggerVisuals.Inactive : ProximityTriggerVisuals.Off);
+    }
+
+    private void Activate(Entity<TriggerOnProximityComponent> ent, EntityUid user)
+    {
+        var curTime = _timing.CurTime;
+
+        if (!ent.Comp.Repeating)
+        {
+            ent.Comp.Enabled = false;
+            ent.Comp.Colliding.Clear();
+        }
+        else
+        {
+            ent.Comp.NextTrigger = curTime + ent.Comp.Cooldown;
+        }
+
+        // Queue a visual update for when the animation is complete.
+        ent.Comp.NextVisualUpdate = curTime + ent.Comp.AnimationDuration;
+        Dirty(ent);
+
+        _appearance.SetData(ent.Owner, ProximityTriggerVisualState.State, ProximityTriggerVisuals.Active);
+
+        Trigger(ent.Owner, user, ent.Comp.KeyOut);
+    }
+
+    private void UpdateProximity()
+    {
+        var curTime = _timing.CurTime;
+
+        var query = EntityQueryEnumerator<TriggerOnProximityComponent>();
+        while (query.MoveNext(out var uid, out var trigger))
+        {
+            if (curTime >= trigger.NextVisualUpdate)
+            {
+                // Update the visual state once the animation is done.
+                trigger.NextVisualUpdate = TimeSpan.MaxValue;
+                Dirty(uid, trigger);
+                SetProximityAppearance((uid, trigger));
+            }
+
+            if (!trigger.Enabled)
+                continue;
+
+            if (curTime < trigger.NextTrigger)
+                // The trigger's on cooldown.
+                continue;
+
+            // Check for anything colliding and moving fast enough.
+            foreach (var (collidingUid, colliding) in trigger.Colliding)
+            {
+                if (TerminatingOrDeleted(collidingUid))
+                    continue;
+
+                if (colliding.LinearVelocity.Length() < trigger.TriggerSpeed)
+                    continue;
+
+                // Trigger!
+                Activate((uid, trigger), collidingUid);
+                break;
+            }
+        }
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Signal.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Signal.cs
new file mode 100644
index 000000000000..fa5aa7ea6e2c
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Signal.cs
@@ -0,0 +1,44 @@
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.Trigger.Components.Effects;
+using Content.Shared.DeviceLinking.Events;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeSignal()
+    {
+        SubscribeLocalEvent<SignalOnTriggerComponent, ComponentInit>(SignalOnTriggerInit);
+        SubscribeLocalEvent<TriggerOnSignalComponent, ComponentInit>(TriggerOnSignalInit);
+
+        SubscribeLocalEvent<SignalOnTriggerComponent, TriggerEvent>(HandleSignalOnTrigger);
+        SubscribeLocalEvent<TriggerOnSignalComponent, SignalReceivedEvent>(OnSignalReceived);
+    }
+
+    private void SignalOnTriggerInit(Entity<SignalOnTriggerComponent> ent, ref ComponentInit args)
+    {
+        _deviceLink.EnsureSourcePorts(ent.Owner, ent.Comp.Port);
+    }
+
+    private void TriggerOnSignalInit(Entity<TriggerOnSignalComponent> ent, ref ComponentInit args)
+    {
+        _deviceLink.EnsureSinkPorts(ent.Owner, ent.Comp.Port);
+    }
+
+    private void HandleSignalOnTrigger(Entity<SignalOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        _deviceLink.InvokePort(ent.Owner, ent.Comp.Port);
+        args.Handled = true;
+    }
+
+    private void OnSignalReceived(Entity<TriggerOnSignalComponent> ent, ref SignalReceivedEvent args)
+    {
+        if (args.Port != ent.Comp.Port)
+            return;
+
+        Trigger(ent.Owner, args.Trigger, ent.Comp.KeyOut);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Spawn.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Spawn.cs
new file mode 100644
index 000000000000..edcdd0389410
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Spawn.cs
@@ -0,0 +1,70 @@
+using Content.Shared.Trigger.Components.Effects;
+using Content.Shared.Trigger.Components.Triggers;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+
+    private void InitializeSpawn()
+    {
+        SubscribeLocalEvent<TriggerOnSpawnComponent, MapInitEvent>(OnSpawnInit);
+
+        SubscribeLocalEvent<SpawnOnTriggerComponent, TriggerEvent>(HandleSpawnOnTrigger);
+        SubscribeLocalEvent<DeleteOnTriggerComponent, TriggerEvent>(HandleDeleteOnTrigger);
+    }
+
+    private void OnSpawnInit(Entity<TriggerOnSpawnComponent> ent, ref MapInitEvent args)
+    {
+        Trigger(ent.Owner, null, ent.Comp.KeyOut);
+    }
+
+    private void HandleSpawnOnTrigger(Entity<SpawnOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        var xform = Transform(target.Value);
+
+        if (ent.Comp.UseMapCoords)
+        {
+            var mapCoords = _transform.GetMapCoordinates(target.Value, xform);
+            if (ent.Comp.Predicted)
+                EntityManager.PredictedSpawn(ent.Comp.Proto, mapCoords);
+            else if (_net.IsServer)
+                Spawn(ent.Comp.Proto, mapCoords);
+
+        }
+        else
+        {
+            var coords = xform.Coordinates;
+            if (!coords.IsValid(EntityManager))
+                return;
+
+            if (ent.Comp.Predicted)
+                PredictedSpawnAttachedTo(ent.Comp.Proto, coords);
+            else if (_net.IsServer)
+                SpawnAttachedTo(ent.Comp.Proto, coords);
+
+        }
+    }
+
+    private void HandleDeleteOnTrigger(Entity<DeleteOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        PredictedQueueDel(target);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Timer.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Timer.cs
new file mode 100644
index 000000000000..776b17bda61b
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Timer.cs
@@ -0,0 +1,179 @@
+using Content.Shared.Trigger.Components;
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.Examine;
+using Content.Shared.Verbs;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeTimer()
+    {
+        SubscribeLocalEvent<RepeatingTriggerComponent, MapInitEvent>(OnRepeatInit);
+        SubscribeLocalEvent<RandomTimerTriggerComponent, MapInitEvent>(OnRandomInit);
+        SubscribeLocalEvent<TimerTriggerComponent, ComponentShutdown>(OnTimerShutdown);
+        SubscribeLocalEvent<TimerTriggerComponent, ExaminedEvent>(OnTimerExamined);
+        SubscribeLocalEvent<TimerTriggerComponent, TriggerEvent>(OnTimerTriggered);
+        SubscribeLocalEvent<TimerTriggerComponent, GetVerbsEvent<AlternativeVerb>>(OnTimerGetAltVerbs);
+    }
+
+    // set the time of the first trigger after being spawned
+    private void OnRepeatInit(Entity<RepeatingTriggerComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextTrigger = _timing.CurTime + ent.Comp.Delay;
+        Dirty(ent);
+    }
+
+    private void OnRandomInit(Entity<RandomTimerTriggerComponent> ent, ref MapInitEvent args)
+    {
+        if (_net.IsClient) // Nextfloat will mispredict, so we set it on the server and dirty it
+            return;
+
+        if (!TryComp<TimerTriggerComponent>(ent, out var timerTriggerComp))
+            return;
+
+        timerTriggerComp.Delay = TimeSpan.FromSeconds(_random.NextFloat(ent.Comp.Min, ent.Comp.Max));
+        Dirty(ent.Owner, timerTriggerComp);
+    }
+
+    private void OnTimerShutdown(Entity<TimerTriggerComponent> ent, ref ComponentShutdown args)
+    {
+        RemComp<ActiveTimerTriggerComponent>(ent);
+    }
+
+    private void OnTimerExamined(Entity<TimerTriggerComponent> ent, ref ExaminedEvent args)
+    {
+        if (args.IsInDetailsRange && ent.Comp.Examinable)
+            args.PushText(Loc.GetString("timer-trigger-examine", ("time", ent.Comp.Delay.TotalSeconds)));
+    }
+
+    private void OnTimerTriggered(Entity<TimerTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        args.Handled |= ActivateTimerTrigger(ent.AsNullable(), args.User);
+    }
+
+    /// <summary>
+    /// Add an alt-click interaction that cycles through delays.
+    /// </summary>
+    private void OnTimerGetAltVerbs(Entity<TimerTriggerComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess || args.Hands == null)
+            return;
+
+        if (ent.Comp.DelayOptions == null || ent.Comp.DelayOptions.Count == 1)
+            return;
+
+        var user = args.User;
+
+        args.Verbs.Add(new AlternativeVerb
+        {
+            Category = TimerOptions,
+            Text = Loc.GetString("timer-trigger-verb-cycle"),
+            Act = () => CycleDelay(ent, user),
+            Priority = 1
+        });
+
+        foreach (var option in ent.Comp.DelayOptions)
+        {
+            if (MathHelper.CloseTo(option.TotalSeconds, ent.Comp.Delay.TotalSeconds))
+            {
+                args.Verbs.Add(new AlternativeVerb
+                {
+                    Category = TimerOptions,
+                    Text = Loc.GetString("timer-trigger-verb-set-current", ("time", option.TotalSeconds)),
+                    Disabled = true,
+                    Priority = -100 * (int)option.TotalSeconds
+                });
+            }
+            else
+            {
+                args.Verbs.Add(new AlternativeVerb
+                {
+                    Category = TimerOptions,
+                    Text = Loc.GetString("timer-trigger-verb-set", ("time", option.TotalSeconds)),
+                    Priority = -100 * (int)option.TotalSeconds,
+                    Act = () =>
+                    {
+                        ent.Comp.Delay = option;
+                        Dirty(ent);
+                        _popup.PopupClient(Loc.GetString("timer-trigger-popup-set", ("time", option.TotalSeconds)), user, user);
+                    }
+                });
+            }
+        }
+    }
+
+    public static readonly VerbCategory TimerOptions = new("verb-categories-timer", "/Textures/Interface/VerbIcons/clock.svg.192dpi.png");
+
+    /// <summary>
+    /// Select the next entry from the DelayOptions.
+    /// </summary>
+    private void CycleDelay(Entity<TimerTriggerComponent> ent, EntityUid? user)
+    {
+        if (ent.Comp.DelayOptions.Count <= 1)
+            return;
+
+        // This is somewhat inefficient, but its good enough. This is run rarely, and the lists should be short.
+
+        ent.Comp.DelayOptions.Sort();
+        Dirty(ent);
+
+        if (ent.Comp.DelayOptions[^1] <= ent.Comp.Delay)
+        {
+            ent.Comp.Delay = ent.Comp.DelayOptions[0];
+            _popup.PopupClient(Loc.GetString("timer-trigger-popup-set", ("time", ent.Comp.Delay)), ent.Owner, user);
+            return;
+        }
+
+        foreach (var option in ent.Comp.DelayOptions)
+        {
+            if (option > ent.Comp.Delay)
+            {
+                ent.Comp.Delay = option;
+                _popup.PopupClient(Loc.GetString("timer-trigger-popup-set", ("time", option)), ent.Owner, user);
+                return;
+            }
+        }
+    }
+
+    private void UpdateRepeat()
+    {
+        var curTime = _timing.CurTime;
+        var query = EntityQueryEnumerator<RepeatingTriggerComponent>();
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            if (comp.NextTrigger > curTime)
+                continue;
+
+            comp.NextTrigger += comp.Delay;
+            Dirty(uid, comp);
+            Trigger(uid, null, comp.KeyOut);
+        }
+    }
+
+    private void UpdateTimer()
+    {
+        var curTime = _timing.CurTime;
+        var query = EntityQueryEnumerator<ActiveTimerTriggerComponent, TimerTriggerComponent>();
+        while (query.MoveNext(out var uid, out _, out var timer))
+        {
+            if (_net.IsServer && timer.BeepSound != null && timer.NextBeep <= curTime)
+            {
+                _audio.PlayPvs(timer.BeepSound, uid);
+                timer.NextBeep += timer.BeepInterval;
+            }
+
+            if (timer.NextTrigger <= curTime)
+            {
+                Trigger(uid, timer.User, timer.KeyOut);
+                // Remove after triggering to prevent it from starting the timer again
+                RemComp<ActiveTimerTriggerComponent>(uid);
+                if (TryComp<AppearanceComponent>(uid, out var appearance))
+                    _appearance.SetData(uid, TriggerVisuals.VisualState, TriggerVisualState.Unprimed, appearance);
+            }
+        }
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Voice.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Voice.cs
new file mode 100644
index 000000000000..ac67cb7ed254
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Voice.cs
@@ -0,0 +1,160 @@
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
+using Content.Shared.Database;
+using Content.Shared.Examine;
+using Content.Shared.Verbs;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeVoice()
+    {
+        SubscribeLocalEvent<TriggerOnVoiceComponent, ComponentInit>(OnVoiceInit);
+        SubscribeLocalEvent<TriggerOnVoiceComponent, ExaminedEvent>(OnVoiceExamine);
+        SubscribeLocalEvent<TriggerOnVoiceComponent, ListenEvent>(OnListen);
+        SubscribeLocalEvent<TriggerOnVoiceComponent, GetVerbsEvent<AlternativeVerb>>(OnVoiceGetAltVerbs);
+    }
+
+    private void OnVoiceInit(Entity<TriggerOnVoiceComponent> ent, ref ComponentInit args)
+    {
+        if (ent.Comp.IsListening)
+            EnsureComp<ActiveListenerComponent>(ent).Range = ent.Comp.ListenRange;
+        else
+            RemCompDeferred<ActiveListenerComponent>(ent);
+    }
+
+    private void OnVoiceExamine(Entity<TriggerOnVoiceComponent> ent, ref ExaminedEvent args)
+    {
+        if (args.IsInDetailsRange)
+        {
+            args.PushText(string.IsNullOrWhiteSpace(ent.Comp.KeyPhrase)
+                ? Loc.GetString("trigger-on-voice-uninitialized")
+                : Loc.GetString("trigger-on-voice-examine", ("keyphrase", ent.Comp.KeyPhrase)));
+        }
+    }
+    private void OnListen(Entity<TriggerOnVoiceComponent> ent, ref ListenEvent args)
+    {
+        var component = ent.Comp;
+        var message = args.Message.Trim();
+
+        if (component.IsRecording)
+        {
+            var ev = new ListenAttemptEvent(args.Source);
+            RaiseLocalEvent(ent, ev);
+
+            if (ev.Cancelled)
+                return;
+
+            if (message.Length >= component.MinLength && message.Length <= component.MaxLength)
+                FinishRecording(ent, args.Source, args.Message);
+            else if (message.Length > component.MaxLength)
+                _popup.PopupEntity(Loc.GetString("trigger-on-voice-record-failed-too-long"), ent);
+            else if (message.Length < component.MinLength)
+                _popup.PopupEntity(Loc.GetString("trigger-on-voice-record-failed-too-short"), ent);
+
+            return;
+        }
+
+        if (!string.IsNullOrWhiteSpace(component.KeyPhrase) && message.IndexOf(component.KeyPhrase, StringComparison.InvariantCultureIgnoreCase) is var index and >= 0)
+        {
+            _adminLogger.Add(LogType.Trigger, LogImpact.Medium,
+                    $"A voice-trigger on {ToPrettyString(ent):entity} was triggered by {ToPrettyString(args.Source):speaker} speaking the key-phrase {component.KeyPhrase}.");
+            Trigger(ent, args.Source, ent.Comp.KeyOut);
+
+            var messageWithoutPhrase = message.Remove(index, component.KeyPhrase.Length).Trim();
+            var voice = new VoiceTriggeredEvent(args.Source, message, messageWithoutPhrase);
+            RaiseLocalEvent(ent, ref voice);
+        }
+    }
+
+    private void OnVoiceGetAltVerbs(Entity<TriggerOnVoiceComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess)
+            return;
+
+        var user = args.User;
+        args.Verbs.Add(new AlternativeVerb
+        {
+            Text = Loc.GetString(ent.Comp.IsRecording ? "trigger-on-voice-stop" : "trigger-on-voice-record"),
+            Act = () =>
+            {
+                if (ent.Comp.IsRecording)
+                    StopRecording(ent, user);
+                else
+                    StartRecording(ent, user);
+            },
+            Priority = 1
+        });
+
+        if (string.IsNullOrWhiteSpace(ent.Comp.KeyPhrase))
+            return;
+
+        args.Verbs.Add(new AlternativeVerb
+        {
+            Text = Loc.GetString("trigger-on-voice-clear"),
+            Act = () =>
+            {
+                ClearRecording(ent);
+            }
+        });
+    }
+
+    /// <summary>
+    /// Start recording a new keyphrase.
+    /// </summary>
+    public void StartRecording(Entity<TriggerOnVoiceComponent> ent, EntityUid? user)
+    {
+        ent.Comp.IsRecording = true;
+        Dirty(ent);
+        EnsureComp<ActiveListenerComponent>(ent).Range = ent.Comp.ListenRange;
+
+        if (user == null)
+            _adminLogger.Add(LogType.Trigger, LogImpact.Low, $"A voice-trigger on {ToPrettyString(ent):entity} has started recording.");
+        else
+            _adminLogger.Add(LogType.Trigger, LogImpact.Low, $"A voice-trigger on {ToPrettyString(ent):entity} has started recording. User: {ToPrettyString(user.Value):user}");
+
+        _popup.PopupPredicted(Loc.GetString("trigger-on-voice-start-recording"), ent, user);
+    }
+
+    /// <summary>
+    /// Stop recording without setting a keyphrase.
+    /// </summary>
+    public void StopRecording(Entity<TriggerOnVoiceComponent> ent, EntityUid? user)
+    {
+        ent.Comp.IsRecording = false;
+        Dirty(ent);
+        if (string.IsNullOrWhiteSpace(ent.Comp.KeyPhrase))
+            RemComp<ActiveListenerComponent>(ent);
+
+        _popup.PopupPredicted(Loc.GetString("trigger-on-voice-stop-recording"), ent, user);
+    }
+
+
+    /// <summary>
+    /// Stop recording and set the current keyphrase message.
+    /// </summary>
+    public void FinishRecording(Entity<TriggerOnVoiceComponent> ent, EntityUid source, string message)
+    {
+        ent.Comp.KeyPhrase = message;
+        ent.Comp.IsRecording = false;
+        Dirty(ent);
+
+        _adminLogger.Add(LogType.Trigger, LogImpact.Low,
+                $"A voice-trigger on {ToPrettyString(ent):entity} has recorded a new keyphrase: '{ent.Comp.KeyPhrase}'. Recorded from {ToPrettyString(source):speaker}");
+
+        _popup.PopupEntity(Loc.GetString("trigger-on-voice-recorded", ("keyphrase", ent.Comp.KeyPhrase)), ent);
+    }
+
+    /// <summary>
+    /// Resets the key phrase and stops recording.
+    /// </summary>
+    public void ClearRecording(Entity<TriggerOnVoiceComponent> ent)
+    {
+        ent.Comp.KeyPhrase = null;
+        ent.Comp.IsRecording = false;
+        Dirty(ent);
+        RemComp<ActiveListenerComponent>(ent);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.cs b/Content.Shared/Trigger/Systems/TriggerSystem.cs
new file mode 100644
index 000000000000..6a749b87abd8
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.cs
@@ -0,0 +1,186 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Database;
+using Content.Shared.DeviceLinking;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Popups;
+using Content.Shared.Timing;
+using Content.Shared.Trigger.Components;
+using Content.Shared.Whitelist;
+using Robust.Shared.Network;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Timing;
+using Robust.Shared.Random;
+using Robust.Shared.Audio.Systems;
+
+
+namespace Content.Shared.Trigger.Systems;
+
+/// <summary>
+/// System containing the basic trigger API.
+/// </summary>
+/// <remarks>
+/// If you add a custom trigger subscription or effect then don't put them here.
+/// Put them into a separate system so we don't end up with a giant list of imports.
+/// </remarks>
+public sealed partial class TriggerSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly FixtureSystem _fixture = default!;
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly UseDelaySystem _useDelay = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+    [Dependency] private readonly ItemToggleSystem _itemToggle = default!;
+    [Dependency] private readonly SharedDeviceLinkSystem _deviceLink = default!;
+
+    public const string DefaultTriggerKey = "trigger";
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        InitializeCollide();
+        InitializeCondition();
+        InitializeInteraction();
+        InitializeProximity();
+        InitializeSignal();
+        InitializeTimer();
+        InitializeSpawn();
+        InitializeVoice();
+    }
+
+    /// <summary>
+    /// Trigger the given entity.
+    /// </summary>
+    /// <param name="trigger">The entity that has the components that should be triggered.</param>
+    /// <param name="user">The user of the trigger. Some effects may target the user instead of the trigger entity.</param>
+    /// <param name="key">A key string to allow multiple, independent triggers on the same entity. If null then all triggers will activate.</param>
+    /// <returns>Whether or not the trigger has sucessfully activated an effect.</returns>
+    public bool Trigger(EntityUid trigger, EntityUid? user = null, string? key = null)
+    {
+        var attemptTriggerEvent = new AttemptTriggerEvent(user, key);
+        RaiseLocalEvent(trigger, ref attemptTriggerEvent);
+        if (attemptTriggerEvent.Cancelled)
+            return false;
+
+        var triggerEvent = new TriggerEvent(user, key);
+        RaiseLocalEvent(trigger, ref triggerEvent, true);
+        return triggerEvent.Handled;
+    }
+
+    /// <summary>
+    /// Activate a timer trigger on an entity with <see cref="TimerTriggerComponent"/>.
+    /// </summary>
+    /// <returns>Whether or not a timer was activated.</returns>
+    public bool ActivateTimerTrigger(Entity<TimerTriggerComponent?> ent, EntityUid? user = null)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
+
+        if (HasComp<ActiveTimerTriggerComponent>(ent))
+            return false; // already activated
+
+        if (user != null)
+        {
+            _adminLogger.Add(LogType.Trigger,
+                $"{ToPrettyString(user.Value):user} started a {ent.Comp.Delay} second timer trigger on entity {ToPrettyString(ent.Owner):timer}");
+        }
+        else
+        {
+            _adminLogger.Add(LogType.Trigger,
+                $"{ent.Comp.Delay} second timer trigger started on entity {ToPrettyString(ent.Owner):timer}");
+        }
+
+        if (ent.Comp.Popup != null)
+            _popup.PopupPredicted(Loc.GetString(ent.Comp.Popup.Value, ("device", ent.Owner)), ent.Owner, user);
+
+        AddComp<ActiveTimerTriggerComponent>(ent);
+        var curTime = _timing.CurTime;
+        ent.Comp.NextTrigger = curTime + ent.Comp.Delay;
+        var delay = ent.Comp.InitialBeepDelay ?? ent.Comp.BeepInterval;
+        ent.Comp.NextBeep = curTime + delay;
+        Dirty(ent);
+
+        var ev = new ActiveTimerTriggerEvent(user);
+        RaiseLocalEvent(ent.Owner, ref ev);
+
+        if (TryComp<AppearanceComponent>(ent, out var appearance))
+            _appearance.SetData(ent.Owner, TriggerVisuals.VisualState, TriggerVisualState.Primed, appearance);
+
+        return true;
+    }
+
+    /// <summary>
+    /// Stop a timer trigger on an entity with <see cref="TimerTriggerComponent"/>.
+    /// </summary>
+    /// <returns>Whether or not a timer was stopped.</returns>
+    public bool StopTimerTrigger(Entity<TimerTriggerComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
+
+        if (!HasComp<ActiveTimerTriggerComponent>(ent))
+            return false; // the timer is not active
+
+        RemComp<ActiveTimerTriggerComponent>(ent);
+        if (TryComp<AppearanceComponent>(ent.Owner, out var appearance))
+            _appearance.SetData(ent.Owner, TriggerVisuals.VisualState, TriggerVisualState.Unprimed, appearance);
+
+        _adminLogger.Add(LogType.Trigger, $"A timer trigger was stopped before triggering on entity {ToPrettyString(ent.Owner):timer}");
+        return true;
+    }
+
+    /// <summary>
+    /// Delay an active timer trigger.
+    /// Returns false if not active.
+    /// </summary>
+    /// <param name="amount">The time to add.</param>
+    public bool TryDelay(Entity<TimerTriggerComponent?> ent, TimeSpan amount)
+    {
+        if (!Resolve(ent, ref ent.Comp, false) || !HasComp<ActiveTimerTriggerComponent>(ent))
+            return false;
+
+        ent.Comp.NextTrigger += amount;
+        Dirty(ent);
+        return true;
+    }
+
+    /// <summary>
+    /// Setter for the Delay datafield.
+    /// </summary>
+    public void SetDelay(Entity<TimerTriggerComponent?> ent, TimeSpan delay)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        ent.Comp.Delay = delay;
+        Dirty(ent);
+    }
+
+    /// <summary>
+    /// Gets the remaining time until the trigger will activate.
+    /// Returns null if the trigger is not currently active.
+    /// </summary>
+    public TimeSpan? GetRemainingTime(Entity<TimerTriggerComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp, false) || !HasComp<ActiveTimerTriggerComponent>(ent))
+            return null; // not a timer or not currently active
+
+        return ent.Comp.NextTrigger - _timing.CurTime;
+    }
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        UpdateTimer();
+        UpdateRepeat();
+        UpdateProximity();
+        UpdateTimedCollide();
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TwoStageTriggerSystem.cs b/Content.Shared/Trigger/Systems/TwoStageTriggerSystem.cs
new file mode 100644
index 000000000000..2461e797dcd4
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TwoStageTriggerSystem.cs
@@ -0,0 +1,51 @@
+using Robust.Shared.Timing;
+using Content.Shared.Trigger.Components;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class TwoStageTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly TriggerSystem _triggerSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TwoStageTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<TwoStageTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (ent.Comp.Triggered)
+            return; // already triggered
+
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        EntityManager.AddComponents(ent, ent.Comp.Components);
+        EnsureComp<ActiveTwoStageTriggerComponent>(ent);
+        ent.Comp.Triggered = true;
+        ent.Comp.NextTriggerTime = _timing.CurTime + ent.Comp.TriggerDelay;
+        ent.Comp.User = args.User;
+        Dirty(ent);
+
+        args.Handled = true;
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var curTime = _timing.CurTime;
+        var enumerator = EntityQueryEnumerator<ActiveTwoStageTriggerComponent, TwoStageTriggerComponent>();
+        while (enumerator.MoveNext(out var uid, out _, out var component))
+        {
+            if (curTime < component.NextTriggerTime)
+                continue;
+
+            RemComp<ActiveTwoStageTriggerComponent>(uid);
+            _triggerSystem.Trigger(uid, component.User, component.KeyOut);
+        }
+    }
+}
diff --git a/Content.Shared/Trigger/TriggerEvent.cs b/Content.Shared/Trigger/TriggerEvent.cs
new file mode 100644
index 000000000000..e65e3b48a875
--- /dev/null
+++ b/Content.Shared/Trigger/TriggerEvent.cs
@@ -0,0 +1,33 @@
+namespace Content.Shared.Trigger;
+
+/// <summary>
+/// Raised whenever something is Triggered on the entity.
+/// </summary>
+/// <param name="User">The entity that activated the trigger.</param>
+/// <param name="Key">
+/// Allows to have multiple independent triggers on the same entity.
+/// Setting this to null will activate all triggers.
+/// </param>
+/// <param name="Handled">Marks the event as handled if at least one trigger effect was activated.</param>
+[ByRefEvent]
+public record struct TriggerEvent(EntityUid? User = null, string? Key = null, bool Handled = false);
+
+/// <summary>
+/// Raised before a trigger is activated.
+/// Cancelling prevents it from triggering.
+/// </summary>
+/// <param name="User">The entity that activated the trigger.</param>
+/// <param name="Key">
+/// Allows to have multiple independent triggers on the same entity.
+/// Setting this to null will activate all triggers.
+/// </param>
+/// <param name="Handled">Marks the event as handled if at least one trigger effect was activated.</param>
+[ByRefEvent]
+public record struct AttemptTriggerEvent(EntityUid? User, string? Key = null, bool Cancelled = false);
+
+/// <summary>
+/// Raised when a timer trigger becomes active.
+/// </summary>
+/// <param name="User">The entity that activated the trigger.</param>
+[ByRefEvent]
+public readonly record struct ActiveTimerTriggerEvent(EntityUid? User);
diff --git a/Content.Shared/Trigger/TriggerVisuals.cs.rej b/Content.Shared/Trigger/TriggerVisuals.cs.rej
new file mode 100644
index 000000000000..ebe82682577d
--- /dev/null
+++ b/Content.Shared/Trigger/TriggerVisuals.cs.rej
@@ -0,0 +1,56 @@
+diff a/Content.Shared/Trigger/TriggerVisuals.cs b/Content.Shared/Trigger/TriggerVisuals.cs	(rejected hunks)
+@@ -1,31 +1,30 @@
+ using Robust.Shared.Serialization;
+ 
+-namespace Content.Shared.Trigger
++namespace Content.Shared.Trigger;
++
++[Serializable, NetSerializable]
++public enum ProximityTriggerVisuals : byte
+ {
+-    [Serializable, NetSerializable]
+-    public enum ProximityTriggerVisuals : byte
+-    {
+-        Off,
+-        Inactive,
+-        Active,
+-    }
++    Off,
++    Inactive,
++    Active,
++}
+ 
+-    [Serializable, NetSerializable]
+-    public enum ProximityTriggerVisualState : byte
+-    {
+-        State,
+-    }
++[Serializable, NetSerializable]
++public enum ProximityTriggerVisualState : byte
++{
++    State,
++}
+ 
+-    [Serializable, NetSerializable]
+-    public enum TriggerVisuals : byte
+-    {
+-        VisualState,
+-    }
++[Serializable, NetSerializable]
++public enum TriggerVisuals : byte
++{
++    VisualState,
++}
+ 
+-    [Serializable, NetSerializable]
+-    public enum TriggerVisualState : byte
+-    {
+-        Primed,
+-        Unprimed,
+-    }
++[Serializable, NetSerializable]
++public enum TriggerVisualState : byte
++{
++    Primed,
++    Unprimed,
+ }
diff --git a/Content.Shared/Trigger/VoiceTriggeredEvent.cs b/Content.Shared/Trigger/VoiceTriggeredEvent.cs
new file mode 100644
index 000000000000..af138b56cfa8
--- /dev/null
+++ b/Content.Shared/Trigger/VoiceTriggeredEvent.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared.Trigger;
+
+/// <summary>
+/// Raised when a voice trigger is activated, containing the message that triggered it.
+/// </summary>
+/// <param name="Source"> The EntityUid of the entity sending the message</param>
+/// <param name="Message"> The contents of the message</param>
+/// <param name="MessageWithoutPhrase"> The message without the phrase that triggered it.</param>
+[ByRefEvent]
+public readonly record struct VoiceTriggeredEvent(EntityUid Source, string? Message, string MessageWithoutPhrase);
diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs
index c07d039e8a66..c2c4fc069beb 100644
--- a/Content.Shared/VendingMachines/VendingMachineComponent.cs
+++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs
@@ -211,15 +211,18 @@ public sealed partial class VendingMachineComponent : Component
         #endregion
     }
 
-    [Serializable, NetSerializable]
-    public sealed class VendingMachineInventoryEntry
+    [Serializable, NetSerializable, DataDefinition]
+    public sealed partial class VendingMachineInventoryEntry
     {
-        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public InventoryType Type;
-        [ViewVariables(VVAccess.ReadWrite)]
+
+        [DataField]
         public string ID;
-        [ViewVariables(VVAccess.ReadWrite)]
+
+        [DataField]
         public uint Amount;
+
         public VendingMachineInventoryEntry(InventoryType type, string id, uint amount)
         {
             Type = type;
diff --git a/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs b/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs
index e8061036df0f..745a51e9cd0b 100644
--- a/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs
+++ b/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs
@@ -91,17 +91,17 @@ public void PlayHitSound(EntityUid targetUid, EntityUid? userUid, string? damage
         {
             if (damageType == null && damageSoundComp.NoDamageSound != null)
             {
-                _audio.PlayPredicted(damageSoundComp.NoDamageSound, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(damageSoundComp.NoDamageSound, coords, userUid, damageSoundComp.NoDamageSound.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
             else if (damageType != null && damageSoundComp.SoundTypes?.TryGetValue(damageType, out var damageSoundType) == true)
             {
-                _audio.PlayPredicted(damageSoundType, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(damageSoundType, coords, userUid, damageSoundType.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
             else if (damageType != null && damageSoundComp.SoundGroups?.TryGetValue(damageType, out var damageSoundGroup) == true)
             {
-                _audio.PlayPredicted(damageSoundGroup, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(damageSoundGroup, coords, userUid, damageSoundGroup.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
         }
@@ -111,17 +111,17 @@ public void PlayHitSound(EntityUid targetUid, EntityUid? userUid, string? damage
         {
             if (hitSoundOverride != null)
             {
-                _audio.PlayPredicted(hitSoundOverride, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(hitSoundOverride, coords, userUid, hitSoundOverride.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
             else if (hitSound != null)
             {
-                _audio.PlayPredicted(hitSound, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(hitSound, coords, userUid, hitSound.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
             else
             {
-                _audio.PlayPredicted(noDamageSound, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(noDamageSound, coords, userUid, noDamageSound.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
         }
diff --git a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
index 7ede021b159b..3f267f5ada65 100644
--- a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
+++ b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
@@ -114,7 +114,7 @@ private void ThrowOnHitHelper(Entity<MeleeThrowOnHitComponent> ent, EntityUid? u
         RaiseLocalEvent(target, ref startEvent);
 
         if (ent.Comp.StunTime != null)
-            _stun.TryParalyze(target, ent.Comp.StunTime.Value, false);
+            _stun.TryAddParalyzeDuration(target, ent.Comp.StunTime.Value);
 
         if (direction == Vector2.Zero)
             return;
diff --git a/Content.Shared/Weapons/Misc/ForceGunComponent.cs b/Content.Shared/Weapons/Misc/ForceGunComponent.cs
index c9c86809752b..5ed6eaacd8b5 100644
--- a/Content.Shared/Weapons/Misc/ForceGunComponent.cs
+++ b/Content.Shared/Weapons/Misc/ForceGunComponent.cs
@@ -14,19 +14,13 @@ public sealed partial class ForceGunComponent : BaseForceGunComponent
     /// <summary>
     /// Maximum distance to throw entities.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("throwDistance"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public float ThrowDistance = 15f;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("throwForce"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public float ThrowForce = 30f;
 
-    /// <summary>
-    /// The entity currently tethered.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("tethered"), AutoNetworkedField]
-    public override EntityUid? Tethered { get; set; }
-
-    [ViewVariables(VVAccess.ReadWrite), DataField("soundLaunch")]
+    [DataField("soundLaunch")]
     public SoundSpecifier? LaunchSound = new SoundPathSpecifier("/Audio/Weapons/soup.ogg")
     {
         Params = AudioParams.Default.WithVolume(5f),
diff --git a/Content.Shared/Weapons/Misc/TetherGunComponent.cs.rej b/Content.Shared/Weapons/Misc/TetherGunComponent.cs.rej
new file mode 100644
index 000000000000..b4bf48254348
--- /dev/null
+++ b/Content.Shared/Weapons/Misc/TetherGunComponent.cs.rej
@@ -0,0 +1,21 @@
+diff a/Content.Shared/Weapons/Misc/TetherGunComponent.cs b/Content.Shared/Weapons/Misc/TetherGunComponent.cs	(rejected hunks)
+@@ -5,18 +5,6 @@ namespace Content.Shared.Weapons.Misc;
+ [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+ public sealed partial class TetherGunComponent : BaseForceGunComponent
+ {
+-    [ViewVariables(VVAccess.ReadWrite), DataField("maxDistance"), AutoNetworkedField]
++    [DataField, AutoNetworkedField]
+     public float MaxDistance = 10f;
+-
+-    /// <summary>
+-    /// The entity the tethered target has a joint to.
+-    /// </summary>
+-    [DataField("tetherEntity"), AutoNetworkedField]
+-    public override EntityUid? TetherEntity { get; set; }
+-
+-    /// <summary>
+-    /// The entity currently tethered.
+-    /// </summary>
+-    [ViewVariables(VVAccess.ReadWrite), DataField("tethered"), AutoNetworkedField]
+-    public override EntityUid? Tethered { get; set; }
+ }
diff --git a/Content.Shared/Weapons/Ranged/Events/OnEmptyGunShotEvent.cs.rej b/Content.Shared/Weapons/Ranged/Events/OnEmptyGunShotEvent.cs.rej
new file mode 100644
index 000000000000..67b60b1329d3
--- /dev/null
+++ b/Content.Shared/Weapons/Ranged/Events/OnEmptyGunShotEvent.cs.rej
@@ -0,0 +1,7 @@
+diff a/Content.Shared/Weapons/Ranged/Events/OnEmptyGunShotEvent.cs b/Content.Shared/Weapons/Ranged/Events/OnEmptyGunShotEvent.cs	(rejected hunks)
+@@ -4,4 +4,4 @@ namespace Content.Shared.Weapons.Ranged.Events;
+ /// Raised directed on the gun when trying to fire it while it's out of ammo
+ /// </summary>
+ [ByRefEvent]
+-public record struct OnEmptyGunShotEvent(EntityUid EmptyGun);
++public record struct OnEmptyGunShotEvent(EntityUid User);
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 9629d5b0b36b..64dd51f1bffc 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -313,11 +313,12 @@ private void StopShooting(EntityUid uid, GunComponent gun)
     /// <summary>
     /// Attempts to shoot at the target coordinates. Resets the shot counter after every shot.
     /// </summary>
-    public void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun, EntityCoordinates toCoordinates)
+    public void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun, EntityCoordinates toCoordinates, EntityUid? target = null)
     {
         gun.ShootCoordinates = toCoordinates;
         AttemptShoot(user, gunUid, gun);
         gun.ShotCounter = 0;
+        gun.Target = target;
         DirtyField(gunUid, gun, nameof(GunComponent.ShotCounter));
     }
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs.rej b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs.rej
new file mode 100644
index 000000000000..dca2bdced567
--- /dev/null
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs.rej
@@ -0,0 +1,10 @@
+diff a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs	(rejected hunks)
+@@ -340,7 +341,7 @@ private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
+         if (ev.Ammo.Count <= 0)
+         {
+             // triggers effects on the gun if it's empty
+-            var emptyGunShotEvent = new OnEmptyGunShotEvent();
++            var emptyGunShotEvent = new OnEmptyGunShotEvent(user);
+             RaiseLocalEvent(gunUid, ref emptyGunShotEvent);
+ 
+             gun.BurstActivated = false;
diff --git a/Resources/Audio/MidiCustom/LICENSE b/Resources/Audio/MidiCustom/LICENSE
new file mode 100644
index 000000000000..273d5cc6bf61
--- /dev/null
+++ b/Resources/Audio/MidiCustom/LICENSE
@@ -0,0 +1,47 @@
+*** GeneralUser GS v2.0.1 ***
+***      License v2.0     ***
+
+** License of the complete work **
+You may use GeneralUser GS without restriction for your own music creation,
+private or commercial. This SoundFont bank is provided to the community free of
+charge. Please feel free to use it in your software projects, and to modify the
+SoundFont bank or its packaging to suit your needs.
+
+** License of contained samples **
+GeneralUser GS inherits the usage rights of the samples contained within, all of
+which allow full use in music production, including the ability to make profit
+from musical recordings created with GeneralUser GS.
+
+Many of the samples are original, but some were taken from other banks freely
+(and legally) available on the Internet from various SoundFont websites. Because
+GeneralUser GS originated as a personal project with no intention for
+publication, I cannot be 100% sure where all of the samples originated, although
+I do know that none of them came from commercially published SoundFont packages
+or sample CDs. Regardless, many "free" SoundFonts available on the web may
+indeed contain samples of questionable origin. My understanding of the
+copyrights of all samples is only as good as the information provided by the
+original sources. If you become aware of any restricted samples being used in
+GeneralUser GS, please let me know so I can replace them.
+
+This uncertainty may concern you if you intend to use GeneralUser GS in a
+commercial software product. That being said, I have never received any
+complaint regarding sample ownership since I published the original GeneralUser
+GS back in 2000, and as far as I am aware, neither have any of the companies
+creating commercial software products using GeneralUser GS.
+
+** More info **
+If you plan to feature GeneralUser GS on your own website, please do not link
+directly to my download files. Either link to my website, or provide your own
+local copy instead.
+
+I hope you enjoy GeneralUser GS! This SoundFont bank is the product of many
+years of hard work.
+
+You can find updates to GeneralUser GS and more of my virtual instruments at:
+http://www.schristiancollins.com
+
+I can be reached via the contact page on my website here:
+https://www.schristiancollins.com/contact
+
+Thank you!
+-~Chris
diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index a656e42976e3..c52dcbe8cb91 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -1277,5 +1277,29 @@ Entries:
   id: 155
   time: '2025-07-16T22:35:14.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38384
+- author: perryprog
+  changes:
+  - message: Rejuvenate will now remove drowsiness, forced sleep, and the seeing rainbows
+      status effect.
+    type: Add
+  id: 156
+  time: '2025-07-24T15:13:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39025
+- author: slarticodefast, beck-thompson
+  changes:
+  - message: Added the "Open Camera" admin verb and the "camera" console command which
+      allow you to observe entities in separate window using a remote camera.
+    type: Add
+  id: 157
+  time: '2025-07-25T16:53:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36969
+- author: perryprog
+  changes:
+  - message: savegrid and savemap will no longer fail to save unpaused grids with
+      vending machines on them.
+    type: Fix
+  id: 158
+  time: '2025-07-31T18:34:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38406
 Name: Admin
 Order: 2
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index dbb86ef230b5..1575e62bdb0d 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,253 +1,4 @@
 Entries:
-- author: BackeTako
-  changes:
-  - message: New Salvage doors
-    type: Add
-  id: 8282
-  time: '2025-04-20T12:03:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36375
-- author: HyperB1
-  changes:
-  - message: Departmental shelves can now contain a wider variety of items.
-    type: Tweak
-  id: 8283
-  time: '2025-04-20T12:19:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34292
-- author: ScarKy0
-  changes:
-  - message: Cargo will receive slightly less mail, but will earn more spesos from
-      it. Overall earnings are still on average the same.
-    type: Tweak
-  id: 8284
-  time: '2025-04-20T13:55:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36767
-- author: HyperB1
-  changes:
-  - message: ERT engineering hardsuit now features proper fire protection.
-    type: Fix
-  id: 8285
-  time: '2025-04-20T14:06:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34949
-- author: K-Dynamic
-  changes:
-  - message: Nonlethal throwables crate can be ordered from cargo (2500 spesos) and
-      contains 4x bolas, 4x flashbang grenades, 4x tear gas grenades, 4x stinger grenades.
-    type: Add
-  id: 8286
-  time: '2025-04-20T14:08:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35808
-- author: RedBookcase
-  changes:
-  - message: Updated Pirate weapons & hardsuits to be more inline with similar items.
-    type: Tweak
-  id: 8287
-  time: '2025-04-20T20:55:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35986
-- author: Booblesnoot42
-  changes:
-  - message: The sprites for the main chapel altars have been adjusted.
-    type: Tweak
-  id: 8289
-  time: '2025-04-20T21:09:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35685
-- author: UBlueberry
-  changes:
-  - message: Beanies can now be found in WinterDrobes, don'tchaknow.
-    type: Add
-  id: 8290
-  time: '2025-04-20T21:15:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32946
-- author: Lanedon
-  changes:
-  - message: Santa hats can now be folded to remove the beard.
-    type: Tweak
-  id: 8291
-  time: '2025-04-20T21:17:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36510
-- author: Princess Cheeseballs
-  changes:
-  - message: Items now slip on slippery surfaces
-    type: Add
-  - message: Puddle slipperiness has been tweaked to be more intuitive
-    type: Tweak
-  id: 8292
-  time: '2025-04-20T21:27:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35845
-- author: uhbg
-  changes:
-  - message: The Bartender can now make Eggnog by shaking an egg, milk, and rum.
-    type: Add
-  id: 8293
-  time: '2025-04-20T21:27:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34065
-- author: notquitehadouken
-  changes:
-  - message: Kill objectives will now always require you to maroon your target.
-    type: Tweak
-  id: 8294
-  time: '2025-04-20T21:34:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35825
-- author: Entvari
-  changes:
-  - message: Added a new Wizard headset.
-    type: Add
-  - message: The Wizard now starts with the Wizard headset.
-    type: Tweak
-  id: 8295
-  time: '2025-04-20T21:38:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35732
-- author: aada
-  changes:
-  - message: Filter categories added to the circuit imprinter.
-    type: Add
-  id: 8296
-  time: '2025-04-20T22:27:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35713
-- author: ScarKy0
-  changes:
-  - message: Mail spawning has been reworked. The mail teleporter now has to be manually
-      emptied to take all the mail out. (You can do it by alt-clicking it or using
-      a verb)
-    type: Tweak
-  - message: The mail teleporter now has an internal capacity of 20. It will not spawn
-      mail past that until emptied by someone.
-    type: Add
-  id: 8297
-  time: '2025-04-21T09:32:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36774
-- author: ScarKy0
-  changes:
-  - message: Default cargo split is now 50% instead of 75%. Lockboxes remain unchanged.
-    type: Tweak
-  id: 8298
-  time: '2025-04-21T10:32:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36800
-- author: Phooooooooooooooooooooooooooooooosphate
-  changes:
-  - message: Add the medical HUDs to medical's loadout.
-    type: Add
-  id: 8299
-  time: '2025-04-21T12:07:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32847
-- author: aada
-  changes:
-  - message: Hotplates and kitchen grills can now be anchored on tables.
-    type: Fix
-  - message: Hotplates and kitchen grills now collide with walls.
-    type: Fix
-  id: 8300
-  time: '2025-04-21T15:38:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34776
-- author: insoPL
-  changes:
-  - message: being able to drag certain food items onto drain and chemmasters
-    type: Fix
-  id: 8301
-  time: '2025-04-21T15:50:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34683
-- author: Hrosts
-  changes:
-  - message: Added rehydratable mop bucket cube, replacing the big and unwieldy yellow
-      bucket in the janitorial supplies crate.
-    type: Add
-  id: 8302
-  time: '2025-04-21T17:16:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34586
-- author: K-Dynamic
-  changes:
-  - message: Increased ratio of crew to thieves from 15 to 20.
-    type: Tweak
-  id: 8303
-  time: '2025-04-21T17:24:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36531
-- author: centcomofficer24
-  changes:
-  - message: Added a genderfluid pin!
-    type: Add
-  id: 8304
-  time: '2025-04-21T17:46:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35854
-- author: ScarKy0
-  changes:
-  - message: Station AI now has a name identifier appended after their name.
-    type: Tweak
-  id: 8305
-  time: '2025-04-21T17:54:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36801
-- author: lzk228
-  changes:
-  - message: Fix identity reveal for creaming and meat spike popups.
-    type: Fix
-  id: 8306
-  time: '2025-04-21T20:15:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32003
-- author: ShadowCommander
-  changes:
-  - message: Added firelock lights for pressure and temperature warnings.
-    type: Add
-  id: 8307
-  time: '2025-04-21T22:39:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28339
-- author: lzk228
-  changes:
-  - message: Bots now can examine, use zoom and see their alerts (health & stamina).
-    type: Tweak
-  - message: Added borgs emotes to bots.
-    type: Tweak
-  id: 8308
-  time: '2025-04-21T22:49:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29949
-- author: Ghagliiarghii
-  changes:
-  - message: The monkey version of captain uniforms and the hamster version of captain
-      hats updated to match humanoid versions
-    type: Tweak
-  id: 8309
-  time: '2025-04-22T01:03:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36804
-- author: Doc-Michael
-  changes:
-  - message: Changed protection values of Security Hardsuits
-    type: Tweak
-  - message: Made Warden/HoS coats slightly more protective to better fit their position
-    type: Tweak
-  id: 8310
-  time: '2025-04-22T03:22:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30212
-- author: K-Dynamic
-  changes:
-  - message: Changed instances of 3.5 second grenade timers to 3 seconds, including
-      clusterbangs and atmos metal foam grenades.
-    type: Tweak
-  - message: Atmos metal foam grenades have been reworked to disperse foam in a 5x5
-      diamond pattern and harden within two seconds.
-    type: Tweak
-  - message: Reduced hardened metal foam health (breakable in 6 crowbar swings).
-    type: Tweak
-  - message: Changed syndicate trickbomb timer from 3.5 seconds to 5 seconds to match
-      minibombs.
-    type: Tweak
-  id: 8311
-  time: '2025-04-22T05:51:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34579
-- author: muburu
-  changes:
-  - message: Dragons can now pry open doors, including firelocks.
-    type: Tweak
-  id: 8312
-  time: '2025-04-22T06:33:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36811
-- author: sowelipililimute
-  changes:
-  - message: The Funding Allocation Computer can now adjust the cut Cargo takes from
-      lockbox sales
-    type: Add
-  - message: The Funding Allocation Computer doesn't show Cargo separately from its
-      75% cut
-    type: Tweak
-  id: 8313
-  time: '2025-04-22T12:34:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36790
 - author: yuitop
   changes:
   - message: Fingerless gloves no more blocking taking the fingerprint.
@@ -3905,3 +3656,242 @@
   id: 8794
   time: '2025-07-19T22:10:38.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/30645
+- author: Princess-Cheeseballs
+  changes:
+  - message: Added crawling!
+    type: Add
+  id: 8795
+  time: '2025-07-19T23:54:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36881
+- author: Princess-Cheeseballs
+  changes:
+  - message: Turrets and NPCs can now shoot downed targets.
+    type: Tweak
+  id: 8796
+  time: '2025-07-20T21:23:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39085
+- author: sowelipililimute
+  changes:
+  - message: SmartFridges are now implemented. You can store large amounts of chemicals
+      and plants within them for people to take.
+    type: Add
+  id: 8797
+  time: '2025-07-21T03:21:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38648
+- author: ArtisticRoomba
+  changes:
+  - message: China-lake fragmentation grenades now spew fragmentation in all directions
+      upon impact. They now do reduced explosion damage.
+    type: Tweak
+  - message: China-lake blast grenades no longer cause spacing.
+    type: Tweak
+  id: 8798
+  time: '2025-07-22T15:05:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39106
+- author: perryprog
+  changes:
+  - message: Void applause should now function as expected again.
+    type: Fix
+  id: 8799
+  time: '2025-07-22T19:34:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38731
+- author: treytipton
+  changes:
+  - message: Made NukeOps elimination announcement less wordy.
+    type: Tweak
+  id: 8800
+  time: '2025-07-23T02:58:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39158
+- author: lzk228
+  changes:
+  - message: The customvote command results now show the title the command had.
+    type: Tweak
+  id: 8801
+  time: '2025-07-23T14:15:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39137
+- author: FairlySadPanda
+  changes:
+  - message: Almost every instrument has been updated to a new soundfont (GeneralUser-GS),
+      unifying all operating systems and massively improving the sound of certain
+      instruments.
+    type: Add
+  id: 8802
+  time: '2025-07-23T15:51:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39142
+- author: slarticodefast
+  changes:
+  - message: Enabled the "showrot", "showvel" and "showangvel" commands for debug
+      permissions.
+    type: Tweak
+  - message: Fixed the "showplayervelocity" command permissions.
+    type: Tweak
+  id: 8803
+  time: '2025-07-23T18:06:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39167
+- author: Lokachop
+  changes:
+  - message: The engineering & chief engineer's hardsuit now properly glow in the
+      dark
+    type: Fix
+  id: 8804
+  time: '2025-07-24T03:04:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39153
+- author: K-Dynamic
+  changes:
+  - message: Cold slowdowns are now less impactful.
+    type: Tweak
+  id: 8805
+  time: '2025-07-24T09:44:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36316
+- author: B-Kirill
+  changes:
+  - message: The AI eye now has a postscript with the name of AI itself.
+    type: Add
+  id: 8806
+  time: '2025-07-24T11:24:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39177
+- author: SlamBamActionman
+  changes:
+  - message: Potassium-water explosion damage scaling has been tweaked to be less
+      potent.
+    type: Tweak
+  id: 8807
+  time: '2025-07-25T16:04:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37924
+- author: SlamBamActionman
+  changes:
+  - message: Chemistry foam and smoke reactions now trigger after regular mix reactions.
+    type: Tweak
+  - message: Foam, smoke and explosion reactions no longer transfer the reagents'
+      energies to the container.
+    type: Tweak
+  id: 8808
+  time: '2025-07-25T16:33:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37915
+- author: Quantum-cross
+  changes:
+  - message: Fixed pinpointer arrow not being centered properly.
+    type: Fix
+  id: 8809
+  time: '2025-07-25T19:46:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38657
+- author: PJB3005
+  changes:
+  - message: Made most plushie sounds quieter, and made plushies slower to use.
+    type: Tweak
+  id: 8811
+  time: '2025-07-28T07:11:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39250
+- author: EmoGarbage404
+  changes:
+  - message: Fixed being unable to fold certain clothing while worn.
+    type: Fix
+  id: 8812
+  time: '2025-07-28T10:19:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39257
+- author: lzk228
+  changes:
+  - message: Janibelt can hold the golden plunger now.
+    type: Fix
+  id: 8813
+  time: '2025-07-28T12:59:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39213
+- author: SuperGDPWYL
+  changes:
+  - message: The Warden now starts with a network configurator in their locker.
+    type: Add
+  id: 8814
+  time: '2025-07-28T16:09:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39254
+- author: TrixxedHeart
+  changes:
+  - message: Several strange sprite issues with Vox have been fixed, most notably
+      jumpsuits and many neck items overlapping the face, as well as a layering issue
+      where their tank would appear over their hair.
+    type: Fix
+  id: 8815
+  time: '2025-07-28T21:28:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39219
+- author: K-Dynamic
+  changes:
+  - message: Quartermaster job and ID icons are now based on Cargo Technicians.
+    type: Tweak
+  id: 8816
+  time: '2025-07-29T07:34:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39259
+- author: Alkheemist
+  changes:
+  - message: Protected Grids can now again have their hull and tiles repaired (Evac,
+      ATS, etc)
+    type: Fix
+  - message: Protected Grids can no longer be expanded outside of their original size.
+    type: Fix
+  id: 8817
+  time: '2025-07-29T12:01:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39271
+- author: Admiral-Obvious-001
+  changes:
+  - message: Several advanced chemicals now act slower, but with raised OD thresholds
+      and lowered OD damage. The healing per unit remains largely the same.
+    type: Tweak
+  - message: Bicaradine no longer makes razorium when mixed with advanced brute chems.
+      Advanced brute chems still mix and create razorium when combined.
+    type: Tweak
+  id: 8818
+  time: '2025-07-29T18:52:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38811
+- author: aada
+  changes:
+  - message: Lipolicide now continues to poison at 0 hunger.
+    type: Fix
+  - message: Tricordrazine now also heals at exactly 50 damage instead of needing
+      to be below 50. Similar thresholds on other reagents tweaked the same.
+    type: Tweak
+  id: 8819
+  time: '2025-07-30T06:44:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36289
+- author: Disp-Dev
+  changes:
+  - message: A new recipe has been added, moth-edible cotton cakes.
+    type: Add
+  id: 8820
+  time: '2025-07-30T22:51:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39222
+- author: spanky-spanky
+  changes:
+  - message: The wizard now spawns in a den instead of a shuttle.
+    type: Tweak
+  id: 8821
+  time: '2025-07-31T04:08:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37701
+- author: perryprog
+  changes:
+  - message: Fixed board game areas sometimes overlapping with those of other board
+      games.
+    type: Fix
+  id: 8822
+  time: '2025-08-01T21:48:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39327
+- author: Krosus
+  changes:
+  - message: Fixed crash when loading saved character profiles
+    type: Fix
+  id: 8823
+  time: '2025-08-02T15:14:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39333
+- author: FairlySadPanda
+  changes:
+  - message: A new cake, berry delight, that is made with a cake base, berries and
+      milk.
+    type: Add
+  id: 8824
+  time: '2025-08-02T18:35:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38881
+- author: DrSmugleaf
+  changes:
+  - message: Fixed rotate verbs being delayed when used, and your right click UI bounce
+      when they appear after a short delay.
+    type: Fix
+  id: 8825
+  time: '2025-08-03T00:34:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38165
diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index d41e81d8b388..b3e0833f7e97 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -419,4 +419,88 @@
   id: 51
   time: '2025-07-19T19:40:33.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38956
+- author: CroilBird
+  changes:
+  - message: Added Polly to Bagel station
+    type: Add
+  id: 52
+  time: '2025-07-23T00:09:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39147
+- author: CroilBird
+  changes:
+  - message: Added Polly to Oasis station
+    type: Add
+  id: 53
+  time: '2025-07-23T00:11:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39146
+- author: CroilBird
+  changes:
+  - message: Added Polly to Exo station
+    type: Add
+  id: 54
+  time: '2025-07-23T00:35:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39145
+- author: CroilBird
+  changes:
+  - message: Added Polly to Fland station
+    type: Add
+  id: 55
+  time: '2025-07-23T00:36:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39144
+- author: CroilBird
+  changes:
+  - message: Added Polly to Packed station
+    type: Add
+  id: 56
+  time: '2025-07-23T00:38:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39143
+- author: CroilBird
+  changes:
+  - message: Added Polly to Marathon station
+    type: Add
+  id: 57
+  time: '2025-07-23T00:41:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39141
+- author: CroilBird
+  changes:
+  - message: Added Polly to Box station
+    type: Add
+  id: 58
+  time: '2025-07-23T00:44:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39140
+- author: CroilBird
+  changes:
+  - message: Added Polly to Amber station
+    type: Add
+  id: 59
+  time: '2025-07-23T00:52:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39139
+- author: CroilBird
+  changes:
+  - message: On Plasma, added Polly to the CE's office.
+    type: Add
+  - message: On Plasma, removed a pipe router that to mail routing problems.
+    type: Fix
+  - message: On Plasma, removed a leftover waste pipe from underneath the science
+      circuit imprinter.
+    type: Fix
+  id: 60
+  time: '2025-07-23T00:53:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39138
+- author: CroilBird
+  changes:
+  - message: Added Polly to Elkridge station
+    type: Add
+  id: 61
+  time: '2025-07-23T00:55:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39150
+- author: SlamBamActionman
+  changes:
+  - message: Exo station has had a major Security department rework, along with the
+      eastern maintenance section of the station, as well as several other minor changes
+      across the station.
+    type: Tweak
+  id: 62
+  time: '2025-07-31T20:28:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39295
 Order: 1
diff --git a/Resources/ConfigPresets/WizardsDen/vulture.toml b/Resources/ConfigPresets/WizardsDen/vulture.toml
index 4e4d3802f188..47c91fda0dc0 100644
--- a/Resources/ConfigPresets/WizardsDen/vulture.toml
+++ b/Resources/ConfigPresets/WizardsDen/vulture.toml
@@ -21,6 +21,3 @@ force_client_hud_version_watermark = true
 
 [chat]
 motd = "\n########################################################\n\n[font size=17]This is a test server. You can play with the newest changes to the game, but these [color=red]changes may not be final or stable[/color], and may be reverted. Please report bugs via our GitHub, forum, or community Discord.[/font]\n\n########################################################\n"
-
-[debug]
-pow3r_disable_parallel = false
diff --git a/Resources/Credits/GitHub.txt.rej b/Resources/Credits/GitHub.txt.rej
new file mode 100644
index 000000000000..77ea7ec02fa9
--- /dev/null
+++ b/Resources/Credits/GitHub.txt.rej
@@ -0,0 +1,4 @@
+diff a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt	(rejected hunks)
+@@ -1 +1 @@
+-0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, azzyisnothere, AzzyIsNotHere, B-Kirill, B3CKDOOR, baa14453, BackeTako, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, crazybrain23, Crazydave91920, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hoshizora, Hreno, Hrosts, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, Kowlin, KrasnoshchekovPavel, Krunklehorn, Kupie, kxvvv, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, maland1, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, matt, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, murolem, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnyxTheBrave, Orange-Winds, OrangeMoronage9622, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, qrtDaniil, qrwas, Quantum-cross, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, SignalWalker, siigiil, silicon14wastaken, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, supergdpwyl, superjj18, Supernorn, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, viceemargo, VigersRay, violet754, Visne, vitusveit, vlad, vlados1408, VMSolidus, vmzd, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
++0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, Alkheemist, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, Arcane-Waffle, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, azzyisnothere, AzzyIsNotHere, B-Kirill, B3CKDOOR, baa14453, BackeTako, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hoshizora, Hreno, Hrosts, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krosus777, Krunklehorn, Kupie, kxvvv, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, maland1, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, matt, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, murolem, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnyxTheBrave, Orange-Winds, OrangeMoronage9622, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, Siginanto, SignalWalker, siigiil, silicon14wastaken, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, supergdpwyl, superjj18, Supernorn, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, viceemargo, VigersRay, violet754, Visne, vitusveit, vlad, vlados1408, VMSolidus, vmzd, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, wrexbe, WTCWR68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
diff --git a/Resources/Locale/en-US/abilities/mime.ftl.rej b/Resources/Locale/en-US/abilities/mime.ftl.rej
new file mode 100644
index 000000000000..465156973619
--- /dev/null
+++ b/Resources/Locale/en-US/abilities/mime.ftl.rej
@@ -0,0 +1,9 @@
+diff a/Resources/Locale/en-US/abilities/mime.ftl b/Resources/Locale/en-US/abilities/mime.ftl	(rejected hunks)
+@@ -1,5 +1,6 @@
+ mime-cant-speak = Your vow of silence prevents you from speaking.
+-mime-invisible-wall-popup = {CAPITALIZE(THE($mime))} brushes up against an invisible wall!
++mime-invisible-wall-popup-self = You brush up against an invisible wall!
++mime-invisible-wall-popup-others = {CAPITALIZE(THE($mime))} brushes up against an invisible wall!
+ mime-invisible-wall-failed = You can't create an invisible wall there.
+ mime-not-ready-repent = You aren't ready to repent for your broken vow yet.
+ mime-ready-to-repent = You feel ready to take your vows again.
diff --git a/Resources/Locale/en-US/accent/accents.ftl b/Resources/Locale/en-US/accent/accents.ftl
index ad049d820ba8..6727c72f2700 100644
--- a/Resources/Locale/en-US/accent/accents.ftl
+++ b/Resources/Locale/en-US/accent/accents.ftl
@@ -150,4 +150,26 @@ accent-words-tomato-1 = Totato!
 accent-words-tomato-2 = Trotect
 accent-words-tomato-3 = Mastet?
 accent-words-tomato-4 = Reaty!
-accent-words-tomato-5 = Water...
\ No newline at end of file
+accent-words-tomato-5 = Water...
+
+# Scurret
+accent-words-scurret-1 = Wa!
+accent-words-scurret-2 = Wa?
+accent-words-scurret-3 = Wa.
+accent-words-scurret-4 = Wa...
+accent-words-scurret-5 = Wawa!
+accent-words-scurret-6 = Wawa?
+accent-words-scurret-7 = Wawa.
+accent-words-scurret-8 = Wawa...
+accent-words-scurret-9 = Wa wawa!
+accent-words-scurret-10 = Wa wawa?
+accent-words-scurret-11 = Wa wawa.
+accent-words-scurret-12 = Wa wawa...
+accent-words-scurret-13 = Wawa wa!
+accent-words-scurret-14 = Wawa wa?
+accent-words-scurret-15 = Wawa wa.
+accent-words-scurret-16 = Wawa wa...
+accent-words-scurret-17 = Waaaaaa.
+accent-words-scurret-18 = Waaaaaa!
+accent-words-scurret-19 = Waaaaaa?
+accent-words-scurret-20 = Waaaaaa...
diff --git a/Resources/Locale/en-US/administration/admin-verbs.ftl b/Resources/Locale/en-US/administration/admin-verbs.ftl
index a1cd23926335..c1353f1d4fe7 100644
--- a/Resources/Locale/en-US/administration/admin-verbs.ftl
+++ b/Resources/Locale/en-US/administration/admin-verbs.ftl
@@ -24,6 +24,8 @@ admin-verbs-teleport-here = Teleport Here
 admin-verbs-freeze = Freeze
 admin-verbs-freeze-and-mute = Freeze And Mute
 admin-verbs-unfreeze = Unfreeze
+admin-verbs-camera = Open Camera
+admin-verbs-camera-description = Open a camera window that follows the selected entity.
 admin-verbs-erase = Erase
 admin-verbs-erase-description = Removes the player from the round and crew manifest and deletes their chat messages.
     Their items are dropped on the ground.
diff --git a/Resources/Locale/en-US/administration/commands/camera.ftl b/Resources/Locale/en-US/administration/commands/camera.ftl
new file mode 100644
index 000000000000..98839683e069
--- /dev/null
+++ b/Resources/Locale/en-US/administration/commands/camera.ftl
@@ -0,0 +1,5 @@
+cmd-camera-desc = Opens a remote camera window for an entity.
+cmd-camera-help = Usage: camera <entityUid or player>
+
+cmd-camera-hint = <entityUid or player>
+cmd-camera-wrong-argument = Argument must be a valid netUid or a player name.
diff --git a/Resources/Locale/en-US/administration/ui/admin-camera-window.ftl b/Resources/Locale/en-US/administration/ui/admin-camera-window.ftl
new file mode 100644
index 000000000000..bf9f45a745cc
--- /dev/null
+++ b/Resources/Locale/en-US/administration/ui/admin-camera-window.ftl
@@ -0,0 +1,5 @@
+admin-camera-window-title = Observing { $name }
+admin-camera-window-title-placeholder = Observing
+admin-camera-window-follow = Follow
+admin-camera-window-pop-out = Pop out
+admin-camera-window-pop-in = Pop in
diff --git a/Resources/Locale/en-US/administration/ui/player-panel.ftl b/Resources/Locale/en-US/administration/ui/player-panel.ftl
index 3f36249eab88..00d20a96868b 100644
--- a/Resources/Locale/en-US/administration/ui/player-panel.ftl
+++ b/Resources/Locale/en-US/administration/ui/player-panel.ftl
@@ -29,3 +29,4 @@ player-panel-rejuvenate = Rejuvenate
 player-panel-false = False
 player-panel-true = True
 player-panel-follow = Follow
+player-panel-camera = Camera
diff --git a/Resources/Locale/en-US/anomaly/anomaly.ftl b/Resources/Locale/en-US/anomaly/anomaly.ftl
index fe7037a41520..5d883094f077 100644
--- a/Resources/Locale/en-US/anomaly/anomaly.ftl
+++ b/Resources/Locale/en-US/anomaly/anomaly.ftl
@@ -65,6 +65,8 @@ anomaly-sync-examine-connected = It is [color=darkgreen]attached[/color] to an a
 anomaly-sync-examine-not-connected = It is [color=darkred]not attached[/color] to an anomaly.
 anomaly-sync-connect-verb-text = Attach anomaly
 anomaly-sync-connect-verb-message = Attach a nearby anomaly to {THE($machine)}.
+anomaly-sync-disconnect-verb-text = Detach anomaly
+anomaly-sync-disconnect-verb-message = Detach the connected anomaly from {THE($machine)}.
 
 anomaly-generator-ui-title = Anomaly Generator
 anomaly-generator-fuel-display = Fuel:
@@ -89,7 +91,7 @@ anomaly-generator-flavor-right = v1.1
 anomaly-behavior-unknown = [color=red]ERROR. Cannot be read.[/color]
 
 anomaly-behavior-title = behavior deviation analysis:
-anomaly-behavior-point =[color=gold]Anomaly produces {$mod}% of the points[/color] 
+anomaly-behavior-point = [color=gold]Anomaly produces {$mod}% of the points[/color]
 
 anomaly-behavior-safe = [color=forestgreen]The anomaly is extremely stable. Extremely rare pulsations.[/color]
 anomaly-behavior-slow = [color=forestgreen]The frequency of pulsations is much less frequent.[/color]
@@ -105,4 +107,4 @@ anomaly-behavior-secret = Interference detected. Some data cannot be read
 anomaly-behavior-inconstancy = [color=crimson]Impermanence has been detected. Particle types can change over time.[/color]
 anomaly-behavior-fast = [color=crimson]The pulsation frequency is strongly increased.[/color]
 anomaly-behavior-strenght = [color=crimson]The pulsation power is significantly increased.[/color]
-anomaly-behavior-moving = [color=crimson]Coordinate instability was detected.[/color]
\ No newline at end of file
+anomaly-behavior-moving = [color=crimson]Coordinate instability was detected.[/color]
diff --git a/Resources/Locale/en-US/commands/makesentient-command.ftl b/Resources/Locale/en-US/commands/makesentient-command.ftl
new file mode 100644
index 000000000000..2d972b8e6039
--- /dev/null
+++ b/Resources/Locale/en-US/commands/makesentient-command.ftl
@@ -0,0 +1,2 @@
+cmd-makesentient-desc = Makes an entity sentient (able to be controlled by a player).
+cmd-makesentient-help = Usage: makesentient <entityUid>
diff --git a/Resources/Locale/en-US/commands/mapping-client-side-setup-command.ftl b/Resources/Locale/en-US/commands/mappingclientsidesetup-command.ftl
similarity index 100%
rename from Resources/Locale/en-US/commands/mapping-client-side-setup-command.ftl
rename to Resources/Locale/en-US/commands/mappingclientsidesetup-command.ftl
diff --git a/Resources/Locale/en-US/commands/mappingclientsidesetup-command.ftl.rej b/Resources/Locale/en-US/commands/mappingclientsidesetup-command.ftl.rej
new file mode 100644
index 000000000000..b339a3ec1092
--- /dev/null
+++ b/Resources/Locale/en-US/commands/mappingclientsidesetup-command.ftl.rej
@@ -0,0 +1,6 @@
+diff a/Resources/Locale/en-US/commands/mappingclientsidesetup-command.ftl b/Resources/Locale/en-US/commands/mappingclientsidesetup-command.ftl	(rejected hunks)
+@@ -1,2 +1,2 @@
+ cmd-mappingclientsidesetup-desc = Sets up the lighting control and such settings client-side. Sent by 'mapping' to client.
+-cmd-mappingclientsidesetup-help = Usage: {$command}
+\ No newline at end of file
++cmd-mappingclientsidesetup-help = Usage: mappingclientsidesetup
diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index a6152a606552..67ba2c9ab567 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -152,6 +152,9 @@ ui-options-vp-integer-scaling-tooltip = If this option is enabled, the viewport
                                         at specific resolutions. While this results in crisp textures, it also often
                                         means that black bars appear at the top/bottom of the screen or that part
                                         of the viewport is not visible.
+ui-options-filter-label = Scaling filter:
+ui-options-filter-nearest = Nearest (no smoothing)
+ui-options-filter-bilinear = Bilinear (smoothed)
 ui-options-vp-vertical-fit = Vertical viewport fitting
 ui-options-vp-vertical-fit-tooltip = When enabled, the main viewport will ignore the horizontal axis entirely when
                                      fitting to your screen. If your screen is smaller than the viewport, then this
diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index a725f5d34c3b..5fdd2f48d90d 100644
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -100,6 +100,7 @@ flavor-base-terrible = terrible
 flavor-base-mindful = mindful
 flavor-base-chewy = chewy
 flavor-base-trashy = trashy
+flavor-base-motivating = motivating
 
 # Complex flavors. Put a flavor here when you want something that's more
 # specific.
diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
index 446ec6917d5f..0e1f4f1426b3 100644
--- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
@@ -65,6 +65,7 @@ petting-success-slimes = You pet {THE($target)} on {POSS-ADJ($target)} mucous su
 petting-success-snake = You pet {THE($target)} on {POSS-ADJ($target)} scaly large head.
 petting-success-monkey = You pet {THE($target)} on {POSS-ADJ($target)} mischevious little head.
 petting-success-nymph = You pet {THE($target)} on {POSS-ADJ($target)} wooden little head.
+petting-success-scurret = You pet {THE($target)} on {POSS-ADJ($target)} legally distinct head.
 
 petting-failure-generic = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} aloof towards you.
 
@@ -86,6 +87,7 @@ petting-failure-bear = You reach out to pet {THE($target)}, but {SUBJECT($target
 petting-failure-monkey = You reach out to pet {THE($target)}, but {SUBJECT($target)} almost {CONJUGATE-BASIC($target, "bite", "bites")} your fingers!
 petting-failure-nymph = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BASIC($target, "move", "moves")} {POSS-ADJ($target)} branches away.
 petting-failure-shadow = You try to pet {THE($target)}, but your hand passes through the cold darkness of {POSS-ADJ($target)} body.
+petting-failure-scurret = You reach out to pet {THE($target)}, but {SUBJECT($target)} does a backflip!
 
 ## Petting silicons
 
diff --git a/Resources/Locale/en-US/machine-linking/receiver_ports.ftl b/Resources/Locale/en-US/machine-linking/receiver_ports.ftl
index 13c20afdf082..05e490e22d25 100644
--- a/Resources/Locale/en-US/machine-linking/receiver_ports.ftl
+++ b/Resources/Locale/en-US/machine-linking/receiver_ports.ftl
@@ -44,11 +44,8 @@ signal-port-description-close = Closes a device.
 signal-port-name-doorbolt = Door bolt
 signal-port-description-doorbolt = Bolts door when HIGH.
 
-signal-port-name-trigger = Trigger
-signal-port-description-trigger = Triggers some mechanism on the device.
-
-signal-port-name-timer = Timer
-signal-port-description-timer = Starts the timer countdown of the device.
+signal-port-name-trigger-receiver = Trigger
+signal-port-description-trigger-receiver = Triggers some mechanism on the device.
 
 signal-port-name-order-sender = Order sender
 signal-port-description-order-sender = Cargo console order sender
diff --git a/Resources/Locale/en-US/machine-linking/transmitter_ports.ftl b/Resources/Locale/en-US/machine-linking/transmitter_ports.ftl
index 2387b5912faa..a6f40cb9d617 100644
--- a/Resources/Locale/en-US/machine-linking/transmitter_ports.ftl
+++ b/Resources/Locale/en-US/machine-linking/transmitter_ports.ftl
@@ -38,8 +38,11 @@ signal-port-description-dockstatus = This port is invoked with HIGH when docked
 signal-port-name-middle = Middle
 signal-port-description-middle = This port is invoked whenever the lever is moved to the neutral position.
 
-signal-port-name-timer-trigger = Timer Trigger
-signal-port-description-timer-trigger = This port is invoked whenever the timer triggers.
+signal-port-name-trigger-sender = Trigger
+signal-port-description-trigger-sender = This port is invoked whenever the device triggers.
+
+signal-port-name-timer-trigger = Timer
+signal-port-description-timer-trigger = This port is invoked whenever the timer is up.
 
 signal-port-name-timer-start = Timer Start
 signal-port-description-timer-start = This port is invoked whenever the timer starts.
diff --git a/Resources/Locale/en-US/nukeops/nuke-ops.ftl.rej b/Resources/Locale/en-US/nukeops/nuke-ops.ftl.rej
new file mode 100644
index 000000000000..9bdb82a999ed
--- /dev/null
+++ b/Resources/Locale/en-US/nukeops/nuke-ops.ftl.rej
@@ -0,0 +1,7 @@
+diff a/Resources/Locale/en-US/nukeops/nuke-ops.ftl b/Resources/Locale/en-US/nukeops/nuke-ops.ftl	(rejected hunks)
+@@ -1,2 +1,2 @@
+-nuke-ops-no-more-threat-announcement-shuttle-call = Based on our scans from our long-range sensors, the nuclear threat is now eliminated. We will call emergency shuttle that will arrive shortly. ETA: {$time} {$units}. You can recall the shuttle to extend the shift.
+-nuke-ops-no-more-threat-announcement = Based on our scans from our long-range sensors, the nuclear threat is now eliminated. Shuttle is already called.
+\ No newline at end of file
++nuke-ops-no-more-threat-announcement-shuttle-call = Long-range sensors indicate the nuclear threat has been eliminated. The emergency shuttle has been called. ETA: {$time} {$units}. You may recall the shuttle to extend the shift.
++nuke-ops-no-more-threat-announcement = Long-range sensors indicate the nuclear threat has been eliminated. The emergency shuttle is already en route.
diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
index fd3b6bfea039..4dffd63d167a 100644
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
@@ -114,7 +114,7 @@ reagent-name-banana-honk = Banana Honk
 reagent-desc-banana-honk = A drink from Clown Heaven.
 
 reagent-name-barefoot = barefoot
-reagent-desc-barefoot = Barefoot and pregnant.
+reagent-desc-barefoot = A cassis milkshake, made from cream, fruit juice, and vermouth wine.
 
 reagent-name-beepsky-smash = Beepsky smash
 reagent-desc-beepsky-smash = Deny drinking this and prepare for THE LAW.
diff --git a/Resources/Locale/en-US/rotation/components/rotatable-component.ftl b/Resources/Locale/en-US/rotation/components/rotatable-component.ftl
index 59d282f4aeab..17105fc73fbb 100644
--- a/Resources/Locale/en-US/rotation/components/rotatable-component.ftl
+++ b/Resources/Locale/en-US/rotation/components/rotatable-component.ftl
@@ -14,3 +14,6 @@ rotate-verb-get-data-text = Rotate clockwise
 
 # RotateCounterVerb
 rotate-counter-verb-get-data-text = Rotate counter-clockwise
+
+# ResetVerb
+rotate-reset-verb-get-data-text = Reset
diff --git a/Resources/Locale/en-US/scurret/role.ftl b/Resources/Locale/en-US/scurret/role.ftl
deleted file mode 100644
index cbc0f8965796..000000000000
--- a/Resources/Locale/en-US/scurret/role.ftl
+++ /dev/null
@@ -1,25 +0,0 @@
-petting-success-scurret = You pet {THE($target)} on {POSS-ADJ($target)} legally distinct head.
-petting-failure-scurret = You reach out to pet {THE($target)}, but {SUBJECT($target)} does a backflip!
-
-accent-words-scurret-1 = Wa!
-accent-words-scurret-2 = Wa?
-accent-words-scurret-3 = Wa.
-accent-words-scurret-4 = Wa...
-accent-words-scurret-5 = Wawa!
-accent-words-scurret-6 = Wawa?
-accent-words-scurret-7 = Wawa.
-accent-words-scurret-8 = Wawa...
-accent-words-scurret-9 = Wa wawa!
-accent-words-scurret-10 = Wa wawa?
-accent-words-scurret-11 = Wa wawa.
-accent-words-scurret-12 = Wa wawa...
-accent-words-scurret-13 = Wawa wa!
-accent-words-scurret-14 = Wawa wa?
-accent-words-scurret-15 = Wawa wa.
-accent-words-scurret-16 = Wawa wa...
-accent-words-scurret-17 = Waaaaaa.
-accent-words-scurret-18 = Waaaaaa!
-accent-words-scurret-19 = Waaaaaa?
-accent-words-scurret-20 = Waaaaaa...
-
-station-event-random-sentience-flavor-scurret = scurret
diff --git a/Resources/Locale/en-US/silicons/station-ai.ftl b/Resources/Locale/en-US/silicons/station-ai.ftl
index 955361e37225..f52fc08d06a9 100644
--- a/Resources/Locale/en-US/silicons/station-ai.ftl
+++ b/Resources/Locale/en-US/silicons/station-ai.ftl
@@ -12,6 +12,7 @@ ai-wire-snipped = Wire has been cut at {$coords}.
 wire-name-ai-vision-light = AIV
 wire-name-ai-act-light = AIA
 station-ai-takeover = AI takeover
+station-ai-eye-name = AI eye - {$name}
 
 # Radial actions
 ai-open = Open actions
@@ -52,6 +53,4 @@ station-ai-hologram-female = Female appearance
 station-ai-hologram-male = Male appearance
 station-ai-hologram-face = Disembodied head
 station-ai-hologram-cat = Cat form
-station-ai-hologram-dog = Corgi form
-station-ai-hologram-kobold = Kobold form
-station-ai-hologram-monkey = Monkey form
+station-ai-hologram-dog = Corgi form
\ No newline at end of file
diff --git a/Resources/Locale/en-US/smartfridge/smartfridge.ftl b/Resources/Locale/en-US/smartfridge/smartfridge.ftl
new file mode 100644
index 000000000000..e7960367b93a
--- /dev/null
+++ b/Resources/Locale/en-US/smartfridge/smartfridge.ftl
@@ -0,0 +1,8 @@
+smart-fridge-component-try-eject-unknown-entry = Invalid selection!
+smart-fridge-component-try-eject-out-of-stock = Out of stock!
+smart-fridge-component-try-eject-access-denied = Access denied!
+smart-fridge-component-search-filter = Search...
+smart-fridge-component-title = SmartFridge
+smart-fridge-list-item = {$item} [{$amount}]
+smart-fridge-request-generic = All sales final
+smart-fridge-request-chemistry = Request refills from chemistry
diff --git a/Resources/Locale/en-US/station-events/events/random-sentience.ftl b/Resources/Locale/en-US/station-events/events/random-sentience.ftl
index 972b63b179df..1dc6893f5351 100644
--- a/Resources/Locale/en-US/station-events/events/random-sentience.ftl
+++ b/Resources/Locale/en-US/station-events/events/random-sentience.ftl
@@ -47,4 +47,5 @@ station-event-random-sentience-flavor-corgi = corgi
 station-event-random-sentience-flavor-primate = primate
 station-event-random-sentience-flavor-kobold = kobold
 station-event-random-sentience-flavor-slime = slime
-station-event-random-sentience-flavor-inanimate = inanimate
\ No newline at end of file
+station-event-random-sentience-flavor-inanimate = inanimate
+station-event-random-sentience-flavor-scurret = scurret
diff --git a/Resources/Locale/en-US/station-events/events/random-sentience.ftl.rej b/Resources/Locale/en-US/station-events/events/random-sentience.ftl.rej
new file mode 100644
index 000000000000..8ab65e1da4aa
--- /dev/null
+++ b/Resources/Locale/en-US/station-events/events/random-sentience.ftl.rej
@@ -0,0 +1,7 @@
+diff a/Resources/Locale/en-US/station-events/events/random-sentience.ftl b/Resources/Locale/en-US/station-events/events/random-sentience.ftl	(rejected hunks)
+@@ -1,4 +1,4 @@
+-## Phrases used for where central command got this information.
++## Phrases used for where central command got this information.
+ random-sentience-event-data-1 = scans from our long-range sensors
+ random-sentience-event-data-2 = our sophisticated probabilistic models
+ random-sentience-event-data-3 = our omnipotence
diff --git a/Resources/Locale/en-US/storage/components/dumpable-component.ftl.rej b/Resources/Locale/en-US/storage/components/dumpable-component.ftl.rej
new file mode 100644
index 000000000000..36c3da96299d
--- /dev/null
+++ b/Resources/Locale/en-US/storage/components/dumpable-component.ftl.rej
@@ -0,0 +1,6 @@
+diff a/Resources/Locale/en-US/storage/components/dumpable-component.ftl b/Resources/Locale/en-US/storage/components/dumpable-component.ftl	(rejected hunks)
+@@ -1,3 +1,4 @@
+ dump-verb-name = Dump out on ground
+ dump-disposal-verb-name = Dump out into {$unit}
+ dump-placeable-verb-name = Dump out onto {$surface}
++dump-smartfridge-verb-name = Restock into {$unit}
diff --git a/Resources/Locale/en-US/store/store.ftl.rej b/Resources/Locale/en-US/store/store.ftl.rej
new file mode 100644
index 000000000000..b37ffc0253ba
--- /dev/null
+++ b/Resources/Locale/en-US/store/store.ftl.rej
@@ -0,0 +1,8 @@
+diff a/Resources/Locale/en-US/store/store.ftl b/Resources/Locale/en-US/store/store.ftl	(rejected hunks)
+@@ -1,5 +1,6 @@
+ store-ui-default-title = Store
+ store-ui-default-withdraw-text = Withdraw
++store-ui-refund-text = Refund
+ store-ui-balance-display = {$currency}: {$amount}
+ store-ui-price-display = {$amount} {$currency}
+ store-ui-discount-display-with-currency =  {$amount} off on {$currency}
diff --git a/Resources/Locale/en-US/triggers/ghost-kick-on-trigger.ftl b/Resources/Locale/en-US/triggers/ghost-kick-on-trigger.ftl
new file mode 100644
index 000000000000..acb06bda4727
--- /dev/null
+++ b/Resources/Locale/en-US/triggers/ghost-kick-on-trigger.ftl
@@ -0,0 +1 @@
+ghost-kick-on-trigger-default = Tripped over a kick mine, crashed through the fourth wall.
diff --git a/Resources/Locale/en-US/triggers/timer-trigger.ftl b/Resources/Locale/en-US/triggers/timer-trigger.ftl
new file mode 100644
index 000000000000..5d6d553b4590
--- /dev/null
+++ b/Resources/Locale/en-US/triggers/timer-trigger.ftl
@@ -0,0 +1,10 @@
+
+timer-trigger-verb-set = {$time} Seconds
+timer-trigger-verb-set-current = {$time} Seconds (current)
+timer-trigger-verb-cycle = Cycle Time Delay
+
+timer-trigger-examine = The timer is set to {$time} seconds.
+
+timer-trigger-popup-set = Timer set to {$time} seconds.
+
+timer-trigger-activated = You activate {THE($device)}.
diff --git a/Resources/Locale/en-US/triggers/toggle-trigger-condition.ftl b/Resources/Locale/en-US/triggers/toggle-trigger-condition.ftl
new file mode 100644
index 000000000000..874490686fa9
--- /dev/null
+++ b/Resources/Locale/en-US/triggers/toggle-trigger-condition.ftl
@@ -0,0 +1,7 @@
+toggle-trigger-condition-default-verb = Toggle device
+toggle-trigger-condition-default-on = Device enabled.
+toggle-trigger-condition-default-off = Device disabled.
+
+toggle-trigger-condition-stick-verb = Toggle auto-activation
+toggle-trigger-condition-stick-on = The device will now activate automatically when planted.
+toggle-trigger-condition-stick-off = The device will no longer activate automatically when planted.
diff --git a/Resources/Locale/en-US/triggers/trigger-on-verb.ftl b/Resources/Locale/en-US/triggers/trigger-on-verb.ftl
new file mode 100644
index 000000000000..d9342e7bdd0e
--- /dev/null
+++ b/Resources/Locale/en-US/triggers/trigger-on-verb.ftl
@@ -0,0 +1,2 @@
+trigger-on-verb-default = Trigger
+trigger-on-verb-detonation = Start detonation
\ No newline at end of file
diff --git a/Resources/Locale/en-US/triggers/trigger-on-voice.ftl b/Resources/Locale/en-US/triggers/trigger-on-voice.ftl
new file mode 100644
index 000000000000..7ace486657ce
--- /dev/null
+++ b/Resources/Locale/en-US/triggers/trigger-on-voice.ftl
@@ -0,0 +1,12 @@
+trigger-on-voice-examine = The display reads: "{$keyphrase}"
+trigger-on-voice-uninitialized = The display reads: Uninitialized...
+
+trigger-on-voice-record = Record
+trigger-on-voice-stop = Stop
+trigger-on-voice-clear = Clear recording
+
+trigger-on-voice-start-recording = Started recording.
+trigger-on-voice-stop-recording = Stopped recording.
+trigger-on-voice-record-failed-too-long = Message too long, try again.
+trigger-on-voice-record-failed-too-short = Message too short, try again.
+trigger-on-voice-recorded = Recorded successfully!
diff --git a/Resources/Locale/en-US/voting/vote-commands.ftl b/Resources/Locale/en-US/voting/vote-commands.ftl
index 3d55184b6fac..15b27a338781 100644
--- a/Resources/Locale/en-US/voting/vote-commands.ftl
+++ b/Resources/Locale/en-US/voting/vote-commands.ftl
@@ -20,8 +20,8 @@ cmd-createvote-arg-vote-type = <vote type>
 
 cmd-customvote-desc = Creates a custom vote
 cmd-customvote-help = Usage: customvote <title> <option1> <option2> [option3...]
-cmd-customvote-on-finished-tie = Tie between {$ties}!
-cmd-customvote-on-finished-win = {$winner} wins!
+cmd-customvote-on-finished-tie = The vote '{$title}' has finished: tie between {$ties}!
+cmd-customvote-on-finished-win = The vote '{$title}' has finished: {$winner} wins!
 cmd-customvote-arg-title = <title>
 cmd-customvote-arg-option-n = <option{ $n }>
 
diff --git a/Resources/Prototypes/AppearanceCustomization/station_ai.yml b/Resources/Prototypes/AppearanceCustomization/station_ai.yml
index 77d36fbaf485..465cfdf648c6 100644
--- a/Resources/Prototypes/AppearanceCustomization/station_ai.yml
+++ b/Resources/Prototypes/AppearanceCustomization/station_ai.yml
@@ -22,8 +22,6 @@
   - StationAiHologramFace
   - StationAiHologramCat
   - StationAiHologramDog
-  - StationAiHologramKobold
-  - StationAiHologramMonkey
 
 # Iconography
 - type: stationAiCustomization
@@ -163,21 +161,3 @@
     Hologram:
       sprite: Mobs/Silicon/holograms.rsi
       state: ai_dog
-
-- type: stationAiCustomization
-  id: StationAiHologramKobold
-  name: station-ai-hologram-kobold
-  previewKey: Hologram
-  layerData:
-    Hologram:
-      sprite: Mobs/Silicon/holograms.rsi
-      state: ai_kobold
-
-- type: stationAiCustomization
-  id: StationAiHologramMonkey
-  name: station-ai-hologram-monkey
-  previewKey: Hologram
-  layerData:
-    Hologram:
-      sprite: Mobs/Silicon/holograms.rsi
-      state: ai_monkey
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml.rej b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml.rej
new file mode 100644
index 000000000000..380b5e641bc9
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml.rej
@@ -0,0 +1,9 @@
+diff a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml	(rejected hunks)
+@@ -43,6 +43,7 @@
+       amount: 2
+     - id: RemoteSignaller
+       amount: 2
++    - id: NetworkConfigurator
+     - id: Binoculars
+ 
+ - type: entityTable
diff --git a/Resources/Prototypes/DeviceLinking/sink_ports.yml b/Resources/Prototypes/DeviceLinking/sink_ports.yml
index 9a7167f6bddd..1e3f5bf19634 100644
--- a/Resources/Prototypes/DeviceLinking/sink_ports.yml
+++ b/Resources/Prototypes/DeviceLinking/sink_ports.yml
@@ -67,8 +67,8 @@
 
 - type: sinkPort
   id: Trigger
-  name: signal-port-name-trigger
-  description: signal-port-description-trigger
+  name: signal-port-name-trigger-receiver
+  description: signal-port-description-trigger-receiver
 
 - type: sinkPort
   id: Timer
diff --git a/Resources/Prototypes/DeviceLinking/source_ports.yml b/Resources/Prototypes/DeviceLinking/source_ports.yml
index 9dc34d895c81..9ebb581ff577 100644
--- a/Resources/Prototypes/DeviceLinking/source_ports.yml
+++ b/Resources/Prototypes/DeviceLinking/source_ports.yml
@@ -179,6 +179,12 @@
   name: signal-port-name-power-discharging
   description: signal-port-description-power-discharging
 
+- type: sourcePort
+  id: Trigger
+  name: signal-port-name-trigger-sender
+  description: signal-port-description-trigger-sender
+  defaultLinks: [ AutoClose, On, Open, Forward, Trigger, Timer ]
+
 - type: sourcePort
   id: ItemDetected
   name: signal-port-name-item-detected
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index 01ae66452893..67b4c853db85 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -434,9 +434,9 @@
     equipDelay: 5 # to avoid accidentally falling into the trap associated with SelfUnremovableClothing
   - type: SelfUnremovableClothing
   - type: ShockOnTrigger
+    targetContainer: true
     damage: 5
     duration: 3
-    cooldown: 4
   - type: TriggerOnSignal
   - type: DeviceLinkSink
     ports:
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml.rej b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml.rej
new file mode 100644
index 000000000000..e884389911f5
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml.rej
@@ -0,0 +1,9 @@
+diff a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml	(rejected hunks)
+@@ -234,6 +234,7 @@
+         - WetFloorSign
+         - HolosignProjector
+         - Plunger
++        - GoldenPlunger
+         - WireBrush
+       components:
+         - LightReplacer
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index c931266fbd71..97b572a594a9 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -206,8 +206,42 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/engineering.rsi
+    layers:
+    - state: icon
+    - state: icon-unshaded
+      shader: unshaded
+    - state: light-overlay
+      visible: false
+      shader: unshaded
+      map: [ "light" ]
+  - type: HandheldLight
+    addPrefix: false
+  - type: ToggleableVisuals
+    spriteLayer: light
+    clothingVisuals:
+      head:
+      - state: equipped-head-light
+        shader: unshaded
+      head-vox:
+      - state: equipped-head-light-vox
+        shader: unshaded
+      head-dog:
+      - state: equipped-head-light-dog
+        shader: unshaded
   - type: Clothing
-    sprite: Clothing/Head/Hardsuits/engineering.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head
+      - state: equipped-head-unshaded
+        shader: unshaded
+      head-vox:
+      - state: equipped-head-vox
+      - state: equipped-head-unshaded-vox
+        shader: unshaded
+      head-dog:
+      - state: equipped-head-dog
+      - state: equipped-head-unshaded-dog
+        shader: unshaded
   - type: PointLight
     color: "#ffdbad"
   - type: PressureProtection
@@ -380,6 +414,7 @@
     - CorgiWearable
     - WhitelistChameleon
 
+#Maxim Hardsuit
 - type: entity
   parent: ClothingHeadHardsuitBase
   id: ClothingHeadHelmetHardsuitMaxim
@@ -552,8 +587,42 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/engineering-white.rsi
+    layers:
+    - state: icon
+    - state: icon-unshaded
+      shader: unshaded
+    - state: light-overlay
+      visible: false
+      shader: unshaded
+      map: [ "light" ]
+  - type: HandheldLight
+    addPrefix: false
+  - type: ToggleableVisuals
+    spriteLayer: light
+    clothingVisuals:
+      head:
+      - state: equipped-head-light
+        shader: unshaded
+      head-vox:
+      - state: equipped-head-light-vox
+        shader: unshaded
+      head-dog:
+      - state: equipped-head-light-dog
+        shader: unshaded
   - type: Clothing
-    sprite: Clothing/Head/Hardsuits/engineering-white.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head
+      - state: equipped-head-unshaded
+        shader: unshaded
+      head-vox:
+      - state: equipped-head-vox
+      - state: equipped-head-unshaded-vox
+        shader: unshaded
+      head-dog:
+      - state: equipped-head-dog
+      - state: equipped-head-unshaded-dog
+        shader: unshaded
   - type: PointLight
     color: "#daffad"
   - type: PressureProtection
@@ -1101,6 +1170,10 @@
       - state: equipped-head
       - state: equipped-head-unshaded
         shader: unshaded
+      head-vox:
+      - state: equipped-head-vox
+      - state: equipped-head-unshaded-vox
+        shader: unshaded
   - type: PointLight
     color: orange
   - type: PressureProtection
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml.rej b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml.rej
new file mode 100644
index 000000000000..dcef38b27613
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml.rej
@@ -0,0 +1,9 @@
+diff a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml	(rejected hunks)
+@@ -162,6 +196,7 @@
+     - CorgiWearable
+     - WhitelistChameleon
+ 
++#Goliath Hardsuit
+ - type: entity
+   parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
+   id: ClothingHeadHelmetHardsuitGoliath
diff --git a/Resources/Prototypes/Entities/Effects/admin_triggers.yml b/Resources/Prototypes/Entities/Effects/admin_triggers.yml
index 0469097ff5e4..8ee31635028a 100644
--- a/Resources/Prototypes/Entities/Effects/admin_triggers.yml
+++ b/Resources/Prototypes/Entities/Effects/admin_triggers.yml
@@ -12,7 +12,7 @@
     sprite: /Textures/Objects/Fun/goldbikehorn.rsi
     visible: false
     state: icon
-  - type: TriggerOnSpawn   
+  - type: TriggerOnSpawn
   - type: TimedDespawn
     lifetime: 5
 
@@ -30,7 +30,7 @@
   suffix: BluespaceFlash
   parent: AdminInstantEffectBase
   components:
-  - type: SpawnOnTrigger 
+  - type: SpawnOnTrigger
     proto: EffectFlashBluespace
 
 - type: entity
@@ -40,9 +40,9 @@
   components:
   - type: FlashOnTrigger
     range: 7
-  - type: SpawnOnTrigger 
+  - type: SpawnOnTrigger
     proto: GrenadeFlashEffect
-  
+
 - type: entity
   id: AdminInstantEffectSmoke3
   suffix: Smoke (03 sec)
@@ -51,12 +51,12 @@
   - type: SmokeOnTrigger
     duration: 3
     spreadAmount: 1
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
     sound: /Audio/Effects/smoke.ogg
   - type: TimerTriggerVisuals
     primingSound:
       path: /Audio/Effects/Smoke-grenade.ogg
-  
+
 - type: entity
   id: AdminInstantEffectSmoke10
   suffix: Smoke (10 sec)
@@ -65,12 +65,12 @@
   - type: SmokeOnTrigger
     duration: 10
     spreadAmount: 30
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
     sound: /Audio/Effects/smoke.ogg
   - type: TimerTriggerVisuals
     primingSound:
       path: /Audio/Effects/Smoke-grenade.ogg
-  
+
 - type: entity
   id: AdminInstantEffectSmoke30
   suffix: Smoke (30 sec)
@@ -79,7 +79,7 @@
   - type: SmokeOnTrigger
     duration: 30
     spreadAmount: 50
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
     sound: /Audio/Effects/smoke.ogg
   - type: TimerTriggerVisuals
     primingSound:
@@ -102,12 +102,12 @@
   id: AdminInstantEffectGravityWell
   suffix: Gravity Well
   parent: AdminInstantEffectBase
-  components: 
-  - type: SoundOnTrigger
-    removeOnTrigger: true
+  components:
+  - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Effects/Grenades/Supermatter/supermatter_start.ogg
-      volume: 5
+      params:
+        volume: 5
   - type: AmbientSound
     enabled: true
     volume: -5
diff --git a/Resources/Prototypes/Entities/Effects/admin_triggers.yml.rej b/Resources/Prototypes/Entities/Effects/admin_triggers.yml.rej
new file mode 100644
index 000000000000..087e55f3738e
--- /dev/null
+++ b/Resources/Prototypes/Entities/Effects/admin_triggers.yml.rej
@@ -0,0 +1,7 @@
+diff a/Resources/Prototypes/Entities/Effects/admin_triggers.yml b/Resources/Prototypes/Entities/Effects/admin_triggers.yml	(rejected hunks)
+@@ -117,4 +117,4 @@
+   - type: SingularityDistortion
+     intensity: 10
+     falloffPower: 1.5
+-      
++
diff --git a/Resources/Prototypes/Entities/Interface/admin_tools.yml b/Resources/Prototypes/Entities/Interface/admin_tools.yml
new file mode 100644
index 000000000000..a8c978ed0cb8
--- /dev/null
+++ b/Resources/Prototypes/Entities/Interface/admin_tools.yml
@@ -0,0 +1,14 @@
+# dummy entity for the admin camera EUI
+# this gets parented to the person being observed
+
+- type: entity
+  id: AdminCamera
+  categories: [ HideSpawnMenu ]
+  name: admin camera
+  description: We are watching you.
+  components:
+  - type: Visibility
+    layer: 8 # Don't network this to anyone so cheat clients can't see it. We are adding a PVS override to the user.
+  - type: Eye # for the camera itself
+    drawFov: false
+    pvsScale: 0.8 # we don't need the full range
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
index 68170d653893..2295a9e242bf 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
@@ -56,6 +56,8 @@
       - FoodCakeChristmasSlice
       - FoodCakeVanillaSlice
       - FoodCakeBirthdaySlice
+      - FoodCakeBerryDelightSlice
+      - FoodCakeCottonSlice
       - FoodBakedMuffin
       - FoodBakedMuffinBerry
       - FoodBakedMuffinCherry
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml
index 63a6bdcb6e96..03308ca18b4a 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml
@@ -47,6 +47,8 @@
       - FoodCakeChristmas
       - FoodCakeBirthday
       - FoodCakeVanilla
+      - FoodCakeBerryDelight
+      - FoodCakeCotton
       - FoodPieApple
       - FoodPieBaklava
       - FoodPieBananaCream
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index a5964e383049..62d2b988b36b 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -469,7 +469,7 @@
     receiveFrequencyId: CyborgControl
     transmitFrequencyId: RoboticsConsole
     savableAddress: false
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 10
     examinable: false
     beepSound:
@@ -477,8 +477,9 @@
       params:
         volume: -4
   # prevent any funnies if someone makes a cyborg item...
-  - type: AutomatedTimer
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   # explosion does most of its damage in the center and less at the edges
   - type: Explosive
     explosionType: Minibomb
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml.rej b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml.rej
new file mode 100644
index 000000000000..d130395f0e64
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml.rej
@@ -0,0 +1,10 @@
+diff a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml	(rejected hunks)
+@@ -143,8 +143,6 @@
+   - type: Body
+   - type: StatusEffects
+     allowed:
+-    - Stun
+-    - SlowedDown
+     - Flashed
+   - type: TypingIndicator
+     proto: robot
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 10716096a698..ddbada02bd75 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2585,6 +2585,7 @@
 - type: entity
   parent: [ SimpleMobBase, FlyingMobBase ]
   id: MobParrotBase
+  name: parrot
   abstract: true
   description: Infiltrates your domain, spies on you, and somehow still a cool pet.
   components:
@@ -2666,7 +2667,6 @@
     bloodMaxVolume: 50
 
 - type: entity
-  name: parrot
   parent: MobParrotBase
   id: MobParrot
   components:
@@ -2787,7 +2787,8 @@
   - type: Item
     size: Normal
     sprite: Mobs/Animals/grenadepenguin.rsi
-  - type: OnUseTimerTrigger
+  - type: TriggerOnUse
+  - type: TimerTrigger
     delay: 10
     beepSound:
       path: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg #funny sfx use
@@ -2800,6 +2801,8 @@
     intensitySlope: 20
     totalIntensity: 225
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Destructible
     thresholds:
     - trigger:
@@ -3608,7 +3611,7 @@
     factions:
     - Syndicate
   - type: Access
-    tags: 
+    tags:
     - NuclearOperative
     - SyndicateAgent
   - type: MeleeWeapon
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml.rej b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml.rej
new file mode 100644
index 000000000000..95ac6e2b1317
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml.rej
@@ -0,0 +1,9 @@
+diff a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml	(rejected hunks)
+@@ -113,6 +113,7 @@
+       10: Dead
+   - type: Stamina
+     critThreshold: 10
++    animationThreshold: 1
+   - type: DamageStateVisuals
+     states:
+       Alive:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
index 8392101a4310..0e2d5eb566ad 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
@@ -48,9 +48,7 @@
     group: GenericNumber
   - type: StatusEffects
     allowed:
-    - SlowedDown
     - Stutter
-    - Stun
     - Electrocution
     - TemporaryBlindness
     - RadiationProtection
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index cc70051b1a0d..46e58976c1c4 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -132,11 +132,6 @@
     critThreshold: 120
   - type: Destructible
     thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:TriggerBehavior
     - trigger:
         !type:DamageTrigger
         damage: 120
@@ -463,7 +458,6 @@
     chemicalMaxVolume: 100
   - type: StatusEffects
     allowed:
-    - SlowedDown
     - Electrocution
   - type: MeleeWeapon
     soundHit:
@@ -486,6 +480,7 @@
       - FootstepSound
       - CannotSuicide
       - DoorBumpOpener
+      - StunImmune
   - type: NoSlip
   - type: ZombieImmune
   - type: ExaminableSolution
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml.rej b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml.rej
new file mode 100644
index 000000000000..1b7e3fa68a75
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml.rej
@@ -0,0 +1,10 @@
+diff a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml	(rejected hunks)
+@@ -35,8 +35,6 @@
+     bodyType: KinematicController # Same for all inheritors
+   - type: StatusEffects
+     allowed:
+-    - Stun
+-    - SlowedDown
+     - Stutter
+     - Electrocution
+   - type: Pullable
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
index 2da0fe00d1df..3267f0064228 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
@@ -78,6 +78,7 @@
       75: Dead
   - type: Stamina
     critThreshold: 50
+    animationThreshold: 25
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -276,6 +277,7 @@
       75: Dead
   - type: Stamina
     critThreshold: 50
+    animationThreshold: 25
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -395,4 +397,4 @@
       30: Dead
   - type: MovementSpeedModifier
     baseWalkSpeed: 2
-    baseSprintSpeed: 2.5
\ No newline at end of file
+    baseSprintSpeed: 2.5
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml b/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml
index b0fa590a278a..badf7752f534 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml
@@ -57,7 +57,6 @@
         BaseUnshaded: dead_glow
   - type: StatusEffects
     allowed:
-    - Stun
     - Corporeal
     - Electrocution
     - StaminaModifier
@@ -100,6 +99,7 @@
   - type: Tag
     tags:
       - FootstepSound
+      - SlowImmune
   - type: Destructible
     thresholds:
       - trigger:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
index 0977563eae7c..ecbc85ba0024 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -120,7 +120,6 @@
     - state: active
   - type: StatusEffects
     allowed:
-    - Stun
     - Corporeal
   - type: Damageable
     damageContainer: ManifestedSpirit
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml.rej b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml.rej
new file mode 100644
index 000000000000..89fa36a50eb2
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml.rej
@@ -0,0 +1,9 @@
+diff a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml	(rejected hunks)
+@@ -83,3 +82,7 @@
+   - type: Reactive
+     groups:
+       Acidic: [Touch]
++  - type: Tag
++    tags:
++    - SlowImmune
++    - KnockdownImmune
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml.rej b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml.rej
new file mode 100644
index 000000000000..a6d1a567f21b
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml.rej
@@ -0,0 +1,10 @@
+diff a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml	(rejected hunks)
+@@ -15,8 +15,6 @@
+     bodyType: KinematicController # Same for all inheritors
+   - type: StatusEffects
+     allowed:
+-    - Stun
+-    - SlowedDown
+     - Stutter
+     - Electrocution
+   - type: Repairable
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index 501510c15d53..8dcf361d25be 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -93,7 +93,6 @@
     baseSprintSpeed : 4
   - type: StatusEffects
     allowed:
-    - SlowedDown
     - Stutter
     - Electrocution
     - TemporaryBlindness
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml.rej b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml.rej
new file mode 100644
index 000000000000..64e18e5dbdea
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml.rej
@@ -0,0 +1,18 @@
+diff a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml	(rejected hunks)
+@@ -32,6 +31,7 @@
+   - type: Tag
+     tags:
+     - DoorBumpOpener
++    - StunImmune
+ 
+ - type: entity
+   abstract: true
+@@ -93,8 +93,6 @@
+     baseDecayRate: 0.04
+   - type: StatusEffects
+     allowed:
+-    - Stun
+-    - SlowedDown
+     - Stutter
+     - Electrocution
+     - TemporaryBlindness
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
index b813b3b2ba73..76a517aa94bf 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
@@ -153,6 +153,7 @@
         recursive: false
   - type: Stamina
     critThreshold: 15
+    animationThreshold: 5
   - type: MovementAlwaysTouching
   - type: DamageStateVisuals
     states:
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index bd3a5e34b873..35897c82b4df 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -242,7 +242,6 @@
       types: {}
   - type: StatusEffects # Overwriting basesimplemob to remove flash, getting flashed as dragon just feelsbad
     allowed:
-    - SlowedDown
     - Stutter
     - Electrocution
     - TemporaryBlindness
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml.rej b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml.rej
new file mode 100644
index 000000000000..9d48e4ce04ad
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml.rej
@@ -0,0 +1,9 @@
+diff a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml	(rejected hunks)
+@@ -154,6 +153,7 @@
+     tags:
+     - CannotSuicide
+     - DoorBumpOpener
++    - StunImmune
+   - type: Puller
+     needsHands: false
+   - type: RandomMetadata
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 1e033709f42b..495189151be7 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -541,9 +541,9 @@
         Heat: 1.5 #per second, scales with temperature & other constants
   - type: TemperatureSpeed
     thresholds:
-      293: 0.8
-      280: 0.6
-      260: 0.4
+      293: 0.9
+      280: 0.8
+      260: 0.7
   - type: ThermalRegulator
     metabolismHeat: 800
     radiatedHeat: 100
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml.rej b/Resources/Prototypes/Entities/Mobs/Species/base.yml.rej
new file mode 100644
index 000000000000..985e750e5d83
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml.rej
@@ -0,0 +1,11 @@
+diff a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml	(rejected hunks)
+@@ -119,9 +119,6 @@
+       - !type:WashCreamPieReaction
+   - type: StatusEffects
+     allowed:
+-    - Stun
+-    - Friction
+-    - SlowedDown
+     - Stutter
+     - Electrocution
+     - Drunk
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index b778184cc8db..9e2819bbd187 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -195,9 +195,9 @@
         Heat : 3 #per second, scales with temperature & other constants
   - type: TemperatureSpeed
     thresholds:
-      289: 0.8
-      275: 0.6
-      250: 0.4
+      289: 0.9
+      275: 0.8
+      250: 0.7
   - type: Sprite # sprite again because we want different layer ordering
     noRot: true
     drawdepth: Mobs
diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
index 3b1ecb0f0934..7bd8c0f3043e 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -200,9 +200,9 @@
         Heat : 1.5 #per second, scales with temperature & other constants
   - type: TemperatureSpeed
     thresholds:
-      301: 0.8
-      295: 0.6
-      285: 0.4
+      301: 0.9
+      295: 0.8
+      285: 0.7
   - type: Wagging
   - type: Inventory
     speciesId: reptilian
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
index 49e8279688b0..cc16968b78e5 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -267,6 +267,11 @@
           32:
             sprite: Mobs/Species/Vox/displacement.rsi
             state: head
+      neck:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: neck
       back:
         sizeMaps:
           32:
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml.rej b/Resources/Prototypes/Entities/Mobs/Species/vox.yml.rej
new file mode 100644
index 000000000000..2e0b328fd72e
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml.rej
@@ -0,0 +1,14 @@
+diff a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml	(rejected hunks)
+@@ -85,11 +85,11 @@
+     - map: [ "outerClothing" ]
+     - map: [ "back" ]
+     - map: [ "neck" ]
++    - map: [ "suitstorage" ] # This is not in the default order
+     - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
+     - map: [ "enum.HumanoidVisualLayers.Hair" ]
+     - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
+     - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
+-    - map: [ "suitstorage" ] # This is not in the default order
+     - map: [ "enum.HumanoidVisualLayers.Tail" ]
+     - map: [ "mask" ]
+     - map: [ "head" ]
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml.rej b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml.rej
new file mode 100644
index 000000000000..f3e45243f944
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml.rej
@@ -0,0 +1,145 @@
+diff a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml	(rejected hunks)
+@@ -1190,3 +1190,143 @@
+       Burger: SuppermatterBurger
+   - type: Item
+     heldPrefix: suppermatter-shard
++
++- type: entity
++  name: cotton cake
++  parent: FoodCakeBase
++  id: FoodCakeCotton
++  description: A cake with a fiber frosting and a wad of cotton on top.
++  components:
++  - type: Sprite
++    state: cotton
++  - type: SliceableFood
++    slice: FoodCakeCottonSlice
++  - type: Tag
++    tags:
++    - Cake
++    - ClothMade
++  - type: SolutionContainerManager
++    solutions:
++      food:
++        maxVol: 55
++        reagents:
++        - ReagentId: Nutriment
++          Quantity: 30
++        - ReagentId: Vitamin
++          Quantity: 5
++        - ReagentId: Fiber
++          Quantity: 10
++  - type: Item
++    heldPrefix: cotton
++
++- type: entity
++  name: slice of cotton cake
++  parent: FoodCakeSliceBase
++  id: FoodCakeCottonSlice
++  description: A slice of cotton cake. You can just lick the frosting, it's fine.
++  components:
++  - type: Sprite
++    state: cotton-slice
++  - type: Tag
++    tags:
++    - Cake
++    - ClothMade
++    - Slice
++  - type: SolutionContainerManager
++    solutions:
++      food:
++        maxVol: 15
++        reagents:
++        - ReagentId: Nutriment
++          Quantity: 8
++        - ReagentId: Vitamin
++          Quantity: 1
++        - ReagentId: Fiber
++          Quantity: 2
++  - type: Item
++    heldPrefix: cotton-slice
++
++# Motivating
++
++- type: entity
++  name: berry delight
++  parent: FoodCakeBase
++  id: FoodCakeBerryDelight
++  description: This is a cake that is approaching.
++  components:
++  - type: Sprite
++    state: berry_delight
++  - type: FlavorProfile
++    flavors:
++      - sweet
++      - berry
++      - motivating
++  - type: SolutionContainerManager
++    solutions:
++      food:
++        maxVol: 55
++        reagents:
++        - ReagentId: Nutriment
++          Quantity: 40
++        - ReagentId: Vitamin
++          Quantity: 10
++        - ReagentId: Milk
++          Quantity: 10
++  - type: SliceableFood
++    slice: FoodCakeBerryDelightSlice
++  - type: Tag
++    tags:
++    - Cake
++    - Fruit
++  - type: Item
++    inhandVisuals:
++      left:
++      - state: plain-inhand-left
++      - state: alpha-filling-inhand-left
++        color: red
++      right:
++      - state: plain-inhand-right
++      - state: alpha-filling-inhand-right
++        color: red
++
++- type: entity
++  name: berry delight slice
++  parent: FoodCakeSliceBase
++  id: FoodCakeBerryDelightSlice
++  description: Put a fork in, your hunger in isolation.
++  components:
++  - type: Sprite
++    state: berry_delight_slice
++  - type: FlavorProfile
++    flavors:
++      - sweet
++      - berry
++      - motivating
++  - type: SolutionContainerManager
++    solutions:
++      food:
++        maxVol: 12
++        reagents:
++        - ReagentId: Nutriment
++          Quantity: 8
++        - ReagentId: Vitamin
++          Quantity: 2
++        - ReagentId: Milk
++          Quantity: 2
++  - type: Tag
++    tags:
++    - Cake
++    - Fruit
++    - Slice
++  - type: Item
++    inhandVisuals:
++      left:
++      - state: alpha-slice-inhand-left
++        color: white
++      - state: alpha-slice-filling-inhand-left
++        color: red
++      right:
++      - state: alpha-slice-inhand-right
++        color: white
++      - state: alpha-slice-filling-inhand-right
++        color: red
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
index 062060c35eb6..f1ce6554eb98 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
@@ -469,9 +469,9 @@
 # Tastes like jelly-donut, fizzy tutti frutti.
 
 - type: entity
-  name: slugcat jelly-donut
+  name: scurret jelly-donut
   parent: FoodDonutBase
-  id: FoodDonutJellySlugcat
+  id: FoodDonutJellyScurret
   description: No holes in this donut in case a suspicious looking pole shows up.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
index fdfafd5cb11e..d261766486d8 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -256,7 +256,7 @@
       payloadSlot:
         whitelist:
           components:
-          - OnUseTimerTrigger
+          - TimerTrigger
         insertSound:
           path: /Audio/Weapons/Guns/Empty/empty.ogg
         ejectSound:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml.rej b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml.rej
new file mode 100644
index 000000000000..ef2213bc1da8
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml.rej
@@ -0,0 +1,9 @@
+diff a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml	(rejected hunks)
+@@ -2694,6 +2694,7 @@
+   - type: Item
+     sprite: Objects/Specific/Hydroponics/cherry.rsi
+     heldPrefix: pit
++    size: Tiny
+   - type: Tag
+     tags:
+     - Recyclable
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml
index 4feb12d62706..6a8da861fcaa 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml
@@ -17,6 +17,11 @@
   - type: IgnitionSource
     temperature: 800
   - type: IgniteOnTrigger
+  - type: EmitSoundOnTrigger
+    sound:
+      collection: WelderOn
+  - type: UseDelayOnTrigger
+  - type: UseDelayTriggerCondition
   - type: TriggerOnSignal
   - type: DeviceNetwork
     deviceNetId: Wireless
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
index a1dfdfb912bc..2efc9eca44a3 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
@@ -28,6 +28,10 @@
     sprite: Objects/Devices/signaller.rsi
     state: signaller
   - type: Signaller
+  - type: SignalOnTrigger
+    port: Pressed
+  - type: UseDelayOnTrigger
+  - type: UseDelayTriggerCondition
   - type: UseDelay
   - type: StaticPrice
     price: 40
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml.rej b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml.rej
new file mode 100644
index 000000000000..88dbe70f59b0
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml.rej
@@ -0,0 +1,8 @@
+diff a/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml	(rejected hunks)
+@@ -43,4 +47,4 @@
+   - type: WirelessNetworkConnection
+     range: 50
+   - type: StaticPrice
+-    price: 30
+\ No newline at end of file
++    price: 30
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
index a2c2cc9ef718..2cc723b4ea72 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
@@ -105,7 +105,13 @@
     price: 40
   - type: PayloadTrigger
     components:
-    - type: OnUseTimerTrigger
+    - type: TriggerOnUse
+      keyOut: startTimer
+    - type: TimerTrigger
+      keysIn:
+      - startTimer
+      # use the default trigger key so it can activate any inserted payload
+      keyOut: trigger
       delay: 5
       delayOptions: [3, 5, 10, 15, 30]
       initialBeepDelay: 0
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml.rej b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml.rej
new file mode 100644
index 000000000000..861c3acadf16
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml.rej
@@ -0,0 +1,23 @@
+diff a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml	(rejected hunks)
+@@ -47,14 +53,19 @@
+     - SignalTrigger
+   - type: PayloadTrigger
+     components:
+-    - type: TimerStartOnSignal
+     - type: DeviceNetwork
+       deviceNetId: Wireless
+       receiveFrequencyId: BasicDevice
+     - type: WirelessNetworkConnection
+       range: 200
+     - type: DeviceLinkSink
+-    - type: OnUseTimerTrigger
++    - type: TriggerOnSignal
++      keyOut: startTimer
++    - type: TimerTrigger
++      keysIn:
++      - startTimer
++      # use the default trigger key so it can activate any inserted payload
++      keyOut: trigger
+       delay: 3
+       initialBeepDelay: 0
+       beepSound:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/desynchronizer.yml b/Resources/Prototypes/Entities/Objects/Devices/desynchronizer.yml
index d5f8352baa94..526d297f608a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/desynchronizer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/desynchronizer.yml
@@ -9,6 +9,7 @@
     state: icon
   - type: TriggerOnUse
   - type: PolymorphOnTrigger
+    targetUser: true
     polymorph: VoidPocket
   - type: UseDelay
     delay: 220 # long delay to ensure it can't be spammed, use it wisely
diff --git a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml.rej b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml.rej
new file mode 100644
index 000000000000..4e5648601ac8
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml.rej
@@ -0,0 +1,38 @@
+diff a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml	(rejected hunks)
+@@ -52,6 +52,27 @@
+         disableEject: true
+         swap: false
+ 
++- type: entity
++  parent: Holoprojector
++  id: HoloprojectorClownBorg
++  name: holopeel projector
++  description: A holopeel projector that creates a slippery, hard light banana peel. It recharges, so that the fun never ends!
++  suffix: borg
++  components:
++  - type: HolosignProjector
++    signProto: HoloPeel
++    chargeUse: 240
++  - type: Sprite
++    sprite: Objects/Devices/Holoprojectors/peel.rsi
++    state: icon
++  - type: ItemSlots
++    slots:
++      cell_slot:
++        name: power-cell-slot-component-slot-name-default
++        startingItem: PowerCellMicroreactor
++        disableEject: true
++        swap: false
++
+ - type: entity
+   parent: Holoprojector
+   id: HolofanProjector
+@@ -89,7 +110,7 @@
+   parent: HolofanProjector
+   id: HolofanProjectorBorg
+   name: integrated holofan
+-  description: Stops idiots from causing more crew harm during atmospheric emergencies. Installed directly into an engineering cyborg, it  recharges over time.
++  description: Stops idiots from causing more crew harm during atmospheric emergencies. Installed directly into an engineering cyborg, it recharges over time.
+   components:
+   - type: ItemSlots
+     slots:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml.rej b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml.rej
new file mode 100644
index 000000000000..4afae7717f12
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml.rej
@@ -0,0 +1,61 @@
+diff a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml	(rejected hunks)
+@@ -8,32 +8,37 @@
+       sprite: Objects/Devices/mousetrap.rsi
+       drawdepth: SmallMobs # if mice can hide under tables, so can mousetraps
+       layers:
+-        - state: mousetrap
+-          map: ["base"]
++      - state: mousetrap
++        map: ["enum.ToggleableVisuals.Layer"]
+     - type: StepTrigger
+       intersectRatio: 0.2
+       requiredTriggeredSpeed: 2
+     - type: Mousetrap
++    - type: ItemToggle
++      soundActivate: "/Audio/Items/Handcuffs/cuff_end.ogg"
++      soundDeactivate: "/Audio/Items/snap.ogg"
++      popupActivate: mousetrap-on-activate
++      popupDeactivate: mousetrap-on-deactivate
++    - type: UseDelay
++    - type: ItemToggleOnTrigger
++      canActivate: false
++      showPopup: false # only show the popup when arming/disarming the trap in your hand
+     - type: TriggerOnStepTrigger
+     - type: PreventableStepTrigger
+-    - type: DamageUserOnTrigger
++    - type: DamageOnTrigger
++      targetUser: true
+       damage:
+         types:
+           Blunt: 2 # base damage, scales based on mass
+-    - type: EmitSoundOnUse
+-      sound: "/Audio/Items/Handcuffs/cuff_end.ogg"
+-      handle: false
+-    - type: EmitSoundOnTrigger
+-      sound: "/Audio/Items/snap.ogg"
+     - type: Item
+       sprite: Objects/Devices/mousetrap.rsi
+     - type: Appearance
+     - type: GenericVisualizer
+       visuals:
+-        enum.MousetrapVisuals.Visual:
+-          base:
+-            Armed: { state: mousetraparmed }
+-            Unarmed: { state: mousetrap }
++        enum.ToggleableVisuals.Enabled:
++          enum.ToggleableVisuals.Layer:
++            True: {state: mousetraparmed}
++            False: {state: mousetrap}
+     - type: Physics
+       bodyType: Dynamic
+     - type: CollisionWake
+@@ -66,6 +71,6 @@
+   - type: Sprite
+     layers:
+     - state: mousetraparmed
+-      map: ["base"]
+-  - type: Mousetrap
+-    isActive: true
++      map: ["enum.ToggleableVisuals.Layer"]
++  - type: ItemToggle
++    activated: true
diff --git a/Resources/Prototypes/Entities/Objects/Devices/payload.yml.rej b/Resources/Prototypes/Entities/Objects/Devices/payload.yml.rej
new file mode 100644
index 000000000000..305f3db0d153
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Devices/payload.yml.rej
@@ -0,0 +1,6 @@
+diff a/Resources/Prototypes/Entities/Objects/Devices/payload.yml b/Resources/Prototypes/Entities/Objects/Devices/payload.yml	(rejected hunks)
+@@ -94,3 +94,4 @@
+     - type: EmitSoundOnTrigger
+       sound:
+         path: "/Audio/Effects/flash_bang.ogg"
++      positional: true
diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
index da75221e3b88..0ed7c245fb71 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
@@ -282,3 +282,4 @@
       - MobMover
   - type: SpawnOnTrigger
     proto: EffectGravityPulse
+    predicted: true
diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice.yml b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
index 91dcf79e6612..0a19928cb4eb 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/dice.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
@@ -162,7 +162,8 @@
       path: /Audio/Effects/glass_step.ogg
     slipData:
       launchForwardsMultiplier: 0
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
+    targetUser: true
     damage:
       types:
         Piercing: 5
diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
index 4afc9d454059..3293db71623c 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
@@ -100,6 +100,8 @@
     - Figurine
   - type: UseDelay
     delay: 5
+  - type: UseDelayOnTrigger
+  - type: UseDelayTriggerCondition # prevent spam
   - type: TriggerOnActivate
   - type: TriggerOnSignal
   - type: Speech
diff --git a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
index 61dc91f83aed..faf94947b550 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
@@ -6,26 +6,24 @@
   id: BasePlushie
   components:
   - type: EmitSoundOnUse
-    sound:
+    sound: &BasePlushieSound
       collection: ToySqueak
+      params:
+        volume: -4
   - type: EmitSoundOnActivate
-    sound:
-      collection: ToySqueak
+    sound: *BasePlushieSound
   - type: EmitSoundOnCollide
-    sound:
-      collection: ToySqueak
+    sound: *BasePlushieSound
   - type: EmitSoundOnLand
-    sound:
-      collection: ToyFall
+    sound: *BasePlushieSound
   - type: EmitSoundOnTrigger
-    sound:
-      collection: ToySqueak
+    sound: *BasePlushieSound
   - type: UseDelay
-    delay: 1.0
+    delay: 3.0
   - type: MeleeWeapon
+    attackRate: 0.333
     wideAnimationRotation: 180
-    soundHit:
-      collection: ToySqueak
+    soundHit: *BasePlushieSound
     damage:
       types:
         Blunt: 0
@@ -37,8 +35,7 @@
     price: 5
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      collection: ToySqueak
+    useSound: *BasePlushieSound
     delay: 2
   - type: SolutionContainerManager
     solutions:
@@ -356,28 +353,24 @@
   - type: Item
     sprite: Objects/Fun/Plushies/lizard.rsi
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieLizardSound
       path: /Audio/Items/Toys/weh.ogg
+      params:
+        volume: -5
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/weh.ogg
+    sound: *PlushieLizardSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/weh.ogg
+    sound: *PlushieLizardSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Items/Toys/weh.ogg
+    sound: *PlushieLizardSound
   - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Items/Toys/weh.ogg
+    sound: *PlushieLizardSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Items/Toys/weh.ogg
+    useSound: *PlushieLizardSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Items/Toys/weh.ogg
+    soundHit: *PlushieLizardSound
   - type: Extractable
     juiceSolution:
       reagents:
@@ -427,28 +420,24 @@
       - state: inhand-right
         shader: shaded
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieExperimentSound
       path: /Audio/Items/Toys/arf.ogg
+      params:
+        volume: -5
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/arf.ogg
+    sound: *PlushieExperimentSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/arf.ogg
+    sound: *PlushieExperimentSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Items/Toys/arf.ogg
+    sound: *PlushieExperimentSound
   - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Items/Toys/arf.ogg
+    sound: *PlushieExperimentSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Items/Toys/arf.ogg
+    useSound: *PlushieExperimentSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Items/Toys/arf.ogg
+    soundHit: *PlushieExperimentSound
   - type: Clothing
     clothingVisuals:
       head:
@@ -515,28 +504,24 @@
     sprite: Objects/Fun/Plushies/lizard.rsi
     heldPrefix: spacelizard
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieSpaceLizardSound
       path: /Audio/Items/Toys/muffled_weh.ogg
+      params:
+        volume: -5
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/muffled_weh.ogg
+    sound: *PlushieSpaceLizardSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/muffled_weh.ogg
+    sound: *PlushieSpaceLizardSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Items/Toys/muffled_weh.ogg
+    sound: *PlushieSpaceLizardSound
   - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Items/Toys/muffled_weh.ogg
+    sound: *PlushieSpaceLizardSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Items/Toys/muffled_weh.ogg
+    useSound: *PlushieSpaceLizardSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Items/Toys/muffled_weh.ogg
+    soundHit: *PlushieSpaceLizardSound
   - type: Clothing
     sprite: Objects/Fun/Plushies/lizard.rsi
     slots:
@@ -561,25 +546,22 @@
   - type: Item
     heldPrefix: plushielizardinversed
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieLizardInversedSound
       path: /Audio/Items/Toys/hew.ogg
+      params:
+        volume: -5
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/hew.ogg
+    sound: *PlushieLizardInversedSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/hew.ogg
+    sound: *PlushieLizardInversedSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Items/Toys/hew.ogg
+    sound: *PlushieLizardInversedSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Items/Toys/hew.ogg
+    useSound: *PlushieLizardInversedSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Items/Toys/hew.ogg
+    soundHit: *PlushieLizardInversedSound
   - type: Extractable
     juiceSolution:
       reagents:
@@ -619,28 +601,24 @@
       map: [ "enum.SolutionContainerLayers.Fill" ]
       visible: false
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieDionaSound
       path: /Audio/Items/Toys/toy_rustle.ogg
+      params:
+        volume: -5
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/toy_rustle.ogg
+    sound: *PlushieDionaSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/toy_rustle.ogg
+    sound: *PlushieDionaSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Items/Toys/toy_rustle.ogg
+    sound: *PlushieDionaSound
   - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Items/Toys/toy_rustle.ogg
+    sound: *PlushieDionaSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Items/Toys/toy_rustle.ogg
+    soundHit: *PlushieDionaSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Items/Toys/toy_rustle.ogg
+    useSound: *PlushieDionaSound
   - type: SolutionContainerManager
     solutions:
       plushie:
@@ -1073,28 +1051,24 @@
     sprite: Objects/Fun/Plushies/vox.rsi
     state: icon
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieVoxSound
       path: /Audio/Voice/Vox/shriek1.ogg
+      params:
+        volume: -5
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Voice/Vox/shriek1.ogg
+    sound: *PlushieVoxSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Voice/Vox/shriek1.ogg
+    sound: *PlushieVoxSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Voice/Vox/shriek1.ogg
+    sound: *PlushieVoxSound
   - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Voice/Vox/shriek1.ogg
+    sound: *PlushieVoxSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Voice/Vox/shriek1.ogg
+    useSound: *PlushieVoxSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Voice/Vox/shriek1.ogg
+    soundHit: *PlushieVoxSound
   - type: Clothing
     quickEquip: false
     sprite: Objects/Fun/Plushies/vox.rsi
@@ -1142,28 +1116,24 @@
   - type: Item
     size: Normal
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieXenoSound
       path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+      params:
+        volume: -8
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+    sound: *PlushieXenoSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+    sound: *PlushieXenoSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+    sound: *PlushieXenoSound
   - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+    sound: *PlushieXenoSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
+    useSound: *PlushieXenoSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+    soundHit: *PlushieXenoSound
   - type: Clothing
     quickEquip: false
     sprite: Objects/Fun/Plushies/xeno.rsi
@@ -1205,27 +1175,41 @@
     sprite: Objects/Fun/Plushies/human.rsi
     state: icon
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieHuman
       path: /Audio/Voice/Human/malescream_1.ogg
+      params:
+        volume: -8
   - type: EmitSoundOnLand
     sound:
       path: /Audio/Voice/Human/malescream_2.ogg
+      params:
+        volume: -8
   - type: EmitSoundOnActivate
     sound:
       path: /Audio/Voice/Human/malescream_3.ogg
+      params:
+        volume: -8
   - type: EmitSoundOnCollide
     sound:
       path: /Audio/Voice/Human/malescream_4.ogg
+      params:
+        volume: -8
   - type: Food
     requiresSpecialDigestion: true
     useSound:
       path: /Audio/Voice/Human/malescream_1.ogg
+      params:
+        volume: -8
   - type: MeleeWeapon
     soundHit:
       path: /Audio/Voice/Human/malescream_4.ogg
+      params:
+        volume: -8
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Voice/Human/malescream_5.ogg
+      params:
+        volume: -8
   - type: Clothing
     quickEquip: false
     sprite: Objects/Fun/Plushies/human.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml.rej b/Resources/Prototypes/Entities/Objects/Fun/toys.yml.rej
new file mode 100644
index 000000000000..9d806c9f9f90
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml.rej
@@ -0,0 +1,10 @@
+diff a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml	(rejected hunks)
+@@ -892,7 +892,7 @@
+   - type: StepTrigger
+     intersectRatio: 0.2
+     requiredTriggeredSpeed: 2
+-  - type: TriggerOnStepTrigger
++  - type: TriggerOnStepTrigger # for payloads
+   - type: Appearance
+   - type: CollisionWake
+     enabled: false
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index 88fb908a9401..f00b049d56a3 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -128,7 +128,8 @@
     slipData:
       launchForwardsMultiplier: 0
   - type: TriggerOnStepTrigger
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
+    targetUser: true
     damage:
       types:
         Piercing: 5
@@ -154,7 +155,7 @@
   - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
     damage:
       types:
         Piercing: 4.5
@@ -193,7 +194,7 @@
     refineResult:
     - id: SheetGlass1
     - id: PartRodMetal1
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
     damage:
       types:
         Piercing: 5.5
@@ -233,7 +234,7 @@
     refineResult:
     - id: SheetGlass1
     - id: SheetPlasma1
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
     damage:
       types:
         Piercing: 6.5
@@ -276,7 +277,7 @@
     refineResult:
     - id: SheetGlass1
     - id: SheetUranium1
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
     damage:
       types:
         Piercing: 5
@@ -315,7 +316,7 @@
     refineResult:
     - id: SheetGlass1
     - id: SheetBrass1
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
     damage:
       types:
         Piercing: 5
diff --git a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
index a94597c7cf47..cad22dcc6dff 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
@@ -84,7 +84,8 @@
   name: kick mine
   parent: BaseLandMine
   components:
-  - type: GhostKickUserOnTrigger
+  - type: GhostKickOnTrigger
+    targetUser: true
   - type: DeleteOnTrigger
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
index f82876d2262b..b55cfebeb67b 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
@@ -158,17 +158,18 @@
   description: This implant lets the user honk anywhere at any time.
   categories: [ HideSpawnMenu ]
   components:
-    - type: SubdermalImplant
-      implantAction: ActionActivateHonkImplant
-    - type: TriggerImplantAction
-    - type: EmitSoundOnTrigger
-      sound:
-        collection: BikeHorn
-        params:
-          variation: 0.125
-    - type: Tag
-      tags:
-      - BikeHorn
+  - type: SubdermalImplant
+    implantAction: ActionActivateHonkImplant
+  - type: TriggerOnActivateImplant
+  - type: EmitSoundOnTrigger
+    predicted: true
+    sound:
+      collection: BikeHorn
+      params:
+        variation: 0.125
+  - type: Tag
+    tags:
+    - BikeHorn
 
 #Security implants
 
@@ -410,11 +411,13 @@
   - type: TriggerOnMobstateChange
     mobState:
     - Dead
-  - type: TriggerImplantAction
+  - type: TriggerOnActivateImplant
   - type: GibOnTrigger
+    targetUser: true
     deleteItems: true
   - type: SpawnOnTrigger
     proto: Acidifier
+    predicted: true
   - type: Tag
     tags:
     - SubdermalImplant
@@ -438,7 +441,8 @@
       mobState:
       - Critical
       - Dead
-    - type: Rattle
+    - type: RattleOnTrigger
+      targetUser: true
 
 - type: entity
   parent: BaseSubdermalImplant
@@ -484,5 +488,5 @@
   description: This implant will inform the Centcomm radio channel should the user fall into critical condition or die.
   categories: [ HideSpawnMenu ]
   components:
-  - type: Rattle
+  - type: RattleOnTrigger
     radioChannel: CentCom
diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml.rej b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml.rej
new file mode 100644
index 000000000000..ff1b7bd56cbc
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml.rej
@@ -0,0 +1,115 @@
+diff a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml	(rejected hunks)
+@@ -179,13 +180,13 @@
+   description: This implant creates an electromagnetic pulse when activated.
+   categories: [ HideSpawnMenu ]
+   components:
+-    - type: SubdermalImplant
+-      implantAction: ActionActivateEmpImplant
+-    - type: TriggerImplantAction
+-    - type: EmpOnTrigger
+-      range: 2.75
+-      energyConsumption: 50000
+-      disableDuration: 10
++  - type: SubdermalImplant
++    implantAction: ActionActivateEmpImplant
++  - type: TriggerOnActivateImplant
++  - type: EmpOnTrigger
++    range: 2.75
++    energyConsumption: 50000
++    disableDuration: 10
+ 
+ - type: entity
+   parent: BaseSubdermalImplant
+@@ -194,10 +195,10 @@
+   description: This implant randomly teleports the user within a large radius when activated.
+   categories: [ HideSpawnMenu ]
+   components:
+-    - type: SubdermalImplant
+-      implantAction: ActionActivateScramImplant
+-    - type: TriggerImplantAction
+-    - type: ScramImplant
++  - type: SubdermalImplant
++    implantAction: ActionActivateScramImplant
++  - type: TriggerOnActivateImplant
++  - type: ScramImplant
+ 
+ - type: entity
+   parent: BaseSubdermalImplant
+@@ -238,27 +239,28 @@
+   description: This implant detonates the user upon activation or upon death.
+   categories: [ HideSpawnMenu ]
+   components:
+-    - type: SubdermalImplant
+-      permanent: true
+-      implantAction: ActionActivateMicroBomb
+-    - type: TriggerOnMobstateChange
+-      mobState:
+-      - Dead
+-    - type: TriggerImplantAction
+-    - type: ExplodeOnTrigger
+-    - type: GibOnTrigger
+-      deleteItems: true
+-    - type: Explosive
+-      explosionType: MicroBomb
+-      totalIntensity: 120
+-      intensitySlope: 5
+-      maxIntensity: 30
+-      canCreateVacuum: false
+-    - type: Tag
+-      tags:
+-        - SubdermalImplant
+-        - HideContextMenu
+-        - MicroBomb
++  - type: SubdermalImplant
++    permanent: true
++    implantAction: ActionActivateMicroBomb
++  - type: TriggerOnMobstateChange
++    mobState:
++    - Dead
++  - type: TriggerOnActivateImplant
++  - type: ExplodeOnTrigger
++  - type: GibOnTrigger
++    targetUser: true
++    deleteItems: true
++  - type: Explosive
++    explosionType: MicroBomb
++    totalIntensity: 120
++    intensitySlope: 5
++    maxIntensity: 30
++    canCreateVacuum: false
++  - type: Tag
++    tags:
++    - SubdermalImplant
++    - HideContextMenu
++    - MicroBomb
+ 
+ 
+ - type: entity
+@@ -270,20 +272,24 @@
+   components:
+     - type: SubdermalImplant
+       permanent: true
+-    - type: TriggerOnMobstateChange #Chains with OnUseTimerTrigger
++    - type: TriggerOnMobstateChange #activates the timer
+       mobState:
+       - Dead
+       preventSuicide: true
+-    - type: OnUseTimerTrigger
++    - type: TimerTrigger
+       delay: 7
+-      initialBeepDelay: 0
+       beepSound:
+         path: /Audio/Machines/Nuke/general_beep.ogg
+         params:
+           volume: -2
+     - type: ExplodeOnTrigger
++      keysIn:
++      - timer
+     - type: GibOnTrigger
++      targetUser: true
+       deleteItems: true
++      keysIn:
++      - timer
+     - type: Explosive
+       explosionType: Default
+       totalIntensity: 3500
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 754a93f97c04..11446d4880f5 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -331,24 +331,31 @@
       path: /Audio/Effects/beep_landmine.ogg
       params:
         maxDistance: 10
-  - type: ExplodeOnTrigger
   - type: Explosive
     explosionType: HardBomb  # normally Default and max 5 total 60
     maxIntensity: 10 # about a ~67.5 total damage
     totalIntensity: 30 # about a ~3 tile radius
     canCreateVacuum: false
+  - type: ExplodeOnTrigger
+    keysIn:
+    - timer
+    - trigger # directly explode from the landmine
   - type: DeleteOnTrigger
-  - type: OnUseTimerTrigger
-    useVerbInstead: true
+    keysIn:
+    - timer
+    - trigger
+  - type: TimerTrigger
     beepInterval: .25
     beepSound:
       path: /Audio/Items/Janitor/floor_sign_beep.ogg
       params:
         volume: 1
     examinable: false
+  - type: TriggerOnVerb
+    text: trigger-on-verb-detonation
   - type: Tag
     tags: # ignore "WhitelistChameleon" tag
-      - WetFloorSign
+    - WetFloorSign
 
 - type: entity
   name: plunger
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
index 525fcac9a897..1f4a0943cfbd 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
@@ -231,10 +231,12 @@
         - ItemMask
   - type: DeleteOnTrigger
   - type: EmitSoundOnTrigger
+    predicted: true
+    positional: true
     sound:
       path: "/Audio/Effects/Fluids/splat.ogg"
       params:
-        volume: -20
+        volume: -8
 
 - type: entity
   name: soap
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml.rej b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml.rej
new file mode 100644
index 000000000000..45d1ddcee92b
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml.rej
@@ -0,0 +1,9 @@
+diff a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml	(rejected hunks)
+@@ -158,6 +158,7 @@
+   - type: Slippery
+   - type: StepTrigger
+     intersectRatio: 0.04
++  - type: TriggerOnStepTrigger
+   - type: Item
+     heldPrefix: syndie
+   - type: Fixtures
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 361998a3b6e4..1830ff684a92 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -1103,6 +1103,26 @@
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: clowning-module }
 
+- type: entity
+  id: BorgModuleAdvancedClowning
+  parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
+  name: advanced clowning cyborg module
+  description: Advanced service module for only the silliest cyborgs! Comes with a built-in oven that bakes pies automatically over time, a holopeel projector, and a push horn.
+  components:
+  - type: Sprite
+    layers:
+    - state: service
+    - state: icon-clown-adv
+  - type: ItemBorgModule
+    items:
+    - HoloprojectorClownBorg
+    - BorgLauncherCreamPie
+    - ClownRecorder
+    - PushHorn
+    - BikeHornInstrument
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-clowning-module }
+
 #syndicate modules
 - type: entity
   id: BorgModuleSyndicateWeapon
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
index 9a63957c35a5..96d1a8f1503e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
@@ -30,7 +30,8 @@
     - state: wires
   - type: Item
     sprite: Objects/Weapons/Bombs/ied.rsi
-  - type: OnUseTimerTrigger
+  - type: TriggerOnUse
+  - type: TimerTrigger
     delay: 5
     examinable: false
     initialBeepDelay: 0
@@ -48,6 +49,8 @@
     maxIntensity: 3
     canCreateVacuum: false
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Appearance
   - type: AnimationPlayer
   - type: TimerTriggerVisuals
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
index 6be0dc33987b..0d7e0e60fc9e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
@@ -41,13 +41,16 @@
       damage:
         types:
           Blunt: 5
-    - type: OnUseTimerTrigger
+    - type: TriggerOnUse
+    - type: TimerTrigger
       delay: 120
       beepSound:
         path: /Audio/Machines/Nuke/general_beep.ogg
         params:
           volume: -2
     - type: ExplodeOnTrigger
+      keysIn:
+      - timer
     - type: Explosive
       explosionType: Default
       maxIntensity: 50
@@ -55,6 +58,8 @@
       totalIntensity: 100
       canCreateVacuum: false
     - type: DeleteOnTrigger
+      keysIn:
+      - timer
     - type: HotPotato
     - type: DamageOnHolding
       enabled: false
@@ -67,7 +72,7 @@
         enum.Trigger.TriggerVisuals.VisualState:
           base:
             Primed: { state: activated }
-            Unprimed: { state: complete }
+            Unprimed: { state: icon }
 
 - type: entity
   id: HotPotatoEffect
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
index df35db1123ed..d917fc5de794 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
@@ -21,7 +21,7 @@
   description: A dark ink pen.
   id: PenExploding
   components:
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 4
     examinable: false
   - type: Explosive
@@ -32,8 +32,11 @@
     canCreateVacuum: false
   - type: ActivateOnPaperOpened
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
+  - type: TriggerOnUse
   - type: TriggerOnSignal
-  - type: DeviceLinkSink # This should be changed into separate behavior where triggering via signal makes beep, while triggering manually is quiet, when that functionality is supported.
+  - type: DeviceLinkSink # This should be changed into separate behavior where triggering via signal makes beep, while triggering manually is quiet.
     ports:
     - Trigger
   - type: EmitSoundOnUse
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pipebomb.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pipebomb.yml
index 9e97bbf339e1..73ce918d3e5c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pipebomb.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pipebomb.yml
@@ -16,7 +16,8 @@
     - state: base
       map: ["enum.TriggerVisualLayers.Base"]
     - state: wires
-  - type: OnUseTimerTrigger # todo: make it activate through welder/lighter/fire instead
+  - type: TriggerOnActivate # todo: make it activate through welder/lighter/fire instead
+  - type: TimerTrigger
     delay: 5
     examinable: false
     initialBeepDelay: 0
@@ -25,6 +26,8 @@
     min: 1
     max: 10
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive # Weak explosion in a very small radius. Doesn't break underplating.
     explosionType: Default
     totalIntensity: 50
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
index 527014a31213..629a9d418e1d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
@@ -65,7 +65,7 @@
       enum.Trigger.TriggerVisuals.VisualState:
         base:
           Primed: { state: primed }
-          Unprimed: { state: complete }
+          Unprimed: { state: icon }
 
 - type: entity
   name: composition C-4
@@ -152,7 +152,20 @@
     layers:
     - state: icon
       map: ["base"]
-  - type: OnUseTimerTrigger
+  - type: TriggerOnActivate
+  - type: TriggerOnSignal
+  - type: TriggerOnStuck
+    keyOut: stuck
+  - type: ToggleTriggerCondition # for toggling the start on stuck ability
+    keys:
+    - stuck
+    toggleVerb: toggle-trigger-condition-stick-verb
+    toggleOn: toggle-trigger-condition-stick-on
+    toggleOff: toggle-trigger-condition-stick-off
+  - type: TimerTrigger
+    keysIn:
+    - trigger
+    - stuck
     delay: 5
     delayOptions: [5, 10, 15, 20]
     initialBeepDelay: 0
@@ -160,12 +173,9 @@
       path: /Audio/Effects/Cargo/buzz_two.ogg
       params:
         volume: -6
-    startOnStick: false
-    canToggleStartOnStick: true
-  - type: TimerStartOnSignal
   - type: DeviceLinkSink
     ports:
-    - Timer
+    - Trigger
   - type: Explosive
     explosionType: Cryo
     totalIntensity: 120
@@ -173,3 +183,5 @@
     maxIntensity: 30
     canCreateVacuum: false
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml.rej b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml.rej
new file mode 100644
index 000000000000..4c62e9654477
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml.rej
@@ -0,0 +1,43 @@
+diff a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml	(rejected hunks)
+@@ -54,17 +54,27 @@
+     quickEquip: false
+     equipDelay: 3
+     unequipDelay: 6
+-  - type: OnUseTimerTrigger
++  - type: TriggerOnActivate
++  - type: TriggerOnSignal
++  - type: TriggerOnStuck
++    keyOut: stuck
++  - type: ToggleTriggerCondition # for toggling the start on stuck ability
++    keys:
++    - stuck
++    toggleVerb: toggle-trigger-condition-stick-verb
++    toggleOn: toggle-trigger-condition-stick-on
++    toggleOff: toggle-trigger-condition-stick-off
++  - type: TimerTrigger
++    keysIn:
++    - trigger
++    - stuck
+     delay: 10
+     delayOptions: [10, 30, 60, 120, 300]
+     initialBeepDelay: 0
+     beepSound: /Audio/Machines/Nuke/general_beep.ogg
+-    startOnStick: true
+-    canToggleStartOnStick: true
+-  - type: TimerStartOnSignal
+   - type: DeviceLinkSink
+     ports:
+-    - Timer
++    - Trigger
+   - type: Explosive # Powerful explosion in a very small radius. Doesn't break underplating.
+     explosionType: DemolitionCharge
+     totalIntensity: 60
+@@ -72,6 +82,8 @@
+     maxIntensity: 30
+     canCreateVacuum: false
+   - type: ExplodeOnTrigger
++    keysIn:
++    - timer
+   - type: HolidayVisuals
+     holidays:
+       festive:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml
index 48abd66d1b2d..703c318b984e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml
@@ -23,13 +23,12 @@
     sprite: Objects/Weapons/Bombs/spidercharge.rsi
     size: Small
   - type: SpiderCharge
-  - type: OnUseTimerTrigger
+  - type: TriggerOnStuck
+  - type: TimerTrigger
     delay: 10
     delayOptions: [5, 10, 30, 60]
     initialBeepDelay: 0
     beepSound: /Audio/Machines/Nuke/general_beep.ogg
-    startOnStick: true
-  - type: AutomatedTimer
   - type: Sticky
     stickDelay: 5
     stickPopupStart: comp-sticky-start-stick-bomb
@@ -48,6 +47,8 @@
     maxIntensity: 120
     canCreateVacuum: true
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: StickyVisualizer
   - type: Appearance
   - type: GenericVisualizer
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml.rej b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml.rej
new file mode 100644
index 000000000000..641069daa894
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml.rej
@@ -0,0 +1,7 @@
+diff a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml	(rejected hunks)
+@@ -44,4 +45,4 @@
+       enum.Trigger.TriggerVisuals.VisualState:
+         base:
+           Primed: { state: primed }
+-          Unprimed: { state: complete }
++          Unprimed: { state: icon }
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml.rej b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml.rej
new file mode 100644
index 000000000000..c2f8de2767da
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml.rej
@@ -0,0 +1,22 @@
+diff a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml	(rejected hunks)
+@@ -54,3 +54,20 @@
+     count: 10
+   - type: TimedDespawn
+     lifetime: 0.25
++
++- type: entity
++  id: PelletClusterLessLethal
++  name: pellet (ball, less lethal)
++  categories: [ HideSpawnMenu ]
++  parent: BaseBullet
++  components:
++  - type: Sprite
++    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
++    state: buckshot
++  - type: Projectile
++    deleteOnCollide: false
++    damage:
++      types:
++        Piercing: 5
++  - type: TimedDespawn
++    lifetime: 0.25
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
index b0ae3114c62a..7a365dbea116 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
@@ -275,6 +275,7 @@
 
 - type: entity
   id: ProjectilePolyboltBase
+  abstract: true
   parent: BaseBullet
   categories: [ HideSpawnMenu ]
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml.rej b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml.rej
new file mode 100644
index 000000000000..d16e68ba52d0
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml.rej
@@ -0,0 +1,64 @@
+diff a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml	(rejected hunks)
+@@ -175,6 +176,8 @@
+         Poison: 5
+   - type: TriggerOnCollide
+     fixtureID: projectile
++  - type: PolymorphOnTrigger
++    targetUser: true
+ 
+ - type: entity
+   id: ProjectilePolyboltCarp
+@@ -185,8 +188,8 @@
+   components:
+   - type: PolymorphOnTrigger
+     polymorph: WizardForcedCarp
+-  - type: TriggerWhitelist
+-    whitelist:
++  - type: WhitelistTriggerCondition
++    userWhitelist:
+       components:
+       - Body
+ 
+@@ -199,8 +202,8 @@
+   components:
+   - type: PolymorphOnTrigger
+     polymorph: WizardForcedMonkey
+-  - type: TriggerWhitelist
+-    whitelist:
++  - type: WhitelistTriggerCondition
++    userWhitelist:
+       components:
+       - Body
+ 
+@@ -218,8 +221,8 @@
+       color: brown
+   - type: PolymorphOnTrigger
+     polymorph: WizardWallDoor
+-  - type: TriggerWhitelist
+-    whitelist:
++  - type: WhitelistTriggerCondition
++    userWhitelist:
+       components:
+       - Airlock
+       - Firelock
+@@ -269,8 +272,8 @@
+   components:
+   - type: PolymorphOnTrigger
+     polymorph: WizardForcedCluwne
+-  - type: TriggerWhitelist
+-    whitelist:
++  - type: WhitelistTriggerCondition
++    userWhitelist:
+       components:
+       - Body
+ 
+@@ -299,7 +302,7 @@
+   components:
+   - type: PolymorphOnTrigger
+     polymorph: BreadMorph
+-  - type: TriggerWhitelist
+-    whitelist:
++  - type: WhitelistTriggerCondition
++    userWhitelist:
+       components:
+       - Body
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index d4d792aad89f..44a01df36a5c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -966,6 +966,7 @@
     totalIntensity: 150 # a ~2 tile radius
     intensitySlope: 5
     maxIntensity: 10
+    canCreateVacuum: false
 
 - type: entity
   id: BulletGrenadeFlash
@@ -1001,9 +1002,16 @@
   - type: ExplodeOnTrigger
   - type: Explosive
     explosionType: Default
-    totalIntensity: 175 # about a ~6 tile radius
+    totalIntensity: 50
     intensitySlope: 1
-    maxIntensity: 10
+    maxIntensity: 5
+    canCreateVacuum: false
+  - type: ContainerContainer
+    containers:
+      cluster-payload: !type:Container
+  - type: ProjectileGrenade
+    fillPrototype: PelletClusterLessLethal
+    capacity: 30
 
 - type: entity
   parent: BaseBulletTrigger
@@ -1015,8 +1023,6 @@
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
     layers:
     - state: cleanade
-  - type: ActiveTimerTrigger
-    timeRemaining: 0.3
   - type: SmokeOnTrigger
     duration: 3.5
     spreadAmount: 30
@@ -1025,7 +1031,7 @@
       reagents:
       - ReagentId: SpaceCleaner
         Quantity: 30
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
     sound: /Audio/Items/smoke_grenade_smoke.ogg
   - type: ExplodeOnTrigger
   - type: Explosive
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml.rej b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml.rej
new file mode 100644
index 000000000000..eb80b2ee4bef
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml.rej
@@ -0,0 +1,13 @@
+diff a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml	(rejected hunks)
+@@ -878,11 +879,8 @@
+     range: 7
+   - type: SpawnOnTrigger
+     proto: GrenadeFlashEffect
+-  - type: ActiveTimerTrigger
+-    timeRemaining: 0.3
+   - type: DeleteOnTrigger
+ 
+-# This is supposed to spawn shrapnel and stuff so uhh... TODO?
+ - type: entity
+   id: BulletGrenadeFrag
+   name: frag grenade
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml.rej b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml.rej
new file mode 100644
index 000000000000..297a8c3a0396
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml.rej
@@ -0,0 +1,17 @@
+diff a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml	(rejected hunks)
+@@ -47,7 +47,7 @@
+   - type: Repairable
+     qualityNeeded: "Anchoring"
+     doAfterDelay: 3
+-  - type: TriggerWhenEmpty
++  - type: TriggerOnEmptyGunshot
+   - type: ExplodeOnTrigger
+   - type: Explosive
+     explosionType: Default
+@@ -135,4 +135,4 @@
+     interactSuccessString: petting-success-generic
+     interactFailureString: petting-failure-generic
+     interactSuccessSound:
+-      path: /Audio/Animals/snake_hiss.ogg
+\ No newline at end of file
++      path: /Audio/Animals/snake_hiss.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml.rej b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml.rej
new file mode 100644
index 000000000000..96769db9831d
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml.rej
@@ -0,0 +1,42 @@
+diff a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml	(rejected hunks)
+@@ -103,6 +103,40 @@
+     containers:
+       storagebase: !type:Container
+         ents: []
++
++- type: entity
++  name: experimental pie cannon
++  parent: BaseWeaponBattery
++  id: BorgLauncherCreamPie
++  description: Deliver a generous portion of cream directly to the crew! Automatically bakes pies over time.
++  components:
++  - type: Sprite
++    sprite: Objects/Weapons/Guns/Cannons/pie_cannon.rsi
++    layers:
++    - state: piecannon
++  - type: Gun
++    fireRate: 2
++    selectedMode: SemiAuto
++    availableModes:
++    - SemiAuto
++    - FullAuto
++    soundGunshot:
++      path: /Audio/Effects/thunk.ogg
++    soundEmpty:
++      path: /Audio/Items/hiss.ogg
++    clumsyProof: true
++  - type: ProjectileBatteryAmmoProvider
++    proto: FoodPieBananaCream
++    fireCost: 30
++  - type: Battery
++    maxCharge: 90
++    startingCharge: 90
++  - type: BatterySelfRecharger
++    autoRecharge: true
++    autoRechargeRate: 1
++  - type: AmmoCounter
++  - type: Item
++    size: Normal
+         
+ - type: entity
+   name: syringe gun
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 9196206ded65..ecc9f3a588cb 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -140,7 +140,8 @@
     quickEquip: false
     slots:
     - Belt
-  - type: OnUseTimerTrigger
+  - type: TriggerOnUse
+  - type: TimerTrigger
     delay: 3
   - type: Damageable
     damageContainer: Inorganic
@@ -151,6 +152,7 @@
         damage: 10
       behaviors:
       - !type:TriggerBehavior
+        keyOut: timer # explode immediately
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Appearance
@@ -183,13 +185,15 @@
   id: ExGrenade
   components:
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive
     explosionType: Default
     maxIntensity: 10
     intensitySlope: 3
     totalIntensity: 120 # about a ~4 tile radius
     canCreateVacuum: false
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     beepSound:
       path: "/Audio/Effects/beep1.ogg"
       params:
@@ -206,13 +210,22 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/flashbang.rsi
   - type: FlashOnTrigger
+    keysIn:
+    - timer
     range: 7
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Effects/flash_bang.ogg"
   - type: DeleteOnTrigger
+    keysIn:
+    - timer
   - type: SpawnOnTrigger
+    keysIn:
+    - timer
     proto: GrenadeFlashEffect
+    predicted: true
   - type: Appearance
   - type: TimerTriggerVisuals
     primingSound:
@@ -265,11 +278,14 @@
         damage: 45
       behaviors:
       - !type:TriggerBehavior
+        keyOut: timer # immediately explode
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 5
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive
     explosionType: Minibomb
     totalIntensity: 200
@@ -292,13 +308,15 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive
     explosionType: Minibomb
     totalIntensity: 400
     intensitySlope: 30
     maxIntensity: 125
     canCreateVacuum: true
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 4.5
     beepSound:
       path: /Audio/Effects/Grenades/SelfDestruct/SDS_Charge2.ogg
@@ -364,12 +382,16 @@
         radius: 6
         softness: 1
         offset: "0, 0"
-      - type: SoundOnTrigger
+      - type: EmitSoundOnTrigger
         sound:
           path: /Audio/Effects/Grenades/Supermatter/supermatter_end.ogg
           params:
             volume: 5
+        keysIn:
+        - stageTwo
       - type: DeleteOnTrigger
+        keysIn:
+        - stageTwo
   - type: StaticPrice
     price: 1000
 
@@ -381,14 +403,20 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/whiteholegrenade.rsi
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 3
     beepInterval: 0.69
-  - type: SoundOnTrigger
-    removeOnTrigger: true
+  - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: /Audio/Effects/Grenades/Supermatter/whitehole_start.ogg
-      volume: 5
+      params:
+        volume: 5
+  - type: AnchorOnTrigger
+    keysIn:
+    - timer
+    removeOnTrigger: true
   - type: TwoStageTrigger
     triggerDelay: 11.14
     components:
@@ -413,12 +441,17 @@
         radius: 6
         softness: 1
         offset: "0, 0"
-      - type: SoundOnTrigger
+      - type: EmitSoundOnTrigger
+        keysIn:
+        - stageTwo
         sound:
           path: /Audio/Effects/Grenades/Supermatter/supermatter_end.ogg
           params:
             volume: 15
+        positional: true
       - type: DeleteOnTrigger
+        keysIn:
+        - stageTwo
   - type: StaticPrice
     price: 1000
 
@@ -430,9 +463,11 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/nukenade.rsi
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 5
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive
     explosionType: Default
     totalIntensity: 20000 # ~15 tile radius.
@@ -445,6 +480,7 @@
         damage: 50
       behaviors:
       - !type:TriggerBehavior
+        keyOut: timer # immediately explode
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Appearance
@@ -509,9 +545,13 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/empgrenade.rsi
   - type: EmpOnTrigger
+    keysIn:
+    - timer
     range: 5.5
     energyConsumption: 50000
   - type: DeleteOnTrigger
+    keysIn:
+    - timer
   - type: Appearance
   - type: TimerTriggerVisuals
     primingSound:
@@ -555,11 +595,17 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/smoke.rsi
   - type: SmokeOnTrigger
+    keysIn:
+    - timer
     duration: 30
     spreadAmount: 50
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound: /Audio/Items/smoke_grenade_smoke.ogg
   - type: DeleteOnTrigger
+    keysIn:
+    - timer
   - type: TimerTriggerVisuals
     primingSound:
       path: /Audio/Items/smoke_grenade_prime.ogg
@@ -573,6 +619,8 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/janitor.rsi
   - type: SmokeOnTrigger
+    keysIn:
+    - timer
     duration: 15
     spreadAmount: 50
     smokePrototype: Foam
@@ -590,6 +638,8 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/tear_gas.rsi
   - type: SmokeOnTrigger
+    keysIn:
+    - timer
     duration: 10
     spreadAmount: 30
     smokePrototype: TearGasSmokeWhite
@@ -606,9 +656,11 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/metalfoam.rsi
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 5
   - type: SmokeOnTrigger
+    keysIn:
+    - timer
     duration: 10
     spreadAmount: 20
     smokePrototype: AluminiumMetalFoam
@@ -623,14 +675,18 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/airboom.rsi
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound: /Audio/Items/smoke_grenade_smoke.ogg
   - type: TimerTriggerVisuals
     primingSound:
       path: /Audio/Items/smoke_grenade_prime.ogg
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 3
   - type: ReleaseGasOnTrigger
+    keysIn:
+    - timer
     removeFraction: 0.25
     air:
       volume: 1000
@@ -658,9 +714,16 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/grenade.rsi
   - type: DeleteOnTrigger
+    keysIn:
+    - timer
   - type: SpawnOnTrigger
+    keysIn:
+    - timer
     proto: GrenadeFlashEffect
-  - type: SoundOnTrigger
+    predicted: true
+  - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: /Audio/Effects/Emotes/parp1.ogg
   - type: Appearance
@@ -676,9 +739,11 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/syndgrenade.rsi
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 5
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: /Audio/Effects/Emotes/parp1.ogg
   - type: Appearance
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml.rej b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml.rej
new file mode 100644
index 000000000000..b35185fb1395
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml.rej
@@ -0,0 +1,51 @@
+diff a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml	(rejected hunks)
+@@ -188,7 +206,7 @@
+   components:
+   - type: Sprite
+     sprite: Objects/Weapons/Grenades/singularitygrenade.rsi
+-  - type: OnUseTimerTrigger
++  - type: TimerTrigger
+     delay: 3
+     beepInterval: 0.46
+     beepSound:
+@@ -200,14 +218,20 @@
+       path: /Audio/Effects/Grenades/Supermatter/smbeep.ogg
+       params:
+         volume: -5
+-  - type: SoundOnTrigger
+-    removeOnTrigger: true
++  - type: EmitSoundOnTrigger
++    keysIn:
++    - timer
+     sound:
+       path: /Audio/Effects/Grenades/Supermatter/supermatter_start.ogg
+-      volume: 5
++      params:
++        volume: 5
+   - type: AnchorOnTrigger
++    keysIn:
++    - timer
+     removeOnTrigger: true
+   - type: TwoStageTrigger
++    keysIn:
++    - timer
+     triggerDelay: 10.45
+     components:
+       - type: AmbientSound
+@@ -395,13 +441,15 @@
+   - type: Sprite
+     sprite: Objects/Weapons/Grenades/holyhandgrenade.rsi
+   - type: ExplodeOnTrigger
++    keysIn:
++    - timer
+   - type: Explosive
+     explosionType: Default # same as macrobomb
+     totalIntensity: 3500
+     intensitySlope: 15
+     maxIntensity: 70
+     canCreateVacuum: true
+-  - type: OnUseTimerTrigger
++  - type: TimerTrigger
+     delay: 3 # by canon
+   - type: PointLight
+     radius: 7
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
index 10e896635c93..6c065e311a54 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
@@ -19,6 +19,8 @@
   - type: Damageable
     damageContainer: Inorganic
   - type: DeleteOnTrigger
+    keysIn:
+    - timer
   - type: Destructible
     thresholds:
     - trigger:
@@ -26,6 +28,7 @@
         damage: 10
       behaviors:
       - !type:TriggerBehavior
+        keyOut: timer # explode immediately
   - type: ContainerContainer
     containers:
       cluster-payload: !type:Container
@@ -66,11 +69,17 @@
     fillPrototype: PelletClusterRubber
     capacity: 30
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Effects/flash_bang.ogg"
   - type: SpawnOnTrigger
+    keysIn:
+    - timer
     proto: GrenadeFlashEffect
-  - type: OnUseTimerTrigger
+    predicted: true
+  - type: TriggerOnUse
+  - type: TimerTrigger
     initialBeepDelay: 0
     beepInterval: 2
     delay: 3.5
@@ -92,7 +101,8 @@
   - type: ProjectileGrenade
     fillPrototype: PelletClusterIncendiary
     capacity: 30
-  - type: OnUseTimerTrigger
+  - type: TriggerOnUse
+  - type: TimerTrigger
     beepSound:
       path: "/Audio/Effects/beep1.ogg"
       params:
@@ -101,6 +111,8 @@
     beepInterval: 2
     delay: 3.5
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Weapons/Guns/Gunshots/batrifle.ogg"
   - type: StaticPrice
@@ -120,7 +132,8 @@
   - type: ProjectileGrenade
     fillPrototype: PelletClusterLethal
     capacity: 30
-  - type: OnUseTimerTrigger
+  - type: TriggerOnUse
+  - type: TimerTrigger
     beepSound:
       path: "/Audio/Effects/beep1.ogg"
       params:
@@ -129,6 +142,8 @@
     beepInterval: 2
     delay: 3.5
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Weapons/Guns/Gunshots/batrifle.ogg"
   - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
index fb7b6764e295..cb763b875897 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
@@ -24,8 +24,10 @@
         damage: 10
       behaviors:
       - !type:TriggerBehavior
+        keyOut: timer # explode immediately
   - type: ScatteringGrenade
-  - type: OnUseTimerTrigger
+  - type: TriggerOnUse
+  - type: TimerTrigger
     delay: 3
   - type: Tag
     tags:
@@ -88,6 +90,8 @@
           Primed: { state: primed }
           Unprimed: { state: icon }
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Machines/door_lock_off.ogg"
 
@@ -105,7 +109,7 @@
   - type: ScatteringGrenade
     fillPrototype: ExGrenade
     distance: 4
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     beepSound:
       path: "/Audio/Effects/beep1.ogg"
       params:
@@ -113,6 +117,8 @@
     initialBeepDelay: 0
     beepInterval: 0.5
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Machines/door_lock_off.ogg"
   - type: StaticPrice
@@ -137,6 +143,8 @@
       types:
         Blunt: 10
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Items/bikehorn.ogg"
 
@@ -162,6 +170,8 @@
       types:
         Blunt: 10
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Effects/flash_bang.ogg"
   - type: StaticPrice
@@ -184,7 +194,7 @@
     fillPrototype: BulletFoam
     capacity: 30
     velocity: 30
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     beepSound:
       path: "/Audio/Effects/beep1.ogg"
       params:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml.rej b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml.rej
new file mode 100644
index 000000000000..beb69d94d84c
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml.rej
@@ -0,0 +1,9 @@
+diff a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml	(rejected hunks)
+@@ -185,5 +195,7 @@
+     initialBeepDelay: 0
+     beepInterval: 2
+   - type: EmitSoundOnTrigger
++    keysIn:
++    - timer
+     sound:
+       path: "/Audio/Weapons/Guns/Gunshots/batrifle.ogg"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
index 46b0bc3edc85..5b5017d719ad 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -358,6 +358,7 @@
   description: An ultrabright flashbulb with a proximity trigger, useful for making an area security-only.
   components:
     - type: EmitSoundOnTrigger
+      predicted: true
       sound:
         path: /Audio/Weapons/flash.ogg
     - type: FlashOnTrigger
diff --git a/Resources/Prototypes/Entities/StatusEffects/misc.yml.rej b/Resources/Prototypes/Entities/StatusEffects/misc.yml.rej
new file mode 100644
index 000000000000..bd311a7ee24d
--- /dev/null
+++ b/Resources/Prototypes/Entities/StatusEffects/misc.yml.rej
@@ -0,0 +1,75 @@
+diff a/Resources/Prototypes/Entities/StatusEffects/misc.yml b/Resources/Prototypes/Entities/StatusEffects/misc.yml	(rejected hunks)
+@@ -19,41 +19,61 @@
+       components:
+       - MobState
+ 
+-# The creature sleeps so heavily that nothing can wake him up. Not even its own death.
++# Things that should be removed by rejuvenation should parent to this
++# Also blocks the status effect being added to godmode-ed entities.
+ - type: entity
+   parent: MobStatusEffectBase
++  id: MobStatusEffectDebuff
++  abstract: true
++  components:
++  - type: RejuvenateRemovedStatusEffect
++
++- type: entity
++  parent: MobStatusEffectDebuff
++  id: MobStandStatusEffectBase
++  abstract: true
++  components:
++  - type: StatusEffect
++    whitelist:
++      components:
++      - MobState
++      - StandingState
++      requireAll: true
++    blacklist: # This blacklist exists because mob prototypes are smelly and everything needs a standing state component.
++      tags:
++      - KnockdownImmune
++
++# The creature sleeps so heavily that nothing can wake him up. Not even its own death.
++- type: entity
++  parent: MobStatusEffectDebuff
+   id: StatusEffectForcedSleeping
+   name: forced sleep
+   components:
+   - type: ForcedSleepingStatusEffect
++  - type: StunnedStatusEffect
++  - type: KnockdownStatusEffect
+ 
+ # This creature is asleep because it's disconnected from the game.
+ - type: entity
+-  parent: MobStatusEffectBase
++  parent: MobStatusEffectBase # Not even rejuvenate can cure SSD...
+   id: StatusEffectSSDSleeping
+   name: forced sleep
+   components:
+   - type: ForcedSleepingStatusEffect
++  - type: StunnedStatusEffect
++  - type: KnockdownStatusEffect
+ 
+ # Blurs your vision and makes you randomly fall asleep
+ - type: entity
+-  parent: MobStatusEffectBase
++  parent: MobStatusEffectDebuff
+   id: StatusEffectDrowsiness
+   name: drowsiness
+   components:
+   - type: DrowsinessStatusEffect
+ 
+-# Makes you more slippery, or perhaps less slippery.
+-- type: entity
+-  parent: MobStatusEffectBase
+-  id: StatusEffectFriction
+-  name: friction
+-  components:
+-  - type: FrictionStatusEffect
+-
+ # Adds drugs overlay
+ - type: entity
+-  parent: MobStatusEffectBase
++  parent: MobStatusEffectDebuff
+   id: StatusEffectSeeingRainbow
+   name: hallucinations
+   components:
diff --git a/Resources/Prototypes/Entities/StatusEffects/movement.yml b/Resources/Prototypes/Entities/StatusEffects/movement.yml
new file mode 100644
index 000000000000..a6cbd207246e
--- /dev/null
+++ b/Resources/Prototypes/Entities/StatusEffects/movement.yml
@@ -0,0 +1,67 @@
+- type: entity
+  parent: MobStatusEffectDebuff
+  id: StatusEffectSlowdown
+  abstract: true
+  name: slowdown
+  components:
+  - type: StatusEffect
+    whitelist:
+      components:
+      - MobState
+    blacklist:
+      tags:
+      - SlowImmune
+  - type: MovementModStatusEffect
+
+- type: entity
+  parent: StatusEffectSlowdown
+  id: VomitingSlowdownStatusEffect
+  name: vomiting slowdown
+
+- type: entity
+  parent: StatusEffectSlowdown
+  id: TaserSlowdownStatusEffect
+  name: shot by taser slowdown
+
+- type: entity
+  parent: StatusEffectSlowdown
+  id: FlashSlowdownStatusEffect
+  name: affected by flash slowdown
+
+- type: entity
+  parent: StatusEffectSlowdown
+  id: StatusEffectStaminaLow
+  name: stamina low
+
+# Makes you more slippery, or perhaps less slippery.
+- type: entity
+  parent: MobStatusEffectDebuff # Debatable if this should be MobStatusEffectBase or not
+  id: StatusEffectFriction
+  name: friction
+  components:
+  - type: FrictionStatusEffect
+
+# Stunnable Status Effect
+
+- type: entity
+  parent: MobStatusEffectDebuff
+  id: StatusEffectStunned
+  name: stunned
+  components:
+  - type: StatusEffect
+    whitelist:
+      components:
+      - MobState
+    blacklist:
+      tags:
+      - StunImmune
+  - type: StatusEffectAlert
+    alert: Stun
+  - type: StunnedStatusEffect
+
+- type: entity
+  parent: MobStandStatusEffectBase
+  id: StatusEffectKnockdown
+  name: knocked down
+  components:
+  - type: KnockdownStatusEffect
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
index c10862baa5f5..f7e5cb5ecc82 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
@@ -116,6 +116,22 @@
     whitelist:
       tags:
       - DrinkBottle
+  - type: Transform
+    noRot: false
+  - type: Machine
+    board: BoozeDispenserMachineCircuitboard
+  - type: GuideHelp
+    guides:
+    - Bartender
+    - Drinks
+  - type: StealTarget
+    stealGroup: BoozeDispenser
+
+- type: entity
+  id: BoozeDispenser
+  suffix: Filled
+  parent: BoozeDispenserEmpty
+  components:
   - type: StorageFill
     contents:
     - id: DrinkAleBottleFullGrowler
@@ -130,23 +146,3 @@
     - id: DrinkVodkaBottleFull
     - id: DrinkWhiskeyBottleFull
     - id: DrinkWineBottleFull
-  - type: Transform
-    noRot: false
-  - type: Machine
-    board: BoozeDispenserMachineCircuitboard
-  - type: GuideHelp
-    guides:
-    - Bartender
-    - Drinks
-  - type: StealTarget
-    stealGroup: BoozeDispenser
-
-- type: entity
-  id: BoozeDispenserEmpty
-  suffix: Empty
-  parent: BoozeDispenser
-  components:
-  - type: Storage
-    whitelist:
-      tags:
-      - DrinkBottle
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml.rej b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml.rej
new file mode 100644
index 000000000000..2f357d96f1e5
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml.rej
@@ -0,0 +1,11 @@
+diff a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml	(rejected hunks)
+@@ -1,7 +1,7 @@
+ - type: entity
+-  id: BoozeDispenser
++  id: BoozeDispenserEmpty
+   name: booze dispenser
+-  suffix: Filled
++  suffix: Empty
+   description: A booze dispenser with a single slot for a container to be filled.
+   parent: ReagentDispenserBase
+   components:
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
index 80d7b4327c24..72465884e583 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
@@ -117,6 +117,20 @@
     whitelist:
       tags:
       - DrinkBottle
+  - type: Transform
+    noRot: false
+  - type: Machine
+    board: SodaDispenserMachineCircuitboard
+  - type: GuideHelp
+    guides:
+    - Bartender
+    - Drinks
+
+- type: entity
+  parent: SodaDispenserEmpty
+  id: SodaDispenser
+  suffix: Filled
+  components:
   - type: StorageFill
     contents:
     - id: DrinkCoconutWaterJug
@@ -138,16 +152,3 @@
     - id: DrinkTeaJug
     - id: DrinkTonicWaterBottleFull
     - id: DrinkWaterMelonJuiceJug
-  - type: Transform
-    noRot: false
-  - type: Machine
-    board: SodaDispenserMachineCircuitboard
-  - type: GuideHelp
-    guides:
-    - Bartender
-    - Drinks
-
-- type: entity
-  parent: SodaDispenser
-  id: SodaDispenserEmpty
-  suffix: Empty
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml.rej b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml.rej
new file mode 100644
index 000000000000..44a0ad1b8be7
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml.rej
@@ -0,0 +1,13 @@
+diff a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml	(rejected hunks)
+@@ -1,9 +1,9 @@
+ - type: entity
+   parent: ReagentDispenserBase
+-  id: SodaDispenser
++  id: SodaDispenserEmpty
+   name: soda dispenser
+   description: A beverage dispenser with a selection of soda and several other common beverages. Has a single fill slot for containers.
+-  suffix: Filled
++  suffix: Empty
+   components:
+   - type: Rotatable
+   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml.rej b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml.rej
new file mode 100644
index 000000000000..805d1cc89c30
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml.rej
@@ -0,0 +1,46 @@
+diff a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml	(rejected hunks)
+@@ -46,6 +46,44 @@
+   - type: Airtight
+     noAirWhenFullyAirBlocked: false
+ 
++- type: entity
++  id: HoloPeel
++  parent: HolosignWetFloor
++  name: holopeel
++  description: A banana peel made of slippery hard light, watch your step!
++  components:
++  - type: Sprite
++    sprite: Structures/Holo/peel.rsi
++    state: icon
++  - type: Physics
++    bodyType: Static
++    canCollide: true
++  - type: Slippery
++  - type: StepTrigger
++    intersectRatio: 0.2
++  - type: CollisionWake
++    enabled: false
++  - type: Fixtures
++    fixtures:
++      slips:
++        shape:
++          !type:PhysShapeAabb
++          bounds: "-0.2,-0.2,0.2,0.2"
++        hard: false
++        layer:
++        - SlipLayer
++  - type: TimedDespawn
++    lifetime: 30
++  - type: Clickable
++  - type: Destructible
++    thresholds:
++      - trigger:
++          !type:DamageTrigger
++          damage: 10
++        behaviors:
++          - !type:DoActsBehavior
++            acts: [ "Destruction" ]
++
+ - type: entity
+   id: HolosignSecurity
+   parent: HolosignWetFloor
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml b/Resources/Prototypes/Entities/Structures/Lighting/service_light.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml
rename to Resources/Prototypes/Entities/Structures/Lighting/service_light.yml
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/wooden_television.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/wooden_television.yml
new file mode 100644
index 000000000000..b542687b5743
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/wooden_television.yml
@@ -0,0 +1,31 @@
+- type: entity
+  parent: ComputerSurveillanceWirelessCameraMonitor
+  id: ComputerTelevision
+  name: wooden television
+  description: Finally, some decent reception around here...
+  components:
+  - type: Sprite
+    noRot: true
+    drawdepth: SmallObjects
+    layers:
+    - map: ["computerLayerBody"]
+      state: television
+    - map: ["computerLayerScreen"]
+      state: detective_television
+  - type: Computer
+    board: ComputerTelevisionCircuitboard
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#b89f25"
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
+        density: 200
+        mask:
+          - TabletopMachineMask
+        layer:
+          - TabletopMachineLayer
diff --git a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
index a25d49a9be87..c9725ce62d5c 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
@@ -234,6 +234,6 @@
   components:
     - type: Defusable
       disposable: true
-    - type: OnUseTimerTrigger
+    - type: TimerTrigger
       delay: 10
       delayOptions: [10, 20, 30, 60, 90, 120, 150, 180, 210, 240, 270, 300]
diff --git a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml.rej b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml.rej
new file mode 100644
index 000000000000..7afe35c2e6da
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml.rej
@@ -0,0 +1,14 @@
+diff a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml	(rejected hunks)
+@@ -23,9 +23,11 @@
+       intensitySlope: 5
+       maxIntensity: 4
+     - type: ExplodeOnTrigger
++      keysIn:
++      - timer
+     # If you nerf the syndicate bomb in any major way, this should probably drop down to at least 100s (not 90s to compensate for slower movement speed & less lag in SS14)
+     # Unless, of course, you want the 90 seconds regardless. I can't stop you.
+-    - type: OnUseTimerTrigger
++    - type: TimerTrigger
+       delay: 180
+       delayOptions: [180, 240, 300, 600, 900]
+       initialBeepDelay: 0
diff --git a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
index 385e0ead01d5..d2856adea8d2 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
@@ -35,27 +35,37 @@
     - state: smartfridge_door
       map: ["enum.StorageVisualLayers.Door"]
       shader: unshaded
-  - type: EntityStorageVisuals
-    stateBaseClosed: smartfridge
-    stateDoorOpen: smartfridge_open
-    stateDoorClosed: smartfridge_door
   - type: PointLight
     radius: 1.5
     energy: 1.6
     color: "#9dc5c9"
-  - type: EntityStorage
-    isCollidableWhenOpen: true
-    closeSound:
-      path: /Audio/Machines/windoor_open.ogg
-      params:
-        volume: -3
-    openSound:
-      path: /Audio/Machines/windoor_open.ogg
-      params:
-        volume: -3
   - type: ContainerContainer
     containers:
-      entity_storage: !type:Container
+      smart_fridge_inventory: !type:Container
+  - type: LitOnPowered
+  - type: ApcPowerReceiver
+    powerLoad: 200
+  - type: ExtensionCableReceiver
+  - type: SmartFridge
+    whitelist:
+      components:
+      - FitsInDispenser
+      - Pill
+      - Produce
+      - Seed
+      tags:
+      - PillCanister
+      - Bottle
+      - Syringe
+      - ChemDispensable
+  - type: ActivatableUI
+    key: enum.SmartFridgeUiKey.Key
+  - type: ActivatableUIRequiresPower
+  - type: UserInterface
+    interfaces:
+      enum.SmartFridgeUiKey.Key:
+        type: SmartFridgeBoundUserInterface
+  - type: AccessReader
   - type: UseDelay
     delay: 1
   - type: AntiRottingContainer
@@ -119,3 +129,15 @@
         Blunt: 5
     soundHit:
       collection: MetalThud
+  - type: ExplosionResistance
+    damageCoefficient: 0.1
+
+- type: entity
+  parent: SmartFridge
+  id: SmartFridgeMedical
+  suffix: Medical
+  components:
+  - type: SmartFridge
+    flavorText: smart-fridge-request-chemistry
+  - type: AccessReader
+    access: [["Medical"]]
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index a23d9c2a13b9..b5701965412c 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -2664,3 +2664,36 @@
     ejectDelay: 2
   - type: AccessReader
     access: [["SyndicateAgent"]]
+
+# wallmount
+- type: entity
+  parent: VendingMachineWallmount
+  id: VendingMachineWallMedical
+  name: NanoMed
+  description: "It's a wall-mounted medical equipment dispenser. Natural chemicals only!"
+  components:
+  - type: VendingMachine
+    pack: NanoMedInventory
+    offState: off
+    brokenState: broken
+    normalState: normal-unshaded
+    denyState: deny-unshaded
+  - type: Sprite
+    sprite: Structures/Machines/VendingMachines/wallmed.rsi
+    layers:
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: PointLight
+    radius: 1.3
+    energy: 1.6
+    color: "#43ccb5"
+  - type: AccessReader
+    access: [["Medical"]]
+  - type: GuideHelp
+    guides:
+    - Medical
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml.rej b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml.rej
new file mode 100644
index 000000000000..07a70ef68d47
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml.rej
@@ -0,0 +1,140 @@
+diff a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml	(rejected hunks)
+@@ -1,3 +1,5 @@
++# base
++
+ - type: entity
+   id: VendingMachine
+   parent: BaseMachinePowered
+@@ -105,6 +107,72 @@
+   - type: Appearance
+   - type: WiresVisuals
+ 
++- type: entity
++  id: VendingMachineWallmount
++  parent: BaseWallmountMachine
++  name: vending machine
++  abstract: true
++  components:
++  - type: StationAiWhitelist
++  - type: AmbientOnPowered
++  - type: AmbientSound
++    volume: -9
++    range: 3
++    enabled: false
++    sound:
++      path: /Audio/Ambience/Objects/vending_machine_hum.ogg
++  - type: Destructible
++    thresholds:
++    - trigger:
++        !type:DamageTrigger
++        damage: 100
++      behaviors:
++      - !type:DoActsBehavior
++        acts: ["Breakage"]
++      - !type:EjectVendorItems
++    - trigger:
++        !type:DamageTrigger
++        damage: 200
++      behaviors:
++      - !type:SpawnEntitiesBehavior
++        spawn:
++          SheetSteel1:
++            min: 1
++            max: 1
++      - !type:DoActsBehavior
++        acts: [ "Destruction" ]
++      - !type:PlaySoundBehavior
++        sound:
++          collection: MetalGlassBreak
++  - type: Repairable
++    doAfterDelay: 8
++  - type: ActivatableUI
++    key: enum.VendingMachineUiKey.Key
++  - type: ActivatableUIRequiresPower
++  - type: UserInterface
++    interfaces:
++      enum.VendingMachineUiKey.Key:
++        type: VendingMachineBoundUserInterface
++      enum.WiresUiKey.Key:
++        type: WiresBoundUserInterface
++  - type: WiresPanel
++  - type: Wires
++    boardName: wires-board-name-vendingmachine
++    layoutId: Vending
++  - type: PointLight
++    enabled: false
++    castShadows: false
++    radius: 1.5
++  - type: LitOnPowered
++  - type: Appearance
++  - type: WiresVisuals
++  - type: Electrified
++    enabled: false
++    usesApcPower: true
++  - type: Rotatable
++
++# Vending machines
++
+ - type: entity
+   parent: VendingMachine
+   id: VendingMachineCondiments
+@@ -1436,59 +1504,6 @@
+     energy: 1.6
+     color: "#d4ab33"
+ 
+-# wallmounted machines
+-
+-- type: entity
+-  id: VendingMachineWallmount
+-  parent: VendingMachine
+-  name: vending machine
+-  abstract: true
+-  placement:
+-    mode: SnapgridCenter
+-    snap:
+-    - Wallmount
+-  components:
+-  - type: Sprite
+-    drawdepth: WallMountedItems
+-    snapCardinals: false
+-  - type: Rotatable
+-  - type: WallMount
+-    arc: 175
+-  - type: Transform
+-    noRot: false
+-
+-- type: entity
+-  parent: VendingMachineWallmount
+-  id: VendingMachineWallMedical
+-  name: NanoMed
+-  description: "It's a wall-mounted medical equipment dispenser. Natural chemicals only!"
+-  components:
+-  - type: VendingMachine
+-    pack: NanoMedInventory
+-    offState: off
+-    brokenState: broken
+-    normalState: normal-unshaded
+-    denyState: deny-unshaded
+-  - type: Sprite
+-    sprite: Structures/Machines/VendingMachines/wallmed.rsi
+-    layers:
+-    - state: "off"
+-      map: ["enum.VendingMachineVisualLayers.Base"]
+-    - state: "off"
+-      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+-      shader: unshaded
+-    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
+-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+-  - type: PointLight
+-    radius: 1.3
+-    energy: 1.6
+-    color: "#43ccb5"
+-  - type: AccessReader
+-    access: [["Medical"]]
+-  - type: GuideHelp
+-    guides:
+-    - Medical
+-
+ # job clothing
+ 
+ - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
index a112f86d43b9..aa77499f5a2f 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
@@ -126,11 +126,9 @@
 - type: entity
   abstract: true
   id: BaseGeneratorWallmount
-  parent: BaseGenerator
+  parent: [ BaseGenerator, BaseWallmount ]
   name: wallmount generator
   description: A high efficiency thermoelectric generator stuffed in a wall cabinet.
-  placement:
-    mode: SnapgridCenter
   components:
   - type: AmbientOnPowered
   - type: AmbientSound
@@ -144,12 +142,6 @@
     color: "#3db83b"
     castShadows: false
     netsync: false
-  - type: Fixtures
-  - type: Transform
-    anchored: true
-  - type: Physics
-    bodyType: Static
-    canCollide: false
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Power/Generation/wallmount_generator.rsi
@@ -172,7 +164,6 @@
     supplyRate: 3000
     supplyRampRate: 500
     supplyRampTolerance: 500
-  - type: WallMount
   - type: GuideHelp
     guides:
     - ShuttleCraft
@@ -180,20 +171,12 @@
 # Construction Frames
 
 - type: entity
+  parent: BaseWallmountMetallic
   categories: [ HideSpawnMenu ]
   id: BaseGeneratorWallmountFrame
   name: wallmount generator frame
   description: A construction frame for a wallmount generator.
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    canCollide: false
-  - type: Fixtures
-  - type: Transform
-    anchored: true
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Power/Generation/wallmount_generator.rsi
@@ -202,7 +185,6 @@
   - type: Construction
     graph: WallmountGenerator
     node: frame
-  - type: WallMount
 
 # Generators in use
 
diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml
index 879463e8ce72..641f271e3b42 100644
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -75,12 +75,8 @@
     color: "#3db83b"
     castShadows: false
     netsync: false
-  - type: Clickable
   - type: AccessReader
     access: [["Engineering"]]
-  - type: InteractionOutline
-  - type: Transform
-    anchored: true
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Power/apc.rsi
@@ -214,6 +210,7 @@
 
 # APC under construction
 - type: entity
+  parent: BaseWallmountMetallic
   categories: [ HideSpawnMenu ]
   id: APCFrame
   name: APC frame
@@ -221,21 +218,12 @@
   placement:
     mode: SnapgridCenter
   components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Transform
-    anchored: true
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Power/apc.rsi
     state: frame
   - type: Construction
     graph: APC
     node: apcFrame
-  - type: WallMount
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml.rej b/Resources/Prototypes/Entities/Structures/Power/apc.yml.rej
new file mode 100644
index 000000000000..da187385f087
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml.rej
@@ -0,0 +1,7 @@
+diff a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml	(rejected hunks)
+@@ -1,4 +1,5 @@
+ - type: entity
++  parent: BaseWallmount
+   categories: [ HideSpawnMenu ]
+   id: BaseAPC
+   name: APC
diff --git a/Resources/Prototypes/Entities/Structures/Power/chargers.yml.rej b/Resources/Prototypes/Entities/Structures/Power/chargers.yml.rej
new file mode 100644
index 000000000000..2561b2ce376f
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml.rej
@@ -0,0 +1,18 @@
+diff a/Resources/Prototypes/Entities/Structures/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml	(rejected hunks)
+@@ -193,7 +193,7 @@
+           - PotatoBattery
+ 
+ - type: entity
+-  parent: BaseItemRecharger
++  parent: [ BaseItemRecharger, BaseWallmount ]
+   id: WallWeaponCapacitorRecharger
+   name: wall recharger
+   components:
+@@ -205,7 +205,6 @@
+     - map: ["enum.PowerChargerVisualLayers.Light"]
+       state: "light-off"
+       shader: "unshaded"
+-  - type: WallMount
+   - type: Charger
+     chargeRate: 25
+   - type: ItemSlots
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
index b7c317884d16..9e9e807582e3 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -194,23 +194,16 @@
 
 #Wall Closet
 - type: entity
+  parent: BaseWallmountMetallic
   id: BaseWallCloset
-  placement:
-    mode: SnapgridCenter
   abstract: true
   name: wall closet
   description: A standard-issue Nanotrasen storage unit, now on walls.
   components:
-  - type: InteractionOutline
-  - type: Clickable
   - type: ResistLocker
   - type: Weldable
-  - type: WallMount
-    arc: 175
   - type: StaticPrice
     price: 75
-  - type: Transform
-    noRot: false
   - type: Sprite
     drawdepth: WallMountedItems
     noRot: false
@@ -235,9 +228,6 @@
     containers:
       entity_storage: !type:Container
         ents: []
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/bell.yml
similarity index 85%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Misc/bell.yml
index ab079c8e84b2..2557864833e0 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/bell.yml
@@ -26,22 +26,12 @@
     successChance: 1
     interactSuccessSound:
       path: /Audio/Weapons/boxingbell.ogg
-  - type: Clickable
   - type: MeleeSound
     soundGroups:
       Brute:
         path:
           "/Audio/Weapons/boxingbell.ogg"
   - type: Appearance
-  - type: Rotatable
-  - type: CollisionWake
-    enabled: false
-  - type: Physics
-    canCollide: false
-    bodyType: Static
-  - type: Fixtures
-  - type: Damageable
-    damageContainer: Inorganic
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/bell.yml.rej b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/bell.yml.rej
new file mode 100644
index 000000000000..7258fa1ced56
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/bell.yml.rej
@@ -0,0 +1,18 @@
+diff a/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/bell.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/bell.yml	(rejected hunks)
+@@ -1,15 +1,9 @@
+ - type: entity
++  parent: BaseWallmountMetallic
+   id: BoxingBell
+   name: boxing bell
+   description: Ding ding!
+-  placement:
+-    mode: SnapgridCenter
+-    snap:
+-    - Wallmount
+   components:
+-  - type: Transform
+-    anchored: true
+-  - type: WallMount
+   - type: Sprite
+     sprite: Structures/Wallmounts/bell.rsi
+     layers:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml
similarity index 90%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml
index b19a11d98462..99bb1b85573b 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml
@@ -51,6 +51,17 @@
     interfaces:
       enum.MagicMirrorUiKey.Key:
         type: MagicMirrorBoundUserInterface
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
 
 - type: entity
   parent: Mirror
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml.rej b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml.rej
new file mode 100644
index 000000000000..4516c32e551e
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml.rej
@@ -0,0 +1,21 @@
+diff a/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml	(rejected hunks)
+@@ -1,18 +1,14 @@
+ - type: entity
++  parent: BaseWallmountGlass
+   id: Mirror
+   name: mirror
+   description: 'Mirror mirror on the wall , who''s the most robust of them all?'
+   placement:
+     mode: SnapgridCenter
+   components:
+-  - type: WallMount
+   - type: Sprite
+     sprite: Structures/Wallmounts/mirror.rsi
+     state: mirror
+-  - type: InteractionOutline
+-  - type: Clickable
+-  - type: Transform
+-    anchored: true
+   - type: MagicMirror #instant and silent
+     changeHairSound: null
+     addSlotTime: 0
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/noticeboard.yml
similarity index 98%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Misc/noticeboard.yml
index dd4a2bc16246..9b70762993fb 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/noticeboard.yml
@@ -87,10 +87,6 @@
     maxFillLevels: 6
     fillBaseName: notice
   - type: Appearance
-  - type: InteractionOutline
-  - type: Clickable
-  - type: Transform
-    anchored: true
   - type: Damageable
     damageModifierSet: Wood
     damageContainer: StructuralInorganic
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/noticeboard.yml.rej b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/noticeboard.yml.rej
new file mode 100644
index 000000000000..350b0eac858d
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/noticeboard.yml.rej
@@ -0,0 +1,14 @@
+diff a/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/noticeboard.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/noticeboard.yml	(rejected hunks)
+@@ -1,11 +1,9 @@
+ - type: entity
++  parent: BaseWallmount
+   id: NoticeBoard
+   name: notice board
+   description: Is there a job for a witcher?
+-  placement:
+-    mode: SnapgridCenter
+   components:
+-  - type: WallMount
+   - type: Sprite
+     drawdepth: WallMountedItems
+     sprite: Structures/Wallmounts/noticeboard.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
index baec1e349dfc..55f0211e6392 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
@@ -72,8 +72,6 @@
       enum.WiresUiKey.Key:
         type: WiresBoundUserInterface
   - type: Appearance
-  - type: Damageable
-    damageContainer: StructuralInorganic
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml.rej b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml.rej
new file mode 100644
index 000000000000..5be8920c060d
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml.rej
@@ -0,0 +1,26 @@
+diff a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml	(rejected hunks)
+@@ -1,23 +1,15 @@
+ - type: entity
+   id: BaseBarSign
+-  parent: BaseStructure
++  parent: [ BaseWallmountGlass, BaseWallmountMetallic ]
+   name: bar sign
+   abstract: true
+   components:
+-  - type: MeleeSound
+-    soundGroups:
+-      Brute:
+-        collection: GlassSmash
+   - type: WallMount
+     arc: 360
+   - type: Sprite
+-    drawdepth: WallMountedItems
+     sprite: Structures/Wallmounts/barsign.rsi
+     state: empty
+-  - type: ApcPowerReceiver
+-  - type: ExtensionCableReceiver
+   - type: BarSign
+-  - type: InteractionOutline
+   - type: AccessReader
+     access: [["Bar"]]
+   - type: ActivatableUIRequiresPower
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml.rej b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml.rej
new file mode 100644
index 000000000000..d746b98086e4
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml.rej
@@ -0,0 +1,37 @@
+diff a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml	(rejected hunks)
+@@ -1,26 +1,12 @@
+ - type: entity
++  parent: BaseWallmountMetallic
+   id: BaseSign
+   name: base sign
+   abstract: true
+-  placement:
+-    mode: SnapgridCenter
+   components:
+   - type: WallMount
+     arc: 360
+-  - type: Clickable
+-  - type: InteractionOutline
+   - type: Rotatable
+-  - type: Physics
+-    bodyType: Static
+-    canCollide: false
+-  - type: Fixtures
+-    fixtures:
+-      fix1:
+-        shape:
+-          !type:PhysShapeAabb {}
+-  - type: Damageable
+-    damageContainer: Inorganic
+-    damageModifierSet: Metallic
+   - type: Destructible
+     thresholds:
+     - trigger:
+@@ -30,7 +16,6 @@
+       - !type:DoActsBehavior
+         acts: ["Destruction"]
+   - type: Sprite
+-    drawdepth: WallMountedItems
+     sprite: Structures/Wallmounts/signs.rsi
+     snapCardinals: true
+   - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
index 99b8149afcd0..ec10899b06c8 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
@@ -81,10 +81,7 @@
   id: BaseFlag
   abstract: true
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/flags.rsi
 
 - type: entity
@@ -113,7 +110,7 @@
   components:
   - type: Sprite
     state: syndie_flag
-    
+
 - type: entity
   parent: BaseFlag
   id: LGBTQFlag
@@ -122,7 +119,7 @@
   components:
   - type: Sprite
     state: lgbtq_flag
-    
+
 - type: entity
   parent: BaseFlag
   id: PirateFlag
@@ -130,4 +127,4 @@
   description: Raise the jolly roger, scallywags!
   components:
   - type: Sprite
-    state: pirate_flag
\ No newline at end of file
+    state: pirate_flag
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml
index 65f361f149e8..4887ed37ac9a 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml
@@ -12,10 +12,7 @@
   id: PaintingBase
   abstract: true
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/paintings.rsi
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml.rej b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml.rej
new file mode 100644
index 000000000000..1e962f3e86c8
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml.rej
@@ -0,0 +1,7 @@
+diff a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml	(rejected hunks)
+@@ -187,4 +184,4 @@
+   description: This painting is a sad clown! It sparks joy.
+   components:
+   - type: Sprite
+-    state: painting19  
++    state: painting19
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
index 3ab8cb37fd93..f88f0bc153bd 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
@@ -108,12 +108,8 @@
   id: PosterBase
   abstract: true
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/posters.rsi
-    snapCardinals: true
   - type: Destructible
     thresholds:
     - trigger: # Excess damage, don't spawn entities
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/base_wallmount_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/base_wallmount_cabinet.yml
new file mode 100644
index 000000000000..69433c3a7de8
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/base_wallmount_cabinet.yml
@@ -0,0 +1,9 @@
+- type: entity
+  parent: [BaseWallmountMetallic, BaseItemCabinet]
+  id: BaseWallmountCabinet
+  abstract: true
+
+- type: entity
+  parent: [BaseWallmountGlass, BaseItemCabinetGlass]
+  id: BaseWallmountCabinetGlass
+  abstract: true
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/defib_cabinet.yml
similarity index 97%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/defib_cabinet.yml
index dd8dd0fd80c2..47d84883a33a 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/defib_cabinet.yml
@@ -52,9 +52,6 @@
         whitelist:
           components:
           - Defibrillator
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger: !type:DamageTrigger
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/defib_cabinet.yml.rej b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/defib_cabinet.yml.rej
new file mode 100644
index 000000000000..17ee06f20a06
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/defib_cabinet.yml.rej
@@ -0,0 +1,21 @@
+diff a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/defib_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/defib_cabinet.yml	(rejected hunks)
+@@ -1,18 +1,12 @@
+ # TODO: same as other wallmount cabinets they should use a base structure prototype
+ - type: entity
+-  parent: BaseItemCabinet
++  parent: BaseWallmountCabinet
+   id: DefibrillatorCabinet
+   name: defibrillator cabinet
+   description: A small wall mounted cabinet designed to hold a defibrillator.
+   placement:
+     mode: SnapgridCenter
+   components:
+-  - type: WallMount
+-    arc: 175
+-  - type: Transform
+-    anchored: true
+-  - type: Clickable
+-  - type: InteractionOutline
+   - type: Sprite
+     sprite: Structures/Wallmounts/defib_cabinet.rsi
+     noRot: false
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/extinguisher_cabinet.yml
similarity index 97%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/extinguisher_cabinet.yml
index 69103a66fb72..91aec7153601 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/extinguisher_cabinet.yml
@@ -53,9 +53,6 @@
           whitelist:
             components:
             - SpraySafety
-    - type: Damageable
-      damageContainer: StructuralInorganic
-      damageModifierSet: Metallic
     - type: Destructible
       thresholds:
         - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/extinguisher_cabinet.yml.rej b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/extinguisher_cabinet.yml.rej
new file mode 100644
index 000000000000..7f8f5796af09
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/extinguisher_cabinet.yml.rej
@@ -0,0 +1,22 @@
+diff a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/extinguisher_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/extinguisher_cabinet.yml	(rejected hunks)
+@@ -1,19 +1,9 @@
+-# TODO: this could probably use some kind of base structure prototype
+-# every wallmount cabinet copypastes placement and like 8 components
+ - type: entity
+-  parent: BaseItemCabinet
++  parent: BaseWallmountCabinet
+   id: ExtinguisherCabinet
+   name: extinguisher cabinet
+   description: A small wall mounted cabinet designed to hold a fire extinguisher.
+-  placement:
+-    mode: SnapgridCenter
+   components:
+-    - type: WallMount
+-      arc: 360
+-    - type: Transform
+-      anchored: true
+-    - type: Clickable
+-    - type: InteractionOutline
+     - type: Sprite
+       sprite: Structures/Wallmounts/extinguisher_cabinet.rsi
+       snapCardinals: true
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/fireaxe_cabinet.yml
similarity index 95%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/fireaxe_cabinet.yml
index 4c0fefbaaa67..3618a42366b9 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/fireaxe_cabinet.yml
@@ -47,13 +47,6 @@
       - !type:PlaySoundBehavior
         sound:
           collection: MetalGlassBreak
-  - type: MeleeSound
-    soundGroups:
-      Brute:
-        collection: GlassSmash
-  - type: WallMount
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     sprite: Structures/Wallmounts/fireaxe_cabinet.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/fireaxe_cabinet.yml.rej b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/fireaxe_cabinet.yml.rej
new file mode 100644
index 000000000000..d934d226434e
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/fireaxe_cabinet.yml.rej
@@ -0,0 +1,18 @@
+diff a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/fireaxe_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/fireaxe_cabinet.yml	(rejected hunks)
+@@ -1,15 +1,11 @@
+-# TODO: same as fire extinguisher make it use a base structure theres lots of copy paste
+ - type: entity
+-  parent: BaseItemCabinetGlass
++  parent: BaseWallmountCabinetGlass
+   id: FireAxeCabinet
+   name: fire axe cabinet
+   description: There is a small label that reads "For Emergency use only" along with details for safe use of the axe. As if.
+   placement:
+     mode: SnapgridCenter
+   components:
+-  - type: Damageable
+-    damageContainer: StructuralInorganic
+-    damageModifierSet: Glass
+   - type: Destructible
+     thresholds:
+     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/shotgun_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/shotgun_cabinet.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/shotgun_cabinet.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/shotgun_cabinet.yml
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml
similarity index 99%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml
index d078c08e0bba..365959f20ab9 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml
@@ -109,7 +109,6 @@
           collection: WoodDestroyHeavy
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: WallMount
   - type: Storage
     grid:
     - 0,0,3,1
@@ -119,7 +118,6 @@
     interfaces:
      enum.StorageUiKey.Key:
       type: StorageBoundUserInterface
-  - type: InteractionOutline
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml.rej b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml.rej
new file mode 100644
index 000000000000..1c31441072bb
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml.rej
@@ -0,0 +1,27 @@
+diff a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml	(rejected hunks)
+@@ -1,23 +1,15 @@
+ # Parents
+ - type: entity
+-  abstract: true
++  parent: BaseWallmount
+   id: ShelfBase
++  abstract: true
+   name: shelf
+   description: A strange place to place, well, anything really. You feel like you shouldn't be seeing this.
+-  placement:
+-    mode: SnapgridCenter
+-    snap:
+-    - Wallmount
+   components:
+-  - type: Clickable
+-  - type: Tag
+-    tags:
+-    - Structure
+   - type: Sprite
+     drawdepth: WallMountedItems
+     sprite: Structures/Storage/Shelfs/wood.rsi
+     state: base
+-  - type: Transform
+   - type: Damageable
+     damageModifierSet: Wood
+     damageContainer: StructuralInorganic
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml
similarity index 96%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml
index 61d77946693f..00712edc2848 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml
@@ -93,12 +93,6 @@
           collection: MetalBreak
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: SolutionContainerManager
-    solutions:
-      tank:
-        reagents:
-        - ReagentId: SpaceCleaner
-          Quantity: 5000
   - type: DrainableSolution
     solution: tank
   - type: ReagentTank
@@ -106,7 +100,7 @@
     solution: tank
 
 - type: entity
-  parent: CleanerDispenser
+  parent: BaseDispenser
   id: FuelDispenser
   name: fuel dispenser
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml.rej b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml.rej
new file mode 100644
index 000000000000..a24524767634
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml.rej
@@ -0,0 +1,47 @@
+diff a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml	(rejected hunks)
+@@ -1,25 +1,12 @@
+ - type: entity
+-  id: CleanerDispenser
+-  name: space cleaner dispenser
+-  description: Wallmount reagent dispenser.
+-  placement:
+-    mode: SnapgridCenter
+-    snap:
+-    - Wallmount
++  parent: BaseWallmountMetallic
++  id: BaseDispenser
++  abstract: true
+   components:
+-  - type: WallMount
+-    arc: 175
+   - type: Sprite
+     sprite: Structures/Storage/tanks.rsi
+     state: cleanerdispenser
+   - type: Appearance
+-  - type: InteractionOutline
+-  - type: Clickable
+-  - type: Transform
+-    anchored: true
+-  - type: Damageable
+-    damageContainer: StructuralInorganic
+-    damageModifierSet: Metallic
+   - type: Destructible
+     thresholds:
+     - trigger:
+@@ -86,3 +67,16 @@
+     weldingDamage:
+       types:
+         Heat: 20
++
++- type: entity
++  parent: BaseDispenser
++  id: CleanerDispenser
++  name: space cleaner dispenser
++  components:
++  - type: SolutionContainerManager
++    solutions:
++      tank:
++        reagents:
++        - ReagentId: SpaceCleaner
++          Quantity: 5000
++  - type: ReagentTank
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml
similarity index 88%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml
index 63de1417b048..4ca62a7da541 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml
@@ -125,7 +125,6 @@
   - type: Construction
     graph: SignalSwitchGraph
     node: SignalSwitchNode
-  - type: Fixtures
   - type: DeviceNetwork
     deviceNetId: Wireless
   - type: WirelessNetworkConnection
@@ -137,26 +136,35 @@
     - Status
     lastSignals:
       Status: false
-  - type: Tag
-    tags:
-    - Structure
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 80
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 40
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalBreak
+              params:
+                volume: -8
 
 - type: entity
+  parent: BaseWallmountMetallic
   id: SignalButton
   name: signal button
   description: It's a button for activating something.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
-  - type: StationAiWhitelist
   - type: WallMount
     arc: 360
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    canCollide: false
+  - type: StationAiWhitelist
   - type: Sprite
     drawdepth: SmallObjects
     sprite: Structures/Wallmounts/switch.rsi
@@ -171,7 +179,6 @@
   - type: Construction
     graph: SignalButtonGraph
     node: SignalButtonNode
-  - type: Fixtures
   - type: DeviceNetwork
     deviceNetId: Wireless
   - type: WirelessNetworkConnection
@@ -179,9 +186,6 @@
   - type: DeviceLinkSource
     ports:
       - Pressed
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
       - trigger:
@@ -201,100 +205,29 @@
               collection: MetalBreak
               params:
                 volume: -8
-  - type: Tag
-    tags:
-    - Structure
 
 - type: entity
+  parent: BaseWallmountMetallic
   id: ApcNetSwitch
   name: apc net switch
   description: It's a switch for toggling lights that are connected to the same apc.
-  placement:
-    mode: SnapgridCenter
-    snap:
-      - Wallmount
-  components:
-    - type: WallMount
-      arc: 360
-    - type: Clickable
-    - type: InteractionOutline
-    - type: Physics
-      canCollide: false
-    - type: Transform
-      anchored: true
-    - type: Sprite
-      drawdepth: SmallObjects
-      sprite: Structures/Wallmounts/switch.rsi
-      state: on
-    - type: Rotatable
-    - type: ExtensionCableReceiver
-    - type: DeviceNetwork
-      deviceNetId: Apc
-      transmitFrequencyId: SmartLight # assuming people want to use it for light switches.
-    - type: ApcNetworkConnection
-    - type: ApcNetSwitch
-    - type: Construction
-      graph: LightSwitchGraph
-      node: LightSwitchNode
-    - type: Fixtures
-    - type: Tag
-      tags:
-      - Structure
-
-- type: entity
-  id: TwoWayLever
-  name: two way lever
-  description: A two way lever.
-  placement:
-    mode: SnapgridCenter
   components:
-    - type: StationAiWhitelist
-    - type: Clickable
-    - type: InteractionOutline
-    - type: Sprite
-      drawdepth: HighFloorObjects
-      sprite: Structures/conveyor.rsi
-      noRot: true
-      layers:
-        - state: switch-off
-          map: ["enabled", "enum.TwoWayLeverState.Middle"]
-    - type: TwoWayLever
-    - type: UseDelay
-      delay: 0.2 # prevent light-toggling auto-clickers.
-    - type: Appearance
-    - type: GenericVisualizer
-      visuals:
-        enum.TwoWayLeverVisuals.State:
-          enabled:
-            Right: { state: switch-fwd }
-            Middle: { state: switch-off }
-            Left: { state: switch-rev }
-    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
-    - type: Destructible
-      thresholds:
-      - trigger:
-          !type:DamageTrigger
-          damage: 100
-        behaviors:
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-    - type: Construction
-      graph: LeverGraph
-      node: LeverNode
-    - type: DeviceNetwork
-      deviceNetId: Wireless
-    - type: WirelessNetworkConnection
-      range: 200
-    - type: DeviceLinkSource
-      ports:
-        - Left
-        - Right
-        - Middle
-    - type: Tag
-      tags:
-      - Structure
+  - type: WallMount
+    arc: 360
+  - type: Sprite
+    drawdepth: SmallObjects
+    sprite: Structures/Wallmounts/switch.rsi
+    state: on
+  - type: Rotatable
+  - type: ExtensionCableReceiver
+  - type: DeviceNetwork
+    deviceNetId: Apc
+    transmitFrequencyId: SmartLight # assuming people want to use it for light switches.
+  - type: ApcNetworkConnection
+  - type: ApcNetSwitch
+  - type: Construction
+    graph: LightSwitchGraph
+    node: LightSwitchNode
 
 #directional
 
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml.rej b/Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml.rej
new file mode 100644
index 000000000000..66796391073b
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml.rej
@@ -0,0 +1,23 @@
+diff a/Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml	(rejected hunks)
+@@ -1,19 +1,12 @@
+ - type: entity
++  parent: BaseWallmountMetallic
+   id: SignalSwitch
+   name: signal switch
+   description: It's a switch for toggling power to things.
+-  placement:
+-    mode: SnapgridCenter
+-    snap:
+-    - Wallmount
+   components:
+-  - type: StationAiWhitelist
+   - type: WallMount
+     arc: 360
+-  - type: Clickable
+-  - type: InteractionOutline
+-  - type: Physics
+-    canCollide: false
++  - type: StationAiWhitelist
+   - type: Sprite
+     drawdepth: SmallObjects
+     sprite: Structures/Wallmounts/switch.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch_autolink.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch_autolink.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/switch_autolink.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch_autolink.yml
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/telescreens.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/telescreens.yml
new file mode 100644
index 000000000000..ed585aa18510
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/telescreens.yml
@@ -0,0 +1,83 @@
+- type: entity
+  parent: BaseWallmountMachine
+  id: WallmountTelescreen
+  suffix: camera monitor
+  name: telescreen
+  description: Finally, some decent reception around here...
+  components:
+  - type: Sprite
+    sprite: Structures/Machines/computers.rsi
+    layers:
+      - map: ["computerLayerBody"]
+        state: telescreen_frame
+      - map: ["computerLayerScreen"]
+        state: telescreen
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
+  - type: Construction
+    graph: WallmountTelescreen
+    node: Telescreen
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#b89f25"
+  - type: DeviceNetwork
+    deviceNetId: Wired
+    receiveFrequencyId: SurveillanceCamera
+    transmitFrequencyId: SurveillanceCamera
+  - type: WiredNetworkConnection
+  - type: DeviceNetworkRequiresPower
+  - type: SurveillanceCameraMonitor
+  - type: ActivatableUI
+    key: enum.SurveillanceCameraMonitorUiKey.Key
+  - type: ActivatableUIRequiresPower
+  - type: ActivatableUIRequiresVision
+  - type: UserInterface
+    interfaces:
+        enum.SurveillanceCameraMonitorUiKey.Key:
+          type: SurveillanceCameraMonitorBoundUserInterface
+
+- type: entity
+  parent: BaseWallmountMetallic
+  id: WallmountTelescreenFrame
+  name: telescreen frame
+  description: Finally, some decent reception around here...
+  components:
+  - type: Construction
+    graph: WallmountTelescreen
+    node: TelescreenFrame
+  - type: Sprite
+    sprite: Structures/Machines/computers.rsi
+    layers:
+      - map: ["computerLayerBody"]
+        state: telescreen_frame
+      - map: ["computerLayerScreen"]
+        state: telescreen
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors: #excess damage, don't spawn entities.
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/televisions.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/televisions.yml
new file mode 100644
index 000000000000..b600ece98540
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/televisions.yml
@@ -0,0 +1,96 @@
+- type: entity
+  parent: BaseWallmountMachine
+  id: WallmountTelevision
+  suffix: entertainment
+  name: television
+  description: Finally, some decent reception around here...
+  components:
+  - type: Construction
+    graph: WallmountTelevision
+    node: Television
+  - type: Sprite
+    sprite: Structures/Wallmounts/flatscreentv.rsi
+    layers:
+      - map: ["computerLayerBody"]
+        state: television_wall
+      - map: ["computerLayerScreen"]
+        state: television_wallscreen
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: SurveillanceCamera
+    transmitFrequencyId: SurveillanceCamera
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: DeviceNetworkRequiresPower
+  - type: Speech
+  - type: SurveillanceCameraSpeaker
+  - type: SurveillanceCameraMonitor
+  - type: ActivatableUI
+    key: enum.SurveillanceCameraMonitorUiKey.Key
+  - type: ActivatableUIRequiresPower
+  - type: ActivatableUIRequiresVision
+  - type: UserInterface
+    interfaces:
+        enum.SurveillanceCameraMonitorUiKey.Key:
+          type: SurveillanceCameraMonitorBoundUserInterface
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#b89f25"
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 200
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalGlassBreak
+              params:
+                volume: -4
+  - type: StationAiWhitelist
+
+- type: entity
+  parent: BaseWallmountGlass
+  id: WallmountTelevisionFrame
+  name: television frame
+  description: Finally, some decent reception around here...
+  components:
+  - type: Construction
+    graph: WallmountTelevision
+    node: TelevisionFrame
+  - type: Sprite
+    drawdepth: WallMountedItems
+    sprite: Structures/Wallmounts/flatscreentv.rsi
+    layers:
+      - map: ["computerLayerBody"]
+        state: television_wall
+      - map: ["computerLayerScreen"]
+        state: television_wallscreen
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 20
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 15
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalGlassBreak
+              params:
+                volume: -4
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
similarity index 97%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
index e6fae31d9174..f4be87e99d82 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
@@ -121,8 +121,6 @@
       map: ["airAlarmState"] # TODO: fire alarm enum
     - state: alarmx
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: Transform
-    anchored: true
   - type: Construction
     graph: AirAlarm
     node: air_alarm
@@ -154,17 +152,11 @@
     - DeviceMonitoringAndControl
 
 - type: entity
+  parent: BaseWallmountMetallic
   id: AirAlarmAssembly
   name: air alarm assembly
   description: An air alarm. Doesn't look like it'll be alarming air any time soon.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
-  - type: WallMount
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     sprite: Structures/Wallmounts/air_monitors.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml.rej b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml.rej
new file mode 100644
index 000000000000..0b557f31dfae
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml.rej
@@ -0,0 +1,48 @@
+diff a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml	(rejected hunks)
+@@ -1,19 +1,13 @@
+ - type: entity
++  parent: BaseWallmountMachine
+   id: AirAlarm
+   name: air alarm
+   description: An air alarm. Alarms... air?
+-  placement:
+-    mode: SnapgridCenter
+-    snap:
+-    - Wallmount
+   components:
+   - type: StationAiWhitelist
+-  - type: WallMount
+-  - type: ApcPowerReceiver
+   - type: Electrified
+     enabled: false
+     usesApcPower: true
+-  - type: ExtensionCableReceiver
+   - type: DeviceNetwork
+     deviceNetId: AtmosDevices
+     receiveFrequencyId: AtmosMonitor
+@@ -147,6 +133,25 @@
+     node: assembly
+   - type: Transform
+     anchored: true
++  - type: Destructible
++    thresholds:
++      - trigger:
++          !type:DamageTrigger
++          damage: 20
++        behaviors:
++          - !type:DoActsBehavior
++            acts: [ "Destruction" ]
++      - trigger:
++          !type:DamageTrigger
++          damage: 15
++        behaviors:
++          - !type:DoActsBehavior
++            acts: [ "Destruction" ]
++          - !type:PlaySoundBehavior
++            sound:
++              collection: MetalGlassBreak
++              params:
++                volume: -4
+ 
+ - type: entity
+   id: AirAlarmXeno
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml
similarity index 96%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml
index 25745b062783..e663e61fe278 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml
@@ -64,8 +64,6 @@
   - type: Tag
     tags:
       - FireAlarm
-  - type: Clickable
-  - type: InteractionOutline
   - type: FireAlarm
   - type: AtmosAlertsDevice
     group: FireAlarm
@@ -133,19 +131,13 @@
               params:
                 volume: -4
   - type: StationAiWhitelist
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
 
 - type: entity
+  parent: BaseWallmountMetallic
   id: FireAlarmAssembly
   name: fire alarm assembly
   description: A fire alarm assembly. Very mild.
   components:
-  - type: WallMount
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     sprite: Structures/Wallmounts/air_monitors.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml.rej b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml.rej
new file mode 100644
index 000000000000..ca24d262d153
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml.rej
@@ -0,0 +1,47 @@
+diff a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml	(rejected hunks)
+@@ -1,10 +1,11 @@
+ - type: entity
++  parent: BaseWallmountMachine
+   id: FireAlarm
+   name: fire alarm
+   description: A fire alarm. Spicy!
+   components:
+-  - type: WallMount
+-  - type: ApcPowerReceiver
++  - type: LightningTarget
++    priority: 0
+   - type: Electrified
+     enabled: false
+     usesApcPower: true
+@@ -136,12 +129,25 @@
+   - type: Construction
+     graph: FireAlarm
+     node: assembly
+-  - type: Transform
+-    anchored: true
+-  placement:
+-    mode: SnapgridCenter
+-    snap:
+-    - Wallmount
++  - type: Destructible
++    thresholds:
++      - trigger:
++          !type:DamageTrigger
++          damage: 20
++        behaviors:
++          - !type:DoActsBehavior
++            acts: [ "Destruction" ]
++      - trigger:
++          !type:DamageTrigger
++          damage: 15
++        behaviors:
++          - !type:DoActsBehavior
++            acts: [ "Destruction" ]
++          - !type:PlaySoundBehavior
++            sound:
++              collection: MetalGlassBreak
++              params:
++                volume: -4
+ 
+ - type: entity
+   id: FireAlarmXeno
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml
similarity index 95%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml
index 59fc365306ab..09b9d217503d 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml
@@ -64,9 +64,6 @@
   - type: VoiceOverride # This is for the wire that makes an electricity zapping noise.
     speechVerbOverride: Electricity
     enabled: false
-  - type: ExtensionCableReceiver
-  - type: Clickable
-  - type: InteractionOutline
   - type: Appearance
   - type: WiresVisuals
   - type: WiresPanelSecurity
@@ -97,9 +94,6 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
       visible: false
-  - type: Transform
-    noRot: false
-    anchored: true
   - type: WiresPanel
   - type: Wires
     boardName: wires-board-name-intercom
@@ -120,9 +114,6 @@
     containers:
     - board
     - key_slots
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
       - trigger:
@@ -160,19 +151,12 @@
         enum.RadioDeviceVisualLayers.Speaker:
           True: { visible: true }
           False: { visible: false }
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
 
 - type: entity
   id: IntercomAssembly
   name: intercom assembly
   description: An intercom. It doesn't seem very helpful right now.
   components:
-  - type: WallMount
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     drawdepth: SmallObjects
     sprite: Structures/Wallmounts/intercom.rsi
@@ -191,12 +175,6 @@
   - type: Construction
     graph: Intercom
     node: assembly
-  - type: Transform
-    anchored: true
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
 
 # this weird inheritance BS exists for construction shitcode
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml.rej b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml.rej
new file mode 100644
index 000000000000..53f42e069ec4
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml.rej
@@ -0,0 +1,15 @@
+diff a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml	(rejected hunks)
+@@ -1,12 +1,11 @@
+ - type: entity
++  parent: BaseWallmountMachine
+   id: BaseIntercom
+   name: intercom
+   description: An intercom. For when the station just needs to know something.
+   abstract: true
+   components:
+   - type: StationAiWhitelist
+-  - type: WallMount
+-  - type: ApcPowerReceiver
+   - type: Electrified
+     enabled: false
+     usesApcPower: true
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/screen.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
similarity index 83%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/screen.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
index 4a4828e16215..33261d46b2c8 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/screen.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
@@ -35,14 +35,19 @@
     sprite: Structures/Wallmounts/screen.rsi
     state: screen
     noRot: true
-  - type: Construction
-    graph: Timer
-    node: screen
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
   - type: ApcPowerReceiver
     powerLoad: 100
-  - type: Electrified
-    enabled: false
-    usesApcPower: true
   - type: ExtensionCableReceiver
   - type: Screen
   - type: DeviceNetwork
@@ -53,6 +58,7 @@
   id: ArrivalsShuttleTimer
   parent: Screen
   name: arrivals screen
+  description: Displays time of arrivals shuttle ETA.
   components:
   - type: DeviceNetwork
     deviceNetId: Private
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml.rej b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml.rej
new file mode 100644
index 000000000000..53d72f45068e
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml.rej
@@ -0,0 +1,22 @@
+diff a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml	(rejected hunks)
+@@ -1,19 +1,9 @@
+ - type: entity
++  parent: BaseWallmountMachine
+   id: Screen
+   name: screen
+   description: Displays text or time.
+-  placement:
+-    mode: SnapgridCenter
+-    snap:
+-    - Wallmount
+   components:
+-  - type: Transform
+-    anchored: true
+-  - type: WallMount
+-    arc: 360
+-  - type: InteractionOutline
+-  - type: Clickable
+-  - type: Appearance
+   - type: Rotatable
+   - type: TextScreenVisuals
+     textOffset: 0,3
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/station_map.yml
similarity index 91%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/station_map.yml
index 8144dcbab3ce..f1c80f1e99b7 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/station_map.yml
@@ -40,17 +40,16 @@
               acts: [ "Destruction" ]
 
 - type: entity
+  parent: BaseWallmountMachine
   id: StationMap
   name: station map
-  parent: BaseComputer
   description: A virtual map of the surrounding station.
   suffix: Wall
-  placement:
-    mode: SnapgridCenter
   components:
+    - type: WallMount
+      arc: 360
+    - type: Appearance
     - type: StationMap
-    - type: Transform
-      anchored: true
     - type: Sprite
       sprite: Structures/Machines/station_map.rsi
       layers:
@@ -69,9 +68,6 @@
         board: !type:Container
     - type: ApcPowerReceiver
       powerLoad: 200
-    - type: WallMount
-      arc: 360
-    - type: ExtensionCableReceiver
     - type: Construction
       graph: StationMap
       node: station_map
@@ -107,15 +103,25 @@
       interfaces:
         enum.StationMapUiKey.Key:
           type: StationMapBoundUserInterface
+    - type: EmitSoundOnUIOpen
+      sound:
+        collection: Keyboard
+        params:
+          volume: -1
+          variation: 0.10
+          pitch: 1.10  # low pitch keyboard sounds feel kinda weird
+      blacklist:
+        tags:
+        - NoConsoleSound
 
 - type: entity
+  parent: BaseWallmountMetallic
   id: StationMapAssembly
   name: station map assembly
   description: A station map assembly.
   components:
   - type: WallMount
-  - type: Clickable
-  - type: InteractionOutline
+    arc: 360
   - type: Sprite
     sprite: Structures/Machines/station_map.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/station_map.yml.rej b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/station_map.yml.rej
new file mode 100644
index 000000000000..630001670ec4
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/station_map.yml.rej
@@ -0,0 +1,35 @@
+diff a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/station_map.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/station_map.yml	(rejected hunks)
+@@ -1,22 +1,15 @@
+ - type: entity
++  parent: BaseWallmountMetallic
+   id: StationMapBroken
+   name: station map
+   description: A virtual map of the surrounding station.
+   suffix: Wall broken
+-  placement:
+-    mode: SnapgridCenter
+   components:
+-    - type: InteractionOutline
+-    - type: Clickable
+-    - type: Transform
+-      anchored: true
+     - type: Sprite
+       sprite: Structures/Machines/station_map.rsi
+       drawdepth: WallMountedItems
+       layers:
+         - state: station_map_broken
+-    - type: Damageable
+-      damageContainer: StructuralInorganic
+     - type: Destructible
+       thresholds:
+         - trigger:
+@@ -122,9 +121,3 @@
+   - type: Construction
+     graph: StationMap
+     node: assembly
+-  - type: Transform
+-    anchored: true
+-  placement:
+-    mode: SnapgridCenter
+-    snap:
+-    - Wallmount
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/surveillance_camera.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/surveillance_camera.yml
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml
similarity index 95%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml
index 7cff3eeba0cd..820578c62881 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml
@@ -70,12 +70,9 @@
     interfaces:
       enum.SignalTimerUiKey.Key:
         type: SignalTimerBoundUserInterface
-  - type: ApcPowerReceiver
-    powerLoad: 100
   - type: Electrified
     enabled: false
     usesApcPower: true
-  - type: ExtensionCableReceiver
   - type: ActivatableUIRequiresPower
   - type: Construction
     graph: Timer
@@ -137,17 +134,10 @@
 # Construction Frame
 
 - type: entity
-  categories: [ HideSpawnMenu ]
   id: TimerFrame
   name: timer frame
   description: A construction frame for a timer.
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Transform
-    anchored: true
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/signalscreen.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml.rej b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml.rej
new file mode 100644
index 000000000000..bd717553926d
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml.rej
@@ -0,0 +1,43 @@
+diff a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml	(rejected hunks)
+@@ -1,24 +1,28 @@
+ - type: entity
++  parent: BaseWallmountMachine
+   id: SignalTimer
+   name: signal timer
+   description: It's a timer for sending timed signals to things.
+-  placement:
+-    mode: SnapgridCenter
+-    snap:
+-    - Wallmount
+   components:
+   - type: StationAiWhitelist
+-  - type: Transform
+-    anchored: true
+   - type: WallMount
+     arc: 360
+-  - type: Clickable
+-  - type: InteractionOutline
+   - type: Sprite
+     drawdepth: SmallObjects
+     sprite: Structures/Wallmounts/switch.rsi
+     state: on
+   - type: Appearance
++  - type: Destructible
++    thresholds:
++    - trigger:
++        !type:DamageTrigger
++        damage: 200
++      behaviors:
++      - !type:DoActsBehavior
++        acts: [ "Destruction" ]
++      - !type:PlaySoundBehavior
++        sound:
++          collection: MetalGlassBreak
+   - type: Rotatable
+   - type: SignalTimer
+     canEditLabel: false
+@@ -121,3 +115,4 @@
+     graph: Timer
+     node: frame
+   - type: WallMount
++    arc: 360
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/base_wallmount.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/base_wallmount.yml
new file mode 100644
index 000000000000..824a446013e0
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/base_wallmount.yml
@@ -0,0 +1,51 @@
+- type: entity
+  id: BaseWallmount
+  abstract: true
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wallmount
+  components:
+  - type: Clickable
+  - type: WallMount
+  - type: InteractionOutline
+  - type: Transform
+    anchored: true
+  - type: Tag
+    tags:
+    - Structure
+  - type: Sprite
+    drawdepth: WallMountedItems
+
+- type: entity
+  parent: BaseWallmount
+  id: BaseWallmountGlass
+  abstract: true
+  components:
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        collection: GlassSmash
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Glass
+
+- type: entity
+  parent: BaseWallmount
+  id: BaseWallmountMetallic
+  abstract: true
+  components:
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
+
+- type: entity
+  parent: BaseWallmountMetallic
+  id: BaseWallmountMachine
+  abstract: true
+  components:
+  - type: ApcPowerReceiver
+    powerLoad: 100
+  - type: ExtensionCableReceiver
+  - type: LightningTarget
+    priority: 1
diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index 5411e318f456..ad035c0a8883 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -194,7 +194,7 @@
           Unprimed:
             state: gibtonite_inactive
             visible: false
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     examinable: false
     beepInterval: 0.4
     beepSound:
@@ -203,6 +203,8 @@
     min: 8
     max: 10
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive
     explosionType: DemolitionCharge
     totalIntensity: 450
@@ -226,6 +228,7 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
       - !type:TriggerBehavior
+        keyOut: timer # explode immediately
 
 # Ore veins
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/lever.yml b/Resources/Prototypes/Entities/Structures/lever.yml
new file mode 100644
index 000000000000..7efb4cea573b
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/lever.yml
@@ -0,0 +1,53 @@
+- type: entity
+  id: TwoWayLever
+  name: two way lever
+  description: A two way lever.
+  placement:
+    mode: SnapgridCenter
+  components:
+    - type: StationAiWhitelist
+    - type: Clickable
+    - type: InteractionOutline
+    - type: Sprite
+      drawdepth: FloorObjects
+      sprite: Structures/conveyor.rsi
+      layers:
+        - state: switch-off
+          map: ["enabled", "enum.TwoWayLeverState.Middle"]
+    - type: TwoWayLever
+    - type: UseDelay
+      delay: 0.2 # prevent light-toggling auto-clickers.
+    - type: Appearance
+    - type: GenericVisualizer
+      visuals:
+        enum.TwoWayLeverVisuals.State:
+          enabled:
+            Right: { state: switch-fwd }
+            Middle: { state: switch-off }
+            Left: { state: switch-rev }
+    - type: Damageable
+      damageContainer: Inorganic
+      damageModifierSet: Metallic
+    - type: Destructible
+      thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+    - type: Construction
+      graph: LeverGraph
+      node: LeverNode
+    - type: DeviceNetwork
+      deviceNetId: Wireless
+    - type: WirelessNetworkConnection
+      range: 200
+    - type: DeviceLinkSource
+      ports:
+        - Left
+        - Right
+        - Middle
+    - type: Tag
+      tags:
+      - Structure
diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index bde5f1b80719..dfc6f789df78 100644
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -1568,3 +1568,8 @@
   id: artifactglue
   flavorType: Complex
   description: flavor-complex-artifact-glue
+
+- type: flavor
+  id: motivating
+  flavorType: Base
+  description: flavor-base-motivating
diff --git a/Resources/Prototypes/GameRules/roundstart.yml.rej b/Resources/Prototypes/GameRules/roundstart.yml.rej
new file mode 100644
index 000000000000..2b7f7677bc51
--- /dev/null
+++ b/Resources/Prototypes/GameRules/roundstart.yml.rej
@@ -0,0 +1,10 @@
+diff a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml	(rejected hunks)
+@@ -271,7 +271,7 @@
+     - WizardSurviveObjective
+     - WizardDemonstrateObjective
+   - type: LoadMapRule
+-    gridPath: /Maps/Shuttles/wizard.yml
++    mapPath: /Maps/Nonstations/wizardsden.yml
+   - type: RuleGrids
+   - type: AntagSelection
+   - type: AntagLoadProfileRule
diff --git a/Resources/Prototypes/Magic/teleport_spells.yml.rej b/Resources/Prototypes/Magic/teleport_spells.yml.rej
new file mode 100644
index 000000000000..c5d7b1a4006f
--- /dev/null
+++ b/Resources/Prototypes/Magic/teleport_spells.yml.rej
@@ -0,0 +1,11 @@
+diff a/Resources/Prototypes/Magic/teleport_spells.yml b/Resources/Prototypes/Magic/teleport_spells.yml	(rejected hunks)
+@@ -35,7 +35,8 @@
+       sprite: Objects/Magic/Eldritch/eldritch_actions.rsi
+       state: voidblink
+   - type: TargetAction
+-    checkCanAccess: false
++    accessMask:
++    - Opaque
+     repeat: false
+     range: 16
+   - type: EntityTargetAction
diff --git a/Resources/Prototypes/Parallaxes/wizard.yml b/Resources/Prototypes/Parallaxes/wizard.yml
new file mode 100644
index 000000000000..0fd482a4855c
--- /dev/null
+++ b/Resources/Prototypes/Parallaxes/wizard.yml
@@ -0,0 +1,14 @@
+- type: parallax
+  id: Wizard
+  layers:
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/purple_nebula.png"
+      slowness: 0.98
+      scale: 1,1
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/KettleParallaxNeb.png"
+      slowness: 0.95
+      scale: "1.5, 1.5"
+      scrolling: "0.1, -0.05"
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index 807481755ee2..5485003721df 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -1493,12 +1493,13 @@
   color: "#8147ff"
   metabolisms:
     Medicine:
+      metabolismRate: 0.1
       effects:
       # heals shocks and removes shock chems
       - !type:HealthChange
         damage:
           types:
-            Shock: -4
+            Shock: -0.5 # 5 per u
       - !type:AdjustReagent
         reagent: Licoxide
         amount: -4
diff --git a/Resources/Prototypes/Reagents/medicine.yml.rej b/Resources/Prototypes/Reagents/medicine.yml.rej
new file mode 100644
index 000000000000..986af56fb469
--- /dev/null
+++ b/Resources/Prototypes/Reagents/medicine.yml.rej
@@ -0,0 +1,153 @@
+diff a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml	(rejected hunks)
+@@ -142,10 +142,9 @@
+   metabolisms:
+     Medicine:
+       effects:
+-      - !type:HealthChange
++      - !type:EvenHealthChange
+         damage:
+-          groups:
+-            Brute: -2
++          Brute: -1.5
+       - !type:HealthChange
+         conditions:
+         - !type:ReagentThreshold
+@@ -845,6 +844,7 @@
+   color: "#520e30"
+   metabolisms:
+     Medicine:
++      metabolismRate: 0.25
+       effects:
+       - !type:HealthChange
+         conditions:
+@@ -853,15 +853,15 @@
+           max: 30
+         damage:
+           groups:
+-            Toxin: -3
+-            Brute: 0.5
++            Toxin: -1.5
++            Brute: 0.25
+       - !type:HealthChange
+         conditions:
+         - !type:ReagentThreshold
+           min: 30
+         damage:
+           groups:
+-            Toxin: -1
++            Toxin: -0.5
+             Brute: 3
+       - !type:AdjustReagent
+         conditions:
+@@ -971,18 +971,19 @@
+   color: "#e0a5b9"
+   metabolisms:
+     Medicine:
++      metabolismRate: 0.1
+       effects:
+       - !type:HealthChange
+         damage:
+           types:
+-            Caustic: -3
++            Caustic: -0.6 # 6 per u
+       - !type:HealthChange
+         conditions:
+         - !type:ReagentThreshold
+-          min: 16
++          min: 21
+         damage:
+           types:
+-            Heat: 2
++            Heat: 0.2
+       - !type:Jitter
+         conditions:
+         - !type:ReagentThreshold
+@@ -1026,18 +1027,19 @@
+   color: "#283332"
+   metabolisms:
+     Medicine:
++      metabolismRate: 0.1
+       effects:
+       - !type:HealthChange
+         damage:
+           types:
+-            Slash: -3
++            Slash: -0.6 # 6 Per u
+       - !type:HealthChange
+         conditions:
+         - !type:ReagentThreshold
+-          min: 12
++          min: 21
+         damage:
+           types:
+-            Cold: 3
++            Cold: 1.5 #15 per u
+ 
+ - type: reagent
+   id: Puncturase
+@@ -1049,19 +1051,20 @@
+   color: "#b9bf93"
+   metabolisms:
+     Medicine:
++      metabolismRate: 0.1
+       effects:
+       - !type:HealthChange
+         damage:
+           types:
+-            Piercing: -4
+-            Blunt: 0.1
++            Piercing: -0.6 # 6 per u
++            Blunt: 0.05 # 0.5 per u
+       - !type:HealthChange
+         conditions:
+         - !type:ReagentThreshold
+-          min: 11
++          min: 21
+         damage:
+           types:
+-            Blunt: 5
++            Blunt: 1 # 10 per u plus base effect
+ 
+ - type: reagent
+   id: Bruizine
+@@ -1073,18 +1076,19 @@
+   color: "#ff3636"
+   metabolisms:
+     Medicine:
++      metabolismRate: 0.1
+       effects:
+       - !type:HealthChange
+         damage:
+           types:
+-            Blunt: -3.5
++            Blunt: -0.6 # 6 per u
+       - !type:HealthChange
+         conditions:
+         - !type:ReagentThreshold
+-          min: 10.5
++          min: 19
+         damage:
+           types:
+-            Poison: 4
++            Poison: 1.5 # 15 per u
+ 
+ - type: reagent
+   id: Holywater
+@@ -1198,14 +1203,14 @@
+       - !type:HealthChange
+         conditions:
+         - !type:ReagentThreshold
+-          min: 12
++          min: 15.5
+         damage:
+           types:
+-            Cold: 2
++            Cold: 0.2 # 2 per u but lethal with cooling OD effect below
+       - !type:AdjustTemperature
+         conditions:
+         - !type:ReagentThreshold
+-          min: 12
++          min: 15.5
+         amount: -30000
+       - !type:Jitter
+         conditions:
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 74508931e9bd..220d2514656a 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1881,6 +1881,18 @@
     FoodSnackRaisins: 1
     OrganAnimalHeart: 1
 
+- type: microwaveMealRecipe
+  id: RecipeBerryDelight
+  name: berry delight recipe
+  result: FoodCakeBerryDelight
+  time: 5
+  group: Cake
+  solids:
+    FoodCakePlain: 1
+    FoodBerries: 5
+  reagents:
+    Milk: 10
+
 - type: microwaveMealRecipe
   id: RecipeBreadDog
   name: bread dog recipe
@@ -2606,3 +2618,14 @@
     MobMothroach: 1
     OrganAnimalHeart: 1
     MoproachShoes: 1
+
+- type: microwaveMealRecipe
+  id: RecipeCottonCake
+  name: cotton cake recipe
+  result: FoodCakeCotton
+  time: 5
+  group: Cake
+  reagents:
+    Fiber: 10
+  solids:
+    FoodCakePlain: 1
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
index c777c96f064f..22e0fbf25973 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
@@ -49,6 +49,7 @@
   recipes:
   - BorgModuleAdvancedCleaning
   - BorgModuleAdvancedTool
+  - BorgModuleAdvancedClowning
   - BorgModuleAdvancedChemical
   - BorgModuleAdvancedMining
 
diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
index 8b4e9e3ffbde..4383ba12323b 100644
--- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml
+++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
@@ -152,6 +152,7 @@
   id: PotassiumExplosion
   impact: High
   priority: 20
+  conserveEnergy: false
   reactants:
     Water:
       amount: 1
@@ -160,15 +161,16 @@
   effects:
     - !type:ExplosionReactionEffect
       explosionType: Default
-      maxIntensity: 100
-      intensityPerUnit: 0.5 # 50+50 reagent for maximum explosion
-      intensitySlope: 4
+      intensityPerUnit: 0.25
       maxTotalIntensity: 100
+      intensitySlope: 4
+      maxIntensity: 7
 
 - type: reaction
   id: Smoke
-  priority: 10
+  priority: -10
   impact: High
+  conserveEnergy: false
   reactants:
     Phosphorus:
       amount: 1
@@ -185,8 +187,9 @@
 
 - type: reaction
   id: Foam
-  priority: 10
+  priority: -10
   impact: High
+  conserveEnergy: false
   reactants:
     Fluorosurfactant:
       amount: 1
@@ -202,7 +205,8 @@
 - type: reaction
   id: IronMetalFoam
   impact: High
-  priority: 10
+  priority: -10
+  conserveEnergy: false
   reactants:
     Iron:
       amount: 3
@@ -220,7 +224,8 @@
 - type: reaction
   id: AluminiumMetalFoam
   impact: High
-  priority: 10
+  priority: -10
+  conserveEnergy: false
   reactants:
     Aluminium:
       amount: 3
@@ -239,6 +244,7 @@
   id: UraniumEmpExplosion
   impact: High
   priority: 20
+  conserveEnergy: false
   reactants:
     Iron:
       amount: 1
@@ -257,6 +263,7 @@
   id: Flash
   impact: High
   priority: 20
+  conserveEnergy: false
   reactants:
     Aluminium:
       amount: 1
diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml
index 6011fbec79da..79e87ce581d5 100644
--- a/Resources/Prototypes/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml
@@ -485,39 +485,6 @@
   products:
     Bruizine: 2
 
-- type: reaction
-  id: BicarLacerinol # mixing any two brute medications will make Razorium
-  impact: Medium
-  reactants:
-    Lacerinol:
-      amount: 1
-    Bicaridine:
-      amount: 1
-  products:
-    Razorium: 1
-
-- type: reaction
-  id: BicarPuncturase # mixing any two brute medications will make Razorium
-  impact: Medium
-  reactants:
-    Puncturase:
-      amount: 1
-    Bicaridine:
-      amount: 1
-  products:
-    Razorium: 1
-
-- type: reaction
-  id: BicarBruizine # mixing any two brute medications will make Razorium
-  impact: Medium
-  reactants:
-    Bruizine:
-      amount: 1
-    Bicaridine:
-      amount: 1
-  products:
-    Razorium: 1
-
 - type: reaction
   id: BruizineLacerinol # mixing any two brute medications will make Razorium
   impact: Medium
diff --git a/Resources/Prototypes/Research/civilianservices.yml.rej b/Resources/Prototypes/Research/civilianservices.yml.rej
new file mode 100644
index 000000000000..6bb14e3b2744
--- /dev/null
+++ b/Resources/Prototypes/Research/civilianservices.yml.rej
@@ -0,0 +1,9 @@
+diff a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml	(rejected hunks)
+@@ -199,6 +199,7 @@
+   cost: 4000
+   recipeUnlocks:
+   - PushHorn
++  - BorgModuleAdvancedClowning
+ 
+ # Tier 3
+ 
diff --git a/Resources/Prototypes/SoundCollections/machines.yml b/Resources/Prototypes/SoundCollections/machines.yml
index 3c567ab7b336..45768bfa88c9 100644
--- a/Resources/Prototypes/SoundCollections/machines.yml
+++ b/Resources/Prototypes/SoundCollections/machines.yml
@@ -22,3 +22,18 @@
   id: CargoBeep
   files:
   - /Audio/Effects/Cargo/beep.ogg
+
+- type: soundCollection
+  id: VendingDispense
+  files:
+  - /Audio/Machines/machine_vend.ogg
+
+- type: soundCollection
+  id: VendingDeny
+  files:
+  - /Audio/Machines/custom_deny.ogg
+
+- type: soundCollection
+  id: MachineInsert
+  files:
+  - /Audio/Weapons/Guns/MagIn/revolver_magin.ogg
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index a1de7136e0f4..75b2a2ff1a89 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1054,6 +1054,9 @@
 - type: Tag
   id: Knife
 
+- type: Tag
+  id: KnockdownImmune
+
 - type: Tag
   id: LavaBrig
 
@@ -1506,6 +1509,9 @@
 - type: Tag
   id: Slice # sliced fruit, vegetables, pizza etc.
 
+- type: Tag
+  id: SlowImmune
+
 - type: Tag
   id: SmallAIChip
 
diff --git a/Resources/Prototypes/tags.yml.rej b/Resources/Prototypes/tags.yml.rej
new file mode 100644
index 000000000000..d39db516bb8d
--- /dev/null
+++ b/Resources/Prototypes/tags.yml.rej
@@ -0,0 +1,11 @@
+diff a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml	(rejected hunks)
+@@ -1331,6 +1337,9 @@
+ - type: Tag
+   id: StringInstrument
+ 
++- type: Tag
++  id: StunImmune
++
+ - type: Tag
+   id: SubdermalImplant
+ 
diff --git a/Resources/ServerInfo/Guidebook/Security/Defusal.xml b/Resources/ServerInfo/Guidebook/Security/Defusal.xml
index 55ca0f6e03eb..19732a82546b 100644
--- a/Resources/ServerInfo/Guidebook/Security/Defusal.xml
+++ b/Resources/ServerInfo/Guidebook/Security/Defusal.xml
@@ -38,7 +38,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
   To arm a bomb, you can either [color=yellow]right click[/color] and click [color=yellow]Begin countdown[/click], or [color=yellow]alt-click[/color] the bomb. It will begin beeping.
 
   ## Time
-  A bomb has a limited time, at a minimum of [protodata="SyndicateBomb" comp="OnUseTimerTrigger" member="ShortestDelayOption"/] seconds and a maximum of [protodata="SyndicateBomb" comp="OnUseTimerTrigger" member="LongestDelayOption"/] seconds. You can view the timer by examining it, unless the Proceed wire is cut. Once the timer hits zero, the bomb will detonate.
+  A bomb has a limited time, at a minimum of [protodata="SyndicateBomb" comp="TimerTrigger" member="ShortestDelayOption"/] seconds and a maximum of [protodata="SyndicateBomb" comp="TimerTrigger" member="LongestDelayOption"/] seconds. You can view the timer by examining it, unless the Proceed wire is cut. Once the timer hits zero, the bomb will detonate.
 
   ## Bolts
   By default, once armed, a bomb will bolt itself to the ground. You must find the BOLT wire and cut it to disable the bolts, after which you can unwrench it and throw it into space.
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM1DoNotPowergame.xml b/Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM1DoNotPowergame.xml
index 47b729d86b7e..0f42d295c188 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM1DoNotPowergame.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM1DoNotPowergame.xml
@@ -25,7 +25,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
   - Roundstart Captain granting all heads AA
   - Roundstart HoP takes Ian to ATS because “He’s a high profile target”
   - Creating duplicates of high-value or unique items to hand off to others
-  - Using low-effort roleplay to skirt the metashield
   - Bolting doors to areas to increase their security before a threat is confirmed that makes that security inefficient
   - Setting the alert level to Blue or Red when the situation does not have a need for the severity implied (this includes maintaining these levels far past when said threats have been confirmed as no longer in play)
   - General situations where a character is preemptively preparing for situations that have yet to happen in ways that logically do not make sense
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml.rej b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml.rej
new file mode 100644
index 000000000000..68917c36678c
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml.rej
@@ -0,0 +1,135 @@
+diff a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml	(rejected hunks)
+@@ -1,92 +1,56 @@
+ <Document>
+-  # Roleplay Rule 4 - Do not metagame, obey the Metashield
+-  Something that is "shielded" cannot be known by your character during a round until the "revealing condition" happens. This also means that your character cannot do things based on "shielded" information. Knowing or acting on something that is shielded before the revealing condition is met is referred to as metagaming.
++  # Roleplay Rule 4 -# Do not use information your character would not have knowledge of.
++Metagaming in Space station 14 is the term used to typically describe actions based on knowledge during a round that is inaccessible to your character. You cannot use information gained while dead or a ghost if you are alive. Use of information gained while dead is considered metagaming. This does not apply to knowledge of what antagonists are capable of doing. We expect players to understand what options are avaliable to antagonists.
+ 
+-  Revealing conditions reveal the shielded information for the round, not for a specific instance. This means that once a revealing condition is met in a round, the shield no longer applies in any case for the remainder of the round.
++## Out of character information and metagaming.
++Unless otherwise specified, when playing as a different character (such as taking a ghost role or being changed to another character via admin intervention), you are to act without knowledge of what occurred in the round as any prior characters and as a ghost while playing a character (ghosts are not considered a character for this rule). Mindswap spells and polymorphs are not considered changing characters for this rule. Failure to follow this is metagaming.
+ 
+-  ## Never Revealed IC
+-  Some shields are never revealed IC. This means that your character can never act as if they know about that shielded thing.
++The knowledge that a round will end is out of character information. Knowledge that the shift will end however, is not out of character information. The intention of this rule is to prevent preparation for End of round griefing (EORG). Utilising the knowledge that the round will end is metagaming.
+ 
+-  The following are shielded:
+-  - Current game mode and possible antags during the current game mode.
+-  - Events from previous rounds.
+-  - Events you experienced as a different character.
+-  - All information related to the player of a character rather than the character itself. (See "Metafriending and Metagrudging" below.)
+-  - All information gained while dead or a ghost.
+-  - The fact that a round will end.
++### Knowledge from past lives
++Except when otherwise specified, you cannot use any information gained in a past life in the same round.
++For example, if you were killed by an antagonist, you cannot warn the crew of said antagonist when you respawn as a mothroach.
++This does _not_ apply when being brought back from death as the same character, having your brain transferred to another body, or being cloned.
++For example, if you were killed by an antagonist, your body was found and your brain was placed in a borg, you can recall what happened prior to your original death and could warn the of the antagonist.
+ 
+-  This does not prevent knowing that a shift will end, but does prohibit things like preparing to kill people at central command when roleplay rules stop being enforced on LRP.
++### Knowledge that the round will end (and your character will, ergo, cease to exist)
++Your character will, or should, know that their current shift on Space Station 14 will end and that they will return to Centcomm. They do not know that this represents the effective end of their existence from the perspective of their player.
++You cannot preprepare for end-of-round griefing (EORG) or perform other actions that only make sense in the context that, your characters life ultimately doesn't matter.
+ 
+-  ## Nuclear Operatives
++### Knowledge gained via LOOC
++You cannot use any knowledge gained via LOOC chat that is not in the context of assisting a player with controls, game mechanics, or being made to feel welcome. No in character information should be shared via LOOC, and no actions should be taken or altered because of LOOC or OOC chats.
+ 
+-  The existence of Nuclear Operatives beyond a myth that no one would act on is shielded.
++### MRP Amendment
++Being in the critically injured state or otherwise unconscious (includes sleeping) prevents your character from remembering anything that happened to or around them while unconscious. If brought out of the critical state to the alive state, you may remember what caused you to enter critical state. Entering the dead state causes your character to forget all events related to their death (if you can tie it to how you died, do not remember it). If revived, placed in a MMI, or in the case of Diona, splitting, the character is aware of the fact that they have died but not how.
+ 
+-  The fact that the nuke disk must be protected and could be used by a bad actor to try to destroy the station is not shielded.
++## Do Not Metafriend or Metagrudge
++Giving a person or character preferential treatment based on the events of a previous round is considered metafriending. Treating a person or character negatively based on the events of a previous round is considered metagrudging.
+ 
+-  The revealing condition for this shield is any of the following:
+-  - discovering a blood red hardsuit
+-  - discovering a nuclear operative's shuttle
+-  - an operative name
+-  - a War Ops announcement
+-  - being a nuclear operative
++#### Metafriending Examples
++These are all examples of things that are prohibited.
++- Giving a character additional access or a job because you are friends with the player who is playing that character.
++- Trusting a character because you are friends with the player who is playing that character.
++- Not fighting a character because you are friends with the player who is playing that character.
++- Ignoring your objective to kill a character because your character and theirs became friends in a previous round.
+ 
+-  ## Chameleon Items
++#### Metagrudging Examples
++These are all examples of things that are prohibited.
+ 
+-  Chameleon items are shielded.
++- Not giving a character additional access or a job because you are mad at or don't like the player who is playing that character.
++- Not trusting a character because you are mad at or don't like the player who is playing that character.
++- Starting a fight with a character because of something that they did in a previous round.
++- Starting a fight with a character because of a major event that happened in a previous round.
++- Starting a fight with a character because they killed you while you were playing a different character.
++- Targeting or harassing a character based on anything which that character did in a previous round.
++- Targeting or harassing a character based on anything which the character's player did while not playing the character.
+ 
+-  Being suspicious of an item being fake or stolen is not shielded, but testing items or calling them chameleon is covered by this shield.
+ 
+-  The revealing condition for this shield is any of the following:
+-  - seeing someone else cause any chameleon item to change
+-  - finding holographic nanomachine fibers
+-  - experiencing a situation where absolutely no other explanation is possible
+-  - discovering an unlocked uplink
++## Explicitly Not Metagaming
+ 
+-  ## Stealth Items
+-
+-  The fact that an item can be something other than what its visual appearance and examine description indicate is shielded.
+-
+-  This shield protects stealth items, including protecting them from being tested.
+-
+-  The revealing condition for this shield is any of the following:
+-  - seeing the item behave differently than the expected behavior for the item
+-  - seeing the item used for its hidden purpose
+-  - experiencing a situation where absolutely no other explanation is possible
+-  - discovering an unlocked uplink
+-
+-  ## MRP Amendment 1
+-  A shield prevents your character from remembering anything that happened while unconscious. This shield is never revealed IC.
+-
+-  ## MRP Amendment 2
+-  There is a "New Life Rule" shield. It prevents you from remembering anything that lead to your death, even if you are put into an MMI. If you are cloned, it also prevents you from remembering everything from that round. This shield is never revealed IC.
+-
+-  ## Metafriending and Metagrudging
+-  This section provides additional information on a concept that is prohibited by multiple metashield items that are never revealed IC. Giving a person or character preferential treatment based on something that your character should not know is considered metafriending. Treating a person or character negatively based on something that your character should not know is considered metagrudging.
+-
+-  ## Metafriending Examples
+-  These are all examples of things that are prohibited by at least one metashield item that is never revealed IC.
+-  - Giving a character additional access or a job because you are friends with the player who is playing that character.
+-  - Trusting a character because you are friends with the player who is playing that character.
+-  - Not fighting a character because you are friends with the player who is playing that character.
+-  - Ignoring your objective to kill a character because your character and theirs became friends in a previous round.
+-
+-  ## Metagrudging Examples
+-  These are all examples of things that are prohibited by at least one metashield item that is never revealed IC.
+-  - Not giving a character additional access or a job because you are mad at or don't like the player who is playing that character.
+-  - Not trusting a character because you are mad at or don't like the player who is playing that character.
+-  - Starting a fight with a character because of something that they did last round.
+-  - Starting a fight with a character because they killed you while you were playing a different character.
+-  - Targeting or harassing a character based on anything which that character did outside the current round.
+-  - Targeting or harassing a character based on anything which the character's player did while not playing the character.
+-
+-  ## Explicitly Not Shielded
+-  The following is a list of things that are explicitly not shielded. If something is not on this list, it doesn't mean that it is shielded, but if something is on it then it definitely is not shielded.
+-  - The fact that the nuke disk must be protected and could be used by a bad actor to try to destroy the station.
+-  - Items that are of high value or are desired by the Syndicate, and therefore are likely targets of theft.
+-  - The idea that any Syndicate agent or other bad actor has goals or objectives that they are attempting to accomplish.
+-  - The number of goals or objectives that a Syndicate agent or other bad actor has.
+-  - The fact that the Syndicate are enemies of Nanotrasen, and that they regularly attempt to send covert agents to spy on, sabotage, or attack Nanotrasen.
+-  - A character's typical appearance. Though you should keep in mind that multiple characters can share the same name.
+-  - The fact that the Syndicate have covert items capable of getting items to them, and that these items are known as uplinks.
+-  - The fact that the Syndicate can provide subdermal implants to their agents with various capabilities.
++- Protecting high value crew items (will be labeled as such), such as the nuke disk, with the understanding that a bad actor may attempt to steal or use them.
++- Remembering the general events of previous rounds (shifts) up to the extent that you do not metagrudge or metafriend any other player or character, remembering that you survived a violent shooting in the medbay is acceptable for example, stating who the shooter was is not. Avoid making remarks about specific characters, such as calling out someone who was an antagonist in a prior round.
++- The fact that antagonists exist and may be present on or off the station in any form.
++- Knowledge of a characters typical appearance.
++- Using knowledge of a characters typical appearance including your own for a disguise, such as a nuclear operative disguising as themselves as crew.
++- Knowing that enemies may have concealed items that may have function that are not immediately apparent.
+ </Document>
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-dog.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-dog.png
rename to Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-dog.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-vox.png
rename to Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-vox.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json
index 88dabe491ab7..4cdc059df8af 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json
@@ -10,31 +10,49 @@
         {
             "name": "icon"
         },
+        {
+            "name": "icon-unshaded"
+        },
         {
             "name": "icon-flash"
         },
         {
-            "name": "off-equipped-HELMET",
+            "name": "light-overlay"
+        },
+        {
+            "name": "equipped-head",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-light",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-unshaded",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-vox",
             "directions": 4
         },
         {
-            "name": "on-equipped-HELMET",
+            "name": "equipped-head-light-vox",
             "directions": 4
         },
         {
-            "name": "off-equipped-HELMET-vox",
+            "name": "equipped-head-unshaded-vox",
             "directions": 4
         },
         {
-            "name": "on-equipped-HELMET-vox",
+            "name": "equipped-head-dog",
             "directions": 4
         },
         {
-            "name": "off-equipped-HELMET-dog",
+            "name": "equipped-head-light-dog",
             "directions": 4
         },
         {
-            "name": "on-equipped-HELMET-dog",
+            "name": "equipped-head-unshaded-dog",
             "directions": 4
         }
     ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-dog.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-dog.png
rename to Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-dog.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-vox.png
rename to Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-vox.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json
index 9f81ae9002e5..4cdc059df8af 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json
@@ -10,31 +10,49 @@
         {
             "name": "icon"
         },
+        {
+            "name": "icon-unshaded"
+        },
         {
             "name": "icon-flash"
         },
         {
-            "name": "off-equipped-HELMET",
+            "name": "light-overlay"
+        },
+        {
+            "name": "equipped-head",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-light",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-unshaded",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-vox",
             "directions": 4
         },
         {
-            "name": "off-equipped-HELMET-vox",
+            "name": "equipped-head-light-vox",
             "directions": 4
         },
         {
-            "name": "off-equipped-HELMET-dog",
+            "name": "equipped-head-unshaded-vox",
             "directions": 4
         },
         {
-            "name": "on-equipped-HELMET",
+            "name": "equipped-head-dog",
             "directions": 4
         },
         {
-            "name": "on-equipped-HELMET-vox",
+            "name": "equipped-head-light-dog",
             "directions": 4
         },
         {
-            "name": "on-equipped-HELMET-dog",
+            "name": "equipped-head-unshaded-dog",
             "directions": 4
         }
     ]
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
index 6875bbef5967..2a2932d3bf89 100644
--- a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9, Module actions by Scarky0. chem, adv-chem, and adv-mining by mubururu_, xenoborg actions by Samuka-C (github)",
+    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9, Module actions by Scarky0. chem, adv-chem, and adv-mining by mubururu_, xenoborg actions by Samuka-C (github), advclown by ThatGuyUSA",
     "size": {
         "x": 32,
         "y": 32
@@ -103,6 +103,9 @@
         {
             "name":"clowning-module"
         },
+        {
+            "name":"adv-clowning-module"
+        },
         {
             "name":"syndicate-weapon-module"
         },
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
index 8e594ae63a88..7c8c0168d462 100644
--- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord) | QuarterMaster modified by K-Dynamic (github)",
     "size": {
         "x": 8,
         "y": 8
diff --git a/Resources/Textures/Mobs/Silicon/holograms.rsi/meta.json b/Resources/Textures/Mobs/Silicon/holograms.rsi/meta.json
index 711bc7958deb..8eaf9165d38b 100644
--- a/Resources/Textures/Mobs/Silicon/holograms.rsi/meta.json
+++ b/Resources/Textures/Mobs/Silicon/holograms.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/blob/e2923df112df8aa025846d0764697bad6506586a/icons/mob/AI.dmi - modified by chromiumboy. Kobold/monkey sprites taken from SS14 Wizard's Den at https://github.com/space-wizards/space-station-14/tree/f574990b11db5936de3635a4273d5eb26217882e/Resources/Textures/Mobs/Animals, modified by Hitlinemoss",
+    "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/blob/e2923df112df8aa025846d0764697bad6506586a/icons/mob/AI.dmi - modified by chromiumboy.",
     "size": {
         "x": 32,
         "y": 32
@@ -33,12 +33,6 @@
         },
         {
             "name": "ai_dog"
-        },
-        {
-            "name": "ai_kobold"
-        },
-        {
-            "name": "ai_monkey"
         }
     ]
 }
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
index 0c910f85e564..e46ca5602494 100644
--- a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
@@ -26,6 +26,10 @@
             "name": "head",
             "directions": 4
         },
+        {
+            "name": "neck",
+            "directions": 4
+        },
         {
             "name": "ears",
             "directions": 4
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
index f54a9cfcc960..c8d773339d67 100644
--- a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, inhands by mubururu_ (github)",
+    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, inhands by mubururu_ (github), cotton cake sprites by DispenserG0inUp, berry delighht sprites by FairlySadPanda (Github)",
     "size": {
         "x": 32,
         "y": 32
@@ -308,6 +308,34 @@
         {
             "name": "lemoon-slice"
 
+        },
+		{
+            "name": "cotton"
+        },
+        {
+            "name": "cotton-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "cotton-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "cotton-slice"
+        },
+        {
+            "name": "cotton-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "cotton-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "berry_delight"
+        },
+        {
+            "name": "berry_delight_slice"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/meta.json b/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/meta.json
new file mode 100644
index 000000000000..0ad72a5acd6c
--- /dev/null
+++ b/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/meta.json
@@ -0,0 +1,82 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+     "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f4017da82ae4de7bfaf8ebdbba33d0de81c15587, and resprited by ThatGuyUSA (github). Inhands by TiniestShark (github)",
+    "states": [
+        {
+            "name": "icon",
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json.rej b/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json.rej
new file mode 100644
index 000000000000..c613b00aedd7
--- /dev/null
+++ b/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json.rej
@@ -0,0 +1,10 @@
+diff a/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json b/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json	(rejected hunks)
+@@ -5,7 +5,7 @@
+         "y": 32
+     },
+     "license": "CC-BY-SA-3.0",
+-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, station and syndicate pinpointer resprited by Ubaser, inhands by TiniestShark (github)",
++    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, station and syndicate pinpointer resprited by Ubaser, inhands by TiniestShark (github). Modified by @whatston3 and @Quantum-cross (github) to center the sprite so arrow rotation is around the proper axis.",
+     "states": [
+         {
+             "name": "pinonalert",
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json.rej b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json.rej
new file mode 100644
index 000000000000..e2a4691db882
--- /dev/null
+++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json.rej
@@ -0,0 +1,10 @@
+diff a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json	(rejected hunks)
+@@ -1,7 +1,7 @@
+ {
+     "version": 1,
+     "license": "CC-BY-SA-3.0",
+-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0 | idboxer and idlawyer recoloured by K-Dynamic (github).",
++    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0 | idboxer and idlawyer recoloured by K-Dynamic (github) | idquartermaster modified by K-Dynamic (github)",
+     "size": {
+         "x": 32,
+         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
index 74ae33be16fd..545259a0941c 100644
--- a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
@@ -37,6 +37,9 @@
         {
             "name": "icon-clown"
         },
+        {
+            "name": "icon-clown-adv"
+        },
         {
             "name": "icon-construction"
         },
diff --git a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/meta.json b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/meta.json
index 664e16d42c20..5a890d67d5c3 100644
--- a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/meta.json
@@ -1,23 +1,23 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "icon from potato.rsi & modified activated by Prole0 (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "activated",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
-}
\ No newline at end of file
+    "states": [
+        {
+      "name": "icon"
+        },
+        {
+            "name": "activated",
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Parallaxes/attributions.yml b/Resources/Textures/Parallaxes/attributions.yml
index 8495a92a119f..808f3748bbee 100644
--- a/Resources/Textures/Parallaxes/attributions.yml
+++ b/Resources/Textures/Parallaxes/attributions.yml
@@ -14,7 +14,7 @@
   copyright: "by Adipemdragon for tgstation, taken at commit 3839e860a7f3102b1488285d3319f61bbfe1fa51 from parallax.dmi"
   source: "https://github.com/tgstation/tgstation"
 
-- files: ["KettleParallaxNeb.png", "KettleParallaxBG.png", "AspidParallaxBG.png", "AspidParallaxBG.png"]
+- files: ["KettleParallaxNeb.png", "KettleParallaxBG.png", "AspidParallaxBG.png", "AspidParallaxBG.png", "purple_nebula.png"]
   license: "CC0-1.0"
   copyright: "adapted from Screaming Brain Studios"
   source: "https://opengameart.org/content/seamless-space-backgrounds"
diff --git a/Resources/Textures/Structures/Holo/peel.rsi/meta.json b/Resources/Textures/Structures/Holo/peel.rsi/meta.json
new file mode 100644
index 000000000000..d6d84c40e610
--- /dev/null
+++ b/Resources/Textures/Structures/Holo/peel.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by thatguyusa (discord) / ThatGuyUSA (github) for SS14",
+    "states": [
+        {
+            "name": "icon",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json b/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json
index 57ea3f50a51d..dc93307bc3f8 100644
--- a/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json
+++ b/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json
@@ -6,6 +6,7 @@
     "x": 32,
     "y": 32
   },
+  "rsic": false,
   "states": [
     {
       "name": "dirt"
diff --git a/Resources/engineCommandPerms.yml b/Resources/engineCommandPerms.yml
index 4da1ed804a3f..db652a7f0f06 100644
--- a/Resources/engineCommandPerms.yml
+++ b/Resources/engineCommandPerms.yml
@@ -64,6 +64,9 @@
   - hwid
   - showaudio
   - showpos
+  - showvel
+  - showrot
+  - showangvel
   - showray
   - showchunkbb
   - showgridnodes
@@ -84,7 +87,7 @@
   - watch
   - sendgarbage
   - setinputcontext
-  - showvelocities
+  - showplayervelocity
   - tilelookup
   - net_entityreport
   - scene
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 28a91ba6477b..9ff4d88413a2 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -1053,3 +1053,6 @@ BarSignWhiskeyEchoesAlignTile: BarSignWhiskeyEchoes
 
 # 2025-06-21
 ClothingNeckHeadphones: ClothingMultipleHeadphones
+
+# 2025-08-01
+FoodDonutJellySlugcat: FoodDonutJellyScurret