diff --git a/Content.Client/Buckle/BuckleSystem.cs b/Content.Client/Buckle/BuckleSystem.cs
index fea18e5cf3c..d4614210d9f 100644
--- a/Content.Client/Buckle/BuckleSystem.cs
+++ b/Content.Client/Buckle/BuckleSystem.cs
@@ -50,17 +50,11 @@ private void OnBuckleAfterAutoHandleState(EntityUid uid, BuckleComponent compone
 
     private void OnAppearanceChange(EntityUid uid, BuckleComponent component, ref AppearanceChangeEvent args)
     {
-        if (!TryComp<RotationVisualsComponent>(uid, out var rotVisuals))
+        if (!TryComp<RotationVisualsComponent>(uid, out var rotVisuals)
+            || !Appearance.TryGetData<bool>(uid, BuckleVisuals.Buckled, out var buckled, args.Component)
+            || !buckled || args.Sprite == null)
             return;
 
-        if (!Appearance.TryGetData<bool>(uid, BuckleVisuals.Buckled, out var buckled, args.Component) ||
-            !buckled ||
-            args.Sprite == null)
-        {
-            _rotationVisualizerSystem.SetHorizontalAngle((uid, rotVisuals), rotVisuals.DefaultRotation);
-            return;
-        }
-
         // Animate strapping yourself to something at a given angle
         // TODO: Dump this when buckle is better
         _rotationVisualizerSystem.AnimateSpriteRotation(uid, args.Sprite, rotVisuals.HorizontalRotation, 0.125f);
diff --git a/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml b/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml
deleted file mode 100644
index f1dae68077d..00000000000
--- a/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml
+++ /dev/null
@@ -1,23 +0,0 @@
-<tabs:DeltaTab xmlns="https://spacestation14.io"
-                  xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                  xmlns:tabs="clr-namespace:Content.Client.DeltaV.Options.UI.Tabs"
-                  xmlns:xNamespace="http://schemas.microsoft.com/winfx/2006/xaml"
-                  xmlns:s="clr-namespace:Content.Client.Stylesheets">
-    <BoxContainer Orientation="Vertical">
-        <BoxContainer Orientation="Vertical" Margin="8 8 8 8" VerticalExpand="True">
-            <Label Text="{Loc 'ui-options-general-forknotice'}"
-                   FontColorOverride="{xNamespace:Static s:StyleNano.ConcerningOrangeFore}"
-                   StyleClasses="LabelKeyText"/>
-            <Label Text="{Loc 'ui-options-general-accessibility'}"
-                   FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
-                   StyleClasses="LabelKeyText"/>
-            <CheckBox Name="DisableFiltersCheckBox" Text="{Loc 'ui-options-no-filters'}" />
-        </BoxContainer>
-        <controls:StripeBack HasBottomEdge="False" HasMargins="False">
-            <Button Name="ApplyButton"
-                    Text="{Loc 'ui-options-apply'}"
-                    TextAlign="Center"
-                    HorizontalAlignment="Right" />
-        </controls:StripeBack>
-    </BoxContainer>
-</tabs:DeltaTab>
diff --git a/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml.cs b/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml.cs
deleted file mode 100644
index 892ddfc15bf..00000000000
--- a/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using Content.Shared.DeltaV.CCVars;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Configuration;
-
-namespace Content.Client.DeltaV.Options.UI.Tabs;
-
-[GenerateTypedNameReferences]
-public sealed partial class DeltaTab : Control
-{
-    [Dependency] private readonly IConfigurationManager _cfg = default!;
-
-    public DeltaTab()
-    {
-        RobustXamlLoader.Load(this);
-        IoCManager.InjectDependencies(this);
-
-        DisableFiltersCheckBox.OnToggled += OnCheckBoxToggled;
-        DisableFiltersCheckBox.Pressed = _cfg.GetCVar(DCCVars.NoVisionFilters);
-
-        ApplyButton.OnPressed += OnApplyButtonPressed;
-        UpdateApplyButton();
-    }
-
-    private void OnCheckBoxToggled(BaseButton.ButtonToggledEventArgs args)
-    {
-        UpdateApplyButton();
-    }
-
-    private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
-    {
-        _cfg.SetCVar(DCCVars.NoVisionFilters, DisableFiltersCheckBox.Pressed);
-
-        _cfg.SaveToFile();
-        UpdateApplyButton();
-    }
-
-    private void UpdateApplyButton()
-    {
-        var isNoVisionFiltersSame = DisableFiltersCheckBox.Pressed == _cfg.GetCVar(DCCVars.NoVisionFilters);
-
-        ApplyButton.Disabled = isNoVisionFiltersSame;
-    }
-}
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
index 503a9ac953b..0e56153752d 100644
--- a/Content.Client/Input/ContentContexts.cs
+++ b/Content.Client/Input/ContentContexts.cs
@@ -82,6 +82,7 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.Arcade1);
             human.AddFunction(ContentKeyFunctions.Arcade2);
             human.AddFunction(ContentKeyFunctions.Arcade3);
+            human.AddFunction(ContentKeyFunctions.LookUp);
 
             // actions should be common (for ghosts, mobs, etc)
             common.AddFunction(ContentKeyFunctions.OpenActionsMenu);
diff --git a/Content.Client/Options/UI/OptionsMenu.xaml b/Content.Client/Options/UI/OptionsMenu.xaml
index 69daaa2cea7..ab3b88ca4e6 100644
--- a/Content.Client/Options/UI/OptionsMenu.xaml
+++ b/Content.Client/Options/UI/OptionsMenu.xaml
@@ -1,6 +1,5 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
-            xmlns:dtabs="clr-namespace:Content.Client.DeltaV.Options.UI.Tabs"
             Title="{Loc 'ui-options-title'}"
             MinSize="800 450">
     <TabContainer Name="Tabs" Access="Public">
@@ -9,6 +8,5 @@
         <tabs:KeyRebindTab Name="KeyRebindTab" />
         <tabs:AudioTab Name="AudioTab" />
         <tabs:NetworkTab Name="NetworkTab" />
-        <dtabs:DeltaTab Name="DeltaTab" />
     </TabContainer>
 </DefaultWindow>
diff --git a/Content.Client/Options/UI/OptionsMenu.xaml.cs b/Content.Client/Options/UI/OptionsMenu.xaml.cs
index bb2c1ce0ed9..c3a8e664705 100644
--- a/Content.Client/Options/UI/OptionsMenu.xaml.cs
+++ b/Content.Client/Options/UI/OptionsMenu.xaml.cs
@@ -20,7 +20,6 @@ public OptionsMenu()
             Tabs.SetTabTitle(2, Loc.GetString("ui-options-tab-controls"));
             Tabs.SetTabTitle(3, Loc.GetString("ui-options-tab-audio"));
             Tabs.SetTabTitle(4, Loc.GetString("ui-options-tab-network"));
-            Tabs.SetTabTitle(5, Loc.GetString("ui-options-tab-deltav")); // DeltaV specific settings
 
             UpdateTabs();
         }
diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index 198eb5e4fb0..ab4ebd83fa7 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -97,6 +97,12 @@ private void HandleToggleWalk(BaseButton.ButtonToggledEventArgs args)
             _deferCommands.Add(_inputManager.SaveToUserData);
         }
 
+        private void HandleHoldLookUp(BaseButton.ButtonToggledEventArgs args)
+        {
+            _cfg.SetCVar(CCVars.HoldLookUp, args.Pressed);
+            _cfg.SaveToFile();
+        }
+        
         private void HandleDefaultWalk(BaseButton.ButtonToggledEventArgs args)
         {
             _cfg.SetCVar(CCVars.DefaultWalk, args.Pressed);
@@ -109,6 +115,12 @@ private void HandleStaticStorageUI(BaseButton.ButtonToggledEventArgs args)
             _cfg.SaveToFile();
         }
 
+        private void HandleToggleAutoGetUp(BaseButton.ButtonToggledEventArgs args)
+        {
+            _cfg.SetCVar(CCVars.AutoGetUp, args.Pressed);
+            _cfg.SaveToFile();
+        }
+
         public KeyRebindTab()
         {
             IoCManager.InjectDependencies(this);
@@ -193,6 +205,9 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.OfferItem);
             AddButton(ContentKeyFunctions.SaveItemLocation);
             AddButton(ContentKeyFunctions.ToggleStanding);
+            AddButton(ContentKeyFunctions.LookUp);
+            AddCheckBox("ui-options-function-auto-get-up", _cfg.GetCVar(CCVars.AutoGetUp), HandleToggleAutoGetUp);
+            AddCheckBox("ui-options-function-hold-look-up", _cfg.GetCVar(CCVars.HoldLookUp), HandleHoldLookUp);
 
             AddHeader("ui-options-header-interaction-adv");
             AddButton(ContentKeyFunctions.SmartEquipBackpack);
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml b/Content.Client/Options/UI/Tabs/MiscTab.xaml
index 96df9f23570..fcd3cceece7 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml
@@ -25,6 +25,7 @@
                 <CheckBox Name="ReducedMotionCheckBox" Text="{Loc 'ui-options-reduced-motion'}" />
                 <CheckBox Name="EnableColorNameCheckBox" Text="{Loc 'ui-options-enable-color-name'}" />
                 <CheckBox Name="ColorblindFriendlyCheckBox" Text="{Loc 'ui-options-colorblind-friendly'}" />
+                <CheckBox Name="DisableFiltersCheckBox" Text="{Loc 'ui-options-no-filters'}" />
                 <BoxContainer Orientation="Horizontal">
                     <Label Text="{Loc 'ui-options-chat-window-opacity'}" Margin="8 0" />
                     <Slider Name="ChatWindowOpacitySlider"
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
index 70c4f489321..96965371763 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
@@ -80,6 +80,7 @@ public MiscTab()
             ScreenShakeIntensitySlider.OnValueChanged += OnScreenShakeIntensitySliderChanged;
             // ToggleWalk.OnToggled += OnCheckBoxToggled;
             StaticStorageUI.OnToggled += OnCheckBoxToggled;
+            DisableFiltersCheckBox.OnToggled += OnCheckBoxToggled;
 
             HudThemeOption.SelectId(_hudThemeIdToIndex.GetValueOrDefault(_cfg.GetCVar(CVars.InterfaceTheme), 0));
             DiscordRich.Pressed = _cfg.GetCVar(CVars.DiscordEnabled);
@@ -98,6 +99,7 @@ public MiscTab()
             ScreenShakeIntensitySlider.Value = _cfg.GetCVar(CCVars.ScreenShakeIntensity) * 100f;
             // ToggleWalk.Pressed = _cfg.GetCVar(CCVars.ToggleWalk);
             StaticStorageUI.Pressed = _cfg.GetCVar(CCVars.StaticStorageUI);
+            DisableFiltersCheckBox.Pressed = _cfg.GetCVar(CCVars.NoVisionFilters);
 
 
             ApplyButton.OnPressed += OnApplyButtonPressed;
@@ -154,6 +156,7 @@ private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
             _cfg.SetCVar(CCVars.ScreenShakeIntensity, ScreenShakeIntensitySlider.Value / 100f);
             // _cfg.SetCVar(CCVars.ToggleWalk, ToggleWalk.Pressed);
             _cfg.SetCVar(CCVars.StaticStorageUI, StaticStorageUI.Pressed);
+            _cfg.SetCVar(CCVars.NoVisionFilters, DisableFiltersCheckBox.Pressed);
 
             if (HudLayoutOption.SelectedMetadata is string opt)
             {
@@ -184,6 +187,7 @@ private void UpdateApplyButton()
             var isScreenShakeIntensitySame = Math.Abs(ScreenShakeIntensitySlider.Value / 100f - _cfg.GetCVar(CCVars.ScreenShakeIntensity)) < 0.01f;
             // var isToggleWalkSame = ToggleWalk.Pressed == _cfg.GetCVar(CCVars.ToggleWalk);
             var isStaticStorageUISame = StaticStorageUI.Pressed == _cfg.GetCVar(CCVars.StaticStorageUI);
+            var isNoVisionFiltersSame = DisableFiltersCheckBox.Pressed == _cfg.GetCVar(CCVars.NoVisionFilters);
 
             ApplyButton.Disabled = isHudThemeSame &&
                                    isLayoutSame &&
@@ -202,7 +206,8 @@ private void UpdateApplyButton()
                                    isChatWindowOpacitySame &&
                                    isScreenShakeIntensitySame &&
                                    // isToggleWalkSame &&
-                                   isStaticStorageUISame;
+                                   isStaticStorageUISame &&
+                                   isNoVisionFiltersSame;
         }
 
     }
diff --git a/Content.Client/Overlays/DogVisionSystem.cs b/Content.Client/Overlays/DogVisionSystem.cs
index 9eab2e09aff..5c80c307cb3 100644
--- a/Content.Client/Overlays/DogVisionSystem.cs
+++ b/Content.Client/Overlays/DogVisionSystem.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Traits.Assorted.Components;
-using Content.Shared.DeltaV.CCVars;
+using Content.Shared.CCVar;
 using Robust.Client.Graphics;
 using Robust.Shared.Configuration;
 using Robust.Shared.Player;
@@ -23,7 +23,7 @@ public override void Initialize()
         SubscribeLocalEvent<DogVisionComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
         SubscribeLocalEvent<DogVisionComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
 
-        Subs.CVar(_cfg, DCCVars.NoVisionFilters, OnNoVisionFiltersChanged);
+        Subs.CVar(_cfg, CCVars.NoVisionFilters, OnNoVisionFiltersChanged);
 
         _overlay = new();
     }
@@ -33,7 +33,7 @@ private void OnDogVisionInit(EntityUid uid, DogVisionComponent component, Compon
         if (uid != _playerMan.LocalEntity)
             return;
 
-        if (!_cfg.GetCVar(DCCVars.NoVisionFilters))
+        if (!_cfg.GetCVar(CCVars.NoVisionFilters))
             _overlayMan.AddOverlay(_overlay);
     }
 
@@ -47,7 +47,7 @@ private void OnDogVisionShutdown(EntityUid uid, DogVisionComponent component, Co
 
     private void OnPlayerAttached(EntityUid uid, DogVisionComponent component, LocalPlayerAttachedEvent args)
     {
-        if (!_cfg.GetCVar(DCCVars.NoVisionFilters))
+        if (!_cfg.GetCVar(CCVars.NoVisionFilters))
             _overlayMan.AddOverlay(_overlay);
     }
 
diff --git a/Content.Client/Overlays/UltraVisionSystem.cs b/Content.Client/Overlays/UltraVisionSystem.cs
index 7728a647848..e8e6cdfa72b 100644
--- a/Content.Client/Overlays/UltraVisionSystem.cs
+++ b/Content.Client/Overlays/UltraVisionSystem.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Traits.Assorted.Components;
-using Content.Shared.DeltaV.CCVars;
+using Content.Shared.CCVar;
 using Robust.Client.Graphics;
 using Robust.Shared.Configuration;
 using Robust.Shared.Player;
@@ -23,7 +23,7 @@ public override void Initialize()
         SubscribeLocalEvent<UltraVisionComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
         SubscribeLocalEvent<UltraVisionComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
 
-        Subs.CVar(_cfg, DCCVars.NoVisionFilters, OnNoVisionFiltersChanged);
+        Subs.CVar(_cfg, CCVars.NoVisionFilters, OnNoVisionFiltersChanged);
 
         _overlay = new();
     }
@@ -33,7 +33,7 @@ private void OnUltraVisionInit(EntityUid uid, UltraVisionComponent component, Co
         if (uid != _playerMan.LocalEntity)
             return;
 
-        if (!_cfg.GetCVar(DCCVars.NoVisionFilters))
+        if (!_cfg.GetCVar(CCVars.NoVisionFilters))
             _overlayMan.AddOverlay(_overlay);
     }
 
@@ -47,7 +47,7 @@ private void OnUltraVisionShutdown(EntityUid uid, UltraVisionComponent component
 
     private void OnPlayerAttached(EntityUid uid, UltraVisionComponent component, LocalPlayerAttachedEvent args)
     {
-        if (!_cfg.GetCVar(DCCVars.NoVisionFilters))
+        if (!_cfg.GetCVar(CCVars.NoVisionFilters))
             _overlayMan.AddOverlay(_overlay);
     }
 
diff --git a/Content.Client/Standing/LayingDownSystem.cs b/Content.Client/Standing/LayingDownSystem.cs
new file mode 100644
index 00000000000..594883ac001
--- /dev/null
+++ b/Content.Client/Standing/LayingDownSystem.cs
@@ -0,0 +1,71 @@
+using Content.Shared.Buckle;
+using Content.Shared.Rotation;
+using Content.Shared.Standing;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Standing;
+
+public sealed class LayingDownSystem : SharedLayingDownSystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IEyeManager _eyeManager = default!;
+    [Dependency] private readonly StandingStateSystem _standing = default!;
+    [Dependency] private readonly AnimationPlayerSystem _animation = default!;
+    [Dependency] private readonly SharedBuckleSystem _buckle = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<LayingDownComponent, MoveEvent>(OnMovementInput);
+
+        SubscribeNetworkEvent<CheckAutoGetUpEvent>(OnCheckAutoGetUp);
+    }
+
+    private void OnMovementInput(EntityUid uid, LayingDownComponent component, MoveEvent args)
+    {
+        if (!_timing.IsFirstTimePredicted
+            || !_standing.IsDown(uid)
+            || _buckle.IsBuckled(uid)
+            || _animation.HasRunningAnimation(uid, "rotate")
+            || !TryComp<TransformComponent>(uid, out var transform)
+            || !TryComp<SpriteComponent>(uid, out var sprite)
+            || !TryComp<RotationVisualsComponent>(uid, out var rotationVisuals))
+            return;
+
+        var rotation = transform.LocalRotation + (_eyeManager.CurrentEye.Rotation - (transform.LocalRotation - transform.WorldRotation));
+
+        if (rotation.GetDir() is Direction.SouthEast or Direction.East or Direction.NorthEast or Direction.North)
+        {
+            rotationVisuals.HorizontalRotation = Angle.FromDegrees(270);
+            sprite.Rotation = Angle.FromDegrees(270);
+            return;
+        }
+
+        rotationVisuals.HorizontalRotation = Angle.FromDegrees(90);
+        sprite.Rotation = Angle.FromDegrees(90);
+    }
+
+    private void OnCheckAutoGetUp(CheckAutoGetUpEvent ev, EntitySessionEventArgs args)
+    {
+        if (!_timing.IsFirstTimePredicted)
+            return;
+
+        var uid = GetEntity(ev.User);
+
+        if (!TryComp<TransformComponent>(uid, out var transform) || !TryComp<RotationVisualsComponent>(uid, out var rotationVisuals))
+            return;
+
+        var rotation = transform.LocalRotation + (_eyeManager.CurrentEye.Rotation - (transform.LocalRotation - transform.WorldRotation));
+
+        if (rotation.GetDir() is Direction.SouthEast or Direction.East or Direction.NorthEast or Direction.North)
+        {
+            rotationVisuals.HorizontalRotation = Angle.FromDegrees(270);
+            return;
+        }
+
+        rotationVisuals.HorizontalRotation = Angle.FromDegrees(90);
+    }
+}
diff --git a/Content.Client/Telescope/TelescopeSystem.cs b/Content.Client/Telescope/TelescopeSystem.cs
new file mode 100644
index 00000000000..ac2270aa971
--- /dev/null
+++ b/Content.Client/Telescope/TelescopeSystem.cs
@@ -0,0 +1,128 @@
+using System.Numerics;
+using Content.Client.Viewport;
+using Content.Shared.CCVar;
+using Content.Shared.Telescope;
+using Content.Shared.Input;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.Input;
+using Robust.Client.Player;
+using Robust.Client.UserInterface;
+using Robust.Shared.Configuration;
+using Robust.Shared.Input;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Telescope;
+
+public sealed class TelescopeSystem : SharedTelescopeSystem
+{
+    [Dependency] private readonly InputSystem _inputSystem = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IInputManager _input = default!;
+    [Dependency] private readonly IEyeManager _eyeManager = default!;
+    [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    private ScalingViewport? _viewport;
+    private bool _holdLookUp;
+    private bool _toggled;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _cfg.OnValueChanged(CCVars.HoldLookUp,
+            val =>
+            {
+                var input = val ? null : InputCmdHandler.FromDelegate(_ => _toggled = !_toggled);
+                _input.SetInputCommand(ContentKeyFunctions.LookUp, input);
+                _holdLookUp = val;
+                _toggled = false;
+            },
+            true);
+    }
+
+    public override void FrameUpdate(float frameTime)
+    {
+        base.FrameUpdate(frameTime);
+
+        if (_timing.ApplyingState
+            || !_timing.IsFirstTimePredicted
+            || !_input.MouseScreenPosition.IsValid)
+            return;
+
+        var player = _player.LocalEntity;
+
+        var telescope = GetRightTelescope(player);
+
+        if (telescope == null)
+        {
+            _toggled = false;
+            return;
+        }
+
+        if (!TryComp<EyeComponent>(player, out var eye))
+            return;
+
+        var offset = Vector2.Zero;
+
+        if (_holdLookUp)
+        {
+            if (_inputSystem.CmdStates.GetState(ContentKeyFunctions.LookUp) != BoundKeyState.Down)
+            {
+                RaiseEvent(offset);
+                return;
+            }
+        }
+        else if (!_toggled)
+        {
+            RaiseEvent(offset);
+            return;
+        }
+
+        var mousePos = _input.MouseScreenPosition;
+
+        if (_uiManager.MouseGetControl(mousePos) as ScalingViewport is { } viewport)
+            _viewport = viewport;
+
+        if (_viewport == null)
+            return;
+
+        var centerPos = _eyeManager.WorldToScreen(eye.Eye.Position.Position + eye.Offset);
+
+        var diff = mousePos.Position - centerPos;
+        var len = diff.Length();
+
+        var size = _viewport.PixelSize;
+
+        var maxLength = Math.Min(size.X, size.Y) * 0.4f;
+        var minLength = maxLength * 0.2f;
+
+        if (len > maxLength)
+        {
+            diff *= maxLength / len;
+            len = maxLength;
+        }
+
+        var divisor = maxLength * telescope.Divisor;
+
+        if (len > minLength)
+        {
+            diff -= diff * minLength / len;
+            offset = new Vector2(diff.X / divisor, -diff.Y / divisor);
+            offset = new Angle(-eye.Rotation.Theta).RotateVec(offset);
+        }
+
+        RaiseEvent(offset);
+    }
+
+    private void RaiseEvent(Vector2 offset)
+    {
+        RaisePredictiveEvent(new EyeOffsetChangedEvent
+        {
+            Offset = offset
+        });
+    }
+}
diff --git a/Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.cs b/Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.cs
index 32e51d3c101..536235b6d63 100644
--- a/Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.cs
+++ b/Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.cs
@@ -12,6 +12,7 @@
 using System.Linq;
 using Robust.Server.Player;
 using Content.Server.Chat.Managers;
+using Content.Server.Psionics.Glimmer;
 
 namespace Content.Server.Abilities.Psionics
 {
@@ -122,6 +123,8 @@ public void InitializePsionicPower(EntityUid uid, PsionicPowerPrototype proto, P
             AddPsionicStatSources(proto, psionic);
             RefreshPsionicModifiers(uid, psionic);
             SendFeedbackMessage(uid, proto, playFeedback);
+            UpdatePowerSlots(psionic);
+            //UpdatePsionicDanger(uid, psionic); // TODO: After Glimmer Refactor
             //SendFeedbackAudio(uid, proto, playPopup); // TODO: This one is coming next!
         }
 
@@ -297,6 +300,27 @@ private void SendFeedbackMessage(EntityUid uid, PsionicPowerPrototype proto, boo
                 session.Channel);
         }
 
+        private void UpdatePowerSlots(PsionicComponent psionic)
+        {
+            var slotsUsed = 0;
+            foreach (var power in psionic.ActivePowers)
+                slotsUsed += power.PowerSlotCost;
+
+            psionic.PowerSlotsTaken = slotsUsed;
+        }
+
+        /// <summary>
+        ///     Psions over a certain power threshold become a glimmer source. This cannot be fully implemented until after I rework Glimmer
+        /// </summary>
+        //private void UpdatePsionicDanger(EntityUid uid, PsionicComponent psionic)
+        //{
+        //   if (psionic.PowerSlotsTaken <= psionic.PowerSlots)
+        //        return;
+        //
+        //    EnsureComp<GlimmerSourceComponent>(uid, out var glimmerSource);
+        //    glimmerSource.SecondsPerGlimmer = 10 / (psionic.PowerSlotsTaken - psionic.PowerSlots);
+        //}
+
         /// <summary>
         ///     Remove all Psychic Actions listed in an entity's Psionic Component. Unfortunately, removing actions associated with a specific Power Prototype is not supported.
         /// </summary>
diff --git a/Content.Server/Administration/Commands/SetOutfitCommand.cs b/Content.Server/Administration/Commands/SetOutfitCommand.cs
index 2f979f4340b..12312286518 100644
--- a/Content.Server/Administration/Commands/SetOutfitCommand.cs
+++ b/Content.Server/Administration/Commands/SetOutfitCommand.cs
@@ -13,6 +13,7 @@
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Content.Server.Silicon.IPC;
+using Content.Shared.Radio.Components;
 
 namespace Content.Server.Administration.Commands
 {
@@ -127,7 +128,12 @@ public static bool SetOutfit(EntityUid target, string gear, IEntityManager entit
                     handsSystem.TryPickup(target, inhandEntity, checkActionBlocker: false, handsComp: handsComponent);
                 }
             }
-            InternalEncryptionKeySpawner.TryInsertEncryptionKey(target, startingGear, entityManager, profile);
+
+            if (entityManager.HasComponent<EncryptionKeyHolderComponent>(target))
+            {
+                var encryption = new InternalEncryptionKeySpawner();
+                encryption.TryInsertEncryptionKey(target, startingGear, entityManager);
+            }
             return true;
         }
     }
diff --git a/Content.Server/Cloning/CloningSystem.Utility.cs b/Content.Server/Cloning/CloningSystem.Utility.cs
index 408e1cf24a3..aa2ce27902c 100644
--- a/Content.Server/Cloning/CloningSystem.Utility.cs
+++ b/Content.Server/Cloning/CloningSystem.Utility.cs
@@ -68,9 +68,10 @@ private bool CheckUncloneable(EntityUid uid, EntityUid bodyToClone, CloningPodCo
 
         if (ev.Cancelled && ev.CloningFailMessage is not null)
         {
-            _chatSystem.TrySendInGameICMessage(uid,
-                Loc.GetString(ev.CloningFailMessage),
-                InGameICChatType.Speak, false);
+            if (clonePod.ConnectedConsole is not null)
+                _chatSystem.TrySendInGameICMessage(clonePod.ConnectedConsole.Value,
+                    Loc.GetString(ev.CloningFailMessage),
+                    InGameICChatType.Speak, false);
             return false;
         }
 
diff --git a/Content.Server/Power/Components/SiliconEmitSoundOnDrainedComponent.cs b/Content.Server/Power/Components/SiliconEmitSoundOnDrainedComponent.cs
index 4e5121d6076..5740d7822d0 100644
--- a/Content.Server/Power/Components/SiliconEmitSoundOnDrainedComponent.cs
+++ b/Content.Server/Power/Components/SiliconEmitSoundOnDrainedComponent.cs
@@ -1,6 +1,4 @@
-using System.ComponentModel.DataAnnotations;
 using Robust.Shared.Audio;
-using Content.Server.Sound.Components;
 
 namespace Content.Server.Silicon;
 
diff --git a/Content.Server/Power/Systems/BatteryDrinkerSystem.cs b/Content.Server/Power/Systems/BatteryDrinkerSystem.cs
index 9a06d4181c9..e42783c4d8d 100644
--- a/Content.Server/Power/Systems/BatteryDrinkerSystem.cs
+++ b/Content.Server/Power/Systems/BatteryDrinkerSystem.cs
@@ -1,4 +1,3 @@
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Power.Components;
 using Content.Shared.Containers.ItemSlots;
@@ -12,8 +11,6 @@
 using Content.Server.Popups;
 using Content.Server.PowerCell;
 using Content.Shared.Popups;
-using Content.Shared.Silicon.Components;
-using FastAccessors;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 
@@ -21,13 +18,11 @@ namespace Content.Server.Power;
 
 public sealed class BatteryDrinkerSystem : EntitySystem
 {
-    [Dependency] private readonly ItemSlotsSystem _slots = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly BatterySystem _battery = default!;
     [Dependency] private readonly SiliconChargeSystem _silicon = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly PowerCellSystem _powerCell = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
 
     public override void Initialize()
@@ -41,12 +36,10 @@ public override void Initialize()
 
     private void AddAltVerb(EntityUid uid, BatteryComponent batteryComponent, GetVerbsEvent<AlternativeVerb> args)
     {
-        if (!args.CanAccess || !args.CanInteract)
-            return;
-
-        if (!TryComp<BatteryDrinkerComponent>(args.User, out var drinkerComp) ||
-            !TestDrinkableBattery(uid, drinkerComp) ||
-            !_silicon.TryGetSiliconBattery(args.User, out var drinkerBattery))
+        if (!args.CanAccess || !args.CanInteract
+            || !TryComp<BatteryDrinkerComponent>(args.User, out var drinkerComp)
+            || !TestDrinkableBattery(uid, drinkerComp)
+            || !_silicon.TryGetSiliconBattery(args.User, out var _))
             return;
 
         AlternativeVerb verb = new()
@@ -80,6 +73,7 @@ private void DrinkBattery(EntityUid target, EntityUid user, BatteryDrinkerCompon
         {
             BreakOnDamage = true,
             BreakOnTargetMove = true,
+            BreakOnUserMove = true,
             Broadcast = false,
             DistanceThreshold = 1.35f,
             RequireCanInteract = true,
@@ -91,39 +85,28 @@ private void DrinkBattery(EntityUid target, EntityUid user, BatteryDrinkerCompon
 
     private void OnDoAfter(EntityUid uid, BatteryDrinkerComponent drinkerComp, DoAfterEvent args)
     {
-        if (args.Cancelled || args.Target == null)
+        if (args.Cancelled || args.Target == null
+            || !TryComp<BatteryComponent>(args.Target.Value, out var sourceBattery)
+            || !_silicon.TryGetSiliconBattery(uid, out var drinkerBatteryComponent)
+            || !TryComp(uid, out PowerCellSlotComponent? batterySlot)
+            || !TryComp<BatteryDrinkerSourceComponent>(args.Target.Value, out var sourceComp)
+            || !_container.TryGetContainer(uid, batterySlot.CellSlotId, out var container)
+            || container.ContainedEntities is null)
             return;
 
         var source = args.Target.Value;
-        var drinker = uid;
-        var sourceBattery = Comp<BatteryComponent>(source);
-
-        _silicon.TryGetSiliconBattery(drinker, out var drinkerBatteryComponent);
-
-        if (!TryComp(uid, out PowerCellSlotComponent? batterySlot))
-            return;
-
-        var container = _container.GetContainer(uid, batterySlot.CellSlotId);
         var drinkerBattery = container.ContainedEntities.First();
-
-        TryComp<BatteryDrinkerSourceComponent>(source, out var sourceComp);
-
-        DebugTools.AssertNotNull(drinkerBattery);
-
-        if (drinkerBattery == null)
-            return;
-
         var amountToDrink = drinkerComp.DrinkMultiplier * 1000;
 
         amountToDrink = MathF.Min(amountToDrink, sourceBattery.CurrentCharge);
         amountToDrink = MathF.Min(amountToDrink, drinkerBatteryComponent!.MaxCharge - drinkerBatteryComponent.CurrentCharge);
 
-        if (sourceComp != null && sourceComp.MaxAmount > 0)
+        if (sourceComp.MaxAmount > 0)
             amountToDrink = MathF.Min(amountToDrink, (float) sourceComp.MaxAmount);
 
         if (amountToDrink <= 0)
         {
-            _popup.PopupEntity(Loc.GetString("battery-drinker-empty", ("target", source)), drinker, drinker);
+            _popup.PopupEntity(Loc.GetString("battery-drinker-empty", ("target", source)), uid, uid);
             return;
         }
 
@@ -135,10 +118,11 @@ private void OnDoAfter(EntityUid uid, BatteryDrinkerComponent drinkerComp, DoAft
             _battery.SetCharge(source, 0);
         }
 
-        if (sourceComp != null && sourceComp.DrinkSound != null){
-            _popup.PopupEntity(Loc.GetString("ipc-recharge-tip"), drinker, drinker, PopupType.SmallCaution);
-            _audio.PlayPvs(sourceComp.DrinkSound, source);
-            Spawn("EffectSparks", Transform(source).Coordinates);
-        }
+        if (sourceComp.DrinkSound is null)
+            return;
+
+        _popup.PopupEntity(Loc.GetString("ipc-recharge-tip"), uid, uid, PopupType.SmallCaution);
+        _audio.PlayPvs(sourceComp.DrinkSound, source);
+        Spawn("EffectSparks", Transform(source).Coordinates);
     }
 }
diff --git a/Content.Server/Power/Systems/BatteryElectrocuteChargeSystem.cs b/Content.Server/Power/Systems/BatteryElectrocuteChargeSystem.cs
index 9993c151b1e..707d7c679e8 100644
--- a/Content.Server/Power/Systems/BatteryElectrocuteChargeSystem.cs
+++ b/Content.Server/Power/Systems/BatteryElectrocuteChargeSystem.cs
@@ -4,7 +4,6 @@
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Electrocution;
 using Robust.Shared.Random;
-using Robust.Shared.Timing;
 
 namespace Content.Server.Power.Systems;
 
@@ -26,10 +25,10 @@ private void OnElectrocuted(EntityUid uid, BatteryComponent battery, Electrocute
         if (args.ShockDamage == null || args.ShockDamage <= 0)
             return;
 
-        var damagePerWatt = ElectrocutionSystem.ElectrifiedDamagePerWatt * 2;
-
-        var damage = args.ShockDamage.Value * args.SiemensCoefficient;
-        var charge = Math.Min(damage / damagePerWatt, battery.MaxCharge * 0.25f) * _random.NextFloat(0.75f, 1.25f);
+        var charge = Math.Min(args.ShockDamage.Value * args.SiemensCoefficient
+            / ElectrocutionSystem.ElectrifiedDamagePerWatt * 2,
+                battery.MaxCharge * 0.25f)
+            * _random.NextFloat(0.75f, 1.25f);
 
         _battery.SetCharge(uid, battery.CurrentCharge + charge);
 
diff --git a/Content.Server/Power/Systems/SiliconEmitSoundOnDrainedSystem.cs b/Content.Server/Power/Systems/SiliconEmitSoundOnDrainedSystem.cs
index 28a46cc7f70..f95a940aaeb 100644
--- a/Content.Server/Power/Systems/SiliconEmitSoundOnDrainedSystem.cs
+++ b/Content.Server/Power/Systems/SiliconEmitSoundOnDrainedSystem.cs
@@ -2,7 +2,6 @@
 using Content.Shared.Sound.Components;
 using Content.Server.Sound;
 using Content.Shared.Mobs;
-using Content.Shared.Silicon.Systems;
 
 namespace Content.Server.Silicon;
 
@@ -35,7 +34,9 @@ private void OnAlive(EntityUid uid, SiliconEmitSoundOnDrainedComponent component
 
     public void OnStateChange(EntityUid uid, SiliconEmitSoundOnDrainedComponent component, MobStateChangedEvent args)
     {
-        if (args.NewMobState == MobState.Dead)
-            RemComp<SpamEmitSoundComponent>(uid);
+        if (args.NewMobState != MobState.Dead)
+            return;
+
+        RemComp<SpamEmitSoundComponent>(uid);
     }
 }
diff --git a/Content.Server/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs
index 23cf6aeb80b..0d05000a3cd 100644
--- a/Content.Server/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Psionics/PsionicsSystem.cs
@@ -11,139 +11,242 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Random;
+using Content.Shared.Popups;
+using Content.Shared.Chat;
+using Robust.Server.Player;
+using Content.Server.Chat.Managers;
+using Robust.Shared.Prototypes;
+using Content.Shared.Psionics;
 
-namespace Content.Server.Psionics
+namespace Content.Server.Psionics;
+
+public sealed class PsionicsSystem : EntitySystem
 {
-    public sealed class PsionicsSystem : EntitySystem
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly PsionicAbilitiesSystem _psionicAbilitiesSystem = default!;
+    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
+    [Dependency] private readonly ElectrocutionSystem _electrocutionSystem = default!;
+    [Dependency] private readonly MindSwapPowerSystem _mindSwapPowerSystem = default!;
+    [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
+    [Dependency] private readonly NpcFactionSystem _npcFactonSystem = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedPopupSystem _popups = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IChatManager _chatManager = default!;
+    [Dependency] private readonly IPrototypeManager _protoMan = default!;
+
+    private const string BaselineAmplification = "Baseline Amplification";
+    private const string BaselineDampening = "Baseline Dampening";
+
+    // Yes these are a mirror of what's normally default datafields on the PsionicPowerPrototype.
+    // We haven't generated a prototype yet, and I'm not going to duplicate them on the PsionicComponent.
+    private const string PsionicRollFailedMessage = "psionic-roll-failed";
+    private const string PsionicRollFailedColor = "#8A00C2";
+    private const int PsionicRollFailedFontSize = 12;
+    private const ChatChannel PsionicRollFailedChatChannel = ChatChannel.Emotes;
+
+    /// <summary>
+    ///     Unfortunately, since spawning as a normal role and anything else is so different,
+    ///     this is the only way to unify them, for now at least.
+    /// </summary>
+    Queue<(PsionicComponent component, EntityUid uid)> _rollers = new();
+    public override void Update(float frameTime)
     {
-        [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly PsionicAbilitiesSystem _psionicAbilitiesSystem = default!;
-        [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
-        [Dependency] private readonly ElectrocutionSystem _electrocutionSystem = default!;
-        [Dependency] private readonly MindSwapPowerSystem _mindSwapPowerSystem = default!;
-        [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
-        [Dependency] private readonly NpcFactionSystem _npcFactonSystem = default!;
-        [Dependency] private readonly IConfigurationManager _cfg = default!;
-        [Dependency] private readonly SharedAudioSystem _audio = default!;
-
-        private const string BaselineAmplification = "Baseline Amplification";
-        private const string BaselineDampening = "Baseline Dampening";
-
-        /// <summary>
-        /// Unfortunately, since spawning as a normal role and anything else is so different,
-        /// this is the only way to unify them, for now at least.
-        /// </summary>
-        Queue<(PsionicComponent component, EntityUid uid)> _rollers = new();
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-            foreach (var roller in _rollers)
-                RollPsionics(roller.uid, roller.component, false);
-            _rollers.Clear();
-        }
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<PsionicComponent, MapInitEvent>(OnStartup);
-            SubscribeLocalEvent<AntiPsionicWeaponComponent, MeleeHitEvent>(OnMeleeHit);
-            SubscribeLocalEvent<AntiPsionicWeaponComponent, TakeStaminaDamageEvent>(OnStamHit);
+        base.Update(frameTime);
+        foreach (var roller in _rollers)
+            RollPsionics(roller.uid, roller.component, false);
+        _rollers.Clear();
+    }
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<PsionicComponent, MapInitEvent>(OnStartup);
+        SubscribeLocalEvent<AntiPsionicWeaponComponent, MeleeHitEvent>(OnMeleeHit);
+        SubscribeLocalEvent<AntiPsionicWeaponComponent, TakeStaminaDamageEvent>(OnStamHit);
 
-            SubscribeLocalEvent<PsionicComponent, ComponentStartup>(OnInit);
-            SubscribeLocalEvent<PsionicComponent, ComponentRemove>(OnRemove);
-        }
+        SubscribeLocalEvent<PsionicComponent, ComponentStartup>(OnInit);
+        SubscribeLocalEvent<PsionicComponent, ComponentRemove>(OnRemove);
+    }
 
-        private void OnStartup(EntityUid uid, PsionicComponent component, MapInitEvent args)
-        {
-            _rollers.Enqueue((component, uid));
-        }
+    private void OnStartup(EntityUid uid, PsionicComponent component, MapInitEvent args)
+    {
+        if (!component.Removable
+            || !component.CanReroll)
+            return;
 
-        private void OnMeleeHit(EntityUid uid, AntiPsionicWeaponComponent component, MeleeHitEvent args)
-        {
-            foreach (var entity in args.HitEntities)
-            {
-                if (HasComp<PsionicComponent>(entity))
-                {
-                    _audio.PlayPvs("/Audio/Effects/lightburn.ogg", entity);
-                    args.ModifiersList.Add(component.Modifiers);
-                    if (_random.Prob(component.DisableChance))
-                        _statusEffects.TryAddStatusEffect(entity, component.DisableStatus, TimeSpan.FromSeconds(component.DisableDuration), true, component.DisableStatus);
-                }
-
-                if (TryComp<MindSwappedComponent>(entity, out var swapped))
-                {
-                    _mindSwapPowerSystem.Swap(entity, swapped.OriginalEntity, true);
-                    return;
-                }
-
-                if (component.Punish && !HasComp<PsionicComponent>(entity) && _random.Prob(component.PunishChances))
-                    _electrocutionSystem.TryDoElectrocution(args.User, null, component.PunishSelfDamage, TimeSpan.FromSeconds(component.PunishStunDuration), false);
-            }
-        }
+        CheckPowerCost(uid, component);
+        _rollers.Enqueue((component, uid));
+    }
 
-        private void OnInit(EntityUid uid, PsionicComponent component, ComponentStartup args)
-        {
-            component.AmplificationSources.Add(BaselineAmplification, _random.NextFloat(component.BaselineAmplification.Item1, component.BaselineAmplification.Item2));
-            component.DampeningSources.Add(BaselineDampening, _random.NextFloat(component.BaselineDampening.Item1, component.BaselineDampening.Item2));
+    /// <summary>
+    ///     On MapInit, PsionicComponent isn't going to contain any powers.
+    ///     So before we send a Latent Psychic into the roundstart roll queue, we need to calculate their power cost in advance.
+    /// </summary>
+    private void CheckPowerCost(EntityUid uid, PsionicComponent component)
+    {
+        if (!TryComp<InnatePsionicPowersComponent>(uid, out var innate))
+            return;
 
-            if (!component.Removable
-                || !TryComp<NpcFactionMemberComponent>(uid, out var factions)
-                || _npcFactonSystem.ContainsFaction(uid, "GlimmerMonster", factions))
-                return;
+        var powerCount = 0;
+        foreach (var powerId in innate.PowersToAdd)
+            if (_protoMan.TryIndex(powerId, out var power))
+                powerCount += power.PowerSlotCost;
 
-            _npcFactonSystem.AddFaction(uid, "PsionicInterloper");
-        }
+        component.NextPowerCost = 100 * MathF.Pow(2, powerCount);
+    }
 
-        private void OnRemove(EntityUid uid, PsionicComponent component, ComponentRemove args)
+    private void OnMeleeHit(EntityUid uid, AntiPsionicWeaponComponent component, MeleeHitEvent args)
+    {
+        foreach (var entity in args.HitEntities)
+            CheckAntiPsionic(entity, component, args);
+    }
+
+    private void CheckAntiPsionic(EntityUid entity, AntiPsionicWeaponComponent component, MeleeHitEvent args)
+    {
+        if (HasComp<PsionicComponent>(entity))
         {
-            if (!HasComp<NpcFactionMemberComponent>(uid))
+            _audio.PlayPvs("/Audio/Effects/lightburn.ogg", entity);
+            args.ModifiersList.Add(component.Modifiers);
+
+            if (!_random.Prob(component.DisableChance))
                 return;
 
-            _npcFactonSystem.RemoveFaction(uid, "PsionicInterloper");
+            _statusEffects.TryAddStatusEffect(entity, component.DisableStatus, TimeSpan.FromSeconds(component.DisableDuration), true, component.DisableStatus);
         }
 
-        private void OnStamHit(EntityUid uid, AntiPsionicWeaponComponent component, TakeStaminaDamageEvent args)
-        {
-            if (HasComp<PsionicComponent>(args.Target))
-                args.FlatModifier += component.PsychicStaminaDamage;
-        }
+        if (TryComp<MindSwappedComponent>(entity, out var swapped))
+            _mindSwapPowerSystem.Swap(entity, swapped.OriginalEntity, true);
 
-        public void RollPsionics(EntityUid uid, PsionicComponent component, bool applyGlimmer = true, float rollEventMultiplier = 1f)
-        {
-            if (!_cfg.GetCVar(CCVars.PsionicRollsEnabled)
-                || !component.Removable)
-                return;
+        if (!component.Punish
+            || HasComp<PsionicComponent>(entity)
+            || !_random.Prob(component.PunishChances))
+            return;
+
+        _electrocutionSystem.TryDoElectrocution(args.User, null, component.PunishSelfDamage, TimeSpan.FromSeconds(component.PunishStunDuration), false);
+    }
 
-            // Calculate the initial odds based on the innate potential
-            var baselineChance = component.Chance
-                * component.PowerRollMultiplier
-                + component.PowerRollFlatBonus;
+    private void OnInit(EntityUid uid, PsionicComponent component, ComponentStartup args)
+    {
+        component.AmplificationSources.Add(BaselineAmplification, _random.NextFloat(component.BaselineAmplification.Item1, component.BaselineAmplification.Item2));
+        component.DampeningSources.Add(BaselineDampening, _random.NextFloat(component.BaselineDampening.Item1, component.BaselineDampening.Item2));
 
-            // Increase the initial odds based on Glimmer.
-            // TODO: Change this equation when I do my Glimmer Refactor
-            baselineChance += applyGlimmer
-                ? (float) _glimmerSystem.Glimmer / 1000 //Convert from Glimmer to %chance
-                : 0;
+        if (!component.Removable
+            || !TryComp<NpcFactionMemberComponent>(uid, out var factions)
+            || _npcFactonSystem.ContainsFaction(uid, "GlimmerMonster", factions))
+            return;
 
-            // Certain sources of power rolls provide their own multiplier.
-            baselineChance *= rollEventMultiplier;
+        _npcFactonSystem.AddFaction(uid, "PsionicInterloper");
+    }
 
-            // Ask if the Roller has any other effects to contribute, such as Traits.
-            var ev = new OnRollPsionicsEvent(uid, baselineChance);
-            RaiseLocalEvent(uid, ref ev);
+    private void OnRemove(EntityUid uid, PsionicComponent component, ComponentRemove args)
+    {
+        if (!HasComp<NpcFactionMemberComponent>(uid))
+            return;
 
-            if (_random.Prob(Math.Clamp(ev.BaselineChance, 0, 1)))
-                _psionicAbilitiesSystem.AddPsionics(uid);
-        }
+        _npcFactonSystem.RemoveFaction(uid, "PsionicInterloper");
+    }
 
-        public void RerollPsionics(EntityUid uid, PsionicComponent? psionic = null, float bonusMuliplier = 1f)
-        {
-            if (!Resolve(uid, ref psionic, false)
-                || !psionic.Removable
-                || psionic.CanReroll)
-                return;
+    private void OnStamHit(EntityUid uid, AntiPsionicWeaponComponent component, TakeStaminaDamageEvent args)
+    {
+        if (!HasComp<PsionicComponent>(args.Target))
+            return;
 
-            RollPsionics(uid, psionic, true, bonusMuliplier);
-            psionic.CanReroll = true;
-        }
+        args.FlatModifier += component.PsychicStaminaDamage;
+    }
+
+    /// <summary>
+    ///     Now we handle Potentia calculations, the more powers you have, the harder it is to obtain psionics, but the content of your roll carries over to the next roll.
+    ///     Your first power costs 100(2^0 is always 1), your second power costs 200, your 3rd power costs 400, and so on. This also considers people with roundstart powers.
+    ///     Such that a Mystagogue(who has 3 powers at roundstart) needs 800 Potentia to gain his 4th power.
+    /// </summary>
+    /// <remarks>
+    ///     This exponential cost is mainly done to prevent stations from becoming "Space Hogwarts",
+    ///     which was a common complaint with Psionic Refactor opening up the opportunity for people to have multiple powers.
+    /// </remarks>
+    private bool HandlePotentiaCalculations(EntityUid uid, PsionicComponent component, float psionicChance)
+    {
+        component.Potentia += _random.NextFloat(0 + psionicChance, 100 + psionicChance);
+
+        if (component.Potentia < component.NextPowerCost)
+            return false;
+
+        component.Potentia -= component.NextPowerCost;
+        _psionicAbilitiesSystem.AddPsionics(uid);
+        component.NextPowerCost = 100 * MathF.Pow(2, component.PowerSlotsTaken);
+        return true;
+    }
+
+    /// <summary>
+    ///     Provide the player with feedback about their roll failure, so they don't just think nothing happened.
+    ///     TODO: Add an audio cue to this and other areas of psionic player feedback.
+    /// </summary>
+    private void HandleRollFeedback(EntityUid uid)
+    {
+        if (!_playerManager.TryGetSessionByEntity(uid, out var session)
+            || !Loc.TryGetString(PsionicRollFailedMessage, out var rollFailedMessage))
+            return;
+
+        _popups.PopupEntity(rollFailedMessage, uid, uid, PopupType.MediumCaution);
+
+        // Popups only last a few seconds, and are easily ignored.
+        // So we also put a message in chat to make it harder to miss.
+        var feedbackMessage = $"[font size={PsionicRollFailedFontSize}][color={PsionicRollFailedColor}]{rollFailedMessage}[/color][/font]";
+        _chatManager.ChatMessageToOne(
+            PsionicRollFailedChatChannel,
+            feedbackMessage,
+            feedbackMessage,
+            EntityUid.Invalid,
+            false,
+            session.Channel);
+    }
+
+    /// <summary>
+    ///     This function attempts to generate a psionic power by incrementing a Psion's Potentia stat by a random amount, then checking if it beats a certain threshold.
+    ///     Please consider going through RerollPsionics or PsionicAbilitiesSystem.InitializePsionicPower instead of this function, particularly if you don't have a good reason to call this directly.
+    /// </summary>
+    public void RollPsionics(EntityUid uid, PsionicComponent component, bool applyGlimmer = true, float rollEventMultiplier = 1f)
+    {
+        if (!_cfg.GetCVar(CCVars.PsionicRollsEnabled)
+            || !component.Removable)
+            return;
+
+        // Calculate the initial odds based on the innate potential
+        var baselineChance = component.Chance
+            * component.PowerRollMultiplier
+            + component.PowerRollFlatBonus;
+
+        // Increase the initial odds based on Glimmer.
+        // TODO: Change this equation when I do my Glimmer Refactor
+        baselineChance += applyGlimmer
+            ? (float) _glimmerSystem.Glimmer / 1000 //Convert from Glimmer to %chance
+            : 0;
+
+        // Certain sources of power rolls provide their own multiplier.
+        baselineChance *= rollEventMultiplier;
+
+        // Ask if the Roller has any other effects to contribute, such as Traits.
+        var ev = new OnRollPsionicsEvent(uid, baselineChance);
+        RaiseLocalEvent(uid, ref ev);
+
+        if (HandlePotentiaCalculations(uid, component, ev.BaselineChance))
+            return;
+
+        HandleRollFeedback(uid);
+    }
+
+    /// <summary>
+    ///     Each person has a single free reroll for their Psionics, which certain conditions can restore.
+    ///     This function attempts to "Spend" a reroll, if one is available.
+    /// </summary>
+    public void RerollPsionics(EntityUid uid, PsionicComponent? psionic = null, float bonusMuliplier = 1f)
+    {
+        if (!Resolve(uid, ref psionic, false)
+            || !psionic.Removable
+            || !psionic.CanReroll)
+            return;
+
+        RollPsionics(uid, psionic, true, bonusMuliplier);
+        psionic.CanReroll = false;
     }
 }
diff --git a/Content.Server/Silicon/BatteryLocking/BatterySlotRequiresLockSystem.cs b/Content.Server/Silicon/BatteryLocking/BatterySlotRequiresLockSystem.cs
index 98e1cb5584c..12e86691281 100644
--- a/Content.Server/Silicon/BatteryLocking/BatterySlotRequiresLockSystem.cs
+++ b/Content.Server/Silicon/BatteryLocking/BatterySlotRequiresLockSystem.cs
@@ -2,7 +2,7 @@
 using Content.Shared.Lock;
 using Content.Shared.Popups;
 using Content.Shared.Silicon.Components;
-using Content.Shared.IdentityManagement; 
+using Content.Shared.IdentityManagement;
 
 namespace Content.Server.Silicon.BatteryLocking;
 
@@ -10,19 +10,18 @@ public sealed class BatterySlotRequiresLockSystem : EntitySystem
 
 {
     [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!; 
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
 
-    /// <inheritdoc/>
     public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<BatterySlotRequiresLockComponent, LockToggledEvent>(LockToggled);
-        SubscribeLocalEvent<BatterySlotRequiresLockComponent, LockToggleAttemptEvent>(LockToggleAttempted); 
-
+        SubscribeLocalEvent<BatterySlotRequiresLockComponent, LockToggleAttemptEvent>(LockToggleAttempted);
     }
+
     private void LockToggled(EntityUid uid, BatterySlotRequiresLockComponent component, LockToggledEvent args)
     {
-        if (!TryComp<LockComponent>(uid, out var lockComp) 
+        if (!TryComp<LockComponent>(uid, out var lockComp)
             || !TryComp<ItemSlotsComponent>(uid, out var itemslots)
             || !_itemSlotsSystem.TryGetSlot(uid, component.ItemSlot, out var slot, itemslots))
             return;
@@ -33,9 +32,9 @@ private void LockToggled(EntityUid uid, BatterySlotRequiresLockComponent compone
     private void LockToggleAttempted(EntityUid uid, BatterySlotRequiresLockComponent component, LockToggleAttemptEvent args)
     {
         if (args.User == uid
-            || !TryComp<SiliconComponent>(uid, out var siliconComp))
+            || !HasComp<SiliconComponent>(uid))
             return;
-            
+
         _popupSystem.PopupEntity(Loc.GetString("batteryslotrequireslock-component-alert-owner", ("user", Identity.Entity(args.User, EntityManager))), uid, uid, PopupType.Large);
     }
 
diff --git a/Content.Server/Silicon/BlindHealing/BlindHealingComponent.cs b/Content.Server/Silicon/BlindHealing/BlindHealingComponent.cs
index 4c3c478c4b8..fe218491708 100644
--- a/Content.Server/Silicon/BlindHealing/BlindHealingComponent.cs
+++ b/Content.Server/Silicon/BlindHealing/BlindHealingComponent.cs
@@ -1,28 +1,23 @@
-using Content.Shared.Damage;
-using Content.Shared.Tools;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+namespace Content.Server.Silicon.BlindHealing;
 
-namespace Content.Server.Silicon.BlindHealing
+[RegisterComponent]
+public sealed partial class BlindHealingComponent : Component
 {
-    [RegisterComponent]
-    public sealed partial class BlindHealingComponent : Component
-    {
-        [DataField]
-        public int DoAfterDelay = 3;
+    [DataField]
+    public int DoAfterDelay = 3;
 
-        /// <summary>
-        ///     A multiplier that will be applied to the above if an entity is repairing themselves.
-        /// </summary>
-        [DataField]
-        public float SelfHealPenalty = 3f;
+    /// <summary>
+    ///     A multiplier that will be applied to the above if an entity is repairing themselves.
+    /// </summary>
+    [DataField]
+    public float SelfHealPenalty = 3f;
 
-        /// <summary>
-        ///     Whether or not an entity is allowed to repair itself.
-        /// </summary>
-        [DataField]
-        public bool AllowSelfHeal = true;
+    /// <summary>
+    ///     Whether or not an entity is allowed to repair itself.
+    /// </summary>
+    [DataField]
+    public bool AllowSelfHeal = true;
 
-        [DataField(required: true)]
-        public List<string> DamageContainers;
-    }
+    [DataField(required: true)]
+    public List<string> DamageContainers;
 }
diff --git a/Content.Server/Silicon/BlindHealing/BlindHealingSystem.cs b/Content.Server/Silicon/BlindHealing/BlindHealingSystem.cs
index 6cf60e6ef3f..b9d26b59f7c 100644
--- a/Content.Server/Silicon/BlindHealing/BlindHealingSystem.cs
+++ b/Content.Server/Silicon/BlindHealing/BlindHealingSystem.cs
@@ -12,110 +12,87 @@
 using Content.Shared.Popups;
 using Content.Shared.Stacks;
 
-namespace Content.Server.Silicon.BlindHealing
+namespace Content.Server.Silicon.BlindHealing;
+
+public sealed class BlindHealingSystem : SharedBlindHealingSystem
 {
-    public sealed class BlindHealingSystem : SharedBlindHealingSystem
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly BlindableSystem _blindableSystem = default!;
+    [Dependency] private readonly StackSystem _stackSystem = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+
+    public override void Initialize()
     {
-        [Dependency] private readonly SharedPopupSystem _popup = default!;
-        [Dependency] private readonly IAdminLogManager _adminLogger= default!;
-        [Dependency] private readonly BlindableSystem _blindableSystem = default!;
-        [Dependency] private readonly StackSystem _stackSystem = default!;
-        [Dependency] private readonly DamageableSystem _damageableSystem = default!;
-        [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-
-        public override void Initialize()
-        {
-            SubscribeLocalEvent<BlindHealingComponent, UseInHandEvent>(OnUse);
-            SubscribeLocalEvent<BlindHealingComponent, AfterInteractEvent>(OnInteract);
-            SubscribeLocalEvent<BlindHealingComponent, HealingDoAfterEvent>(OnHealingFinished);
-        }
-
-        private void OnHealingFinished(EntityUid uid, BlindHealingComponent component, HealingDoAfterEvent args)
-        {
-            Log.Info("event started!");
-
-            if (args.Cancelled || args.Target == null)
-                return;
-
-            EntityUid target = (EntityUid) args.Target;
-
-            if(!EntityManager.TryGetComponent(target, out BlindableComponent? blindcomp)
-                || blindcomp is { EyeDamage: 0 })
-                return;
-
-            if(EntityManager.TryGetComponent(uid, out StackComponent? stackComponent))
-            {
-                double price = 1;
-                if (EntityManager.TryGetComponent(uid, out StackPriceComponent? stackPrice))
-                    price = stackPrice.Price;
-                _stackSystem.SetCount(uid, (int) (_stackSystem.GetCount(uid, stackComponent) - price), stackComponent);
+        SubscribeLocalEvent<BlindHealingComponent, UseInHandEvent>(OnUse);
+        SubscribeLocalEvent<BlindHealingComponent, AfterInteractEvent>(OnInteract);
+        SubscribeLocalEvent<BlindHealingComponent, HealingDoAfterEvent>(OnHealingFinished);
+    }
 
-            }
+    private void OnHealingFinished(EntityUid uid, BlindHealingComponent component, HealingDoAfterEvent args)
+    {
+        if (args.Cancelled || args.Target == null
+            || !TryComp<BlindableComponent>(args.Target, out var blindComp)
+            || blindComp is { EyeDamage: 0 })
+            return;
 
-            _blindableSystem.AdjustEyeDamage((target, blindcomp), -blindcomp!.EyeDamage);
+        if (TryComp<StackComponent>(uid, out var stackComponent)
+            && TryComp<StackPriceComponent>(uid, out var stackPrice))
+            _stackSystem.SetCount(uid, (int) (_stackSystem.GetCount(uid, stackComponent) - stackPrice.Price), stackComponent);
 
-            _adminLogger.Add(LogType.Healed, $"{ToPrettyString(args.User):user} repaired {ToPrettyString(uid):target}'s vision");
+        _blindableSystem.AdjustEyeDamage((args.Target.Value, blindComp), -blindComp.EyeDamage);
 
-            var str = Loc.GetString("comp-repairable-repair",
-                ("target", uid),
-                ("tool", args.Used!));
-            _popup.PopupEntity(str, uid, args.User);
+        _adminLogger.Add(LogType.Healed, $"{ToPrettyString(args.User):user} repaired {ToPrettyString(uid):target}'s vision");
 
-        }
+        var str = Loc.GetString("comp-repairable-repair",
+            ("target", uid),
+            ("tool", args.Used!));
+        _popup.PopupEntity(str, uid, args.User);
 
-        private bool TryHealBlindness(EntityUid uid, EntityUid user, EntityUid target, float delay)
-        {
-            var doAfterEventArgs =
-                new DoAfterArgs(EntityManager, user, delay, new HealingDoAfterEvent(), uid, target: target, used: uid)
-                {
-                    NeedHand = true,
-                    BreakOnUserMove = true,
-                    BreakOnWeightlessMove = false,
-                };
+    }
 
-            _doAfter.TryStartDoAfter(doAfterEventArgs);
-            return true;
-        }
+    private bool TryHealBlindness(EntityUid uid, EntityUid user, EntityUid target, float delay)
+    {
+        var doAfterEventArgs =
+            new DoAfterArgs(EntityManager, user, delay, new HealingDoAfterEvent(), uid, target: target, used: uid)
+            {
+                NeedHand = true,
+                BreakOnUserMove = true,
+                BreakOnWeightlessMove = false,
+            };
 
-        private void OnInteract(EntityUid uid, BlindHealingComponent component, ref AfterInteractEvent args)
-        {
+        _doAfter.TryStartDoAfter(doAfterEventArgs);
+        return true;
+    }
 
-            if (args.Handled
-                || !TryComp(args.User, out DamageableComponent? damageable)
-                || damageable.DamageContainerID != null
-                && !component.DamageContainers.Contains(damageable.DamageContainerID)
-                || !TryComp(args.User, out BlindableComponent? blindcomp)
-                || blindcomp is { EyeDamage: 0 })
-                return;
+    private void OnInteract(EntityUid uid, BlindHealingComponent component, ref AfterInteractEvent args)
+    {
 
-            float delay = component.DoAfterDelay;
+        if (args.Handled
+            || !TryComp<DamageableComponent>(args.User, out var damageable)
+            || damageable.DamageContainerID != null && !component.DamageContainers.Contains(damageable.DamageContainerID)
+            || !TryComp<BlindableComponent>(args.User, out var blindcomp)
+            || blindcomp.EyeDamage == 0
+            || args.User == args.Target && !component.AllowSelfHeal)
+            return;
+
+        TryHealBlindness(uid, args.User, args.User,
+            args.User == args.Target
+                ? component.DoAfterDelay * component.SelfHealPenalty
+                : component.DoAfterDelay);
+    }
 
-            if (args.User == args.Target)
-            {
-                if (!component.AllowSelfHeal)
-                    return;
-                delay *= component.SelfHealPenalty;
-            }
-
-            TryHealBlindness(uid, args.User, args.User, delay);
-        }
-
-        private void OnUse(EntityUid uid, BlindHealingComponent component, ref UseInHandEvent args)
-        {
-            if (args.Handled
-                || !TryComp(args.User, out DamageableComponent? damageable)
-                || damageable.DamageContainerID != null
-                && !component.DamageContainers.Contains(damageable.DamageContainerID)
-                || !TryComp(args.User, out BlindableComponent? blindcomp)
-                || blindcomp is { EyeDamage: 0 }
-                || !component.AllowSelfHeal)
-                return;
-
-            float delay = component.DoAfterDelay;
-            delay *= component.SelfHealPenalty;
-
-            TryHealBlindness(uid, args.User, args.User, delay);
-
-        }
+    private void OnUse(EntityUid uid, BlindHealingComponent component, ref UseInHandEvent args)
+    {
+        if (args.Handled
+            || !TryComp<DamageableComponent>(args.User, out var damageable)
+            || damageable.DamageContainerID != null && !component.DamageContainers.Contains(damageable.DamageContainerID)
+            || !TryComp<BlindableComponent>(args.User, out var blindcomp)
+            || blindcomp.EyeDamage == 0
+            || !component.AllowSelfHeal)
+            return;
+
+        TryHealBlindness(uid, args.User, args.User,
+            component.DoAfterDelay * component.SelfHealPenalty);
     }
 }
diff --git a/Content.Server/Silicon/Charge/Components/SiliconDownOnDeadComponent.cs b/Content.Server/Silicon/Charge/Components/SiliconDownOnDeadComponent.cs
index 3080144cd4a..4b3aad33ab6 100644
--- a/Content.Server/Silicon/Charge/Components/SiliconDownOnDeadComponent.cs
+++ b/Content.Server/Silicon/Charge/Components/SiliconDownOnDeadComponent.cs
@@ -1,5 +1,3 @@
-using System.Threading;
-
 namespace Content.Server.Silicon.Death;
 
 /// <summary>
@@ -15,5 +13,5 @@ public sealed partial class SiliconDownOnDeadComponent : Component
     ///     Is this Silicon currently dead?
     /// </summary>
     [ViewVariables(VVAccess.ReadOnly)]
-    public bool Dead { get; set; } = false;
+    public bool Dead;
 }
diff --git a/Content.Server/Silicon/Charge/Systems/SiliconChargeDeathSystem.cs b/Content.Server/Silicon/Charge/Systems/SiliconChargeDeathSystem.cs
index d6fa07a1a14..d4d1db5ed96 100644
--- a/Content.Server/Silicon/Charge/Systems/SiliconChargeDeathSystem.cs
+++ b/Content.Server/Silicon/Charge/Systems/SiliconChargeDeathSystem.cs
@@ -2,14 +2,9 @@
 using Content.Shared.Silicon.Systems;
 using Content.Server.Bed.Sleep;
 using Content.Shared.Bed.Sleep;
-using Content.Server.Sound.Components;
 using Content.Server.Silicon.Charge;
-using System.Threading;
 using Content.Server.Humanoid;
 using Content.Shared.Humanoid;
-using Content.Shared.Humanoid.Markings;
-using Robust.Shared.Utility;
-using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Server.Silicon.Death;
 
@@ -40,7 +35,7 @@ private void OnSiliconChargeStateUpdate(EntityUid uid, SiliconDownOnDeadComponen
         if (args.ChargePercent == 0 && !siliconDeadComp.Dead)
             SiliconDead(uid, siliconDeadComp, batteryComp, uid);
         else if (args.ChargePercent != 0 && siliconDeadComp.Dead)
-                SiliconUnDead(uid, siliconDeadComp, batteryComp, uid);
+            SiliconUnDead(uid, siliconDeadComp, batteryComp, uid);
     }
 
     private void SiliconDead(EntityUid uid, SiliconDownOnDeadComponent siliconDeadComp, BatteryComponent? batteryComp, EntityUid batteryUid)
@@ -54,7 +49,7 @@ private void SiliconDead(EntityUid uid, SiliconDownOnDeadComponent siliconDeadCo
         EntityManager.EnsureComponent<SleepingComponent>(uid);
         EntityManager.EnsureComponent<ForcedSleepingComponent>(uid);
 
-        if (TryComp(uid, out HumanoidAppearanceComponent? humanoidAppearanceComponent))
+        if (TryComp<HumanoidAppearanceComponent>(uid, out var humanoidAppearanceComponent))
         {
             var layers = HumanoidVisualLayersExtension.Sublayers(HumanoidVisualLayers.HeadSide);
             _humanoidAppearanceSystem.SetLayersVisibility(uid, layers, false, true, humanoidAppearanceComponent);
diff --git a/Content.Server/Silicon/Charge/Systems/SiliconChargeSystem.cs b/Content.Server/Silicon/Charge/Systems/SiliconChargeSystem.cs
index de50c828bd7..d8b034a69f5 100644
--- a/Content.Server/Silicon/Charge/Systems/SiliconChargeSystem.cs
+++ b/Content.Server/Silicon/Charge/Systems/SiliconChargeSystem.cs
@@ -10,20 +10,16 @@
 using Content.Shared.Silicon.Systems;
 using Content.Shared.Movement.Systems;
 using Content.Server.Body.Components;
-using Content.Server.Power.EntitySystems;
 using Robust.Shared.Containers;
 using Content.Shared.Mind.Components;
 using System.Diagnostics.CodeAnalysis;
 using Content.Server.PowerCell;
 using Robust.Shared.Timing;
 using Robust.Shared.Configuration;
-using Robust.Shared.Audio.Systems;
 using Robust.Shared.Utility;
 using Content.Shared.CCVar;
 using Content.Shared.PowerCell.Components;
-using Content.Shared.Mind;
 using Content.Shared.Alert;
-using Content.Server.Silicon.Death;
 
 namespace Content.Server.Silicon.Charge;
 
@@ -34,7 +30,6 @@ public sealed class SiliconChargeSystem : EntitySystem
     [Dependency] private readonly FlammableSystem _flammable = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _moveMod = default!;
-    [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IConfigurationManager _config = default!;
     [Dependency] private readonly PowerCellSystem _powerCell = default!;
@@ -49,27 +44,23 @@ public override void Initialize()
     public bool TryGetSiliconBattery(EntityUid silicon, [NotNullWhen(true)] out BatteryComponent? batteryComp)
     {
         batteryComp = null;
-        if (!TryComp(silicon, out SiliconComponent? siliconComp))
+        if (!HasComp<SiliconComponent>(silicon))
             return false;
 
-
         // try get a battery directly on the inserted entity
         if (TryComp(silicon, out batteryComp)
             || _powerCell.TryGetBatteryFromSlot(silicon, out batteryComp))
             return true;
 
-
         //DebugTools.Assert("SiliconComponent does not contain Battery");
         return false;
     }
 
     private void OnSiliconStartup(EntityUid uid, SiliconComponent component, ComponentStartup args)
     {
-        if (!TryComp(uid, out PowerCellSlotComponent? batterySlot))
+        if (!HasComp<PowerCellSlotComponent>(uid))
             return;
 
-        var container = _container.GetContainer(uid, batterySlot.CellSlotId);
-
         if (component.EntityType.GetType() != typeof(SiliconType))
             DebugTools.Assert("SiliconComponent.EntityType is not a SiliconType enum.");
     }
@@ -82,7 +73,8 @@ public override void Update(float frameTime)
         var query = EntityQueryEnumerator<SiliconComponent>();
         while (query.MoveNext(out var silicon, out var siliconComp))
         {
-            if (!siliconComp.BatteryPowered)
+            if (_mobState.IsDead(silicon)
+                || !siliconComp.BatteryPowered)
                 continue;
 
             // Check if the Silicon is an NPC, and if so, follow the delay as specified in the CVAR.
@@ -107,20 +99,11 @@ public override void Update(float frameTime)
                 continue;
             }
 
-            // If the silicon is dead, skip it.
-            if (_mobState.IsDead(silicon))
+            // If the silicon ghosted or is SSD while still being powered, skip it.
+            if (TryComp<MindContainerComponent>(silicon, out var mindContComp)
+                && !mindContComp.HasMind)
                 continue;
 
-            // If the silicon ghosted or is SSD while still being powered, skip it. - DeltaV
-            if (EntityManager.TryGetComponent<MindContainerComponent>(silicon, out var mindContComp)
-                && EntityManager.TryGetComponent<SiliconDownOnDeadComponent>(silicon, out var siliconDeathComp))
-            {
-                if ((mindContComp.HasMind == false || CompOrNull<MindComponent>(mindContComp.Mind)?.Session == null) && !siliconDeathComp.Dead)
-                {
-                    continue;
-                }
-            }
-
             var drainRate = siliconComp.DrainPerSecond;
 
             // All multipliers will be subtracted by 1, and then added together, and then multiplied by the drain rate. This is then added to the base drain rate.
@@ -131,7 +114,7 @@ public override void Update(float frameTime)
             // Maybe use something similar to refreshmovespeedmodifiers, where it's stored in the component.
             // Maybe it doesn't matter, and stuff should just use static drain?
             if (!siliconComp.EntityType.Equals(SiliconType.Npc)) // Don't bother checking heat if it's an NPC. It's a waste of time, and it'd be delayed due to the update time.
-                drainRateFinalAddi += SiliconHeatEffects(silicon, frameTime) - 1; // This will need to be changed at some point if we allow external batteries, since the heat of the Silicon might not be applicable.
+                drainRateFinalAddi += SiliconHeatEffects(silicon, siliconComp, frameTime) - 1; // This will need to be changed at some point if we allow external batteries, since the heat of the Silicon might not be applicable.
 
             // Ensures that the drain rate is at least 10% of normal,
             // and would allow at least 4 minutes of life with a max charge, to prevent cheese.
@@ -166,14 +149,12 @@ public void UpdateChargeState(EntityUid uid, short chargePercent, SiliconCompone
         }
     }
 
-    private float SiliconHeatEffects(EntityUid silicon, float frameTime)
+    private float SiliconHeatEffects(EntityUid silicon, SiliconComponent siliconComp, float frameTime)
     {
-        if (!EntityManager.TryGetComponent<TemperatureComponent>(silicon, out var temperComp) 
-            || !EntityManager.TryGetComponent<ThermalRegulatorComponent>(silicon, out var thermalComp))
+        if (!TryComp<TemperatureComponent>(silicon, out var temperComp)
+            || !TryComp<ThermalRegulatorComponent>(silicon, out var thermalComp))
             return 0;
 
-        var siliconComp = EntityManager.GetComponent<SiliconComponent>(silicon);
-
         // If the Silicon is hot, drain the battery faster, if it's cold, drain it slower, capped.
         var upperThresh = thermalComp.NormalBodyTemperature + thermalComp.ThermalRegulationTemperatureThreshold;
         var upperThreshHalf = thermalComp.NormalBodyTemperature + thermalComp.ThermalRegulationTemperatureThreshold * 0.5f;
@@ -198,12 +179,11 @@ private float SiliconHeatEffects(EntityUid silicon, float frameTime)
                 return hotTempMulti;
 
             _popup.PopupEntity(Loc.GetString("silicon-overheating"), silicon, silicon, PopupType.MediumCaution);
-            if (_random.Prob(Math.Clamp(temperComp.CurrentTemperature / (upperThresh * 5), 0.001f, 0.9f)))
-            {
-                //MaximumFireStacks and MinimumFireStacks doesn't exists on EE
-                _flammable.AdjustFireStacks(silicon, Math.Clamp(siliconComp.FireStackMultiplier,  -10, 10), flamComp);
-                _flammable.Ignite(silicon, silicon, flamComp);
-            }
+            if (!_random.Prob(Math.Clamp(temperComp.CurrentTemperature / (upperThresh * 5), 0.001f, 0.9f)))
+                return hotTempMulti;
+
+            _flammable.AdjustFireStacks(silicon, Math.Clamp(siliconComp.FireStackMultiplier, -10, 10), flamComp);
+            _flammable.Ignite(silicon, silicon, flamComp);
             return hotTempMulti;
         }
 
diff --git a/Content.Server/Silicon/DeadStartupButtonSystem/DeadStartupButtonSystem.cs b/Content.Server/Silicon/DeadStartupButtonSystem/DeadStartupButtonSystem.cs
index a25f2a22545..1c43a3cff91 100644
--- a/Content.Server/Silicon/DeadStartupButtonSystem/DeadStartupButtonSystem.cs
+++ b/Content.Server/Silicon/DeadStartupButtonSystem/DeadStartupButtonSystem.cs
@@ -1,4 +1,3 @@
-using Content.Server.Chat.Systems;
 using Content.Server.Lightning;
 using Content.Server.Popups;
 using Content.Server.PowerCell;
@@ -25,7 +24,6 @@ public sealed class DeadStartupButtonSystem : SharedDeadStartupButtonSystem
     [Dependency] private readonly LightningSystem _lightning = default!;
     [Dependency] private readonly SiliconChargeSystem _siliconChargeSystem = default!;
     [Dependency] private readonly PowerCellSystem _powerCell = default!;
-    [Dependency] private readonly ChatSystem _chatSystem = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -39,14 +37,13 @@ public override void Initialize()
     private void OnDoAfter(EntityUid uid, DeadStartupButtonComponent comp, OnDoAfterButtonPressedEvent args)
     {
         if (args.Handled || args.Cancelled
-            || !TryComp(uid, out MobStateComponent? mobStateComponent) 
+            || !TryComp<MobStateComponent>(uid, out var mobStateComponent)
             || !_mobState.IsDead(uid, mobStateComponent)
-            || !TryComp(uid, out MobThresholdsComponent? mobThresholdsComponent) 
-            || !TryComp(uid, out DamageableComponent? damageable))
+            || !TryComp<MobThresholdsComponent>(uid, out var mobThresholdsComponent)
+            || !TryComp<DamageableComponent>(uid, out var damageable)
+            || !_mobThreshold.TryGetThresholdForState(uid, MobState.Critical, out var criticalThreshold, mobThresholdsComponent))
             return;
 
-        var criticalThreshold = _mobThreshold.GetThresholdForState(uid, MobState.Critical, mobThresholdsComponent);
-
         if (damageable.TotalDamage < criticalThreshold)
             _mobState.ChangeMobState(uid, MobState.Alive, mobStateComponent);
         else
@@ -59,9 +56,9 @@ private void OnDoAfter(EntityUid uid, DeadStartupButtonComponent comp, OnDoAfter
 
     private void OnElectrocuted(EntityUid uid, DeadStartupButtonComponent comp, ElectrocutedEvent args)
     {
-        if (!TryComp(uid, out MobStateComponent? mobStateComponent) 
+        if (!TryComp<MobStateComponent>(uid, out var mobStateComponent)
             || !_mobState.IsDead(uid, mobStateComponent)
-            || !_siliconChargeSystem.TryGetSiliconBattery(uid, out var bateria) 
+            || !_siliconChargeSystem.TryGetSiliconBattery(uid, out var bateria)
             || bateria.CurrentCharge <= 0)
             return;
 
@@ -72,13 +69,10 @@ private void OnElectrocuted(EntityUid uid, DeadStartupButtonComponent comp, Elec
 
     private void OnMobStateChanged(EntityUid uid, DeadStartupButtonComponent comp, MobStateChangedEvent args)
     {
+        if (args.NewMobState != MobState.Alive)
+            return;
 
-        if (args.NewMobState == MobState.Alive)
-        {
-            _popup.PopupEntity(Loc.GetString("dead-startup-system-reboot-success", ("target", MetaData(uid).EntityName)), uid);
-            _audio.PlayPvs(comp.Sound, uid);
-        }
-
+        _popup.PopupEntity(Loc.GetString("dead-startup-system-reboot-success", ("target", MetaData(uid).EntityName)), uid);
+        _audio.PlayPvs(comp.Sound, uid);
     }
-
 }
diff --git a/Content.Server/Silicon/EmitBuzzWhileDamaged/EmitBuzzWhileDamagedSystem.cs b/Content.Server/Silicon/EmitBuzzWhileDamaged/EmitBuzzWhileDamagedSystem.cs
index 05e5f5af89b..161a912d061 100644
--- a/Content.Server/Silicon/EmitBuzzWhileDamaged/EmitBuzzWhileDamagedSystem.cs
+++ b/Content.Server/Silicon/EmitBuzzWhileDamaged/EmitBuzzWhileDamagedSystem.cs
@@ -1,13 +1,13 @@
 using Content.Server.Popups;
 using Content.Shared.Silicon.EmitBuzzWhileDamaged;
 using Content.Shared.Audio;
-using Content.Shared.Body.Components;
 using Content.Shared.Damage;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Systems;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
+using Content.Shared.Mobs.Components;
 
 namespace Content.Server.Silicon.EmitBuzzOnCrit;
 
@@ -27,34 +27,29 @@ public override void Update(float frameTime)
     {
         base.Update(frameTime);
 
-        var query = EntityQueryEnumerator<EmitBuzzWhileDamagedComponent, BodyComponent>();
+        var query = EntityQueryEnumerator<EmitBuzzWhileDamagedComponent, MobStateComponent, MobThresholdsComponent, DamageableComponent>();
 
-        while (query.MoveNext(out var uid, out var emitBuzzOnCritComponent, out var body))
+        while (query.MoveNext(out var uid, out var emitBuzzOnCritComponent, out var mobStateComponent, out var thresholdsComponent, out var damageableComponent))
         {
-
-            if (_mobState.IsDead(uid)
-                || !_mobThreshold.TryGetThresholdForState(uid, MobState.Critical, out var threshold) 
-                || !TryComp(uid, out DamageableComponent? damageableComponent)
-                || damageableComponent.TotalDamage < (threshold/2))
+            if (_mobState.IsDead(uid, mobStateComponent)
+                || !_mobThreshold.TryGetThresholdForState(uid, MobState.Critical, out var threshold, thresholdsComponent)
+                || damageableComponent.TotalDamage < threshold / 2)
                 continue;
 
-
+            // Check update time
             emitBuzzOnCritComponent.AccumulatedFrametime += frameTime;
-
             if (emitBuzzOnCritComponent.AccumulatedFrametime < emitBuzzOnCritComponent.CycleDelay)
                 continue;
             emitBuzzOnCritComponent.AccumulatedFrametime -= emitBuzzOnCritComponent.CycleDelay;
 
+            if (_gameTiming.CurTime <= emitBuzzOnCritComponent.LastBuzzPopupTime + emitBuzzOnCritComponent.BuzzPopupCooldown)
+                continue;
 
-            // start buzzing
-            if (_gameTiming.CurTime >= emitBuzzOnCritComponent.LastBuzzPopupTime + emitBuzzOnCritComponent.BuzzPopupCooldown)
-            {
-                emitBuzzOnCritComponent.LastBuzzPopupTime = _gameTiming.CurTime;
-                _popupSystem.PopupEntity(Loc.GetString("silicon-behavior-buzz"), uid);
-                Spawn("EffectSparks", Transform(uid).Coordinates);
-                _audio.PlayPvs(emitBuzzOnCritComponent.Sound, uid, AudioHelpers.WithVariation(0.05f, _robustRandom));
-            }
+            // Start buzzing
+            emitBuzzOnCritComponent.LastBuzzPopupTime = _gameTiming.CurTime;
+            _popupSystem.PopupEntity(Loc.GetString("silicon-behavior-buzz"), uid);
+            Spawn("EffectSparks", Transform(uid).Coordinates);
+            _audio.PlayPvs(emitBuzzOnCritComponent.Sound, uid, AudioHelpers.WithVariation(0.05f, _robustRandom));
         }
     }
-
 }
diff --git a/Content.Server/Silicon/EncryptionHolderRequiresLock/EncryptionHolderRequiresLockSystem.cs b/Content.Server/Silicon/EncryptionHolderRequiresLock/EncryptionHolderRequiresLockSystem.cs
index 5eb4f25c49b..6efb51096c3 100644
--- a/Content.Server/Silicon/EncryptionHolderRequiresLock/EncryptionHolderRequiresLockSystem.cs
+++ b/Content.Server/Silicon/EncryptionHolderRequiresLock/EncryptionHolderRequiresLockSystem.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Lock;
 using Content.Shared.Radio.Components;
 using Content.Shared.Radio.EntitySystems;
@@ -8,7 +7,6 @@ namespace Content.Server.Silicon.EncryptionHolderRequiresLock;
 public sealed class EncryptionHolderRequiresLockSystem : EntitySystem
 
 {
-    [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
     [Dependency] private readonly EncryptionKeySystem _encryptionKeySystem = default!;
 
     /// <inheritdoc/>
@@ -16,11 +14,11 @@ public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<EncryptionHolderRequiresLockComponent, LockToggledEvent>(LockToggled);
-
     }
+
     private void LockToggled(EntityUid uid, EncryptionHolderRequiresLockComponent component, LockToggledEvent args)
     {
-        if (!TryComp<LockComponent>(uid, out var lockComp) 
+        if (!TryComp<LockComponent>(uid, out var lockComp)
             || !TryComp<EncryptionKeyHolderComponent>(uid, out var keyHolder))
             return;
 
diff --git a/Content.Server/Silicon/IPC/InternalEncryptionKeySpawner.cs b/Content.Server/Silicon/IPC/InternalEncryptionKeySpawner.cs
index eb01409e854..5f799a102e7 100644
--- a/Content.Server/Silicon/IPC/InternalEncryptionKeySpawner.cs
+++ b/Content.Server/Silicon/IPC/InternalEncryptionKeySpawner.cs
@@ -1,39 +1,34 @@
-using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Content.Shared.Radio.Components;
 using Content.Shared.Containers;
 using Robust.Shared.Containers;
 
- // Pretty much copied from StationSpawningSystem.SpawnStartingGear
 namespace Content.Server.Silicon.IPC;
-public static class InternalEncryptionKeySpawner
+public sealed partial class InternalEncryptionKeySpawner : EntitySystem
 {
-    public static void TryInsertEncryptionKey(EntityUid target, StartingGearPrototype startingGear, IEntityManager entityManager, HumanoidCharacterProfile? profile)
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    public void TryInsertEncryptionKey(EntityUid target, StartingGearPrototype startingGear, IEntityManager entityManager)
     {
-        if (entityManager.TryGetComponent<EncryptionKeyHolderComponent>(target, out var keyHolderComp))
-        {
-            var earEquipString = startingGear.GetGear("ears", profile);
-            var containerMan = entityManager.System<SharedContainerSystem>();
+#pragma warning disable CS8073
+        if (target == null // target can be null during race conditions intentionally created by awful tests.
+#pragma warning restore CS8073
+            || !TryComp<EncryptionKeyHolderComponent>(target, out var keyHolderComp)
+            || keyHolderComp is null
+            || !startingGear.Equipment.TryGetValue("ears", out var earEquipString)
+            || string.IsNullOrEmpty(earEquipString))
+            return;
 
-            if (!string.IsNullOrEmpty(earEquipString))
-            {
-                var earEntity = entityManager.SpawnEntity(earEquipString, entityManager.GetComponent<TransformComponent>(target).Coordinates);
+        var earEntity = entityManager.SpawnEntity(earEquipString, entityManager.GetComponent<TransformComponent>(target).Coordinates);
+        if (!entityManager.HasComponent<EncryptionKeyHolderComponent>(earEntity)
+            || !entityManager.TryGetComponent<ContainerFillComponent>(earEntity, out var fillComp)
+            || !fillComp.Containers.TryGetValue(EncryptionKeyHolderComponent.KeyContainerName, out var defaultKeys))
+            return;
 
-                if (entityManager.TryGetComponent<EncryptionKeyHolderComponent>(earEntity, out _) && // I had initially wanted this to spawn the headset, and simply move all the keys over, but the headset didn't seem to have any keys in it when spawned...
-                    entityManager.TryGetComponent<ContainerFillComponent>(earEntity, out var fillComp) &&
-                    fillComp.Containers.TryGetValue(EncryptionKeyHolderComponent.KeyContainerName, out var defaultKeys))
-                {
-                    containerMan.CleanContainer(keyHolderComp.KeyContainer);
+        _container.CleanContainer(keyHolderComp.KeyContainer);
 
-                    foreach (var key in defaultKeys)
-                    {
-                        var keyEntity = entityManager.SpawnEntity(key, entityManager.GetComponent<TransformComponent>(target).Coordinates);
-                        containerMan.Insert(keyEntity, keyHolderComp.KeyContainer, force: true);
-                    }
-                }
+        foreach (var key in defaultKeys)
+            entityManager.SpawnInContainerOrDrop(key, target, keyHolderComp.KeyContainer.ID, out _);
 
-                entityManager.QueueDeleteEntity(earEntity);
-            }
-        }
+        entityManager.QueueDeleteEntity(earEntity);
     }
 }
diff --git a/Content.Server/Silicon/Systems/SiliconMiscSystem.cs b/Content.Server/Silicon/Systems/SiliconMiscSystem.cs
deleted file mode 100644
index 85d76c77bc8..00000000000
--- a/Content.Server/Silicon/Systems/SiliconMiscSystem.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Shared.Silicon.Components;
-using Content.Shared.Bed.Sleep;
-
-namespace Content.Server.Silicon.Misc;
-
-// This entire thing is fucking stupid and I hate it.
-public sealed class SiliconMiscSystem : EntitySystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SiliconComponent, TryingToSleepEvent>(OnTryingToSleep);
-    }
-
-    private void OnTryingToSleep(EntityUid uid, SiliconComponent component, ref TryingToSleepEvent args)
-    {
-        args.Cancelled = true;
-    }
-}
diff --git a/Content.Server/Silicon/WeldingHealable/WeldingHealableComponent.cs b/Content.Server/Silicon/WeldingHealable/WeldingHealableComponent.cs
index 115e9308707..9f4b6c3483f 100644
--- a/Content.Server/Silicon/WeldingHealable/WeldingHealableComponent.cs
+++ b/Content.Server/Silicon/WeldingHealable/WeldingHealableComponent.cs
@@ -1,9 +1,5 @@
-using Content.Shared.Damage;
-using Content.Shared.Tools;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+namespace Content.Server.Silicon.WeldingHealable;
+
+[RegisterComponent]
+public sealed partial class WeldingHealableComponent : Component { }
 
-namespace Content.Server.Silicon.WeldingHealable
-{
-    [RegisterComponent]
-    public sealed partial class WeldingHealableComponent : Component { }
-}
diff --git a/Content.Server/Silicon/WeldingHealable/WeldingHealableSystem.cs b/Content.Server/Silicon/WeldingHealable/WeldingHealableSystem.cs
index 09a2ee99fcd..e0783db0c8b 100644
--- a/Content.Server/Silicon/WeldingHealable/WeldingHealableSystem.cs
+++ b/Content.Server/Silicon/WeldingHealable/WeldingHealableSystem.cs
@@ -1,121 +1,102 @@
-using System.Diagnostics;
 using Content.Server.Silicon.WeldingHealing;
-using Content.Server.Administration.Logs;
-using Content.Server.Stack;
 using Content.Server.Tools.Components;
 using Content.Shared.Silicon.WeldingHealing;
-using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Damage;
-using Content.Shared.Database;
-using Content.Shared.Eye.Blinding.Components;
-using Content.Shared.Eye.Blinding.Systems;
-using Content.Shared.FixedPoint;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
-using Content.Shared.Tools;
-using Content.Shared.Stacks;
 using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
 
-namespace Content.Server.Silicon.WeldingHealable
-{
-    public sealed class WeldingHealableSystem : SharedWeldingHealableSystem
-    {
-        [Dependency] private readonly SharedToolSystem _toolSystem = default!;
-        [Dependency] private readonly DamageableSystem _damageableSystem = default!;
-        [Dependency] private readonly SharedPopupSystem _popup = default!;
-        [Dependency] private readonly IAdminLogManager _adminLogger= default!;
-        [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer= default!;
-
-        public override void Initialize()
-        {
-            SubscribeLocalEvent<WeldingHealableComponent, InteractUsingEvent>(Repair);
-            SubscribeLocalEvent<WeldingHealableComponent, SiliconRepairFinishedEvent>(OnRepairFinished);
-        }
-
-        private void OnRepairFinished(EntityUid uid, WeldingHealableComponent healableComponentcomponent, SiliconRepairFinishedEvent args)
-        {
-            if (args.Cancelled || args.Used == null
-                || !EntityManager.TryGetComponent(args.Target, out DamageableComponent? damageable)
-                || !EntityManager.TryGetComponent(args.Used, out WeldingHealingComponent? component)
-                || damageable.DamageContainerID != null
-                && !component.DamageContainers.Contains(damageable.DamageContainerID))
-                return;
-
-            var damageChanged = _damageableSystem.TryChangeDamage(uid, component.Damage, true, false, origin: args.User);
-
-
-            if (!HasDamage(damageable, component))
-                return;
-
-            if (TryComp(args.Used, out WelderComponent? welder) &&
-                TryComp(args.Used, out SolutionContainerManagerComponent? solutionContainer))
-            {
-                if (!_solutionContainer.ResolveSolution(((EntityUid) args.Used, solutionContainer), welder.FuelSolutionName, ref welder.FuelSolution, out var solution))
-                    return;
-                _solutionContainer.RemoveReagent(welder.FuelSolution.Value, welder.FuelReagent, component.FuelCost);
-            }
-
-            var str = Loc.GetString("comp-repairable-repair",
-                ("target", uid),
-                ("tool", args.Used!));
-            _popup.PopupEntity(str, uid, args.User);
-
-
-            if (args.Used.HasValue)
-            {
-                args.Handled = _toolSystem.UseTool(args.Used.Value, args.User, uid, args.Delay, component.QualityNeeded, new SiliconRepairFinishedEvent
-                {
-                    Delay = args.Delay
-                });
-            }
-        }
-
-
+namespace Content.Server.Silicon.WeldingHealable;
 
-        private async void Repair(EntityUid uid, WeldingHealableComponent healableComponent, InteractUsingEvent args)
-        {
-            if (args.Handled
-                || !EntityManager.TryGetComponent(args.Used, out WeldingHealingComponent? component)
-                || !EntityManager.TryGetComponent(args.Target, out DamageableComponent? damageable)
-                || damageable.DamageContainerID != null
-                && !component.DamageContainers.Contains(damageable.DamageContainerID)
-                || !HasDamage(damageable, component)
-                || !_toolSystem.HasQuality(args.Used, component.QualityNeeded))
-                return;
+public sealed class WeldingHealableSystem : SharedWeldingHealableSystem
+{
+    [Dependency] private readonly SharedToolSystem _toolSystem = default!;
+    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
 
-            float delay = component.DoAfterDelay;
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<WeldingHealableComponent, InteractUsingEvent>(Repair);
+        SubscribeLocalEvent<WeldingHealableComponent, SiliconRepairFinishedEvent>(OnRepairFinished);
+    }
 
-            // Add a penalty to how long it takes if the user is repairing itself
-            if (args.User == args.Target)
+    private void OnRepairFinished(EntityUid uid, WeldingHealableComponent healableComponent, SiliconRepairFinishedEvent args)
+    {
+        if (args.Cancelled || args.Used == null
+            || !TryComp<DamageableComponent>(args.Target, out var damageable)
+            || !TryComp<WeldingHealingComponent>(args.Used, out var component)
+            || damageable.DamageContainerID is null
+            || !component.DamageContainers.Contains(damageable.DamageContainerID)
+            || !HasDamage(damageable, component)
+            || !TryComp<WelderComponent>(args.Used, out var welder)
+            || !TryComp<SolutionContainerManagerComponent>(args.Used, out var solutionContainer)
+            || !_solutionContainer.ResolveSolution(((EntityUid) args.Used, solutionContainer), welder.FuelSolutionName, ref welder.FuelSolution))
+            return;
+
+        _damageableSystem.TryChangeDamage(uid, component.Damage, true, false, origin: args.User);
+
+        _solutionContainer.RemoveReagent(welder.FuelSolution.Value, welder.FuelReagent, component.FuelCost);
+
+        var str = Loc.GetString("comp-repairable-repair",
+            ("target", uid),
+            ("tool", args.Used!));
+        _popup.PopupEntity(str, uid, args.User);
+
+        if (!args.Used.HasValue)
+            return;
+
+        args.Handled = _toolSystem.UseTool
+            (args.Used.Value,
+            args.User,
+            uid,
+            args.Delay,
+            component.QualityNeeded,
+            new SiliconRepairFinishedEvent
             {
-                if (!component.AllowSelfHeal)
-                    return;
-
-                delay *= component.SelfHealPenalty;
-            }
+                Delay = args.Delay
+            });
+    }
 
-            // Run the repairing doafter
-            args.Handled = _toolSystem.UseTool(args.Used, args.User, args.Target, delay, component.QualityNeeded, new SiliconRepairFinishedEvent
+    private async void Repair(EntityUid uid, WeldingHealableComponent healableComponent, InteractUsingEvent args)
+    {
+        if (args.Handled
+            || !EntityManager.TryGetComponent(args.Used, out WeldingHealingComponent? component)
+            || !EntityManager.TryGetComponent(args.Target, out DamageableComponent? damageable)
+            || damageable.DamageContainerID is null
+            || !component.DamageContainers.Contains(damageable.DamageContainerID)
+            || !HasDamage(damageable, component)
+            || !_toolSystem.HasQuality(args.Used, component.QualityNeeded)
+            || args.User == args.Target && !component.AllowSelfHeal)
+            return;
+
+        float delay = args.User == args.Target
+            ? component.DoAfterDelay * component.SelfHealPenalty
+            : component.DoAfterDelay;
+
+        args.Handled = _toolSystem.UseTool
+            (args.Used,
+            args.User,
+            args.Target,
+            delay,
+            component.QualityNeeded,
+            new SiliconRepairFinishedEvent
             {
                 Delay = delay,
             });
+    }
 
-        }
-        private bool HasDamage(DamageableComponent component, WeldingHealingComponent healable)
-        {
-            var damageableDict = component.Damage.DamageDict;
-            var healingDict = healable.Damage.DamageDict;
-            foreach (var type in healingDict)
-            {
-                if (damageableDict[type.Key].Value > 0)
-                {
-                    return true;
-                }
-            }
-
+    private bool HasDamage(DamageableComponent component, WeldingHealingComponent healable)
+    {
+        if (healable.Damage.DamageDict is null)
             return false;
-        }
+
+        foreach (var type in healable.Damage.DamageDict)
+            if (component.Damage.DamageDict[type.Key].Value > 0)
+                return true;
+        return false;
     }
 }
+
diff --git a/Content.Server/Silicon/WeldingHealing/WeldingHealingComponent.cs b/Content.Server/Silicon/WeldingHealing/WeldingHealingComponent.cs
index c381d547180..a7aa1707938 100644
--- a/Content.Server/Silicon/WeldingHealing/WeldingHealingComponent.cs
+++ b/Content.Server/Silicon/WeldingHealing/WeldingHealingComponent.cs
@@ -2,47 +2,46 @@
 using Content.Shared.Tools;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Silicon.WeldingHealing
+namespace Content.Server.Silicon.WeldingHealing;
+
+[RegisterComponent]
+public sealed partial class WeldingHealingComponent : Component
 {
-    [RegisterComponent]
-    public sealed partial class WeldingHealingComponent : Component
-    {
-        /// <summary>
-        ///     All the damage to change information is stored in this <see cref="DamageSpecifier"/>.
-        /// </summary>
-        /// <remarks>
-        ///     If this data-field is specified, it will change damage by this amount instead of setting all damage to 0.
-        ///     in order to heal/repair the damage values have to be negative.
-        /// </remarks>
-
-        [DataField(required: true)]
-        public DamageSpecifier Damage;
-
-        [DataField(customTypeSerializer:typeof(PrototypeIdSerializer<ToolQualityPrototype>))]
-        public string QualityNeeded = "Welding";
-
-        /// <summary>
-        ///     The fuel amount needed to repair physical related damage
-        /// </summary>
-        [DataField]
-        public int FuelCost = 5;
-
-        [DataField]
-        public int DoAfterDelay = 3;
-
-        /// <summary>
-        ///     A multiplier that will be applied to the above if an entity is repairing themselves.
-        /// </summary>
-        [DataField]
-        public float SelfHealPenalty = 3f;
-
-        /// <summary>
-        ///     Whether or not an entity is allowed to repair itself.
-        /// </summary>
-        [DataField]
-        public bool AllowSelfHeal = true;
-
-        [DataField(required: true)]
-        public List<string> DamageContainers;
-    }
+    /// <summary>
+    ///     All the damage to change information is stored in this <see cref="DamageSpecifier"/>.
+    /// </summary>
+    /// <remarks>
+    ///     If this data-field is specified, it will change damage by this amount instead of setting all damage to 0.
+    ///     in order to heal/repair the damage values have to be negative.
+    /// </remarks>
+
+    [DataField(required: true)]
+    public DamageSpecifier Damage;
+
+    [DataField(customTypeSerializer:typeof(PrototypeIdSerializer<ToolQualityPrototype>))]
+    public string QualityNeeded = "Welding";
+
+    /// <summary>
+    ///     The fuel amount needed to repair physical related damage
+    /// </summary>
+    [DataField]
+    public int FuelCost = 5;
+
+    [DataField]
+    public int DoAfterDelay = 3;
+
+    /// <summary>
+    ///     A multiplier that will be applied to the above if an entity is repairing themselves.
+    /// </summary>
+    [DataField]
+    public float SelfHealPenalty = 3f;
+
+    /// <summary>
+    ///     Whether or not an entity is allowed to repair itself.
+    /// </summary>
+    [DataField]
+    public bool AllowSelfHeal = true;
+
+    [DataField(required: true)]
+    public List<string> DamageContainers;
 }
diff --git a/Content.Server/Standing/LayingDownComponent.cs b/Content.Server/Standing/LayingDownComponent.cs
deleted file mode 100644
index 7921749f148..00000000000
--- a/Content.Server/Standing/LayingDownComponent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Content.Server.Standing;
-
-[RegisterComponent]
-public sealed partial class LayingDownComponent : Component
-{
-    [DataField]
-    public float DownedSpeedMultiplier = 0.15f;
-
-    [DataField]
-    public TimeSpan Cooldown = TimeSpan.FromSeconds(2.5f);
-
-    [DataField]
-    public TimeSpan NextToggleAttempt = TimeSpan.Zero;
-}
diff --git a/Content.Server/Standing/LayingDownSystem.cs b/Content.Server/Standing/LayingDownSystem.cs
index 73a929fdfc4..e5054bdd706 100644
--- a/Content.Server/Standing/LayingDownSystem.cs
+++ b/Content.Server/Standing/LayingDownSystem.cs
@@ -1,101 +1,28 @@
-using Content.Shared.ActionBlocker;
-using Content.Shared.Input;
-using Content.Shared.Movement.Systems;
-using Content.Shared.Popups;
 using Content.Shared.Standing;
-using Robust.Shared.Input.Binding;
-using Robust.Shared.Player;
-using Robust.Shared.Timing;
+using Content.Shared.CCVar;
+using Robust.Shared.Configuration;
 
 namespace Content.Server.Standing;
 
-/// <remarks>Unfortunately cannot be shared because some standing conditions are server-side only</remarks>
-public sealed class LayingDownSystem : EntitySystem
+public sealed class LayingDownSystem : SharedLayingDownSystem
 {
-    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
-    [Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
-    [Dependency] private readonly SharedPopupSystem _popups = default!;
-    [Dependency] private readonly Shared.Standing.StandingStateSystem _standing = default!; // WHY IS THERE TWO DIFFERENT STANDING SYSTEMS?!
-    [Dependency] private readonly IGameTiming _timing = default!;
-
+    [Dependency] private readonly INetConfigurationManager _cfg = default!;
 
     public override void Initialize()
     {
-        CommandBinds.Builder
-            .Bind(ContentKeyFunctions.ToggleStanding, InputCmdHandler.FromDelegate(ToggleStanding, handle: false, outsidePrediction: false))
-            .Register<LayingDownSystem>();
-
-        SubscribeLocalEvent<LayingDownComponent, StoodEvent>(DoRefreshMovementSpeed);
-        SubscribeLocalEvent<LayingDownComponent, DownedEvent>(DoRefreshMovementSpeed);
-        SubscribeLocalEvent<LayingDownComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeed);
-        SubscribeLocalEvent<LayingDownComponent, EntParentChangedMessage>(OnParentChanged);
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-
-        CommandBinds.Unregister<LayingDownSystem>();
-    }
+        base.Initialize();
 
-    private void DoRefreshMovementSpeed(EntityUid uid, LayingDownComponent component, object args)
-    {
-        _movement.RefreshMovementSpeedModifiers(uid);
+        SubscribeNetworkEvent<CheckAutoGetUpEvent>(OnCheckAutoGetUp);
     }
 
-    private void OnRefreshMovementSpeed(EntityUid uid, LayingDownComponent component, RefreshMovementSpeedModifiersEvent args)
+    private void OnCheckAutoGetUp(CheckAutoGetUpEvent ev, EntitySessionEventArgs args)
     {
-        if (TryComp<StandingStateComponent>(uid, out var standingState) && standingState.Standing)
-            return;
+        var uid = GetEntity(ev.User);
 
-        args.ModifySpeed(component.DownedSpeedMultiplier, component.DownedSpeedMultiplier, bypassImmunity: true);
-    }
-
-    private void OnParentChanged(EntityUid uid, LayingDownComponent component, EntParentChangedMessage args)
-    {
-        // If the entity is not on a grid, try to make it stand up to avoid issues
-        if (!TryComp<StandingStateComponent>(uid, out var standingState)
-            || standingState.Standing
-            || Transform(uid).GridUid != null)
+        if (!TryComp(uid, out LayingDownComponent? layingDown))
             return;
 
-        _standing.Stand(uid, standingState);
-    }
-
-    private void ToggleStanding(ICommonSession? session)
-    {
-        if (session is not { AttachedEntity: { Valid: true } uid } playerSession
-            || !Exists(uid)
-            || !TryComp<StandingStateComponent>(uid, out var standingState)
-            || !TryComp<LayingDownComponent>(uid, out var layingDown))
-            return;
-
-        // If successful, show popup to self and others. Otherwise, only to self.
-        if (ToggleStandingImpl(uid, standingState, layingDown, out var popupBranch))
-        {
-            _popups.PopupEntity(Loc.GetString($"laying-comp-{popupBranch}-other", ("entity", uid)), uid, Filter.PvsExcept(uid), true);
-            layingDown.NextToggleAttempt = _timing.CurTime + layingDown.Cooldown;
-        }
-
-        _popups.PopupEntity(Loc.GetString($"laying-comp-{popupBranch}-self", ("entity", uid)), uid, uid);
-    }
-
-    private bool ToggleStandingImpl(EntityUid uid, StandingStateComponent standingState, LayingDownComponent layingDown, out string popupBranch)
-    {
-        var success = layingDown.NextToggleAttempt <= _timing.CurTime;
-
-        if (_standing.IsDown(uid, standingState))
-        {
-            success = success && _standing.Stand(uid, standingState, force: false);
-            popupBranch = success ? "stand-success" : "stand-fail";
-        }
-        else
-        {
-            success = success && Transform(uid).GridUid != null; // Do not allow laying down when not on a surface.
-            success = success && _standing.Down(uid, standingState: standingState, playSound: true, dropHeldItems: false);
-            popupBranch = success ? "lay-success" : "lay-fail";
-        }
-
-        return success;
+        layingDown.AutoGetUp = _cfg.GetClientCVar(args.SenderSession.Channel, CCVars.AutoGetUp);
+        Dirty(uid, layingDown);
     }
 }
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index 61fc1e0a51b..92f16de5c73 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -47,7 +47,7 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
     [Dependency] private readonly SharedAccessSystem _accessSystem = default!;
     [Dependency] private readonly IdentitySystem _identity = default!;
     [Dependency] private readonly MetaDataSystem _metaSystem = default!;
-
+    [Dependency] private readonly InternalEncryptionKeySpawner _internalEncryption = default!;
     [Dependency] private readonly ArrivalsSystem _arrivalsSystem = default!;
     [Dependency] private readonly ContainerSpawnPointSystem _containerSpawnPointSystem = default!;
 
@@ -176,7 +176,7 @@ public EntityUid SpawnPlayerMob(
             EquipStartingGear(entity.Value, startingGear);
             if (profile != null)
                 EquipIdCard(entity.Value, profile.Name, prototype, station);
-                InternalEncryptionKeySpawner.TryInsertEncryptionKey(entity.Value, startingGear, EntityManager, profile); // Parkstation - IPC
+            _internalEncryption.TryInsertEncryptionKey(entity.Value, startingGear, EntityManager);
         }
 
         if (profile != null)
diff --git a/Content.Server/StationEvents/Events/NoosphericZapRule.cs b/Content.Server/StationEvents/Events/NoosphericZapRule.cs
index 4be7b6e63fc..96c33612036 100644
--- a/Content.Server/StationEvents/Events/NoosphericZapRule.cs
+++ b/Content.Server/StationEvents/Events/NoosphericZapRule.cs
@@ -36,9 +36,9 @@ protected override void Started(EntityUid uid, NoosphericZapRuleComponent compon
             _stunSystem.TryParalyze(psion, TimeSpan.FromSeconds(component.StunDuration), false);
             _statusEffectsSystem.TryAddStatusEffect(psion, "Stutter", TimeSpan.FromSeconds(component.StutterDuration), false, "StutteringAccent");
 
-            if (psionicComponent.CanReroll)
+            if (!psionicComponent.CanReroll)
             {
-                psionicComponent.CanReroll = false;
+                psionicComponent.CanReroll = true;
                 _popupSystem.PopupEntity(Loc.GetString("noospheric-zap-seize-potential-regained"), psion, psion, Shared.Popups.PopupType.LargeCaution);
             }
             else
diff --git a/Content.Server/Telescope/TelescopeSystem.cs b/Content.Server/Telescope/TelescopeSystem.cs
new file mode 100644
index 00000000000..0e53cc15a20
--- /dev/null
+++ b/Content.Server/Telescope/TelescopeSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Telescope;
+
+namespace Content.Server.Telescope;
+
+public sealed class TelescopeSystem : SharedTelescopeSystem;
diff --git a/Content.Server/Traits/Assorted/LayingDownModifierSystem.cs b/Content.Server/Traits/Assorted/LayingDownModifierSystem.cs
index dc6dcd2de3b..e4a63d6108b 100644
--- a/Content.Server/Traits/Assorted/LayingDownModifierSystem.cs
+++ b/Content.Server/Traits/Assorted/LayingDownModifierSystem.cs
@@ -1,5 +1,5 @@
 using Content.Server.Traits.Assorted;
-using Content.Server.Standing;
+using Content.Shared.Standing;
 
 namespace Content.Shared.Traits.Assorted.Systems;
 
@@ -16,7 +16,7 @@ private void OnStartup(EntityUid uid, LayingDownModifierComponent component, Com
         if (!TryComp<LayingDownComponent>(uid, out var layingDown))
             return;
 
-        layingDown.Cooldown *= component.LayingDownCooldownMultiplier;
-        layingDown.DownedSpeedMultiplier *= component.DownedSpeedMultiplierMultiplier;
+        layingDown.StandingUpTime *= component.LayingDownCooldownMultiplier;
+        layingDown.SpeedModify *= component.DownedSpeedMultiplierMultiplier;
     }
 }
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index bad706f8154..417817b5419 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1771,6 +1771,12 @@ public static readonly CVarDef<int>
         public static readonly CVarDef<bool> AccessibilityColorblindFriendly =
             CVarDef.Create("accessibility.colorblind_friendly", false, CVar.CLIENTONLY | CVar.ARCHIVE);
 
+        /// <summary>
+        /// Disables all vision filters for species like Vulpkanin or Harpies. There are good reasons someone might want to disable these.
+        /// </summary>
+        public static readonly CVarDef<bool> NoVisionFilters =
+            CVarDef.Create("accessibility.no_vision_filters", false, CVar.CLIENTONLY | CVar.ARCHIVE);
+
         /*
          * CHAT
          */
@@ -2457,6 +2463,16 @@ public static readonly CVarDef<float>
 
         #endregion
 
+        #region Lying Down System
+
+        public static readonly CVarDef<bool> AutoGetUp =
+            CVarDef.Create("rest.auto_get_up", true, CVar.CLIENT | CVar.ARCHIVE | CVar.REPLICATED);
+
+        public static readonly CVarDef<bool> HoldLookUp =
+            CVarDef.Create("rest.hold_look_up", false, CVar.CLIENT | CVar.ARCHIVE);
+            
+        #endregion
+        
         #region Material Reclaimer
 
         /// <summary>
diff --git a/Content.Shared/Contests/ContestsSystem.cs b/Content.Shared/Contests/ContestsSystem.cs
index 35a52d7fc3c..4dc89e2bbc9 100644
--- a/Content.Shared/Contests/ContestsSystem.cs
+++ b/Content.Shared/Contests/ContestsSystem.cs
@@ -7,468 +7,467 @@
 using Robust.Shared.Configuration;
 using Robust.Shared.Physics.Components;
 
-namespace Content.Shared.Contests
+namespace Content.Shared.Contests;
+
+public sealed partial class ContestsSystem : EntitySystem
 {
-    public sealed partial class ContestsSystem : EntitySystem
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
+
+    /// <summary>
+    ///     The presumed average mass of a player entity
+    ///     Defaulted to the average mass of an adult human
+    /// </summary>
+    private const float AverageMass = 71f;
+
+    /// <summary>
+    ///     The presumed average sum of a Psionic's Baseline Amplification and Baseline Dampening.
+    ///     Since Baseline casting stats are a random value between 0.4 and 1.2, this is defaulted to 0.8 + 0.8.
+    /// </summary>
+    private const float AveragePsionicPotential = 1.6f;
+
+    #region Mass Contests
+    /// <summary>
+    ///     Outputs the ratio of mass between a performer and the average human mass
+    /// </summary>
+    /// <remarks>
+    ///     bypassClamp is a deprecated input intended for supporting legacy Nyanotrasen systems. Do not use it if you don't know what you're doing.
+    /// </remarks>
+    public float MassContest(EntityUid performerUid, bool bypassClamp = false, float rangeFactor = 1f, float otherMass = AverageMass)
+    {
+        if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+            || !_cfg.GetCVar(CCVars.DoMassContests)
+            || !TryComp<PhysicsComponent>(performerUid, out var performerPhysics)
+            || performerPhysics.Mass == 0)
+            return 1f;
+
+        return ContestClamp(ContestClampOverride(bypassClamp)
+            ? performerPhysics.Mass / otherMass
+            : Math.Clamp(performerPhysics.Mass / otherMass,
+                1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
+                1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
+    }
+
+    /// <inheritdoc cref="MassContest(EntityUid, bool, float, float)"/>
+    /// <remarks>
+    ///     MaybeMassContest, in case your entity doesn't exist
+    /// </remarks>
+    public float MassContest(EntityUid? performerUid, bool bypassClamp = false, float rangeFactor = 1f, float otherMass = AverageMass)
+    {
+        if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+            || !_cfg.GetCVar(CCVars.DoMassContests)
+            || performerUid is null)
+            return 1f;
+
+        return MassContest(performerUid.Value, bypassClamp, rangeFactor, otherMass);
+    }
+
+    /// <summary>
+    ///     Outputs the ratio of mass between a performer and the average human mass
+    ///     If a function already has the performer's physics component, this is faster
+    /// </summary>
+    /// <remarks>
+    ///     bypassClamp is a deprecated input intended for supporting legacy Nyanotrasen systems. Do not use it if you don't know what you're doing.
+    /// </remarks>
+    public float MassContest(PhysicsComponent performerPhysics, bool bypassClamp = false, float rangeFactor = 1f, float otherMass = AverageMass)
+    {
+        if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+            || !_cfg.GetCVar(CCVars.DoMassContests)
+            || performerPhysics.Mass == 0)
+            return 1f;
+
+        return ContestClamp(ContestClampOverride(bypassClamp)
+            ? performerPhysics.Mass / otherMass
+            : Math.Clamp(performerPhysics.Mass / otherMass,
+                1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
+                1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
+    }
+
+    /// <summary>
+    ///     Outputs the ratio of mass between a performer and a target, accepts either EntityUids or PhysicsComponents in any combination
+    ///     If you have physics components already in your function, use <see cref="MassContest(PhysicsComponent, float)" /> instead
+    /// </summary>
+    /// <remarks>
+    ///     bypassClamp is a deprecated input intended for supporting legacy Nyanotrasen systems. Do not use it if you don't know what you're doing.
+    /// </remarks>
+    public float MassContest(EntityUid performerUid, EntityUid targetUid, bool bypassClamp = false, float rangeFactor = 1f)
+    {
+        if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+            || !_cfg.GetCVar(CCVars.DoMassContests)
+            || !TryComp<PhysicsComponent>(performerUid, out var performerPhysics)
+            || !TryComp<PhysicsComponent>(targetUid, out var targetPhysics)
+            || performerPhysics.Mass == 0
+            || targetPhysics.InvMass == 0)
+            return 1f;
+
+        return ContestClamp(ContestClampOverride(bypassClamp)
+            ? performerPhysics.Mass * targetPhysics.InvMass
+            : Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass,
+                1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
+                1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
+    }
+
+    /// <inheritdoc cref="MassContest(EntityUid, EntityUid, bool, float)"/>
+    public float MassContest(EntityUid performerUid, PhysicsComponent targetPhysics, bool bypassClamp = false, float rangeFactor = 1f)
+    {
+        if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+            || !_cfg.GetCVar(CCVars.DoMassContests)
+            || !TryComp<PhysicsComponent>(performerUid, out var performerPhysics)
+            || performerPhysics.Mass == 0
+            || targetPhysics.InvMass == 0)
+            return 1f;
+
+        return ContestClamp(ContestClampOverride(bypassClamp)
+            ? performerPhysics.Mass * targetPhysics.InvMass
+            : Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass,
+                1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
+                1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
+    }
+
+    /// <inheritdoc cref="MassContest(EntityUid, EntityUid, bool, float)"/>
+    public float MassContest(PhysicsComponent performerPhysics, EntityUid targetUid, bool bypassClamp = false, float rangeFactor = 1f)
+    {
+        if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+            || !_cfg.GetCVar(CCVars.DoMassContests)
+            || !TryComp<PhysicsComponent>(targetUid, out var targetPhysics)
+            || performerPhysics.Mass == 0
+            || targetPhysics.InvMass == 0)
+            return 1f;
+
+        return ContestClamp(ContestClampOverride(bypassClamp)
+            ? performerPhysics.Mass * targetPhysics.InvMass
+            : Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass,
+                1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
+                1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
+    }
+
+    /// <inheritdoc cref="MassContest(EntityUid, EntityUid, bool, float)"/>
+    public float MassContest(PhysicsComponent performerPhysics, PhysicsComponent targetPhysics, bool bypassClamp = false, float rangeFactor = 1f)
+    {
+        if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+            || !_cfg.GetCVar(CCVars.DoMassContests)
+            || performerPhysics.Mass == 0
+            || targetPhysics.InvMass == 0)
+            return 1f;
+
+        return ContestClamp(ContestClampOverride(bypassClamp)
+            ? performerPhysics.Mass * targetPhysics.InvMass
+            : Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass,
+                1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
+                1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
+    }
+
+    #endregion
+    #region Stamina Contests
+
+    /// <summary>
+    ///     Outputs 1 minus the percentage of an Entity's Stamina, with a Range of [Epsilon, 1 - 0.25 * rangeFactor], or a range of [Epsilon, 1 - Epsilon] if bypassClamp is true.
+    ///     This will never return a value >1.
+    /// </summary>
+    /// <remarks>
+    ///     bypassClamp is a deprecated input intended for supporting legacy Nyanotrasen systems. Do not use it if you don't know what you're doing.
+    /// </remarks>
+    public float StaminaContest(EntityUid performer, bool bypassClamp = false, float rangeFactor = 1f)
+    {
+        if (!TryComp<StaminaComponent>(performer, out var perfStamina)
+            || perfStamina.StaminaDamage == 0)
+            return 1f;
+
+        return StaminaContest(perfStamina, bypassClamp, rangeFactor);
+    }
+
+    /// <inheritdoc cref="StaminaContest(EntityUid, bool, float)"/>
+    public float StaminaContest(StaminaComponent perfStamina, bool bypassClamp = false, float rangeFactor = 1f)
+    {
+        if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+            || !_cfg.GetCVar(CCVars.DoStaminaContests))
+            return 1f;
+
+        return ContestClamp(ContestClampOverride(bypassClamp)
+            ? 1 - perfStamina.StaminaDamage / perfStamina.CritThreshold
+            : 1 - Math.Clamp(perfStamina.StaminaDamage / perfStamina.CritThreshold, 0, 0.25f * rangeFactor));
+    }
+
+    /// <summary>
+    ///     Outputs the ratio of percentage of an Entity's Stamina and a Target Entity's Stamina, with a Range of [Epsilon, 0.25 * rangeFactor], or a range of [Epsilon, +inf] if bypassClamp is true.
+    ///     This does NOT produce the same kind of outputs as a Single-Entity StaminaContest. 2Entity StaminaContest returns the product of two Solo Stamina Contests, and so its values can be very strange.
+    /// </summary>
+    /// <remarks>
+    ///     bypassClamp is a deprecated input intended for supporting legacy Nyanotrasen systems. Do not use it if you don't know what you're doing.
+    /// </remarks>
+    public float StaminaContest(EntityUid performer, EntityUid target, bool bypassClamp = false, float rangeFactor = 1f)
+    {
+        if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+            || !_cfg.GetCVar(CCVars.DoStaminaContests)
+            || !TryComp<StaminaComponent>(performer, out var perfStamina)
+            || !TryComp<StaminaComponent>(target, out var targetStamina))
+            return 1f;
+
+        return ContestClamp(ContestClampOverride(bypassClamp)
+            ? (1 - perfStamina.StaminaDamage / perfStamina.CritThreshold)
+                / (1 - targetStamina.StaminaDamage / targetStamina.CritThreshold)
+            : (1 - Math.Clamp(perfStamina.StaminaDamage / perfStamina.CritThreshold, 0, 0.25f * rangeFactor))
+                / (1 - Math.Clamp(targetStamina.StaminaDamage / targetStamina.CritThreshold, 0, 0.25f * rangeFactor)));
+    }
+
+    #endregion
+
+    #region Health Contests
+
+    /// <summary>
+    ///     Outputs 1 minus the percentage of an Entity's Health, with a Range of [Epsilon, 1 - 0.25 * rangeFactor], or a range of [Epsilon, 1 - Epsilon] if bypassClamp is true.
+    ///     This will never return a value >1.
+    /// </summary>
+    /// <remarks>
+    ///     bypassClamp is a deprecated input intended for supporting legacy Nyanotrasen systems. Do not use it if you don't know what you're doing.
+    /// </remarks>
+    public float HealthContest(EntityUid performer, bool bypassClamp = false, float rangeFactor = 1f)
+    {
+        if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+            || !_cfg.GetCVar(CCVars.DoHealthContests)
+            || !TryComp<DamageableComponent>(performer, out var damage)
+            || !_mobThreshold.TryGetThresholdForState(performer, Mobs.MobState.Critical, out var threshold))
+            return 1f;
+
+        return ContestClamp(ContestClampOverride(bypassClamp)
+            ? 1 - damage.TotalDamage.Float() / threshold.Value.Float()
+            : 1 - Math.Clamp(damage.TotalDamage.Float() / threshold.Value.Float(), 0, 0.25f * rangeFactor));
+    }
+
+    /// <summary>
+    ///     Outputs the ratio of percentage of an Entity's Health and a Target Entity's Health, with a Range of [Epsilon, 0.25 * rangeFactor], or a range of [Epsilon, +inf] if bypassClamp is true.
+    ///     This does NOT produce the same kind of outputs as a Single-Entity HealthContest. 2Entity HealthContest returns the product of two Solo Health Contests, and so its values can be very strange.
+    /// </summary>
+    /// <remarks>
+    ///     bypassClamp is a deprecated input intended for supporting legacy Nyanotrasen systems. Do not use it if you don't know what you're doing.
+    /// </remarks>
+    public float HealthContest(EntityUid performer, EntityUid target, bool bypassClamp = false, float rangeFactor = 1f)
+    {
+        if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+            || !_cfg.GetCVar(CCVars.DoHealthContests)
+            || !TryComp<DamageableComponent>(performer, out var perfDamage)
+            || !TryComp<DamageableComponent>(target, out var targetDamage)
+            || !_mobThreshold.TryGetThresholdForState(performer, Mobs.MobState.Critical, out var perfThreshold)
+            || !_mobThreshold.TryGetThresholdForState(target, Mobs.MobState.Critical, out var targetThreshold))
+            return 1f;
+
+        return ContestClamp(ContestClampOverride(bypassClamp)
+            ? (1 - perfDamage.TotalDamage.Float() / perfThreshold.Value.Float())
+                / (1 - targetDamage.TotalDamage.Float() / targetThreshold.Value.Float())
+            : (1 - Math.Clamp(perfDamage.TotalDamage.Float() / perfThreshold.Value.Float(), 0, 0.25f * rangeFactor))
+                / (1 - Math.Clamp(targetDamage.TotalDamage.Float() / targetThreshold.Value.Float(), 0, 0.25f * rangeFactor)));
+    }
+    #endregion
+
+    #region Mind Contests
+
+    /// <summary>
+    ///     Returns the ratio of casting stats between a performer and the presumed average latent psionic.
+    ///     Uniquely among Contests, not being Psionic is not a failure condition, and is instead a variable.
+    ///     If you do not have a PsionicComponent, your combined casting stats are assumed to be 0.1f
+    /// </summary>
+    /// <remarks>
+    ///     This can produce some truly astounding modifiers, so be ready to meet god if you bypass the clamp.
+    ///     By bypassing this function's clamp you hereby agree to forfeit your soul to VMSolidus should unintended bugs occur.
+    /// </remarks>
+    public float MindContest(EntityUid performer, bool bypassClamp = false, float rangeFactor = 1f, float otherPsion = AveragePsionicPotential)
+    {
+        if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+            || !_cfg.GetCVar(CCVars.DoMindContests))
+            return 1f;
+
+        var performerPotential = TryComp<PsionicComponent>(performer, out var performerPsionic)
+            ? performerPsionic.CurrentAmplification + performerPsionic.CurrentDampening
+            : 0.1f;
+
+        if (performerPotential == otherPsion)
+            return 1f;
+
+        return ContestClamp(ContestClampOverride(bypassClamp)
+            ? performerPotential / otherPsion
+            : Math.Clamp(performerPotential / otherPsion,
+                1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
+                1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
+    }
+
+    /// <summary>
+    ///     Returns the ratio of casting stats between a performer and a target.
+    ///     Like with single-Uid MindContests, if an entity does not possess a PsionicComponent, its casting stats are assumed to be 0.1f.
+    /// </summary>
+    /// <remarks>
+    ///     This can produce some truly astounding modifiers, so be ready to meet god if you bypass the clamp.
+    ///     By bypassing this function's clamp you hereby agree to forfeit your soul to VMSolidus should unintended bugs occur.
+    /// </remarks>
+    public float MindContest(EntityUid performer, EntityUid target, bool bypassClamp = false, float rangeFactor = 1f)
+    {
+        if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+            || !_cfg.GetCVar(CCVars.DoMindContests))
+            return 1f;
+
+        var performerPotential = TryComp<PsionicComponent>(performer, out var performerPsionic)
+            ? performerPsionic.CurrentAmplification + performerPsionic.CurrentDampening
+            : 0.1f;
+
+        var targetPotential = TryComp<PsionicComponent>(target, out var targetPsionic)
+            ? targetPsionic.CurrentAmplification + targetPsionic.CurrentDampening
+            : 0.1f;
+
+        if (performerPotential == targetPotential)
+            return 1f;
+
+        return ContestClamp(ContestClampOverride(bypassClamp)
+            ? performerPotential / targetPotential
+            : Math.Clamp(performerPotential / targetPotential,
+                1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
+                1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
+    }
+
+    #endregion
+
+    #region Mood Contests
+
+    /// <summary>
+    ///     Outputs the ratio of an Entity's mood level and its Neutral Mood threshold.
+    /// </summary>
+    /// <remarks>
+    ///     bypassClamp is a deprecated input intended for supporting legacy Nyanotrasen systems. Do not use it if you don't know what you're doing.
+    /// </remarks>
+    public float MoodContest(EntityUid performer, bool bypassClamp = false, float rangeFactor = 1f)
+    {
+        if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+            || !_cfg.GetCVar(CCVars.DoMoodContests)
+            || !TryComp<NetMoodComponent>(performer, out var mood))
+            return 1f;
+
+        return ContestClamp(ContestClampOverride(bypassClamp)
+            ? mood.CurrentMoodLevel / mood.NeutralMoodThreshold
+            : Math.Clamp(mood.CurrentMoodLevel / mood.NeutralMoodThreshold,
+                1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
+                1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
+    }
+
+    /// <summary>
+    ///     Outputs the ratio of mood level between two Entities.
+    /// </summary>
+    /// <remarks>
+    ///     bypassClamp is a deprecated input intended for supporting legacy Nyanotrasen systems. Do not use it if you don't know what you're doing.
+    /// </remarks>
+    public float MoodContest(EntityUid performer, EntityUid target, bool bypassClamp = false, float rangeFactor = 1f)
+    {
+        if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+            || !_cfg.GetCVar(CCVars.DoMoodContests)
+            || !TryComp<NetMoodComponent>(performer, out var performerMood)
+            || !TryComp<NetMoodComponent>(target, out var targetMood))
+            return 1f;
+
+        return ContestClamp(ContestClampOverride(bypassClamp)
+            ? performerMood.CurrentMoodLevel / targetMood.CurrentMoodLevel
+            : Math.Clamp(performerMood.CurrentMoodLevel / targetMood.CurrentMoodLevel,
+                1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
+                1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
+    }
+
+    #endregion
+
+    #region EVERY CONTESTS
+
+    /// <summary>
+    ///     EveryContest takes either the Sum or Product of all existing contests, for if you want to just check if somebody is absolutely fucked up.
+    /// </summary>
+    /// <returns>
+    ///     If it's not immediately obvious that a function with 16 optional inputs is a joke, please take a step back and re-evaluate why you're using this function.
+    ///     All prior warnings also apply here. Bypass the clamps at your own risk. By calling this function in your system, you hereby agree to forfeit your soul to VMSolidus if bugs occur.
+    /// </returns>
+    public float EveryContest(
+        EntityUid performer,
+        bool bypassClampMass = false,
+        bool bypassClampStamina = false,
+        bool bypassClampHealth = false,
+        bool bypassClampMind = false,
+        bool bypassClampMood = false,
+        float rangeFactorMass = 1f,
+        float rangeFactorStamina = 1f,
+        float rangeFactorHealth = 1f,
+        float rangeFactorMind = 1f,
+        float rangeFactorMood = 1f,
+        float weightMass = 1f,
+        float weightStamina = 1f,
+        float weightHealth = 1f,
+        float weightMind = 1f,
+        float weightMood = 1f,
+        bool sumOrMultiply = false)
+    {
+        if (!_cfg.GetCVar(CCVars.DoContestsSystem))
+            return 1f;
+
+        var weightTotal = weightMass + weightStamina + weightHealth + weightMind + weightMood;
+        var massMultiplier = weightMass / weightTotal;
+        var staminaMultiplier = weightStamina / weightTotal;
+        var healthMultiplier = weightHealth / weightTotal;
+        var mindMultiplier = weightMind / weightTotal;
+        var moodMultiplier = weightMood / weightTotal;
+
+        return sumOrMultiply
+            ? MassContest(performer, bypassClampMass, rangeFactorMass) * massMultiplier
+                + StaminaContest(performer, bypassClampStamina, rangeFactorStamina) * staminaMultiplier
+                + HealthContest(performer, bypassClampHealth, rangeFactorHealth) * healthMultiplier
+                + MindContest(performer, bypassClampMind, rangeFactorMind) * mindMultiplier
+                + MoodContest(performer, bypassClampMood, rangeFactorMood) * moodMultiplier
+            : ContestClamp(MassContest(performer, bypassClampMass, rangeFactorMass) * massMultiplier
+                * StaminaContest(performer, bypassClampStamina, rangeFactorStamina) * staminaMultiplier
+                * HealthContest(performer, bypassClampHealth, rangeFactorHealth) * healthMultiplier
+                * MindContest(performer, bypassClampMind, rangeFactorMind) * mindMultiplier
+                * MoodContest(performer, bypassClampMood, rangeFactorMood) * moodMultiplier);
+    }
+
+    /// <summary>
+    ///     EveryContest takes either the Sum or Product of all existing contests, for if you want to just check if somebody is absolutely fucked up.
+    /// </summary>
+    /// <returns>
+    ///     If it's not immediately obvious that a function with 16 optional inputs is a joke, please take a step back and re-evaluate why you're using this function.
+    ///     All prior warnings also apply here. Bypass the clamps at your own risk. By calling this function in your system, you hereby agree to forfeit your soul to VMSolidus if bugs occur.
+    /// </returns>
+    public float EveryContest(
+        EntityUid performer,
+        EntityUid target,
+        bool bypassClampMass = false,
+        bool bypassClampStamina = false,
+        bool bypassClampHealth = false,
+        bool bypassClampMind = false,
+        bool bypassClampMood = false,
+        float rangeFactorMass = 1f,
+        float rangeFactorStamina = 1f,
+        float rangeFactorHealth = 1f,
+        float rangeFactorMind = 1f,
+        float rangeFactorMood = 1f,
+        float weightMass = 1f,
+        float weightStamina = 1f,
+        float weightHealth = 1f,
+        float weightMind = 1f,
+        float weightMood = 1f,
+        bool sumOrMultiply = false)
     {
-        [Dependency] private readonly IConfigurationManager _cfg = default!;
-        [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
-
-        /// <summary>
-        ///     The presumed average mass of a player entity
-        ///     Defaulted to the average mass of an adult human
-        /// </summary>
-        private const float AverageMass = 71f;
-
-        /// <summary>
-        ///     The presumed average sum of a Psionic's Baseline Amplification and Baseline Dampening.
-        ///     Since Baseline casting stats are a random value between 0.4 and 1.2, this is defaulted to 0.8 + 0.8.
-        /// </summary>
-        private const float AveragePsionicPotential = 1.6f;
-
-        #region Mass Contests
-        /// <summary>
-        ///     Outputs the ratio of mass between a performer and the average human mass
-        /// </summary>
-        /// <remarks>
-        ///     bypassClamp is a deprecated input intended for supporting legacy Nyanotrasen systems. Do not use it if you don't know what you're doing.
-        /// </remarks>
-        public float MassContest(EntityUid performerUid, bool bypassClamp = false, float rangeFactor = 1f, float otherMass = AverageMass)
-        {
-            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
-                || !_cfg.GetCVar(CCVars.DoMassContests)
-                || !TryComp<PhysicsComponent>(performerUid, out var performerPhysics)
-                || performerPhysics.Mass == 0)
-                return 1f;
-
-            return ContestClamp(ContestClampOverride(bypassClamp)
-                ? performerPhysics.Mass / otherMass
-                : Math.Clamp(performerPhysics.Mass / otherMass,
-                    1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
-                    1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
-        }
-
-        /// <inheritdoc cref="MassContest(EntityUid, bool, float, float)"/>
-        /// <remarks>
-        ///     MaybeMassContest, in case your entity doesn't exist
-        /// </remarks>
-        public float MassContest(EntityUid? performerUid, bool bypassClamp = false, float rangeFactor = 1f, float otherMass = AverageMass)
-        {
-            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
-                || !_cfg.GetCVar(CCVars.DoMassContests)
-                || performerUid is null)
-                return 1f;
-
-            return MassContest(performerUid.Value, bypassClamp, rangeFactor, otherMass);
-        }
-
-        /// <summary>
-        ///     Outputs the ratio of mass between a performer and the average human mass
-        ///     If a function already has the performer's physics component, this is faster
-        /// </summary>
-        /// <remarks>
-        ///     bypassClamp is a deprecated input intended for supporting legacy Nyanotrasen systems. Do not use it if you don't know what you're doing.
-        /// </remarks>
-        public float MassContest(PhysicsComponent performerPhysics, bool bypassClamp = false, float rangeFactor = 1f, float otherMass = AverageMass)
-        {
-            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
-                || !_cfg.GetCVar(CCVars.DoMassContests)
-                || performerPhysics.Mass == 0)
-                return 1f;
-
-            return ContestClamp(ContestClampOverride(bypassClamp)
-                ? performerPhysics.Mass / otherMass
-                : Math.Clamp(performerPhysics.Mass / otherMass,
-                    1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
-                    1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
-        }
-
-        /// <summary>
-        ///     Outputs the ratio of mass between a performer and a target, accepts either EntityUids or PhysicsComponents in any combination
-        ///     If you have physics components already in your function, use <see cref="MassContest(PhysicsComponent, float)" /> instead
-        /// </summary>
-        /// <remarks>
-        ///     bypassClamp is a deprecated input intended for supporting legacy Nyanotrasen systems. Do not use it if you don't know what you're doing.
-        /// </remarks>
-        public float MassContest(EntityUid performerUid, EntityUid targetUid, bool bypassClamp = false, float rangeFactor = 1f)
-        {
-            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
-                || !_cfg.GetCVar(CCVars.DoMassContests)
-                || !TryComp<PhysicsComponent>(performerUid, out var performerPhysics)
-                || !TryComp<PhysicsComponent>(targetUid, out var targetPhysics)
-                || performerPhysics.Mass == 0
-                || targetPhysics.InvMass == 0)
-                return 1f;
-
-            return ContestClamp(ContestClampOverride(bypassClamp)
-                ? performerPhysics.Mass * targetPhysics.InvMass
-                : Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass,
-                    1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
-                    1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
-        }
-
-        /// <inheritdoc cref="MassContest(EntityUid, EntityUid, bool, float)"/>
-        public float MassContest(EntityUid performerUid, PhysicsComponent targetPhysics, bool bypassClamp = false, float rangeFactor = 1f)
-        {
-            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
-                || !_cfg.GetCVar(CCVars.DoMassContests)
-                || !TryComp<PhysicsComponent>(performerUid, out var performerPhysics)
-                || performerPhysics.Mass == 0
-                || targetPhysics.InvMass == 0)
-                return 1f;
-
-            return ContestClamp(ContestClampOverride(bypassClamp)
-                ? performerPhysics.Mass * targetPhysics.InvMass
-                : Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass,
-                    1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
-                    1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
-        }
-
-        /// <inheritdoc cref="MassContest(EntityUid, EntityUid, bool, float)"/>
-        public float MassContest(PhysicsComponent performerPhysics, EntityUid targetUid, bool bypassClamp = false, float rangeFactor = 1f)
-        {
-            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
-                || !_cfg.GetCVar(CCVars.DoMassContests)
-                || !TryComp<PhysicsComponent>(targetUid, out var targetPhysics)
-                || performerPhysics.Mass == 0
-                || targetPhysics.InvMass == 0)
-                return 1f;
-
-            return ContestClamp(ContestClampOverride(bypassClamp)
-                ? performerPhysics.Mass * targetPhysics.InvMass
-                : Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass,
-                    1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
-                    1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
-        }
-
-        /// <inheritdoc cref="MassContest(EntityUid, EntityUid, bool, float)"/>
-        public float MassContest(PhysicsComponent performerPhysics, PhysicsComponent targetPhysics, bool bypassClamp = false, float rangeFactor = 1f)
-        {
-            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
-                || !_cfg.GetCVar(CCVars.DoMassContests)
-                || performerPhysics.Mass == 0
-                || targetPhysics.InvMass == 0)
-                return 1f;
-
-            return ContestClamp(ContestClampOverride(bypassClamp)
-                ? performerPhysics.Mass * targetPhysics.InvMass
-                : Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass,
-                    1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
-                    1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
-        }
-
-        #endregion
-        #region Stamina Contests
-
-        /// <summary>
-        ///     Outputs 1 minus the percentage of an Entity's Stamina, with a Range of [Epsilon, 1 - 0.25 * rangeFactor], or a range of [Epsilon, 1 - Epsilon] if bypassClamp is true.
-        ///     This will never return a value >1.
-        /// </summary>
-        /// <remarks>
-        ///     bypassClamp is a deprecated input intended for supporting legacy Nyanotrasen systems. Do not use it if you don't know what you're doing.
-        /// </remarks>
-        public float StaminaContest(EntityUid performer, bool bypassClamp = false, float rangeFactor = 1f)
-        {
-            if (!TryComp<StaminaComponent>(performer, out var perfStamina)
-                || perfStamina.StaminaDamage == 0)
-                return 1f;
-
-            return StaminaContest(perfStamina, bypassClamp, rangeFactor);
-        }
-
-        /// <inheritdoc cref="StaminaContest(EntityUid, bool, float)"/>
-        public float StaminaContest(StaminaComponent perfStamina, bool bypassClamp = false, float rangeFactor = 1f)
-        {
-            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
-                || !_cfg.GetCVar(CCVars.DoStaminaContests))
-                return 1f;
-
-            return ContestClamp(ContestClampOverride(bypassClamp)
-                ? 1 - perfStamina.StaminaDamage / perfStamina.CritThreshold
-                : 1 - Math.Clamp(perfStamina.StaminaDamage / perfStamina.CritThreshold, 0, 0.25f * rangeFactor));
-        }
-
-        /// <summary>
-        ///     Outputs the ratio of percentage of an Entity's Stamina and a Target Entity's Stamina, with a Range of [Epsilon, 0.25 * rangeFactor], or a range of [Epsilon, +inf] if bypassClamp is true.
-        ///     This does NOT produce the same kind of outputs as a Single-Entity StaminaContest. 2Entity StaminaContest returns the product of two Solo Stamina Contests, and so its values can be very strange.
-        /// </summary>
-        /// <remarks>
-        ///     bypassClamp is a deprecated input intended for supporting legacy Nyanotrasen systems. Do not use it if you don't know what you're doing.
-        /// </remarks>
-        public float StaminaContest(EntityUid performer, EntityUid target, bool bypassClamp = false, float rangeFactor = 1f)
-        {
-            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
-                || !_cfg.GetCVar(CCVars.DoStaminaContests)
-                || !TryComp<StaminaComponent>(performer, out var perfStamina)
-                || !TryComp<StaminaComponent>(target, out var targetStamina))
-                return 1f;
-
-            return ContestClamp(ContestClampOverride(bypassClamp)
-                ? (1 - perfStamina.StaminaDamage / perfStamina.CritThreshold)
-                    / (1 - targetStamina.StaminaDamage / targetStamina.CritThreshold)
-                : (1 - Math.Clamp(perfStamina.StaminaDamage / perfStamina.CritThreshold, 0, 0.25f * rangeFactor))
-                    / (1 - Math.Clamp(targetStamina.StaminaDamage / targetStamina.CritThreshold, 0, 0.25f * rangeFactor)));
-        }
-
-        #endregion
-
-        #region Health Contests
-
-        /// <summary>
-        ///     Outputs 1 minus the percentage of an Entity's Health, with a Range of [Epsilon, 1 - 0.25 * rangeFactor], or a range of [Epsilon, 1 - Epsilon] if bypassClamp is true.
-        ///     This will never return a value >1.
-        /// </summary>
-        /// <remarks>
-        ///     bypassClamp is a deprecated input intended for supporting legacy Nyanotrasen systems. Do not use it if you don't know what you're doing.
-        /// </remarks>
-        public float HealthContest(EntityUid performer, bool bypassClamp = false, float rangeFactor = 1f)
-        {
-            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
-                || !_cfg.GetCVar(CCVars.DoHealthContests)
-                || !TryComp<DamageableComponent>(performer, out var damage)
-                || !_mobThreshold.TryGetThresholdForState(performer, Mobs.MobState.Critical, out var threshold))
-                return 1f;
-
-            return ContestClamp(ContestClampOverride(bypassClamp)
-                ? 1 - damage.TotalDamage.Float() / threshold.Value.Float()
-                : 1 - Math.Clamp(damage.TotalDamage.Float() / threshold.Value.Float(), 0, 0.25f * rangeFactor));
-        }
-
-        /// <summary>
-        ///     Outputs the ratio of percentage of an Entity's Health and a Target Entity's Health, with a Range of [Epsilon, 0.25 * rangeFactor], or a range of [Epsilon, +inf] if bypassClamp is true.
-        ///     This does NOT produce the same kind of outputs as a Single-Entity HealthContest. 2Entity HealthContest returns the product of two Solo Health Contests, and so its values can be very strange.
-        /// </summary>
-        /// <remarks>
-        ///     bypassClamp is a deprecated input intended for supporting legacy Nyanotrasen systems. Do not use it if you don't know what you're doing.
-        /// </remarks>
-        public float HealthContest(EntityUid performer, EntityUid target, bool bypassClamp = false, float rangeFactor = 1f)
-        {
-            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
-                || !_cfg.GetCVar(CCVars.DoHealthContests)
-                || !TryComp<DamageableComponent>(performer, out var perfDamage)
-                || !TryComp<DamageableComponent>(target, out var targetDamage)
-                || !_mobThreshold.TryGetThresholdForState(performer, Mobs.MobState.Critical, out var perfThreshold)
-                || !_mobThreshold.TryGetThresholdForState(target, Mobs.MobState.Critical, out var targetThreshold))
-                return 1f;
-
-            return ContestClamp(ContestClampOverride(bypassClamp)
-                ? (1 - perfDamage.TotalDamage.Float() / perfThreshold.Value.Float())
-                    / (1 - targetDamage.TotalDamage.Float() / targetThreshold.Value.Float())
-                : (1 - Math.Clamp(perfDamage.TotalDamage.Float() / perfThreshold.Value.Float(), 0, 0.25f * rangeFactor))
-                    / (1 - Math.Clamp(targetDamage.TotalDamage.Float() / targetThreshold.Value.Float(), 0, 0.25f * rangeFactor)));
-        }
-        #endregion
-
-        #region Mind Contests
-
-        /// <summary>
-        ///     Returns the ratio of casting stats between a performer and the presumed average latent psionic.
-        ///     Uniquely among Contests, not being Psionic is not a failure condition, and is instead a variable.
-        ///     If you do not have a PsionicComponent, your combined casting stats are assumed to be 0.1f
-        /// </summary>
-        /// <remarks>
-        ///     This can produce some truly astounding modifiers, so be ready to meet god if you bypass the clamp.
-        ///     By bypassing this function's clamp you hereby agree to forfeit your soul to VMSolidus should unintended bugs occur.
-        /// </remarks>
-        public float MindContest(EntityUid performer, bool bypassClamp = false, float rangeFactor = 1f, float otherPsion = AveragePsionicPotential)
-        {
-            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
-                || !_cfg.GetCVar(CCVars.DoMindContests))
-                return 1f;
-
-            var performerPotential = TryComp<PsionicComponent>(performer, out var performerPsionic)
-                ? performerPsionic.CurrentAmplification + performerPsionic.CurrentDampening
-                : 0.1f;
-
-            if (performerPotential == otherPsion)
-                return 1f;
-
-            return ContestClamp(ContestClampOverride(bypassClamp)
-                ? performerPotential / otherPsion
-                : Math.Clamp(performerPotential / otherPsion,
-                    1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
-                    1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
-        }
-
-        /// <summary>
-        ///     Returns the ratio of casting stats between a performer and a target.
-        ///     Like with single-Uid MindContests, if an entity does not possess a PsionicComponent, its casting stats are assumed to be 0.1f.
-        /// </summary>
-        /// <remarks>
-        ///     This can produce some truly astounding modifiers, so be ready to meet god if you bypass the clamp.
-        ///     By bypassing this function's clamp you hereby agree to forfeit your soul to VMSolidus should unintended bugs occur.
-        /// </remarks>
-        public float MindContest(EntityUid performer, EntityUid target, bool bypassClamp = false, float rangeFactor = 1f)
-        {
-            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
-                || !_cfg.GetCVar(CCVars.DoMindContests))
-                return 1f;
-
-            var performerPotential = TryComp<PsionicComponent>(performer, out var performerPsionic)
-                ? performerPsionic.CurrentAmplification + performerPsionic.CurrentDampening
-                : 0.1f;
-
-            var targetPotential = TryComp<PsionicComponent>(target, out var targetPsionic)
-                ? targetPsionic.CurrentAmplification + targetPsionic.CurrentDampening
-                : 0.1f;
-
-            if (performerPotential == targetPotential)
-                return 1f;
-
-            return ContestClamp(ContestClampOverride(bypassClamp)
-                ? performerPotential / targetPotential
-                : Math.Clamp(performerPotential / targetPotential,
-                    1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
-                    1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
-        }
-
-        #endregion
-
-        #region Mood Contests
-
-        /// <summary>
-        ///     Outputs the ratio of an Entity's mood level and its Neutral Mood threshold.
-        /// </summary>
-        /// <remarks>
-        ///     bypassClamp is a deprecated input intended for supporting legacy Nyanotrasen systems. Do not use it if you don't know what you're doing.
-        /// </remarks>
-        public float MoodContest(EntityUid performer, bool bypassClamp = false, float rangeFactor = 1f)
-        {
-            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
-                || !_cfg.GetCVar(CCVars.DoMoodContests)
-                || !TryComp<NetMoodComponent>(performer, out var mood))
-                return 1f;
-
-            return ContestClamp(ContestClampOverride(bypassClamp)
-                ? mood.CurrentMoodLevel / mood.NeutralMoodThreshold
-                : Math.Clamp(mood.CurrentMoodLevel / mood.NeutralMoodThreshold,
-                    1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
-                    1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
-        }
-
-        /// <summary>
-        ///     Outputs the ratio of mood level between two Entities.
-        /// </summary>
-        /// <remarks>
-        ///     bypassClamp is a deprecated input intended for supporting legacy Nyanotrasen systems. Do not use it if you don't know what you're doing.
-        /// </remarks>
-        public float MoodContest(EntityUid performer, EntityUid target, bool bypassClamp = false, float rangeFactor = 1f)
-        {
-            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
-                || !_cfg.GetCVar(CCVars.DoMoodContests)
-                || !TryComp<NetMoodComponent>(performer, out var performerMood)
-                || !TryComp<NetMoodComponent>(target, out var targetMood))
-                return 1f;
-
-            return ContestClamp(ContestClampOverride(bypassClamp)
-                ? performerMood.CurrentMoodLevel / targetMood.CurrentMoodLevel
-                : Math.Clamp(performerMood.CurrentMoodLevel / targetMood.CurrentMoodLevel,
-                    1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
-                    1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor));
-        }
-
-        #endregion
-
-        #region EVERY CONTESTS
-
-        /// <summary>
-        ///     EveryContest takes either the Sum or Product of all existing contests, for if you want to just check if somebody is absolutely fucked up.
-        /// </summary>
-        /// <returns>
-        ///     If it's not immediately obvious that a function with 16 optional inputs is a joke, please take a step back and re-evaluate why you're using this function.
-        ///     All prior warnings also apply here. Bypass the clamps at your own risk. By calling this function in your system, you hereby agree to forfeit your soul to VMSolidus if bugs occur.
-        /// </returns>
-        public float EveryContest(
-        	EntityUid performer,
-            bool bypassClampMass = false,
-            bool bypassClampStamina = false,
-            bool bypassClampHealth = false,
-            bool bypassClampMind = false,
-            bool bypassClampMood = false,
-            float rangeFactorMass = 1f,
-            float rangeFactorStamina = 1f,
-            float rangeFactorHealth = 1f,
-            float rangeFactorMind = 1f,
-            float rangeFactorMood = 1f,
-            float weightMass = 1f,
-            float weightStamina = 1f,
-            float weightHealth = 1f,
-            float weightMind = 1f,
-            float weightMood = 1f,
-            bool sumOrMultiply = false)
-        {
-            if (!_cfg.GetCVar(CCVars.DoContestsSystem))
-                return 1f;
-
-            var weightTotal = weightMass + weightStamina + weightHealth + weightMind + weightMood;
-            var massMultiplier = weightMass / weightTotal;
-            var staminaMultiplier = weightStamina / weightTotal;
-            var healthMultiplier = weightHealth / weightTotal;
-            var mindMultiplier = weightMind / weightTotal;
-            var moodMultiplier = weightMood / weightTotal;
-
-            return sumOrMultiply
-                ? MassContest(performer, bypassClampMass, rangeFactorMass) * massMultiplier
-                    + StaminaContest(performer, bypassClampStamina, rangeFactorStamina) * staminaMultiplier
-                    + HealthContest(performer, bypassClampHealth, rangeFactorHealth) * healthMultiplier
-                    + MindContest(performer, bypassClampMind, rangeFactorMind) * mindMultiplier
-                    + MoodContest(performer, bypassClampMood, rangeFactorMood) * moodMultiplier
-                : ContestClamp(MassContest(performer, bypassClampMass, rangeFactorMass) * massMultiplier
-                    * StaminaContest(performer, bypassClampStamina, rangeFactorStamina) * staminaMultiplier
-                    * HealthContest(performer, bypassClampHealth, rangeFactorHealth) * healthMultiplier
-                    * MindContest(performer, bypassClampMind, rangeFactorMind) * mindMultiplier
-                    * MoodContest(performer, bypassClampMood, rangeFactorMood) * moodMultiplier);
-        }
-
-        /// <summary>
-        ///     EveryContest takes either the Sum or Product of all existing contests, for if you want to just check if somebody is absolutely fucked up.
-        /// </summary>
-        /// <returns>
-        ///     If it's not immediately obvious that a function with 16 optional inputs is a joke, please take a step back and re-evaluate why you're using this function.
-        ///     All prior warnings also apply here. Bypass the clamps at your own risk. By calling this function in your system, you hereby agree to forfeit your soul to VMSolidus if bugs occur.
-        /// </returns>
-        public float EveryContest(
-        	EntityUid performer,
-        	EntityUid target,
-            bool bypassClampMass = false,
-            bool bypassClampStamina = false,
-            bool bypassClampHealth = false,
-            bool bypassClampMind = false,
-            bool bypassClampMood = false,
-            float rangeFactorMass = 1f,
-            float rangeFactorStamina = 1f,
-            float rangeFactorHealth = 1f,
-            float rangeFactorMind = 1f,
-            float rangeFactorMood = 1f,
-            float weightMass = 1f,
-            float weightStamina = 1f,
-            float weightHealth = 1f,
-            float weightMind = 1f,
-            float weightMood = 1f,
-            bool sumOrMultiply = false)
-        {
-            if (!_cfg.GetCVar(CCVars.DoContestsSystem))
-                return 1f;
-
-            var weightTotal = weightMass + weightStamina + weightHealth + weightMind + weightMood;
-            var massMultiplier = weightMass / weightTotal;
-            var staminaMultiplier = weightStamina / weightTotal;
-            var healthMultiplier = weightHealth / weightTotal;
-            var mindMultiplier = weightMind / weightTotal;
-            var moodMultiplier = weightMood / weightTotal;
-
-            return sumOrMultiply
-                ? MassContest(performer, target, bypassClampMass, rangeFactorMass) * massMultiplier
-                    + StaminaContest(performer, target, bypassClampStamina, rangeFactorStamina) * staminaMultiplier
-                    + HealthContest(performer, target, bypassClampHealth, rangeFactorHealth) * healthMultiplier
-                    + MindContest(performer, target, bypassClampMind, rangeFactorMind) * mindMultiplier
-                    + MoodContest(performer, target, bypassClampMood, rangeFactorMood) * moodMultiplier
-                : ContestClamp(MassContest(performer, target, bypassClampMass, rangeFactorMass) * massMultiplier
-                    * StaminaContest(performer, target, bypassClampStamina, rangeFactorStamina) * staminaMultiplier
-                    * HealthContest(performer, target, bypassClampHealth, rangeFactorHealth) * healthMultiplier
-                    * MindContest(performer, target, bypassClampMind, rangeFactorMind) * mindMultiplier
-                    * MoodContest(performer, target, bypassClampMood, rangeFactorMood) * moodMultiplier);
-        }
-        #endregion
+        if (!_cfg.GetCVar(CCVars.DoContestsSystem))
+            return 1f;
+
+        var weightTotal = weightMass + weightStamina + weightHealth + weightMind + weightMood;
+        var massMultiplier = weightMass / weightTotal;
+        var staminaMultiplier = weightStamina / weightTotal;
+        var healthMultiplier = weightHealth / weightTotal;
+        var mindMultiplier = weightMind / weightTotal;
+        var moodMultiplier = weightMood / weightTotal;
+
+        return sumOrMultiply
+            ? MassContest(performer, target, bypassClampMass, rangeFactorMass) * massMultiplier
+                + StaminaContest(performer, target, bypassClampStamina, rangeFactorStamina) * staminaMultiplier
+                + HealthContest(performer, target, bypassClampHealth, rangeFactorHealth) * healthMultiplier
+                + MindContest(performer, target, bypassClampMind, rangeFactorMind) * mindMultiplier
+                + MoodContest(performer, target, bypassClampMood, rangeFactorMood) * moodMultiplier
+            : ContestClamp(MassContest(performer, target, bypassClampMass, rangeFactorMass) * massMultiplier
+                * StaminaContest(performer, target, bypassClampStamina, rangeFactorStamina) * staminaMultiplier
+                * HealthContest(performer, target, bypassClampHealth, rangeFactorHealth) * healthMultiplier
+                * MindContest(performer, target, bypassClampMind, rangeFactorMind) * mindMultiplier
+                * MoodContest(performer, target, bypassClampMood, rangeFactorMood) * moodMultiplier);
     }
+    #endregion
 }
diff --git a/Content.Shared/DeltaV/CCVars/DCCVars.cs b/Content.Shared/DeltaV/CCVars/DCCVars.cs
index 2028397ffe2..89a14275bef 100644
--- a/Content.Shared/DeltaV/CCVars/DCCVars.cs
+++ b/Content.Shared/DeltaV/CCVars/DCCVars.cs
@@ -15,10 +15,4 @@ public sealed class DCCVars
     /// </summary>
     public static readonly CVarDef<bool> RoundEndPacifist =
         CVarDef.Create("game.round_end_pacifist", false, CVar.SERVERONLY);
-
-    /// <summary>
-    /// Disables all vision filters for species like Vulpkanin or Harpies. There are good reasons someone might want to disable these.
-    /// </summary>
-    public static readonly CVarDef<bool> NoVisionFilters =
-        CVarDef.Create("accessibility.no_vision_filters", false, CVar.CLIENTONLY | CVar.ARCHIVE);
 }
diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs
index dac780783c7..f85983282c7 100644
--- a/Content.Shared/Input/ContentKeyFunctions.cs
+++ b/Content.Shared/Input/ContentKeyFunctions.cs
@@ -57,6 +57,7 @@ public static class ContentKeyFunctions
         public static readonly BoundKeyFunction ResetZoom = "ResetZoom";
         public static readonly BoundKeyFunction OfferItem = "OfferItem";
         public static readonly BoundKeyFunction ToggleStanding = "ToggleStanding";
+        public static readonly BoundKeyFunction LookUp = "LookUp";
 
         public static readonly BoundKeyFunction ArcadeUp = "ArcadeUp";
         public static readonly BoundKeyFunction ArcadeDown = "ArcadeDown";
diff --git a/Content.Shared/Lock/LockComponent.cs b/Content.Shared/Lock/LockComponent.cs
index 9606540a74a..875451b5a14 100644
--- a/Content.Shared/Lock/LockComponent.cs
+++ b/Content.Shared/Lock/LockComponent.cs
@@ -14,88 +14,82 @@ namespace Content.Shared.Lock;
 public sealed partial class LockComponent : Component
 {
     /// <summary>
-    /// Whether or not the lock is locked.
+    ///     Whether or not the lock is locked.
     /// </summary>
-    [DataField("locked"), ViewVariables(VVAccess.ReadWrite)]
-    [AutoNetworkedField]
-    public bool Locked  = true;
+    [DataField, AutoNetworkedField]
+    public bool Locked = true;
 
     /// <summary>
-    /// Whether or not the lock is toggled by simply clicking.
+    ///     Whether or not the lock is toggled by simply clicking.
     /// </summary>
-    [DataField("lockOnClick"), ViewVariables(VVAccess.ReadWrite)]
-    [AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool LockOnClick;
 
     /// <summary>
-    /// Whether or not the lock is unlocked by simply clicking.
+    ///     Whether or not the lock is unlocked by simply clicking.
     /// </summary>
-    [DataField("unlockOnClick"), ViewVariables(VVAccess.ReadWrite)]
-    [AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool UnlockOnClick = true;
 
 
     /// <summary>
-    /// The sound played when unlocked.
+    ///     The sound played when unlocked.
     /// </summary>
-    [DataField("unlockingSound"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier UnlockSound = new SoundPathSpecifier("/Audio/Machines/door_lock_off.ogg")
     {
         Params = AudioParams.Default.WithVolume(-5f),
     };
 
     /// <summary>
-    /// The sound played when locked.
+    ///     The sound played when locked.
     /// </summary>
-    [DataField("lockingSound"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier LockSound = new SoundPathSpecifier("/Audio/Machines/door_lock_on.ogg")
     {
         Params = AudioParams.Default.WithVolume(-5f)
     };
 
     /// <summary>
-    /// Whether or not an emag disables it.
+    ///     Whether or not an emag disables it.
     /// </summary>
-    [DataField("breakOnEmag")]
-    [AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool BreakOnEmag = true;
 
     /// <summary>
-    /// Amount of do-after time needed to lock the entity.
+    ///     Amount of do-after time needed to lock the entity.
     /// </summary>
     /// <remarks>
-    /// If set to zero, no do-after will be used.
+    ///     If set to zero, no do-after will be used.
     /// </remarks>
-    [DataField]
-    [AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public TimeSpan LockTime;
 
     /// <summary>
-    /// Amount of do-after time needed to unlock the entity.
+    ///     Amount of do-after time needed to unlock the entity.
     /// </summary>
     /// <remarks>
-    /// If set to zero, no do-after will be used.
+    ///     If set to zero, no do-after will be used.
     /// </remarks>
-    [DataField]
-    [AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public TimeSpan UnlockTime;
 }
 
 /// <summary>
-/// Event raised on the lock when a toggle is attempted.
-/// Can be cancelled to prevent it.
+///     Event raised on the lock when a toggle is attempted.
+///     Can be cancelled to prevent it.
 /// </summary>
 [ByRefEvent]
 public record struct LockToggleAttemptEvent(EntityUid User, bool Silent = false, bool Cancelled = false);
 
 /// <summary>
-/// Event raised on a lock after it has been toggled.
+///     Event raised on a lock after it has been toggled.
 /// </summary>
 [ByRefEvent]
 public readonly record struct LockToggledEvent(bool Locked);
 
 /// <summary>
-/// Used to lock a lockable entity that has a lock time configured.
+///     Used to lock a lockable entity that has a lock time configured.
 /// </summary>
 /// <seealso cref="LockComponent"/>
 /// <seealso cref="LockSystem"/>
@@ -109,7 +103,7 @@ public override DoAfterEvent Clone()
 }
 
 /// <summary>
-/// Used to unlock a lockable entity that has an unlock time configured.
+///     Used to unlock a lockable entity that has an unlock time configured.
 /// </summary>
 /// <seealso cref="LockComponent"/>
 /// <seealso cref="LockSystem"/>
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index b74f17b1525..bd533663876 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -54,7 +54,6 @@ private void OnStartup(EntityUid uid, LockComponent lockComp, ComponentStartup a
 
     private void OnActivated(EntityUid uid, LockComponent lockComp, ActivateInWorldEvent args)
     {
-
         if (args.Handled)
             return;
 
diff --git a/Content.Shared/Movement/Pulling/Components/PullableComponent.cs b/Content.Shared/Movement/Pulling/Components/PullableComponent.cs
index db889e7e3bd..01ce0efaae6 100644
--- a/Content.Shared/Movement/Pulling/Components/PullableComponent.cs
+++ b/Content.Shared/Movement/Pulling/Components/PullableComponent.cs
@@ -36,4 +36,11 @@ public sealed partial class PullableComponent : Component
     [Access(typeof(Systems.PullingSystem), Other = AccessPermissions.ReadExecute)]
     [AutoNetworkedField, DataField]
     public bool PrevFixedRotation;
+
+    /// <summary>
+    ///     Whether the entity is currently being actively pushed by the puller.
+    ///     If true, the entity will be able to enter disposals upon colliding with them, and the like.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool BeingActivelyPushed = false;
 }
diff --git a/Content.Shared/Movement/Pulling/Components/PullerComponent.cs b/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
index 1fc9b731bd5..c13baa28eff 100644
--- a/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
+++ b/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Movement.Pulling.Systems;
 using Robust.Shared.GameStates;
+using Robust.Shared.Map;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Movement.Pulling.Components;
@@ -11,16 +12,17 @@ namespace Content.Shared.Movement.Pulling.Components;
 [Access(typeof(PullingSystem))]
 public sealed partial class PullerComponent : Component
 {
-    // My raiding guild
     /// <summary>
-    /// Next time the puller can throw what is being pulled.
-    /// Used to avoid spamming it for infinite spin + velocity.
+    ///     Next time the puller change where they are pulling the target towards.
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]
-    public TimeSpan NextThrow;
+    public TimeSpan NextPushTargetChange;
+
+    [DataField, AutoNetworkedField]
+    public TimeSpan NextPushStop;
 
     [DataField]
-    public TimeSpan ThrowCooldown = TimeSpan.FromSeconds(1);
+    public TimeSpan PushChangeCooldown = TimeSpan.FromSeconds(0.1f), PushDuration = TimeSpan.FromSeconds(2f);
 
     // Before changing how this is updated, please see SharedPullerSystem.RefreshMovementSpeed
     public float WalkSpeedModifier => Pulling == default ? 1.0f : 0.95f;
@@ -28,14 +30,38 @@ public sealed partial class PullerComponent : Component
     public float SprintSpeedModifier => Pulling == default ? 1.0f : 0.95f;
 
     /// <summary>
-    /// Entity currently being pulled if applicable.
+    ///     Entity currently being pulled/pushed if applicable.
     /// </summary>
     [AutoNetworkedField, DataField]
     public EntityUid? Pulling;
 
+    /// <summary>
+    ///     The position the entity is currently being pulled towards.
+    /// </summary>
+    [AutoNetworkedField, DataField]
+    public EntityCoordinates? PushingTowards;
+
     /// <summary>
     ///     Does this entity need hands to be able to pull something?
     /// </summary>
     [DataField]
     public bool NeedsHands = true;
+
+    /// <summary>
+    ///     The maximum acceleration of pushing, in meters per second squared.
+    /// </summary>
+    [DataField]
+    public float PushAcceleration = 0.3f;
+
+    /// <summary>
+    ///     The maximum speed to which the pulled entity may be accelerated relative to the push direction, in meters per second.
+    /// </summary>
+    [DataField]
+    public float MaxPushSpeed = 1.2f;
+
+    /// <summary>
+    ///     The maximum distance between the puller and the point towards which the puller may attempt to pull it, in meters.
+    /// </summary>
+    [DataField]
+    public float MaxPushRange = 2f;
 }
diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
index 3c265d5a027..e6acabc33c5 100644
--- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
+++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
@@ -8,16 +8,19 @@
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Input;
 using Content.Shared.Interaction;
+using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Events;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Pulling.Events;
 using Content.Shared.Movement.Systems;
+using Content.Shared.Projectiles;
 using Content.Shared.Pulling.Events;
 using Content.Shared.Throwing;
 using Content.Shared.Verbs;
 using Robust.Shared.Containers;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Map;
+using Robust.Shared.Network;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
@@ -34,6 +37,7 @@ public sealed class PullingSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly ActionBlockerSystem _blocker = default!;
     [Dependency] private readonly AlertsSystem _alertsSystem = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _modifierSystem = default!;
@@ -43,7 +47,7 @@ public sealed class PullingSystem : EntitySystem
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SharedTransformSystem _xformSys = default!;
-    [Dependency] private readonly ThrowingSystem _throwing = default!;
+    [Dependency] private readonly ThrownItemSystem _thrownItem = default!;
 
     public override void Initialize()
     {
@@ -57,7 +61,9 @@ public override void Initialize()
         SubscribeLocalEvent<PullableComponent, JointRemovedEvent>(OnJointRemoved);
         SubscribeLocalEvent<PullableComponent, GetVerbsEvent<Verb>>(AddPullVerbs);
         SubscribeLocalEvent<PullableComponent, EntGotInsertedIntoContainerMessage>(OnPullableContainerInsert);
+        SubscribeLocalEvent<PullableComponent, StartCollideEvent>(OnPullableCollide);
 
+        SubscribeLocalEvent<PullerComponent, MoveInputEvent>(OnPullerMoveInput);
         SubscribeLocalEvent<PullerComponent, EntGotInsertedIntoContainerMessage>(OnPullerContainerInsert);
         SubscribeLocalEvent<PullerComponent, EntityUnpausedEvent>(OnPullerUnpaused);
         SubscribeLocalEvent<PullerComponent, VirtualItemDeletedEvent>(OnVirtualItemDeleted);
@@ -69,6 +75,86 @@ public override void Initialize()
             .Register<PullingSystem>();
     }
 
+    public override void Shutdown()
+    {
+        base.Shutdown();
+        CommandBinds.Unregister<PullingSystem>();
+    }
+
+    public override void Update(float frameTime)
+    {
+        if (_net.IsClient) // Client cannot predict this
+            return;
+
+        var query = EntityQueryEnumerator<PullerComponent, PhysicsComponent, TransformComponent>();
+        while (query.MoveNext(out var puller, out var pullerComp, out var pullerPhysics, out var pullerXForm))
+        {
+            // If not pulling, reset the pushing cooldowns and exit
+            if (pullerComp.Pulling is not { } pulled || !TryComp<PullableComponent>(pulled, out var pulledComp))
+            {
+                pullerComp.PushingTowards = null;
+                pullerComp.NextPushTargetChange = TimeSpan.Zero;
+                continue;
+            }
+
+            pulledComp.BeingActivelyPushed = false; // Temporarily set to false; if the checks below pass, it will be set to true again
+
+            // If pulling but the pullee is invalid or is on a different map, stop pulling
+            var pulledXForm = Transform(pulled);
+            if (!TryComp<PhysicsComponent>(pulled, out var pulledPhysics)
+                || pulledPhysics.BodyType == BodyType.Static
+                || pulledXForm.MapUid != pullerXForm.MapUid)
+            {
+                StopPulling(pulled, pulledComp);
+                continue;
+            }
+
+            if (pullerComp.PushingTowards is null)
+                continue;
+
+            // If pushing but the target position is invalid, or the push action has expired or finished, stop pushing
+            if (pullerComp.NextPushStop < _timing.CurTime
+                || !(pullerComp.PushingTowards.Value.ToMap(EntityManager, _xformSys) is var pushCoordinates)
+                || pushCoordinates.MapId != pulledXForm.MapID)
+            {
+                pullerComp.PushingTowards = null;
+                pullerComp.NextPushTargetChange = TimeSpan.Zero;
+                continue;
+            }
+
+            // Actual force calculation. All the Vector2's below are in map coordinates.
+            var desiredDeltaPos = pushCoordinates.Position - Transform(pulled).Coordinates.ToMapPos(EntityManager, _xformSys);
+            if (desiredDeltaPos.LengthSquared() < 0.1f)
+            {
+                pullerComp.PushingTowards = null;
+                continue;
+            }
+
+            var velocityAndDirectionAngle = new Angle(pulledPhysics.LinearVelocity) - new Angle(desiredDeltaPos);
+            var currentRelativeSpeed = pulledPhysics.LinearVelocity.Length() * (float) Math.Cos(velocityAndDirectionAngle.Theta);
+            var desiredAcceleration = MathF.Max(0f, pullerComp.MaxPushSpeed - currentRelativeSpeed);
+
+            var desiredImpulse = pulledPhysics.Mass * desiredDeltaPos;
+            var maxSourceImpulse = MathF.Min(pullerComp.PushAcceleration, desiredAcceleration) * pullerPhysics.Mass;
+            var actualImpulse = desiredImpulse.LengthSquared() > maxSourceImpulse * maxSourceImpulse ? desiredDeltaPos.Normalized() * maxSourceImpulse : desiredImpulse;
+
+            // Ideally we'd want to apply forces instead of impulses, however...
+            // We cannot use ApplyForce here because it will be cleared on the next physics substep which will render it ultimately useless
+            // The alternative is to run this function on every physics substep, but that is way too expensive for such a minor system
+            _physics.ApplyLinearImpulse(pulled, actualImpulse);
+            _physics.ApplyLinearImpulse(puller, -actualImpulse);
+            pulledComp.BeingActivelyPushed = true;
+        }
+        query.Dispose();
+    }
+
+    private void OnPullerMoveInput(EntityUid uid, PullerComponent component, ref MoveInputEvent args)
+    {
+        // Stop pushing
+        component.PushingTowards = null;
+        component.NextPushStop = TimeSpan.Zero;
+    }
+
     private void OnPullerContainerInsert(Entity<PullerComponent> ent, ref EntGotInsertedIntoContainerMessage args)
     {
         if (ent.Comp.Pulling == null) return;
@@ -84,15 +170,26 @@ private void OnPullableContainerInsert(Entity<PullableComponent> ent, ref EntGot
         TryStopPull(ent.Owner, ent.Comp);
     }
 
-    public override void Shutdown()
+    private void OnPullableCollide(Entity<PullableComponent> ent, ref StartCollideEvent args)
     {
-        base.Shutdown();
-        CommandBinds.Unregister<PullingSystem>();
+        if (!ent.Comp.BeingActivelyPushed || args.OtherEntity == ent.Comp.Puller)
+            return;
+
+        // This component isn't actually needed anywhere besides the thrownitemsyste`m itself, so we just fake it
+        var fakeThrown = new ThrownItemComponent()
+        {
+            Owner = ent.Owner,
+            Animate = false,
+            Landed = false,
+            PlayLandSound = false,
+            Thrower = ent.Comp.Puller
+        };
+        _thrownItem.ThrowCollideInteraction(fakeThrown, ent, args.OtherEntity);
     }
 
     private void OnPullerUnpaused(EntityUid uid, PullerComponent component, ref EntityUnpausedEvent args)
     {
-        component.NextThrow += args.PausedTime;
+        component.NextPushTargetChange += args.PausedTime;
     }
 
     private void OnVirtualItemDeleted(EntityUid uid, PullerComponent component, VirtualItemDeletedEvent args)
@@ -234,31 +331,22 @@ public bool IsPulled(EntityUid uid, PullableComponent? component = null)
 
     private bool OnRequestMovePulledObject(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
     {
-        if (session?.AttachedEntity is not { } player ||
-            !player.IsValid())
-        {
-            return false;
-        }
-
-        if (!TryComp<PullerComponent>(player, out var pullerComp))
+        if (session?.AttachedEntity is not { } player
+            || !player.IsValid()
+            || !TryComp<PullerComponent>(player, out var pullerComp))
             return false;
 
         var pulled = pullerComp.Pulling;
-
-        if (!HasComp<PullableComponent>(pulled))
-            return false;
-
-        if (_containerSystem.IsEntityInContainer(player))
+        if (!HasComp<PullableComponent>(pulled)
+            || _containerSystem.IsEntityInContainer(player)
+            || _timing.CurTime < pullerComp.NextPushTargetChange)
             return false;
 
-        // Cooldown buddy
-        if (_timing.CurTime < pullerComp.NextThrow)
-            return false;
-
-        pullerComp.NextThrow = _timing.CurTime + pullerComp.ThrowCooldown;
+        pullerComp.NextPushTargetChange = _timing.CurTime + pullerComp.PushChangeCooldown;
+        pullerComp.NextPushStop = _timing.CurTime + pullerComp.PushDuration;
 
         // Cap the distance
-        const float range = 2f;
+        var range = pullerComp.MaxPushRange;
         var fromUserCoords = coords.WithEntityId(player, EntityManager);
         var userCoords = new EntityCoordinates(player, Vector2.Zero);
 
@@ -268,8 +356,9 @@ private bool OnRequestMovePulledObject(ICommonSession? session, EntityCoordinate
             fromUserCoords = userCoords.Offset(userDirection.Normalized() * range);
         }
 
+        pullerComp.PushingTowards = fromUserCoords;
         Dirty(player, pullerComp);
-        _throwing.TryThrow(pulled.Value, fromUserCoords, user: player, strength: 4f, animated: false, recoil: false, playSound: false, doSpin: false);
+
         return false;
     }
 
diff --git a/Content.Shared/Psionics/PsionicComponent.cs b/Content.Shared/Psionics/PsionicComponent.cs
index 63529576152..85b7e380fea 100644
--- a/Content.Shared/Psionics/PsionicComponent.cs
+++ b/Content.Shared/Psionics/PsionicComponent.cs
@@ -8,11 +8,19 @@ namespace Content.Shared.Abilities.Psionics
     public sealed partial class PsionicComponent : Component
     {
         /// <summary>
-        ///     How close a Psion is to awakening a new power.
-        ///     TODO: Implement this in a separate PR.
+        ///     How close a Psion is to generating a new power. When Potentia reaches the NextPowerCost, it is "Spent" in order to "Buy" a random new power.
+        ///     TODO: Psi-Potentiometry should be able to read how much Potentia a person has.
+        /// </summary>
+        [DataField]
+        public float Potentia;
+
+        /// <summary>
+        ///     Each time a Psion rolls for a new power, they roll a number between 0 and 100, adding any relevant modifiers. This number is then added to Potentia,
+        ///     meaning that it carries over between rolls. When a character has an amount of potentia equal to at least 100 * 2^(total powers), the potentia is then spent, and a power is generated.
+        ///     This variable stores the cost of the next power.
         /// </summary>
         [DataField]
-        public float Potentia = 0;
+        public float NextPowerCost = 100;
 
         /// <summary>
         ///     The baseline chance of obtaining a psionic power when rolling for one.
@@ -24,7 +32,7 @@ public sealed partial class PsionicComponent : Component
         ///     Whether or not a Psion has an available "Reroll" to spend on attempting to gain powers.
         /// </summary>
         [DataField]
-        public bool CanReroll;
+        public bool CanReroll = true;
 
         /// <summary>
         ///     The Base amount of time (in minutes) this Psion is given the stutter effect if they become mindbroken.
@@ -142,6 +150,18 @@ private set
         public float CurrentDampening;
 
         /// <summary>
+        ///     How many "Slots" an entity has for psionic powers. This is not a hard limit, and is instead used for calculating the cost to generate new powers.
+        ///     Exceeding this limit causes an entity to become a Glimmer Source.
+        /// </summary>
+        [DataField]
+        public int PowerSlots = 1;
+
+        /// <summary>
+        ///     How many "Slots" are currently occupied by psionic powers.
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite)]
+        public int PowerSlotsTaken;
+
         ///     List of descriptors this entity will bring up for psychognomy. Used to remove
         ///     unneccesary subs for unique psionic entities like e.g. Oracle.
         /// </summary>
diff --git a/Content.Shared/Psionics/PsionicPowerPrototype.cs b/Content.Shared/Psionics/PsionicPowerPrototype.cs
index 3d389f6cdbe..c4a3326733a 100644
--- a/Content.Shared/Psionics/PsionicPowerPrototype.cs
+++ b/Content.Shared/Psionics/PsionicPowerPrototype.cs
@@ -86,4 +86,10 @@ public sealed partial class PsionicPowerPrototype : IPrototype
     /// </summary>
     [DataField]
     public float DampeningModifier = 0;
+
+    /// <summary>
+    ///     How many "Power Slots" this power occupies.
+    /// </summary>
+    [DataField]
+    public int PowerSlotCost = 1;
 }
\ No newline at end of file
diff --git a/Content.Shared/Radio/Components/EncryptionKeyHolderComponent.cs b/Content.Shared/Radio/Components/EncryptionKeyHolderComponent.cs
index 6c50acb9660..d84a1618602 100644
--- a/Content.Shared/Radio/Components/EncryptionKeyHolderComponent.cs
+++ b/Content.Shared/Radio/Components/EncryptionKeyHolderComponent.cs
@@ -15,27 +15,22 @@ public sealed partial class EncryptionKeyHolderComponent : Component
     /// <summary>
     ///     Whether or not encryption keys can be removed from the headset.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("keysUnlocked")]
+    [DataField]
     public bool KeysUnlocked = true;
 
     /// <summary>
     ///     The tool required to extract the encryption keys from the headset.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("keysExtractionMethod", customTypeSerializer: typeof(PrototypeIdSerializer<ToolQualityPrototype>))]
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<ToolQualityPrototype>))]
     public string KeysExtractionMethod = "Screwing";
 
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("keySlots")]
+    [DataField]
     public int KeySlots = 2;
 
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("keyExtractionSound")]
+    [DataField]
     public SoundSpecifier KeyExtractionSound = new SoundPathSpecifier("/Audio/Items/pistol_magout.ogg");
 
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("keyInsertionSound")]
+    [DataField]
     public SoundSpecifier KeyInsertionSound = new SoundPathSpecifier("/Audio/Items/pistol_magin.ogg");
 
     [ViewVariables]
@@ -45,8 +40,7 @@ public sealed partial class EncryptionKeyHolderComponent : Component
     /// <summary>
     ///     Whether or not the headset can be examined to see the encryption keys while the keys aren't accessible.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("examineWhileLocked")]
+    [DataField]
     public bool ExamineWhileLocked = true;
 
     /// <summary>
diff --git a/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs b/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs
index 712debbafa0..a15b6f76e90 100644
--- a/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs
+++ b/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs
@@ -6,10 +6,8 @@
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Radio.Components;
-using Content.Shared.Tools;
 using Content.Shared.Tools.Components;
 using Content.Shared.Wires;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Network;
@@ -175,13 +173,9 @@ private void OnStartup(EntityUid uid, EncryptionKeyHolderComponent component, Co
 
     private void OnHolderExamined(EntityUid uid, EncryptionKeyHolderComponent component, ExaminedEvent args)
     {
-        if (!args.IsInDetailsRange)
-            return;
-
-        if (!component.ExamineWhileLocked && !component.KeysUnlocked)
-            return;
-
-        if (!component.ExamineWhileLocked && TryComp<WiresPanelComponent>(uid, out var panel) && !panel.Open)
+        if (!args.IsInDetailsRange
+            || !component.ExamineWhileLocked && !component.KeysUnlocked
+            || !component.ExamineWhileLocked && TryComp<WiresPanelComponent>(uid, out var panel) && !panel.Open)
             return;
 
         if (component.KeyContainer.ContainedEntities.Count == 0)
diff --git a/Content.Shared/Silicon/BatteryDrinkerEvent.cs b/Content.Shared/Silicon/BatteryDrinkerEvent.cs
index 4d9a610055d..99af03df3a1 100644
--- a/Content.Shared/Silicon/BatteryDrinkerEvent.cs
+++ b/Content.Shared/Silicon/BatteryDrinkerEvent.cs
@@ -6,7 +6,5 @@ namespace Content.Shared.Silicon;
 [Serializable, NetSerializable]
 public sealed partial class BatteryDrinkerDoAfterEvent : SimpleDoAfterEvent
 {
-    public BatteryDrinkerDoAfterEvent()
-    {
-    }
+    public BatteryDrinkerDoAfterEvent() { }
 }
diff --git a/Content.Shared/Silicon/BlindHealing/SharedBlindHealingSystem.cs b/Content.Shared/Silicon/BlindHealing/SharedBlindHealingSystem.cs
index be4be9e5d38..bfc5092b644 100644
--- a/Content.Shared/Silicon/BlindHealing/SharedBlindHealingSystem.cs
+++ b/Content.Shared/Silicon/BlindHealing/SharedBlindHealingSystem.cs
@@ -6,8 +6,6 @@ namespace Content.Shared.Silicon.BlindHealing;
 public abstract partial class SharedBlindHealingSystem : EntitySystem
 {
     [Serializable, NetSerializable]
-    protected sealed partial class HealingDoAfterEvent : SimpleDoAfterEvent
-    {
-    }
+    protected sealed partial class HealingDoAfterEvent : SimpleDoAfterEvent { }
 }
 
diff --git a/Content.Shared/Silicon/Components/SiliconComponent.cs b/Content.Shared/Silicon/Components/SiliconComponent.cs
index c80d9397d93..bcee4d161a5 100644
--- a/Content.Shared/Silicon/Components/SiliconComponent.cs
+++ b/Content.Shared/Silicon/Components/SiliconComponent.cs
@@ -1,7 +1,6 @@
 using Robust.Shared.GameStates;
 using Content.Shared.Silicon.Systems;
 using Robust.Shared.Serialization.TypeSerializers.Implementations;
-using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 using Content.Shared.Alert;
 
@@ -36,7 +35,7 @@ public sealed partial class SiliconComponent : Component
     /// <summary>
     ///     Is the Silicon currently dead?
     /// </summary>
-    public bool Dead = false;
+    public bool Dead;
 
     // BatterySystem took issue with how this was used, so I'm coming back to it at a later date, when more foundational Silicon stuff is implemented.
     // /// <summary>
@@ -52,7 +51,7 @@ public sealed partial class SiliconComponent : Component
     ///     Any new types of Silicons should be added to the enum.
     ///     Setting this to Npc will delay charge state updates by LastDrainTime and skip battery heat calculations
     /// </remarks>
-    [DataField("entityType", customTypeSerializer: typeof(EnumSerializer))]
+    [DataField(customTypeSerializer: typeof(EnumSerializer))]
     public Enum EntityType = SiliconType.Npc;
 
     /// <summary>
@@ -61,13 +60,13 @@ public sealed partial class SiliconComponent : Component
     /// <remarks>
     ///     If true, should go along with a battery component. One will not be added automatically.
     /// </remarks>
-    [DataField("batteryPowered"), ViewVariables(VVAccess.ReadWrite)]
-    public bool BatteryPowered = false;
+    [DataField]
+    public bool BatteryPowered;
 
     /// <summary>
     ///     How much power is drained by this Silicon every second by default.
     /// </summary>
-    [DataField("drainPerSecond"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float DrainPerSecond = 50f;
 
 
@@ -79,15 +78,15 @@ public sealed partial class SiliconComponent : Component
     ///     Setting a value to null will disable that state.
     ///     Setting Critical to 0 will cause the Silicon to never enter the dead state.
     /// </remarks>
-    [DataField("chargeThresholdMid"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float? ChargeThresholdMid = 0.5f;
 
     /// <inheritdoc cref="ChargeThresholdMid"/>
-    [DataField("chargeThresholdLow"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float? ChargeThresholdLow = 0.25f;
 
     /// <inheritdoc cref="ChargeThresholdMid"/>
-    [DataField("chargeThresholdCritical"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float? ChargeThresholdCritical = 0.1f;
 
     [DataField]
@@ -100,9 +99,16 @@ public sealed partial class SiliconComponent : Component
     /// <summary>
     ///     The amount the Silicon will be slowed at each charge state.
     /// </summary>
-    [DataField("speedModifierThresholds", required: true)]
-    public Dictionary<short, float> SpeedModifierThresholds = default!;
+    [DataField(required: true)]
+    public Dictionary<int, float> SpeedModifierThresholds = default!;
 
-    [DataField("fireStackMultiplier"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float FireStackMultiplier = 1f;
+
+    /// <summary>
+    ///     Whether or not a Silicon will cancel all sleep events.
+    ///     Maybe you want an android that can sleep as well as drink APCs? I'm not going to judge.
+    /// </summary>
+    [DataField]
+    public bool DoSiliconsDreamOfElectricSheep;
 }
diff --git a/Content.Shared/Silicon/DeadStartupButton/DeadStartupButtonComponent.cs b/Content.Shared/Silicon/DeadStartupButton/DeadStartupButtonComponent.cs
index 3390a76439b..9c2e5baf573 100644
--- a/Content.Shared/Silicon/DeadStartupButton/DeadStartupButtonComponent.cs
+++ b/Content.Shared/Silicon/DeadStartupButton/DeadStartupButtonComponent.cs
@@ -3,26 +3,26 @@
 namespace Content.Shared.Silicon.DeadStartupButton;
 
 /// <summary>
-/// This is used for...
+///     This is used for Silicon entities such as IPCs, Cyborgs, Androids, anything "living" with a button people can touch.
 /// </summary>
 [RegisterComponent]
 public sealed partial class DeadStartupButtonComponent : Component
 {
-    [DataField("verbText")]
+    [DataField]
     public string VerbText = "dead-startup-button-verb";
 
-    [DataField("sound")]
+    [DataField]
     public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Effects/Arcade/newgame.ogg");
 
-    [DataField("buttonSound")]
+    [DataField]
     public SoundSpecifier ButtonSound = new SoundPathSpecifier("/Audio/Machines/button.ogg");
 
-    [DataField("doAfterInterval"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float DoAfterInterval = 1f;
 
-    [DataField("buzzSound")]
+    [DataField]
     public SoundSpecifier BuzzSound = new SoundCollectionSpecifier("buzzes");
 
-    [DataField("verbPriority"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public int VerbPriority = 1;
 }
diff --git a/Content.Shared/Silicon/DeadStartupButton/SharedDeadStartupButtonSystem.cs b/Content.Shared/Silicon/DeadStartupButton/SharedDeadStartupButtonSystem.cs
index 2faa6dfde00..605ca48e6cb 100644
--- a/Content.Shared/Silicon/DeadStartupButton/SharedDeadStartupButtonSystem.cs
+++ b/Content.Shared/Silicon/DeadStartupButton/SharedDeadStartupButtonSystem.cs
@@ -1,5 +1,4 @@
 using Content.Shared.DoAfter;
-using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Verbs;
 using Robust.Shared.Audio.Systems;
@@ -10,19 +9,16 @@
 namespace Content.Shared.Silicon.DeadStartupButton;
 
 /// <summary>
-/// This creates a Button that can be activated after an entity, usually a silicon or an IPC, died.
-/// This will activate a doAfter and then revive the entity, playing a custom afterward sound.
+///     This creates a Button that can be activated after an entity, usually a silicon or an IPC, died.
+///     This will activate a doAfter and then revive the entity, playing a custom afterward sound.
 /// </summary>
-public partial class SharedDeadStartupButtonSystem : EntitySystem
+public abstract partial class SharedDeadStartupButtonSystem : EntitySystem
 {
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
     [Dependency] private readonly INetManager _net = default!;
 
-
-
-
     /// <inheritdoc/>
     public override void Initialize()
     {
@@ -31,10 +27,8 @@ public override void Initialize()
 
     private void AddTurnOnVerb(EntityUid uid, DeadStartupButtonComponent component, GetVerbsEvent<AlternativeVerb> args)
     {
-        if (!args.CanAccess || !args.CanInteract || args.Hands == null)
-            return;
-
-        if (!TryComp(uid, out MobStateComponent? mobStateComponent) || !_mobState.IsDead(uid, mobStateComponent))
+        if (!_mobState.IsDead(uid)
+            || !args.CanAccess || !args.CanInteract || args.Hands == null)
             return;
 
         args.Verbs.Add(new AlternativeVerb()
@@ -50,6 +44,7 @@ private void TryStartup(EntityUid user, EntityUid target, DeadStartupButtonCompo
     {
         if (!_net.IsServer)
             return;
+
         _audio.PlayPvs(comp.ButtonSound, target);
         var args = new DoAfterArgs(EntityManager, user, comp.DoAfterInterval, new OnDoAfterButtonPressedEvent(), target, target:target)
         {
@@ -60,9 +55,5 @@ private void TryStartup(EntityUid user, EntityUid target, DeadStartupButtonCompo
     }
 
     [Serializable, NetSerializable]
-    public sealed partial class OnDoAfterButtonPressedEvent : SimpleDoAfterEvent
-    {
-    }
-
-
+    public sealed partial class OnDoAfterButtonPressedEvent : SimpleDoAfterEvent { }
 }
diff --git a/Content.Shared/Silicon/EmitBuzzWhileDamaged/EmitBuzzWhileDamagedComponent.cs b/Content.Shared/Silicon/EmitBuzzWhileDamaged/EmitBuzzWhileDamagedComponent.cs
index a8362610e25..986292551d0 100644
--- a/Content.Shared/Silicon/EmitBuzzWhileDamaged/EmitBuzzWhileDamagedComponent.cs
+++ b/Content.Shared/Silicon/EmitBuzzWhileDamaged/EmitBuzzWhileDamagedComponent.cs
@@ -1,26 +1,26 @@
-using System.ComponentModel.DataAnnotations;
 using Robust.Shared.Audio;
 
 namespace Content.Shared.Silicon.EmitBuzzWhileDamaged;
 
 /// <summary>
-/// This is used for controlling the cadence of the buzzing emitted by EmitBuzzOnCritSystem.
-/// This component is used by mechanical species that can get to critical health.
+///     This is used for controlling the cadence of the buzzing emitted by EmitBuzzOnCritSystem.
+///     This component is used by mechanical species that can get to critical health.
 /// </summary>
 [RegisterComponent]
 public sealed partial class EmitBuzzWhileDamagedComponent : Component
 {
-    [DataField("buzzPopupCooldown")]
-    public TimeSpan BuzzPopupCooldown { get; private set; } = TimeSpan.FromSeconds(8);
+    [DataField]
+    public TimeSpan BuzzPopupCooldown = TimeSpan.FromSeconds(8);
 
     [ViewVariables]
     public TimeSpan LastBuzzPopupTime;
 
-    [DataField("cycleDelay")]
+    [DataField]
     public float CycleDelay = 2.0f;
 
+    [ViewVariables]
     public float AccumulatedFrametime;
 
-    [DataField("sound")]
+    [DataField]
     public SoundSpecifier Sound = new SoundCollectionSpecifier("buzzes");
 }
diff --git a/Content.Shared/Silicon/Systems/SharedSiliconSystem.cs b/Content.Shared/Silicon/Systems/SharedSiliconSystem.cs
index aab9b6e7522..8fe87e162bc 100644
--- a/Content.Shared/Silicon/Systems/SharedSiliconSystem.cs
+++ b/Content.Shared/Silicon/Systems/SharedSiliconSystem.cs
@@ -1,17 +1,17 @@
 using Content.Shared.Silicon.Components;
 using Content.Shared.Alert;
-using Robust.Shared.Serialization;
-using Content.Shared.Movement.Systems;
+using Content.Shared.Bed.Sleep;
 using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Movement.Systems;
 using Content.Shared.PowerCell.Components;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Silicon.Systems;
 
-
 public sealed class SharedSiliconChargeSystem : EntitySystem
 {
     [Dependency] private readonly AlertsSystem _alertsSystem = default!;
-    [Dependency] protected readonly ItemSlotsSystem ItemSlots = default!;
+    [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
 
     public override void Initialize()
     {
@@ -22,47 +22,50 @@ public override void Initialize()
         SubscribeLocalEvent<SiliconComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
         SubscribeLocalEvent<SiliconComponent, ItemSlotInsertAttemptEvent>(OnItemSlotInsertAttempt);
         SubscribeLocalEvent<SiliconComponent, ItemSlotEjectAttemptEvent>(OnItemSlotEjectAttempt);
+        SubscribeLocalEvent<SiliconComponent, TryingToSleepEvent>(OnTryingToSleep);
     }
 
-    private void OnItemSlotInsertAttempt(EntityUid uid, SiliconComponent component, ref ItemSlotInsertAttemptEvent args)
+    /// <summary>
+    ///     Silicon entities can now also be Living player entities. We may want to prevent them from sleeping if they can't sleep.
+    /// </summary>
+    private void OnTryingToSleep(EntityUid uid, SiliconComponent component, ref TryingToSleepEvent args)
     {
-        if (args.Cancelled)
-            return;
-
-        if (!TryComp<PowerCellSlotComponent>(uid, out var cellSlotComp))
-            return;
+        args.Cancelled = !component.DoSiliconsDreamOfElectricSheep;
+    }
 
-        if (!ItemSlots.TryGetSlot(uid, cellSlotComp.CellSlotId, out var cellSlot) || cellSlot != args.Slot)
+    private void OnItemSlotInsertAttempt(EntityUid uid, SiliconComponent component, ref ItemSlotInsertAttemptEvent args)
+    {
+        if (args.Cancelled
+            || !TryComp<PowerCellSlotComponent>(uid, out var cellSlotComp)
+            || !_itemSlots.TryGetSlot(uid, cellSlotComp.CellSlotId, out var cellSlot)
+            || cellSlot != args.Slot || args.User != uid)
             return;
 
-        if (args.User == uid)
-            args.Cancelled = true;
+        args.Cancelled = true;
     }
 
     private void OnItemSlotEjectAttempt(EntityUid uid, SiliconComponent component, ref ItemSlotEjectAttemptEvent args)
     {
-        if (args.Cancelled)
-            return;
-
-        if (!TryComp<PowerCellSlotComponent>(uid, out var cellSlotComp))
-            return;
-
-        if (!ItemSlots.TryGetSlot(uid, cellSlotComp.CellSlotId, out var cellSlot) || cellSlot != args.Slot)
+        if (args.Cancelled
+            || !TryComp<PowerCellSlotComponent>(uid, out var cellSlotComp)
+            || !_itemSlots.TryGetSlot(uid, cellSlotComp.CellSlotId, out var cellSlot)
+            || cellSlot != args.Slot || args.User != uid)
             return;
 
-        if (args.User == uid)
-            args.Cancelled = true;
+        args.Cancelled = true;
     }
 
     private void OnSiliconInit(EntityUid uid, SiliconComponent component, ComponentInit args)
     {
-        if (component.BatteryPowered)
-            _alertsSystem.ShowAlert(uid, AlertType.BorgBattery, component.ChargeState);
+        if (!component.BatteryPowered)
+            return;
+
+        _alertsSystem.ShowAlert(uid, AlertType.BorgBattery, component.ChargeState);
     }
 
     private void OnSiliconChargeStateUpdate(EntityUid uid, SiliconComponent component, SiliconChargeStateUpdateEvent ev)
     {
-        _alertsSystem.ShowAlert(uid, AlertType.BorgBattery, (short) ev.ChargePercent);
+        _alertsSystem.ShowAlert(uid, AlertType.BorgBattery, ev.ChargePercent);
     }
 
     private void OnRefreshMovespeed(EntityUid uid, SiliconComponent component, RefreshMovementSpeedModifiersEvent args)
@@ -70,17 +73,12 @@ private void OnRefreshMovespeed(EntityUid uid, SiliconComponent component, Refre
         if (!component.BatteryPowered)
             return;
 
-        var speedModThresholds = component.SpeedModifierThresholds;
-
-        var closest = 0f;
-
-        foreach (var state in speedModThresholds)
-        {
-            if (component.ChargeState >= state.Key && (float) state.Key > closest)
-                closest = (float) state.Key;
-        }
+        var closest = 0;
+        foreach (var state in component.SpeedModifierThresholds)
+            if (component.ChargeState >= state.Key && state.Key > closest)
+                closest = state.Key;
 
-        var speedMod = speedModThresholds[(short) closest];
+        var speedMod = component.SpeedModifierThresholds[closest];
 
         args.ModifySpeed(speedMod, speedMod);
     }
diff --git a/Content.Shared/Standing/LayingDownComponent.cs b/Content.Shared/Standing/LayingDownComponent.cs
new file mode 100644
index 00000000000..1499704c53b
--- /dev/null
+++ b/Content.Shared/Standing/LayingDownComponent.cs
@@ -0,0 +1,26 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Standing;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class LayingDownComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public float StandingUpTime { get; set; } = 1f;
+
+    [DataField, AutoNetworkedField]
+    public float SpeedModify { get; set; } = 0.4f;
+
+    [DataField, AutoNetworkedField]
+    public bool AutoGetUp;
+}
+
+[Serializable, NetSerializable]
+public sealed class ChangeLayingDownEvent : CancellableEntityEventArgs;
+
+[Serializable, NetSerializable]
+public sealed class CheckAutoGetUpEvent(NetEntity user) : CancellableEntityEventArgs
+{
+    public NetEntity User = user;
+}
diff --git a/Content.Shared/Standing/SharedLayingDownSystem.cs b/Content.Shared/Standing/SharedLayingDownSystem.cs
new file mode 100644
index 00000000000..7a82d4b7aa8
--- /dev/null
+++ b/Content.Shared/Standing/SharedLayingDownSystem.cs
@@ -0,0 +1,156 @@
+using Content.Shared.DoAfter;
+using Content.Shared.Gravity;
+using Content.Shared.Input;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Movement.Systems;
+using Content.Shared.Standing;
+using Content.Shared.Stunnable;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Player;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Standing;
+
+public abstract class SharedLayingDownSystem : EntitySystem
+{
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly StandingStateSystem _standing = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly SharedGravitySystem _gravity = default!;
+
+    public override void Initialize()
+    {
+        CommandBinds.Builder
+            .Bind(ContentKeyFunctions.ToggleStanding, InputCmdHandler.FromDelegate(ToggleStanding))
+            .Register<SharedLayingDownSystem>();
+
+        SubscribeNetworkEvent<ChangeLayingDownEvent>(OnChangeState);
+
+        SubscribeLocalEvent<StandingStateComponent, StandingUpDoAfterEvent>(OnStandingUpDoAfter);
+        SubscribeLocalEvent<LayingDownComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeed);
+        SubscribeLocalEvent<LayingDownComponent, EntParentChangedMessage>(OnParentChanged);
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+
+        CommandBinds.Unregister<SharedLayingDownSystem>();
+    }
+
+    private void ToggleStanding(ICommonSession? session)
+    {
+        if (session is not { AttachedEntity: { Valid: true } uid } _
+            || !Exists(uid)
+            || !HasComp<LayingDownComponent>(session.AttachedEntity)
+            || _gravity.IsWeightless(session.AttachedEntity.Value))
+            return;
+
+        RaiseNetworkEvent(new ChangeLayingDownEvent());
+    }
+
+    private void OnChangeState(ChangeLayingDownEvent ev, EntitySessionEventArgs args)
+    {
+        if (!args.SenderSession.AttachedEntity.HasValue)
+            return;
+
+        var uid = args.SenderSession.AttachedEntity.Value;
+
+        // TODO: Wizard
+        //if (HasComp<FrozenComponent>(uid))
+        //   return;
+
+        if (!TryComp(uid, out StandingStateComponent? standing)
+            || !TryComp(uid, out LayingDownComponent? layingDown))
+            return;
+
+        RaiseNetworkEvent(new CheckAutoGetUpEvent(GetNetEntity(uid)));
+
+        if (HasComp<KnockedDownComponent>(uid)
+            || !_mobState.IsAlive(uid))
+            return;
+
+        if (_standing.IsDown(uid, standing))
+            TryStandUp(uid, layingDown, standing);
+        else
+            TryLieDown(uid, layingDown, standing);
+    }
+
+    private void OnStandingUpDoAfter(EntityUid uid, StandingStateComponent component, StandingUpDoAfterEvent args)
+    {
+        if (args.Handled || args.Cancelled
+            || HasComp<KnockedDownComponent>(uid)
+            || _mobState.IsIncapacitated(uid)
+            || !_standing.Stand(uid))
+            component.CurrentState = StandingState.Lying;
+
+        component.CurrentState = StandingState.Standing;
+    }
+
+    private void OnRefreshMovementSpeed(EntityUid uid, LayingDownComponent component, RefreshMovementSpeedModifiersEvent args)
+    {
+        if (_standing.IsDown(uid))
+            args.ModifySpeed(component.SpeedModify, component.SpeedModify);
+        else
+            args.ModifySpeed(1f, 1f);
+    }
+
+    private void OnParentChanged(EntityUid uid, LayingDownComponent component, EntParentChangedMessage args)
+    {
+        // If the entity is not on a grid, try to make it stand up to avoid issues
+        if (!TryComp<StandingStateComponent>(uid, out var standingState)
+            || standingState.CurrentState is StandingState.Standing
+            || Transform(uid).GridUid != null)
+            return;
+
+        _standing.Stand(uid, standingState);
+    }
+
+    public bool TryStandUp(EntityUid uid, LayingDownComponent? layingDown = null, StandingStateComponent? standingState = null)
+    {
+        if (!Resolve(uid, ref standingState, false)
+            || !Resolve(uid, ref layingDown, false)
+            || standingState.CurrentState is not StandingState.Lying
+            || !_mobState.IsAlive(uid)
+            || TerminatingOrDeleted(uid))
+            return false;
+
+        var args = new DoAfterArgs(EntityManager, uid, layingDown.StandingUpTime, new StandingUpDoAfterEvent(), uid)
+        {
+            BreakOnHandChange = false,
+            RequireCanInteract = false
+        };
+
+        if (!_doAfter.TryStartDoAfter(args))
+            return false;
+
+        standingState.CurrentState = StandingState.GettingUp;
+        return true;
+    }
+
+    public bool TryLieDown(EntityUid uid, LayingDownComponent? layingDown = null, StandingStateComponent? standingState = null, DropHeldItemsBehavior behavior = DropHeldItemsBehavior.NoDrop)
+    {
+        if (!Resolve(uid, ref standingState, false)
+            || !Resolve(uid, ref layingDown, false)
+            || standingState.CurrentState is not StandingState.Standing)
+        {
+            if (behavior == DropHeldItemsBehavior.AlwaysDrop)
+                RaiseLocalEvent(uid, new DropHandItemsEvent());
+
+            return false;
+        }
+
+        _standing.Down(uid, true, behavior != DropHeldItemsBehavior.NoDrop, standingState);
+        return true;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed partial class StandingUpDoAfterEvent : SimpleDoAfterEvent;
+
+public enum DropHeldItemsBehavior : byte
+{
+    NoDrop,
+    DropIfStanding,
+    AlwaysDrop
+}
diff --git a/Content.Shared/Standing/StandingStateComponent.cs b/Content.Shared/Standing/StandingStateComponent.cs
index 5d7bb0a59fd..5b9759a0252 100644
--- a/Content.Shared/Standing/StandingStateComponent.cs
+++ b/Content.Shared/Standing/StandingStateComponent.cs
@@ -1,24 +1,31 @@
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Standing
+namespace Content.Shared.Standing;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class StandingStateComponent : Component
 {
-    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-    [Access(typeof(StandingStateSystem))]
-    public sealed partial class StandingStateComponent : Component
-    {
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField]
-        public SoundSpecifier DownSound { get; private set; } = new SoundCollectionSpecifier("BodyFall");
+    [DataField]
+    public SoundSpecifier DownSound { get; private set; } = new SoundCollectionSpecifier("BodyFall");
+
+    [DataField, AutoNetworkedField]
+    public StandingState CurrentState { get; set; } = StandingState.Standing;
 
-        [DataField, AutoNetworkedField]
-        public bool Standing { get; set; } = true;
+    [DataField, AutoNetworkedField]
+    public bool Standing { get; set; } = true;
 
-        /// <summary>
-        ///     List of fixtures that had their collision mask changed when the entity was downed.
-        ///     Required for re-adding the collision mask.
-        /// </summary>
-        [DataField, AutoNetworkedField]
-        public List<string> ChangedFixtures = new();
-    }
+    /// <summary>
+    ///     List of fixtures that had their collision mask changed when the entity was downed.
+    ///     Required for re-adding the collision mask.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<string> ChangedFixtures = new();
+}
+
+public enum StandingState
+{
+    Lying,
+    GettingUp,
+    Standing,
 }
diff --git a/Content.Shared/Standing/StandingStateSystem.cs b/Content.Shared/Standing/StandingStateSystem.cs
index 517831b8a1b..69e72033bba 100644
--- a/Content.Shared/Standing/StandingStateSystem.cs
+++ b/Content.Shared/Standing/StandingStateSystem.cs
@@ -1,166 +1,160 @@
+using Content.Shared.Buckle;
+using Content.Shared.Buckle.Components;
 using Content.Shared.Hands.Components;
+using Content.Shared.Movement.Systems;
 using Content.Shared.Physics;
 using Content.Shared.Rotation;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Systems;
 
-namespace Content.Shared.Standing
+namespace Content.Shared.Standing;
+
+public sealed class StandingStateSystem : EntitySystem
 {
-    public sealed class StandingStateSystem : EntitySystem
-    {
-        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-        [Dependency] private readonly SharedAudioSystem _audio = default!;
-        [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
+    [Dependency] private readonly SharedBuckleSystem _buckle = default!;
 
-        // If StandingCollisionLayer value is ever changed to more than one layer, the logic needs to be edited.
-        private const int StandingCollisionLayer = (int) CollisionGroup.MidImpassable;
+    // If StandingCollisionLayer value is ever changed to more than one layer, the logic needs to be edited.
+    private const int StandingCollisionLayer = (int) CollisionGroup.MidImpassable;
 
-        public bool IsDown(EntityUid uid, StandingStateComponent? standingState = null)
-        {
-            if (!Resolve(uid, ref standingState, false))
-                return false;
-
-            return !standingState.Standing;
-        }
+    public bool IsDown(EntityUid uid, StandingStateComponent? standingState = null)
+    {
+        if (!Resolve(uid, ref standingState, false))
+            return false;
 
-        public bool Down(EntityUid uid, bool playSound = true, bool dropHeldItems = true,
-            StandingStateComponent? standingState = null,
-            AppearanceComponent? appearance = null,
-            HandsComponent? hands = null)
-        {
-            // TODO: This should actually log missing comps...
-            if (!Resolve(uid, ref standingState, false))
-                return false;
+        return standingState.CurrentState is StandingState.Lying or StandingState.GettingUp;
+    }
 
-            // Optional component.
-            Resolve(uid, ref appearance, ref hands, false);
+    public bool Down(EntityUid uid, bool playSound = true, bool dropHeldItems = true,
+        StandingStateComponent? standingState = null,
+        AppearanceComponent? appearance = null,
+        HandsComponent? hands = null)
+    {
+        // TODO: This should actually log missing comps...
+        if (!Resolve(uid, ref standingState, false))
+            return false;
 
-            if (!standingState.Standing)
-                return true;
+        // Optional component.
+        Resolve(uid, ref appearance, ref hands, false);
 
-            // This is just to avoid most callers doing this manually saving boilerplate
-            // 99% of the time you'll want to drop items but in some scenarios (e.g. buckling) you don't want to.
-            // We do this BEFORE downing because something like buckle may be blocking downing but we want to drop hand items anyway
-            // and ultimately this is just to avoid boilerplate in Down callers + keep their behavior consistent.
-            if (dropHeldItems && hands != null)
-            {
-                RaiseLocalEvent(uid, new DropHandItemsEvent(), false);
-            }
+        if (standingState.CurrentState is StandingState.Lying or StandingState.GettingUp)
+            return true;
 
-            var msg = new DownAttemptEvent();
-            RaiseLocalEvent(uid, msg, false);
+        // This is just to avoid most callers doing this manually saving boilerplate
+        // 99% of the time you'll want to drop items but in some scenarios (e.g. buckling) you don't want to.
+        // We do this BEFORE downing because something like buckle may be blocking downing but we want to drop hand items anyway
+        // and ultimately this is just to avoid boilerplate in Down callers + keep their behavior consistent.
+        if (dropHeldItems && hands != null)
+            RaiseLocalEvent(uid, new DropHandItemsEvent(), false);
 
-            if (msg.Cancelled)
-                return false;
+        if (TryComp(uid, out BuckleComponent? buckle) && buckle.Buckled && !_buckle.TryUnbuckle(uid, uid, buckleComp: buckle))
+            return false;
 
-            standingState.Standing = false;
-            Dirty(standingState);
-            RaiseLocalEvent(uid, new DownedEvent(), false);
+        var msg = new DownAttemptEvent();
+        RaiseLocalEvent(uid, msg, false);
 
-            // Seemed like the best place to put it
-            _appearance.SetData(uid, RotationVisuals.RotationState, RotationState.Horizontal, appearance);
+        if (msg.Cancelled)
+            return false;
 
-            // Change collision masks to allow going under certain entities like flaps and tables
-            if (TryComp(uid, out FixturesComponent? fixtureComponent))
-            {
-                foreach (var (key, fixture) in fixtureComponent.Fixtures)
-                {
-                    if ((fixture.CollisionMask & StandingCollisionLayer) == 0)
-                        continue;
-
-                    standingState.ChangedFixtures.Add(key);
-                    _physics.SetCollisionMask(uid, key, fixture, fixture.CollisionMask & ~StandingCollisionLayer, manager: fixtureComponent);
-                }
-            }
+        standingState.CurrentState = StandingState.Lying;
+        Dirty(standingState);
+        RaiseLocalEvent(uid, new DownedEvent(), false);
 
-            // check if component was just added or streamed to client
-            // if true, no need to play sound - mob was down before player could seen that
-            if (standingState.LifeStage <= ComponentLifeStage.Starting)
-                return true;
+        // Seemed like the best place to put it
+        _appearance.SetData(uid, RotationVisuals.RotationState, RotationState.Horizontal, appearance);
 
-            if (playSound)
+        // Change collision masks to allow going under certain entities like flaps and tables
+        if (TryComp(uid, out FixturesComponent? fixtureComponent))
+            foreach (var (key, fixture) in fixtureComponent.Fixtures)
             {
-                _audio.PlayPredicted(standingState.DownSound, uid, uid);
+                if ((fixture.CollisionMask & StandingCollisionLayer) == 0)
+                    continue;
+
+                standingState.ChangedFixtures.Add(key);
+                _physics.SetCollisionMask(uid, key, fixture, fixture.CollisionMask & ~StandingCollisionLayer, manager: fixtureComponent);
             }
 
+        // check if component was just added or streamed to client
+        // if true, no need to play sound - mob was down before player could seen that
+        if (standingState.LifeStage <= ComponentLifeStage.Starting)
             return true;
-        }
 
-        public bool Stand(EntityUid uid,
-            StandingStateComponent? standingState = null,
-            AppearanceComponent? appearance = null,
-            bool force = false)
-        {
-            // TODO: This should actually log missing comps...
-            if (!Resolve(uid, ref standingState, false))
-                return false;
+        if (playSound)
+            _audio.PlayPredicted(standingState.DownSound, uid, null);
 
-            // Optional component.
-            Resolve(uid, ref appearance, false);
+        _movement.RefreshMovementSpeedModifiers(uid);
+        return true;
+    }
 
-            if (standingState.Standing)
-                return true;
+    public bool Stand(EntityUid uid,
+        StandingStateComponent? standingState = null,
+        AppearanceComponent? appearance = null,
+        bool force = false)
+    {
+        // TODO: This should actually log missing comps...
+        if (!Resolve(uid, ref standingState, false))
+            return false;
 
-            if (!force)
-            {
-                var msg = new StandAttemptEvent();
-                RaiseLocalEvent(uid, msg, false);
+        // Optional component.
+        Resolve(uid, ref appearance, false);
 
-                if (msg.Cancelled)
-                    return false;
-            }
+        if (standingState.CurrentState is StandingState.Standing
+            || TryComp(uid, out BuckleComponent? buckle)
+            && buckle.Buckled && !_buckle.TryUnbuckle(uid, uid, buckleComp: buckle))
+            return true;
 
-            standingState.Standing = true;
-            Dirty(uid, standingState);
-            RaiseLocalEvent(uid, new StoodEvent(), false);
+        if (!force)
+        {
+            var msg = new StandAttemptEvent();
+            RaiseLocalEvent(uid, msg, false);
 
-            _appearance.SetData(uid, RotationVisuals.RotationState, RotationState.Vertical, appearance);
+            if (msg.Cancelled)
+                return false;
+        }
 
-            if (TryComp(uid, out FixturesComponent? fixtureComponent))
+        standingState.CurrentState = StandingState.Standing;
+        Dirty(uid, standingState);
+        RaiseLocalEvent(uid, new StoodEvent(), false);
+
+        _appearance.SetData(uid, RotationVisuals.RotationState, RotationState.Vertical, appearance);
+
+        if (TryComp(uid, out FixturesComponent? fixtureComponent))
+        {
+            foreach (var key in standingState.ChangedFixtures)
             {
-                foreach (var key in standingState.ChangedFixtures)
-                {
-                    if (fixtureComponent.Fixtures.TryGetValue(key, out var fixture))
-                        _physics.SetCollisionMask(uid, key, fixture, fixture.CollisionMask | StandingCollisionLayer, fixtureComponent);
-                }
+                if (fixtureComponent.Fixtures.TryGetValue(key, out var fixture))
+                    _physics.SetCollisionMask(uid, key, fixture, fixture.CollisionMask | StandingCollisionLayer, fixtureComponent);
             }
-            standingState.ChangedFixtures.Clear();
-
-            return true;
         }
-    }
+        standingState.ChangedFixtures.Clear();
+        _movement.RefreshMovementSpeedModifiers(uid);
 
-    public sealed class DropHandItemsEvent : EventArgs
-    {
+        return true;
     }
+}
 
-    /// <summary>
-    /// Subscribe if you can potentially block a down attempt.
-    /// </summary>
-    public sealed class DownAttemptEvent : CancellableEntityEventArgs
-    {
-    }
+public sealed class DropHandItemsEvent : EventArgs { }
 
-    /// <summary>
-    /// Subscribe if you can potentially block a stand attempt.
-    /// </summary>
-    public sealed class StandAttemptEvent : CancellableEntityEventArgs
-    {
-    }
+/// <summary>
+///     Subscribe if you can potentially block a down attempt.
+/// </summary>
+public sealed class DownAttemptEvent : CancellableEntityEventArgs { }
 
-    /// <summary>
-    /// Raised when an entity becomes standing
-    /// </summary>
-    public sealed class StoodEvent : EntityEventArgs
-    {
-    }
+/// <summary>
+///     Subscribe if you can potentially block a stand attempt.
+/// </summary>
+public sealed class StandAttemptEvent : CancellableEntityEventArgs { }
 
-    /// <summary>
-    /// Raised when an entity is not standing
-    /// </summary>
-    public sealed class DownedEvent : EntityEventArgs
-    {
-    }
-}
+/// <summary>
+///     Raised when an entity becomes standing
+/// </summary>
+public sealed class StoodEvent : EntityEventArgs { }
+
+/// <summary>
+///     Raised when an entity is not standing
+/// </summary>
+public sealed class DownedEvent : EntityEventArgs { }
diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs
index 56a8a846b07..9e933181034 100644
--- a/Content.Shared/Station/SharedStationSpawningSystem.cs
+++ b/Content.Shared/Station/SharedStationSpawningSystem.cs
@@ -49,7 +49,6 @@ public void EquipStartingGear(EntityUid entity, StartingGearPrototype? startingG
                 var equipmentEntity = EntityManager.SpawnEntity(equipmentStr, EntityManager.GetComponent<TransformComponent>(entity).Coordinates);
                 InventorySystem.TryEquip(entity, equipmentEntity, slot.Name, true, force:true);
             }
-            
         }
 
         if (TryComp(entity, out HandsComponent? handsComponent))
diff --git a/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs b/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs
index b8483d021a4..d12c2c983ee 100644
--- a/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs
+++ b/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.StepTrigger.Prototypes;
 using Content.Shared.StepTrigger.Systems;
 using Content.Shared.Whitelist;
 using Robust.Shared.GameStates;
@@ -53,15 +54,18 @@ public sealed partial class StepTriggerComponent : Component
     public bool IgnoreWeightless;
 
     /// <summary>
-    /// Does this have separate "StepOn" and "StepOff" triggers.
+    ///     Does this have separate "StepOn" and "StepOff" triggers.
     /// </summary>
     [DataField, AutoNetworkedField]
     public bool StepOn = false;
+
+    /// <summary>
+    ///     If TriggerGroups is specified, it will check StepTriggerImmunityComponent to have the same TriggerType to activate immunity
+    /// </summary>
+    [DataField]
+    public StepTriggerGroup? TriggerGroups;
 }
 
 [RegisterComponent]
 [Access(typeof(StepTriggerSystem))]
-public sealed partial class StepTriggerActiveComponent : Component
-{
-
-}
+public sealed partial class StepTriggerActiveComponent : Component { }
diff --git a/Content.Shared/StepTrigger/Components/StepTriggerImmuneComponent.cs b/Content.Shared/StepTrigger/Components/StepTriggerImmuneComponent.cs
index 4321334a3ae..1b92905fa61 100644
--- a/Content.Shared/StepTrigger/Components/StepTriggerImmuneComponent.cs
+++ b/Content.Shared/StepTrigger/Components/StepTriggerImmuneComponent.cs
@@ -1,3 +1,5 @@
+using Content.Shared.StepTrigger.Prototypes;
+using Content.Shared.StepTrigger.Systems;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.StepTrigger.Components;
@@ -12,4 +14,12 @@ namespace Content.Shared.StepTrigger.Components;
 ///     Consider using a subscription to StepTriggerAttemptEvent if you wish to be more selective.
 /// </remarks>
 [RegisterComponent, NetworkedComponent]
-public sealed partial class StepTriggerImmuneComponent : Component { }
+[Access(typeof(StepTriggerSystem))]
+public sealed partial class StepTriggerImmuneComponent : Component
+{
+    /// <summary>
+    ///     WhiteList of immunity step triggers.
+    /// </summary>
+    [DataField]
+    public StepTriggerGroup? Whitelist;
+}
diff --git a/Content.Shared/StepTrigger/Prototypes/StepTriggerGroup.cs b/Content.Shared/StepTrigger/Prototypes/StepTriggerGroup.cs
new file mode 100644
index 00000000000..5b64085e9a9
--- /dev/null
+++ b/Content.Shared/StepTrigger/Prototypes/StepTriggerGroup.cs
@@ -0,0 +1,72 @@
+using Content.Shared.StepTrigger.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.StepTrigger.Prototypes;
+
+/// <summary>
+///     A group of <see cref="StepTriggerTypePrototype">
+///     Used to determine StepTriggerTypes like Tags.
+///     Used for better work with Immunity.
+///     StepTriggerTypes in StepTriggerTypes.yml
+/// </summary>
+/// <code>
+/// stepTriggerGroups:
+///   types:
+///   - Lava
+///   - Landmine
+///   - Shard
+///   - Chasm
+///   - Mousetrap
+///   - SlipTile
+///   - SlipEntity
+/// </code>
+[DataDefinition]
+[Serializable, NetSerializable]
+public sealed partial class StepTriggerGroup
+{
+    [DataField]
+    public List<ProtoId<StepTriggerTypePrototype>>? Types = null;
+
+    /// <summary>
+    ///     Checks if types of this StepTriggerGroup is similar to types of AnotherGroup
+    /// </summary>
+    public bool IsValid(StepTriggerGroup? anotherGroup)
+    {
+        if (Types is null)
+            return false;
+
+        foreach (var type in Types)
+        {
+            if (anotherGroup != null
+                && anotherGroup.Types != null
+                && anotherGroup.Types.Contains(type))
+                return true;
+        }
+        return false;
+    }
+
+    /// <summary>
+    ///     Checks validation (if types of this StepTriggerGroup are similar to types of
+    ///     another StepTriggerComponent.
+    /// </summary>
+    public bool IsValid(StepTriggerComponent component)
+    {
+        if (component.TriggerGroups is null)
+            return false;
+
+        return IsValid(component.TriggerGroups);
+    }
+
+    /// <summary>
+    ///     Checks validation (if types of this StepTriggerGroup are similar to types of
+    ///     another StepTriggerImmuneComponent.
+    /// </summary>
+    public bool IsValid(StepTriggerImmuneComponent component)
+    {
+        if (component.Whitelist is null)
+            return false;
+
+        return IsValid(component.Whitelist);
+    }
+}
diff --git a/Content.Shared/StepTrigger/Prototypes/StepTriggerTypePrototype.cs b/Content.Shared/StepTrigger/Prototypes/StepTriggerTypePrototype.cs
new file mode 100644
index 00000000000..732eb4b732e
--- /dev/null
+++ b/Content.Shared/StepTrigger/Prototypes/StepTriggerTypePrototype.cs
@@ -0,0 +1,15 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.StepTrigger.Prototypes;
+
+/// <summary>
+///     Prototype representing a StepTriggerType in YAML.
+///     Meant to only have an ID property, as that is the only thing that
+///     gets saved in StepTriggerGroup.
+/// </summary>
+[Prototype]
+public sealed partial class StepTriggerTypePrototype : IPrototype
+{
+    [ViewVariables, IdDataField]
+    public string ID { get; private set; } = default!;
+}
diff --git a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
index 89655afac23..d0cd5c4b4e2 100644
--- a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
+++ b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
@@ -118,11 +118,16 @@ private void UpdateColliding(EntityUid uid, StepTriggerComponent component, Tran
 
     private bool CanTrigger(EntityUid uid, EntityUid otherUid, StepTriggerComponent component)
     {
-        if (HasComp<StepTriggerImmuneComponent>(otherUid)
-            || !component.Active
+        if (!component.Active
             || component.CurrentlySteppedOn.Contains(otherUid))
             return false;
 
+        // Immunity checks
+        if (TryComp<StepTriggerImmuneComponent>(otherUid, out var stepTriggerImmuneComponent)
+            && component.TriggerGroups != null
+            && component.TriggerGroups.IsValid(stepTriggerImmuneComponent))
+            return false;
+
         // Can't trigger if we don't ignore weightless entities
         // and the entity is flying or currently weightless
         // Makes sense simulation wise to have this be part of steptrigger directly IMO
diff --git a/Content.Shared/Stunnable/SharedStunSystem.cs b/Content.Shared/Stunnable/SharedStunSystem.cs
index 976b0ab500d..52225843f23 100644
--- a/Content.Shared/Stunnable/SharedStunSystem.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.cs
@@ -19,6 +19,7 @@
 using Content.Shared.Throwing;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Player;
 
@@ -32,6 +33,8 @@ public abstract class SharedStunSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly StandingStateSystem _standingState = default!;
     [Dependency] private readonly StatusEffectsSystem _statusEffect = default!;
+    [Dependency] private readonly SharedLayingDownSystem _layingDown = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
 
     /// <summary>
     /// Friction modifier for knocked down players.
@@ -76,15 +79,12 @@ public override void Initialize()
     private void OnMobStateChanged(EntityUid uid, MobStateComponent component, MobStateChangedEvent args)
     {
         if (!TryComp<StatusEffectsComponent>(uid, out var status))
-        {
             return;
-        }
+
         switch (args.NewMobState)
         {
             case MobState.Alive:
-            {
                 break;
-            }
             case MobState.Critical:
             {
                 _statusEffect.TryRemoveStatusEffect(uid, "Stun");
@@ -109,12 +109,23 @@ private void UpdateCanMove(EntityUid uid, StunnedComponent component, EntityEven
 
     private void OnKnockInit(EntityUid uid, KnockedDownComponent component, ComponentInit args)
     {
-        _standingState.Down(uid);
+        RaiseNetworkEvent(new CheckAutoGetUpEvent(GetNetEntity(uid)));
+        _layingDown.TryLieDown(uid, null, null, DropHeldItemsBehavior.DropIfStanding);
     }
 
     private void OnKnockShutdown(EntityUid uid, KnockedDownComponent component, ComponentShutdown args)
     {
-        _standingState.Stand(uid);
+        if (!TryComp(uid, out StandingStateComponent? standing))
+            return;
+
+        if (TryComp(uid, out LayingDownComponent? layingDown))
+        {
+            if (layingDown.AutoGetUp && !_container.IsEntityInContainer(uid))
+                _layingDown.TryStandUp(uid, layingDown);
+            return;
+        }
+
+        _standingState.Stand(uid, standing);
     }
 
     private void OnStandAttempt(EntityUid uid, KnockedDownComponent component, StandAttemptEvent args)
@@ -148,13 +159,9 @@ private void OnRefreshMovespeed(EntityUid uid, SlowedDownComponent component, Re
     public bool TryStun(EntityUid uid, TimeSpan time, bool refresh,
         StatusEffectsComponent? status = null)
     {
-        if (time <= TimeSpan.Zero)
-            return false;
-
-        if (!Resolve(uid, ref status, false))
-            return false;
-
-        if (!_statusEffect.TryAddStatusEffect<StunnedComponent>(uid, "Stun", time, refresh))
+        if (time <= TimeSpan.Zero
+            || !Resolve(uid, ref status, false)
+            || !_statusEffect.TryAddStatusEffect<StunnedComponent>(uid, "Stun", time, refresh))
             return false;
 
         var ev = new StunnedEvent();
@@ -170,13 +177,9 @@ public bool TryStun(EntityUid uid, TimeSpan time, bool refresh,
     public bool TryKnockdown(EntityUid uid, TimeSpan time, bool refresh,
         StatusEffectsComponent? status = null)
     {
-        if (time <= TimeSpan.Zero)
-            return false;
-
-        if (!Resolve(uid, ref status, false))
-            return false;
-
-        if (!_statusEffect.TryAddStatusEffect<KnockedDownComponent>(uid, "KnockedDown", time, refresh))
+        if (time <= TimeSpan.Zero
+            || !Resolve(uid, ref status, false)
+            || !_statusEffect.TryAddStatusEffect<KnockedDownComponent>(uid, "KnockedDown", time, refresh))
             return false;
 
         var ev = new KnockedDownEvent();
@@ -204,10 +207,8 @@ public bool TrySlowdown(EntityUid uid, TimeSpan time, bool refresh,
         float walkSpeedMultiplier = 1f, float runSpeedMultiplier = 1f,
         StatusEffectsComponent? status = null)
     {
-        if (!Resolve(uid, ref status, false))
-            return false;
-
-        if (time <= TimeSpan.Zero)
+        if (!Resolve(uid, ref status, false)
+            || time <= TimeSpan.Zero)
             return false;
 
         if (_statusEffect.TryAddStatusEffect<SlowedDownComponent>(uid, "SlowedDown", time, refresh, status))
@@ -230,14 +231,8 @@ public bool TrySlowdown(EntityUid uid, TimeSpan time, bool refresh,
 
     private void OnInteractHand(EntityUid uid, KnockedDownComponent knocked, InteractHandEvent args)
     {
-        // This is currently disabled in favor of an interaction verb with the same effect, but more obvious usage.
-        return;
-
-        if (args.Handled || knocked.HelpTimer > 0f)
-            return;
-
-        // TODO: This should be an event.
-        if (HasComp<SleepingComponent>(uid))
+        if (args.Handled || knocked.HelpTimer > 0f
+            || HasComp<SleepingComponent>(uid))
             return;
 
         // Set it to half the help interval so helping is actually useful...
@@ -273,15 +268,19 @@ private void OnAttempt(EntityUid uid, StunnedComponent stunned, CancellableEntit
     private void OnEquipAttempt(EntityUid uid, StunnedComponent stunned, IsEquippingAttemptEvent args)
     {
         // is this a self-equip, or are they being stripped?
-        if (args.Equipee == uid)
-            args.Cancel();
+        if (args.Equipee != uid)
+            return;
+
+        args.Cancel();
     }
 
     private void OnUnequipAttempt(EntityUid uid, StunnedComponent stunned, IsUnequippingAttemptEvent args)
     {
         // is this a self-equip, or are they being stripped?
-        if (args.Unequipee == uid)
-            args.Cancel();
+        if (args.Unequipee != uid)
+            return;
+
+        args.Cancel();
     }
 
     #endregion
diff --git a/Content.Shared/Telescope/SharedTelescopeSystem.cs b/Content.Shared/Telescope/SharedTelescopeSystem.cs
new file mode 100644
index 00000000000..5f9896cc359
--- /dev/null
+++ b/Content.Shared/Telescope/SharedTelescopeSystem.cs
@@ -0,0 +1,110 @@
+using System.Numerics;
+using Content.Shared.Camera;
+using Content.Shared.Hands;
+using Content.Shared.Hands.Components;
+using Content.Shared.Item;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Telescope;
+
+public abstract class SharedTelescopeSystem : EntitySystem
+{
+    [Dependency] private readonly SharedEyeSystem _eye = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeAllEvent<EyeOffsetChangedEvent>(OnEyeOffsetChanged);
+        SubscribeLocalEvent<TelescopeComponent, GotUnequippedHandEvent>(OnUnequip);
+        SubscribeLocalEvent<TelescopeComponent, HandDeselectedEvent>(OnHandDeselected);
+        SubscribeLocalEvent<TelescopeComponent, ComponentShutdown>(OnShutdown);
+    }
+
+    private void OnShutdown(Entity<TelescopeComponent> ent, ref ComponentShutdown args)
+    {
+        if (!TryComp(ent.Comp.LastEntity, out EyeComponent? eye)
+            || ent.Comp.LastEntity == ent && TerminatingOrDeleted(ent))
+            return;
+
+        SetOffset((ent.Comp.LastEntity.Value, eye), Vector2.Zero, ent);
+    }
+
+    private void OnHandDeselected(Entity<TelescopeComponent> ent, ref HandDeselectedEvent args)
+    {
+        if (!TryComp(args.User, out EyeComponent? eye))
+            return;
+
+        SetOffset((args.User, eye), Vector2.Zero, ent);
+    }
+
+    private void OnUnequip(Entity<TelescopeComponent> ent, ref GotUnequippedHandEvent args)
+    {
+        if (!TryComp(args.User, out EyeComponent? eye)
+            || !HasComp<ItemComponent>(ent.Owner))
+            return;
+
+        SetOffset((args.User, eye), Vector2.Zero, ent);
+    }
+
+    public TelescopeComponent? GetRightTelescope(EntityUid? ent)
+    {
+        TelescopeComponent? telescope = null;
+
+        if (TryComp<HandsComponent>(ent, out var hands)
+            && hands.ActiveHandEntity.HasValue
+            && TryComp<TelescopeComponent>(hands.ActiveHandEntity, out var handTelescope))
+            telescope = handTelescope;
+        else if (TryComp<TelescopeComponent>(ent, out var entityTelescope))
+            telescope = entityTelescope;
+
+        return telescope;
+    }
+
+    private void OnEyeOffsetChanged(EyeOffsetChangedEvent msg, EntitySessionEventArgs args)
+    {
+        if (args.SenderSession.AttachedEntity is not { } ent
+            || !TryComp<EyeComponent>(ent, out var eye))
+            return;
+
+        var telescope = GetRightTelescope(ent);
+
+        if (telescope == null)
+            return;
+
+        var offset = Vector2.Lerp(eye.Offset, msg.Offset, telescope.LerpAmount);
+
+        SetOffset((ent, eye), offset, telescope);
+    }
+
+    private void SetOffset(Entity<EyeComponent> ent, Vector2 offset, TelescopeComponent telescope)
+    {
+        telescope.LastEntity = ent;
+
+        if (TryComp(ent, out CameraRecoilComponent? recoil))
+        {
+            recoil.BaseOffset = offset;
+            _eye.SetOffset(ent, offset + recoil.CurrentKick, ent);
+        }
+        else
+        {
+            _eye.SetOffset(ent, offset, ent);
+        }
+    }
+
+    public void SetParameters(Entity<TelescopeComponent> ent, float? divisor = null, float? lerpAmount = null)
+    {
+        var telescope = ent.Comp;
+
+        telescope.Divisor = divisor ?? telescope.Divisor;
+        telescope.LerpAmount = lerpAmount ?? telescope.LerpAmount;
+
+        Dirty(ent.Owner, telescope);
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class EyeOffsetChangedEvent : EntityEventArgs
+{
+    public Vector2 Offset;
+}
diff --git a/Content.Shared/Telescope/TelescopeComponent.cs b/Content.Shared/Telescope/TelescopeComponent.cs
new file mode 100644
index 00000000000..529cc58324f
--- /dev/null
+++ b/Content.Shared/Telescope/TelescopeComponent.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Telescope;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TelescopeComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public float Divisor = 0.1f;
+
+    [DataField, AutoNetworkedField]
+    public float LerpAmount = 0.1f;
+
+    [ViewVariables]
+    public EntityUid? LastEntity;
+}
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 6a8111cec5e..a233a61a2d4 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6381,3 +6381,89 @@ Entries:
   id: 6363
   time: '2024-09-16T04:41:44.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/919
+- author: Mnemotechnician
+  changes:
+    - type: Add
+      message: >-
+        Pulling has been reworked. Your character will now try to continuously
+        push the pulled entity when you use the push keybind.
+    - type: Remove
+      message: >-
+        You can no longer push the pulled entity while walking, and pushing now
+        follows the momentum conservation laws.
+  id: 6364
+  time: '2024-09-17T23:38:45.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/883
+- author: VMSolidus
+  changes:
+    - type: Tweak
+      message: >-
+        Core now has a 6-Core AME, which is supplied with two jars of fuel. This
+        should give Engineers significantly more than 20 minutes of time to
+        setup the Supermatter engine.
+  id: 6365
+  time: '2024-09-17T23:39:07.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/927
+- author: JayJacobs
+  changes:
+    - type: Tweak
+      message: Changed the sprite of the barber chair.
+    - type: Fix
+      message: Fixed bench textures.
+  id: 6366
+  time: '2024-09-17T23:39:57.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/925
+- author: zelezniciar
+  changes:
+    - type: Tweak
+      message: The fireaxe once again can pry subfloors
+  id: 6367
+  time: '2024-09-17T23:40:13.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/921
+- author: VMSolidus
+  changes:
+    - type: Fix
+      message: >-
+        Cloning Consoles will now correctly state when a body has the
+        Uncloneable trait. 
+  id: 6368
+  time: '2024-09-18T04:30:39.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/926
+- author: Spatison
+  changes:
+    - type: Add
+      message: Added lying down system / Добавлена система лежания
+    - type: Tweak
+      message: >-
+        Lying down now uses do-afters that are visible to other people to
+        indicate what is going on.
+    - type: Add
+      message: Added telescope system / Добавлена система прицеливания
+    - type: Tweak
+      message: Now you can aim from Hristov / Теперь можно прицеливаться из Христова
+  id: 6369
+  time: '2024-09-19T02:18:35.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/815
+- author: FoxxoTrystan
+  changes:
+    - type: Remove
+      message: DeltaV Option Tab (Options moved)
+  id: 6370
+  time: '2024-09-19T02:24:25.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/928
+- author: Hell_Cat
+  changes: []
+  id: 6371
+  time: '2024-09-19T03:29:41.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/929
+- author: VMSolidus
+  changes:
+    - type: Fix
+      message: >-
+        Fixed issues with the LayingDownSystem. Laying down no longer causes all
+        entities on your screen to lay down at once. Using any movement input no
+        longer causes the character to appear to the player as to be laying
+        down.
+  id: 6372
+  time: '2024-09-19T20:37:51.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/933
diff --git a/Resources/Locale/en-US/deltav/escape-menu/options-menu.ftl b/Resources/Locale/en-US/deltav/escape-menu/options-menu.ftl
deleted file mode 100644
index 50d55cb76d0..00000000000
--- a/Resources/Locale/en-US/deltav/escape-menu/options-menu.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-ui-options-tab-deltav = DeltaV
-ui-options-general-forknotice = Note: These settings are fork-specific and might not apply on other servers.
-
-ui-options-no-filters = Disable species vision filters
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 7d6af11f379..ea24439f708 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -52,6 +52,7 @@ ui-options-fancy-speech = Show names in speech bubbles
 ui-options-fancy-name-background = Add background to speech bubble names
 ui-options-enable-color-name = Add colors to character names
 ui-options-colorblind-friendly = Colorblind friendly mode
+ui-options-no-filters = Disable species vision filters
 ui-options-reduced-motion = Reduce motion of visual effects
 ui-options-chat-window-opacity = Chat window opacity
 ui-options-chat-window-opacity-percent = { TOSTRING($opacity, "P0") }
@@ -269,3 +270,8 @@ ui-options-net-pvs-leave-tooltip = This limits the rate at which the client will
 ## Toggle window console command
 cmd-options-desc = Opens options menu, optionally with a specific tab selected.
 cmd-options-help = Usage: options [tab]
+
+## Combat Options
+ui-options-function-look-up = Look up/Take aim
+ui-options-function-auto-get-up = Automatically get up after falling
+ui-options-function-hold-look-up = Hold down the key to aim
diff --git a/Resources/Locale/en-US/prototypes/entities/clothing/head/hardsuit-helmets.ftl b/Resources/Locale/en-US/prototypes/entities/clothing/head/hardsuit-helmets.ftl
index 2bbacf2abca..4e003d2704d 100644
--- a/Resources/Locale/en-US/prototypes/entities/clothing/head/hardsuit-helmets.ftl
+++ b/Resources/Locale/en-US/prototypes/entities/clothing/head/hardsuit-helmets.ftl
@@ -55,6 +55,8 @@ ent-ClothingHeadHelmetHardsuitLuxury = HpI-20c helmet
     .desc = A modified helmet for the Minos hardsuit, fashioned after the Logistics Officer's colors. It's been modified for greater mobility at the expense of physical trauma protection.
 ent-ClothingHeadHelmetHardsuitSyndie = CSA-51a helmet
     .desc = An armored helmet deployed over a Shanlin tacsuit. This one has been painted blood red.
+ent-ClothingHeadHelmetHardsuitSyndieReverseEngineered = CSA-51a helmet
+    .desc = An armored helmet deployed over a Shanlin tacsuit. This one has been painted blue.
 ent-ClothingHeadHelmetHardsuitSyndieMedic = CSA-51m helmet
     .desc = An armored helmet deployed over a Zhongyao tacsuit. features optic integrations for nearly every medical hud on the market.
     Designed to enable the survival of combat medics in the most dangerous of environments.
@@ -64,6 +66,8 @@ ent-ClothingHeadHelmetHardsuitSyndieCommander = CSA-54c helmet
     .desc = A bulked up version of the Shanlin tacsuit's helmet, purpose-built for commanders of special operation squads. This one has been painted blood-red.
 ent-ClothingHeadHelmetHardsuitCybersun = CSA-80UA helmet
     .desc = An incredibly sturdy looking helmet designed for the Guan Yu tacsuit.
+ent-ClothingHeadHelmetHardsuitJuggernautReverseEngineered = CSA-80UA helmet
+    .desc = An incredibly sturdy looking helmet designed for the Guan Yu tacsuit. This one has been painted blue.
 ent-ClothingHeadHelmetHardsuitWizard = WZD-84 helmet
     .desc = A bizarre, gem-encrusted helmet from unknown origins. It provides some protection to its wearer without restricting their movements.
 ent-ClothingHeadHelmetHardsuitLing = organic space helmet
diff --git a/Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl b/Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl
index 84f03af5c92..188f08ae260 100644
--- a/Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl
+++ b/Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl
@@ -74,6 +74,9 @@ ent-ClothingOuterHardsuitLuxury = HpI-20c - "Minos" hardsuit
 ent-ClothingOuterHardsuitSyndie = CSA-51a - "Shanlin" tacsuit
     .desc = A tactical combat hardsuit produced by the Cybersun-Armaments Corporation, the suit's tags indicate it provides moderate protection against most forms of damage.
     This one has been painted blood red. It feels incredibly light.
+ent-ClothingOuterHardsuitSyndieReverseEngineered = CSA-51a - "Shanlin" tacsuit
+    .desc = A tactical combat hardsuit produced by the Cybersun-Armaments Corporation, the suit's tags indicate it provides moderate protection against most forms of damage.
+        This one has been painted blue. It feels incredibly light.
 ent-ClothingOuterHardsuitSyndieMedic = CSA-51m - "Zhongyao" tacsuit
     .desc = A tactical combat hardsuit produced by the Cybersun-Armaments Corporation, the suit's tags indicate it provides moderate protection against most forms of damage.
     Half of the suit is painted blood red, the rest bears galactic-standard medical markings. It feels incredibly light.
@@ -87,6 +90,9 @@ ent-ClothingOuterHardsuitSyndieCommander = CSA-54c - "Tianming" tacsuit
 ent-ClothingOuterHardsuitJuggernaut = CSA-80UA - "Guan Yu" tacsuit
     .desc = The pride and joy of the Cybersun-Armaments Corporation, named after an ancient Sol' War God. Commonly known throughout the galaxy as a "Juggernaut".
     Matching its bulky appearance, it protects against all forms of damage. It feels VERY heavy.
+end-ClothingOuterHardsuitJuggernautReverseEngineered = CSA-80UA - "Guan Yu" tacsuit
+    .desc = The pride and joy of the Cybersun-Armaments Corporation, named after an ancient Sol' War God. Commonly known throughout the galaxy as a "Juggernaut".
+        Matching its bulky appearance, it protects against all forms of damage. It feels VERY heavy.
 ent-ClothingOuterHardsuitWizard = WZD-84 - "Mana" tacsuit
     .desc = A bizarre gem-encrusted hardsuit. Famously used by members of the Wizard Federation in their operations.
     Contrary to it's appearance, it can protect its wearer from space and considerable amounts of physical trauma, it feels somewhat light.
diff --git a/Resources/Locale/en-US/psionics/psionic-powers.ftl b/Resources/Locale/en-US/psionics/psionic-powers.ftl
index ad6bbef02bd..c68bb2a4968 100644
--- a/Resources/Locale/en-US/psionics/psionic-powers.ftl
+++ b/Resources/Locale/en-US/psionics/psionic-powers.ftl
@@ -86,7 +86,9 @@ telepathy-power-initialization-feedback =
     The voices I've heard all my life begin to clear, yet they do not leave me. Before, they were as incoherent whispers,
     now my senses broaden, I come to a realization that they are part of a communal shared hallucination. Behind every voice is a glimmering sentience.
 
+# Psionic System Messages
 mindbreaking-feedback = The light of life vanishes from {CAPITALIZE($entity)}'s eyes, leaving behind a husk pretending at sapience
 examine-mindbroken-message =
     Eyes unblinking, staring deep into the horizon. {CAPITALIZE($entity)} is a sack of meat pretending it has a soul.
-    There is nothing behind its gaze, no evidence there can be found of the divine light of creation.
\ No newline at end of file
+    There is nothing behind its gaze, no evidence there can be found of the divine light of creation.
+psionic-roll-failed = For a moment, my consciousness expands, yet I feel that it is not enough.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/tools/tool-qualities.ftl b/Resources/Locale/en-US/tools/tool-qualities.ftl
index 14e42390a76..2482dca5174 100644
--- a/Resources/Locale/en-US/tools/tool-qualities.ftl
+++ b/Resources/Locale/en-US/tools/tool-qualities.ftl
@@ -32,4 +32,7 @@ tool-quality-rolling-name = Rolling
 tool-quality-rolling-tool-name = Rolling Pin
 
 tool-quality-digging-name = Digging
-tool-quality-digging-tool-name = Shovel
\ No newline at end of file
+tool-quality-digging-tool-name = Shovel
+
+tool-quality-axing-name = Axing
+tool-quality-axing-tool-name = Fireaxe
\ No newline at end of file
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index ff329a12a71..b034f69b9e8 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -228,6 +228,68 @@ trait-description-AnomalousPositronics =
     your positronic brain lacks its standard psionic insulation. As a being that can be argued to have a soul,
     this by extension means that it is possible for you to be influenced by the Noosphere.
 
+trait-name-Photophobia = Photophobia
+trait-description-Photophobia =
+    Your eyes are extremely sensitive to bright lights.
+    As a result, you may be blinded for a greater duration than others when exposed to sudden flashes of light.
+    Your eyes are also more likely to be injured by flashes.
+
+trait-name-Clumsy = Clumsy
+trait-description-Clumsy =
+    You have a severe deficiency in hand-eye-coordination, resulting in an inability to do some things that others would take for granted.
+    Any weapons you may try to use are more likely to injure yourself than others. You are unable to climb any objects without injuring yourself.
+
+trait-name-Small = Small
+trait-description-Small =
+    You are much smaller than a typical person, and can climb into spaces others would not normally be able to fit into, such as duffel bags.
+    This trait does not in any way modify your character's size, it merely requires that your character be at most the size of a standard Felinid.
+
+trait-name-TemperatureTolerance = Temperature Tolerance
+trait-description-TemperatureTolerance =
+    You have a notable tolerance for lower temperatures. You can stand for extended periods of time
+    in conditions just slightly below freezing, such as the inside of a kitchen fridge,
+    or the sunlit mountainside of the famous Glacier station.
+
+trait-name-Talons = Talons
+trait-description-Talons =
+    Your fingertips have been replaced with piercing talons.
+    These could come from gene modifications, vatgrown implants,
+    or even hard plastic retractable talons incorpoated into a prosthetic limb.
+    Your unarmed melee attacks deal Piercing damage instead of the standard damage type for your species.
+    This has no effect on damage dealt with any form of armed melee.
+
+trait-name-Claws = Claws
+trait-description-Claws =
+    Your fingertips have been replaced with sharp claws.
+    These could come from gene modifications, vatgrown implants,
+    or even hard plastic retractable claws incorpoated into a prosthetic limb.
+    Your unarmed melee attacks deal Slashing damage instead of the standard damage type for your species.
+    This has no effect on damage dealt with any form of armed melee.
+
+trait-name-NaturalWeaponRemoval = Natural Weapons Removal
+trait-description-NaturalWeaponRemoval =
+    Whatever "Natural Weapons" your species are normally born with have been surgically removed.
+    This could have been done to better fit in with terran space stations, or as a cosmetic choice.
+    As a result, your unarmed attacks deal Blunt damage instead of the standard damage type for your species.
+    This has no effect on damage dealt with any form of armed melee.
+
+trait-name-StrikingCalluses = Striking Calluses
+trait-description-StrikingCalluses =
+    An iconic enhancement commonly found in the world of cyberenhanced martial arts.
+    Striking Calluses consist of bony dermal deposits grafted into a user's hands, either inside the palm
+    for "Tiger Style" fighting, or just below the knuckles for those who favor traditional boxing.
+    Owners of prosthetic or bionic limbs would instead have a hard plastic shell over their knuckles.
+    These enhancements increase your unarmed strike damage by 1 point base, but do not confer
+    any benefits to any form of armed melee.
+
+trait-name-Spinarette = Bionic Spinarette
+trait-description-Spinarette =
+    This vatgrown organ-- trademarked and patented by the Cybersun Corporation, is marketed as a highly
+    utilitarian enhancement, and sold in clinics all across known space. It consists of a nodule that is traditionally
+    implanted right below the wrist, which absorbs bodily lipids to convert into all natural silk. A small opening
+    in the palm allows the user to 'spin' this thread. Users of this enhancement typically require twice as much food
+    as a standard Sol Human, owing to the high metabolic cost of artificial Sericulture.
+
 trait-name-AddictionNicotine = Nicotine Addiction
 trait-description-AddictionNicotine =
-    You have an addiction to Nicotine, and will require frequent smoke breaks to keep your mood in check.
\ No newline at end of file
+    You have an addiction to Nicotine, and will require frequent smoke breaks to keep your mood in check.
diff --git a/Resources/Locale/ru-RU/Escape-Menu/options-menu.ftl b/Resources/Locale/ru-RU/Escape-Menu/options-menu.ftl
new file mode 100644
index 00000000000..a39bc37af90
--- /dev/null
+++ b/Resources/Locale/ru-RU/Escape-Menu/options-menu.ftl
@@ -0,0 +1,3 @@
+ui-options-function-look-up = Присмотреться/Прицелиться
+ui-options-function-auto-get-up = Автоматически вставать при падении
+ui-options-function-hold-look-up = Удерживать клавишу для прицеливания
diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml
index 0f31cea8379..d8ad22c30ac 100644
--- a/Resources/Maps/core.yml
+++ b/Resources/Maps/core.yml
@@ -97,11 +97,11 @@ entities:
           version: 6
         0,-2:
           ind: 0,-2
-          tiles: aAAAAAAAaAAAAAAAXQAAAAADXQAAAAADaAAAAAACXQAAAAABXQAAAAADXQAAAAABaAAAAAABXQAAAAADaAAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAADTgAAAAABTgAAAAABaAAAAAACaAAAAAACaAAAAAABaAAAAAAAaAAAAAABaAAAAAACaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAaAAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAABfgAAAAAAHwAAAAAAJAAAAAAAJAAAAAABJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAHwAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAJAAAAAADegAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAAAJAAAAAADfgAAAAAAHwAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADegAAAAAAegAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAABfgAAAAAAHwAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADJAAAAAABJAAAAAAAJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACaAAAAAABXQAAAAABHwAAAAABfgAAAAAAHwAAAAACJAAAAAABJAAAAAACJAAAAAAAJAAAAAABXQAAAAAAXQAAAAAAJAAAAAAAfgAAAAAAJAAAAAACaAAAAAADaAAAAAAAaAAAAAACXQAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAATgAAAAACTgAAAAADJAAAAAABfgAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAACXQAAAAACHwAAAAABHwAAAAACHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADXQAAAAAAXQAAAAABXQAAAAABaAAAAAADaAAAAAADaAAAAAACaAAAAAADaAAAAAACXQAAAAABHwAAAAACHwAAAAAAHwAAAAABHwAAAAABXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAaAAAAAACaAAAAAADaAAAAAACaAAAAAADXQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAACXQAAAAADXQAAAAABaAAAAAAAHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAABXQAAAAABfgAAAAAAJAAAAAACJAAAAAAAJAAAAAABXQAAAAABXQAAAAADaAAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAJAAAAAACHwAAAAACHwAAAAACXQAAAAAAXQAAAAADaAAAAAADXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAABXQAAAAADXQAAAAAAaAAAAAAD
+          tiles: aAAAAAAAaAAAAAAAXQAAAAADXQAAAAADaAAAAAACXQAAAAABXQAAAAADXQAAAAABaAAAAAABXQAAAAADaAAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAADTgAAAAABTgAAAAABaAAAAAACaAAAAAACaAAAAAABaAAAAAAAaAAAAAABaAAAAAACaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAaAAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAABfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAJAAAAAADegAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAAAJAAAAAADfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADegAAAAAAegAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAABfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADJAAAAAABJAAAAAAAJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACaAAAAAABXQAAAAABHwAAAAABfgAAAAAAHwAAAAACJAAAAAABJAAAAAACJAAAAAAAJAAAAAABXQAAAAAAXQAAAAAAJAAAAAAAfgAAAAAAJAAAAAACaAAAAAADaAAAAAAAaAAAAAACXQAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAATgAAAAACTgAAAAADJAAAAAABfgAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAACXQAAAAACHwAAAAABHwAAAAACHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADXQAAAAAAXQAAAAABXQAAAAABaAAAAAADaAAAAAADaAAAAAACaAAAAAADaAAAAAACXQAAAAABHwAAAAACHwAAAAAAHwAAAAABHwAAAAABXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAaAAAAAACaAAAAAADaAAAAAACaAAAAAADXQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAACXQAAAAADXQAAAAABaAAAAAAAHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAABXQAAAAABfgAAAAAAJAAAAAACJAAAAAAAJAAAAAABXQAAAAABXQAAAAADaAAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAJAAAAAACHwAAAAACHwAAAAACXQAAAAAAXQAAAAADaAAAAAADXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAABXQAAAAADXQAAAAAAaAAAAAAD
           version: 6
         1,-2:
           ind: 1,-2
-          tiles: XQAAAAAAXQAAAAABaAAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAHwAAAAACaAAAAAADaAAAAAABaAAAAAABaAAAAAADaAAAAAABHwAAAAABfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAABfgAAAAAAHwAAAAAAaAAAAAADaAAAAAAAaAAAAAADaAAAAAABaAAAAAABHwAAAAAAfgAAAAAAHwAAAAAAJAAAAAABHwAAAAACfgAAAAAAXQAAAAABaAAAAAACXQAAAAACfgAAAAAAHwAAAAAAaAAAAAAAaAAAAAABaAAAAAABXQAAAAADaAAAAAACHwAAAAADHwAAAAACHwAAAAACJAAAAAAAHwAAAAADfgAAAAAAXQAAAAADaAAAAAAAXQAAAAABfgAAAAAAHwAAAAADaAAAAAABaAAAAAABaAAAAAABaAAAAAADaAAAAAADHwAAAAABfgAAAAAAHwAAAAAAJAAAAAACHwAAAAABfgAAAAAAaAAAAAAAaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAADHwAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAAAJAAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAJAAAAAADHwAAAAABfgAAAAAAXQAAAAACaAAAAAACaAAAAAAAaAAAAAABaAAAAAACaAAAAAACaAAAAAABaAAAAAADaAAAAAABaAAAAAADXQAAAAACfgAAAAAAHwAAAAABJAAAAAAAHwAAAAADfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAHwAAAAAAHwAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAABaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAJAAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAHwAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAaAAAAAABXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABaAAAAAABaAAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAADfgAAAAAAXQAAAAABXQAAAAABXQAAAAACaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAA
+          tiles: XQAAAAAAXQAAAAABaAAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAHwAAAAACaAAAAAADaAAAAAABaAAAAAABaAAAAAADaAAAAAABHwAAAAABfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAABfgAAAAAAHwAAAAAAaAAAAAADaAAAAAAAaAAAAAADaAAAAAABaAAAAAABHwAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAACfgAAAAAAXQAAAAABaAAAAAACXQAAAAACfgAAAAAAHwAAAAAAaAAAAAAAaAAAAAABaAAAAAABXQAAAAADaAAAAAACHwAAAAADHwAAAAACHwAAAAACfgAAAAAAHwAAAAADfgAAAAAAXQAAAAADaAAAAAAAXQAAAAABfgAAAAAAHwAAAAADaAAAAAABaAAAAAABaAAAAAABaAAAAAADaAAAAAADHwAAAAABfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAABfgAAAAAAaAAAAAAAaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAHwAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAAAJAAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAJAAAAAADHwAAAAABfgAAAAAAXQAAAAACaAAAAAACaAAAAAAAaAAAAAABaAAAAAACaAAAAAACaAAAAAABaAAAAAADaAAAAAABaAAAAAADXQAAAAACfgAAAAAAHwAAAAABJAAAAAAAHwAAAAADfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAHwAAAAAAHwAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAABaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAJAAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAHwAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAaAAAAAABXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABaAAAAAABaAAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAADfgAAAAAAXQAAAAABXQAAAAABXQAAAAACaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAA
           version: 6
         1,-1:
           ind: 1,-1
@@ -3793,7 +3793,6 @@ entities:
             5754: 12,-22
             5755: 15,-26
             5756: 12,-26
-            5757: 12,-29
             5758: 7,-30
             5759: 8,-32
             5760: 7,-32
@@ -3860,15 +3859,6 @@ entities:
             6417: 39,-3
             6418: 37,-3
             6419: 37,-3
-        - node:
-            cleanable: True
-            color: '#FFFFFF47'
-            id: Dirt
-          decals:
-            6314: 15,-30
-            6315: 15,-30
-            6316: 16,-27
-            6317: 16,-27
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -5194,7 +5184,6 @@ entities:
             4911: 13,-17
             4912: 11,-30
             4913: 11,-28
-            4914: 11,-27
             4915: 11,-26
             4916: 17,-26
             4917: 17,-28
@@ -5955,15 +5944,12 @@ entities:
             3363: 10,-16
             3364: 10,-18
             3365: 10,-18
-            3366: 12,-29
-            3367: 12,-28
             3368: 12,-26
             3369: 13,-25
             3370: 14,-25
             3371: 14,-26
             3372: 15,-25
             3373: 16,-26
-            3374: 16,-29
             3375: -4,-36
             3376: -4,-37
             3377: -6,-37
@@ -6482,10 +6468,6 @@ entities:
             id: DirtHeavyMonotile
           decals:
             2847: -44,17
-            6310: 13,-30
-            6311: 16,-30
-            6312: 12,-30
-            6313: 12,-30
         - node:
             cleanable: True
             angle: -6.283185307179586 rad
@@ -8333,12 +8315,6 @@ entities:
           decals:
             6401: 49,-11
             6402: 52,-11
-        - node:
-            color: '#EFB34118'
-            id: WarnCornerSmallNE
-          decals:
-            6325: 12,-30
-            6326: 12,-30
         - node:
             color: '#EFB34131'
             id: WarnCornerSmallNE
@@ -8347,11 +8323,6 @@ entities:
             6471: 14,39
             6472: 14,39
             6473: 14,39
-        - node:
-            color: '#EFB3416C'
-            id: WarnCornerSmallNE
-          decals:
-            6324: 12,-30
         - node:
             color: '#EFB34196'
             id: WarnCornerSmallNE
@@ -8368,12 +8339,6 @@ entities:
             6071: 51,-11
             6748: 46,15
             6846: 57,-5
-        - node:
-            color: '#EFB34118'
-            id: WarnCornerSmallNW
-          decals:
-            6327: 16,-30
-            6328: 16,-30
         - node:
             color: '#EFB34131'
             id: WarnCornerSmallNW
@@ -8382,11 +8347,6 @@ entities:
             6467: 16,39
             6468: 16,39
             6469: 16,39
-        - node:
-            color: '#EFB3416C'
-            id: WarnCornerSmallNW
-          decals:
-            6323: 16,-30
         - node:
             color: '#EFB34196'
             id: WarnCornerSmallNW
@@ -8469,9 +8429,6 @@ entities:
             85: -4,-19
             116: -4,-16
             119: -2,-15
-            189: 12,-27
-            190: 12,-28
-            191: 12,-29
             265: 25,-16
             266: 25,-15
             276: 29,-13
@@ -8648,9 +8605,6 @@ entities:
             88: -10,-17
             89: -10,-16
             128: 0,-21
-            186: 16,-27
-            187: 16,-28
-            188: 16,-29
             194: 13,-21
             195: 13,-20
             196: 13,-19
@@ -8677,16 +8631,6 @@ entities:
             6370: -33,-11
             6743: 46,16
             6824: 61,-4
-        - node:
-            color: '#EFB34118'
-            id: WarnLineW
-          decals:
-            6329: 13,-30
-            6330: 13,-30
-            6331: 14,-30
-            6332: 14,-30
-            6333: 15,-30
-            6334: 15,-30
         - node:
             color: '#EFB34131'
             id: WarnLineW
@@ -8695,13 +8639,6 @@ entities:
             6451: 15,39
             6452: 15,39
             6453: 15,39
-        - node:
-            color: '#EFB3416C'
-            id: WarnLineW
-          decals:
-            6320: 13,-30
-            6321: 14,-30
-            6322: 15,-30
         - node:
             color: '#EFB34196'
             id: WarnLineW
@@ -17945,10 +17882,15 @@ entities:
       parent: 2
 - proto: AmeJar
   entities:
-  - uid: 94
+  - uid: 695
     components:
     - type: Transform
-      pos: 17.51151,-27.35627
+      pos: 15.659197,-24.407036
+      parent: 2
+  - uid: 1534
+    components:
+    - type: Transform
+      pos: 15.346697,-24.39141
       parent: 2
 - proto: AmePartFlatpack
   entities:
@@ -17997,6 +17939,61 @@ entities:
     - type: Transform
       pos: 16.69675,-24.555443
       parent: 2
+  - uid: 693
+    components:
+    - type: Transform
+      pos: 16.299822,-24.36016
+      parent: 2
+  - uid: 694
+    components:
+    - type: Transform
+      pos: 17.768572,-25.313286
+      parent: 2
+  - uid: 6126
+    components:
+    - type: Transform
+      pos: 16.299822,-24.20391
+      parent: 2
+  - uid: 10573
+    components:
+    - type: Transform
+      pos: 16.299822,-24.563286
+      parent: 2
+  - uid: 22532
+    components:
+    - type: Transform
+      pos: 17.768572,-25.563286
+      parent: 2
+  - uid: 22533
+    components:
+    - type: Transform
+      pos: 17.768572,-25.73516
+      parent: 2
+  - uid: 22534
+    components:
+    - type: Transform
+      pos: 17.284197,-25.70391
+      parent: 2
+  - uid: 22535
+    components:
+    - type: Transform
+      pos: 17.284197,-25.48516
+      parent: 2
+  - uid: 22536
+    components:
+    - type: Transform
+      pos: 17.284197,-25.26641
+      parent: 2
+  - uid: 22538
+    components:
+    - type: Transform
+      pos: 17.737322,-26.20391
+      parent: 2
+  - uid: 22539
+    components:
+    - type: Transform
+      pos: 17.518572,-26.344536
+      parent: 2
 - proto: AmmoniaCanister
   entities:
   - uid: 22510
@@ -51029,50 +51026,37 @@ entities:
   - uid: 641
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,-26.5
-      parent: 2
-  - uid: 642
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,-27.5
+      pos: 12.5,-28.5
       parent: 2
   - uid: 643
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,-28.5
+      pos: 12.5,-27.5
       parent: 2
   - uid: 647
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 14.5,-26.5
+      pos: 13.5,-29.5
       parent: 2
   - uid: 648
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 14.5,-27.5
+      pos: 12.5,-29.5
       parent: 2
   - uid: 650
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 15.5,-27.5
+      pos: 13.5,-27.5
       parent: 2
   - uid: 651
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 15.5,-28.5
+      pos: 14.5,-26.5
       parent: 2
   - uid: 652
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 15.5,-26.5
+      pos: 13.5,-28.5
       parent: 2
   - uid: 653
     components:
@@ -51212,6 +51196,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 16.5,-13.5
       parent: 2
+  - uid: 692
+    components:
+    - type: Transform
+      pos: 13.5,-26.5
+      parent: 2
   - uid: 753
     components:
     - type: Transform
@@ -51400,6 +51389,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -22.5,25.5
       parent: 2
+  - uid: 2189
+    components:
+    - type: Transform
+      pos: 12.5,-26.5
+      parent: 2
   - uid: 2199
     components:
     - type: Transform
@@ -51660,11 +51654,6 @@ entities:
     - type: Transform
       pos: 40.5,21.5
       parent: 2
-  - uid: 6126
-    components:
-    - type: Transform
-      pos: 14.5,-28.5
-      parent: 2
   - uid: 6203
     components:
     - type: Transform
@@ -56376,6 +56365,61 @@ entities:
     - type: Transform
       pos: -6.5,-12.5
       parent: 2
+  - uid: 22521
+    components:
+    - type: Transform
+      pos: 14.5,-27.5
+      parent: 2
+  - uid: 22522
+    components:
+    - type: Transform
+      pos: 14.5,-28.5
+      parent: 2
+  - uid: 22523
+    components:
+    - type: Transform
+      pos: 14.5,-29.5
+      parent: 2
+  - uid: 22524
+    components:
+    - type: Transform
+      pos: 15.5,-29.5
+      parent: 2
+  - uid: 22525
+    components:
+    - type: Transform
+      pos: 15.5,-28.5
+      parent: 2
+  - uid: 22526
+    components:
+    - type: Transform
+      pos: 15.5,-27.5
+      parent: 2
+  - uid: 22527
+    components:
+    - type: Transform
+      pos: 15.5,-26.5
+      parent: 2
+  - uid: 22528
+    components:
+    - type: Transform
+      pos: 16.5,-26.5
+      parent: 2
+  - uid: 22529
+    components:
+    - type: Transform
+      pos: 16.5,-27.5
+      parent: 2
+  - uid: 22530
+    components:
+    - type: Transform
+      pos: 16.5,-28.5
+      parent: 2
+  - uid: 22531
+    components:
+    - type: Transform
+      pos: 16.5,-29.5
+      parent: 2
 - proto: Chair
   entities:
   - uid: 678
@@ -56452,28 +56496,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,-24.5
       parent: 2
-  - uid: 692
-    components:
-    - type: Transform
-      pos: 11.5,-26.5
-      parent: 2
-  - uid: 693
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 11.5,-28.5
-      parent: 2
-  - uid: 694
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 17.5,-28.5
-      parent: 2
-  - uid: 695
-    components:
-    - type: Transform
-      pos: 17.5,-26.5
-      parent: 2
   - uid: 696
     components:
     - type: Transform
@@ -62611,10 +62633,10 @@ entities:
       parent: 2
 - proto: DefaultStationBeaconAME
   entities:
-  - uid: 10573
+  - uid: 642
     components:
     - type: Transform
-      pos: 14.5,-27.5
+      pos: 13.5,-25.5
       parent: 2
 - proto: DefaultStationBeaconAnomalyGenerator
   entities:
@@ -105392,7 +105414,7 @@ entities:
     - type: Transform
       pos: 14.5,32.5
       parent: 2
-- proto: Oracle
+- proto: OracleSpawner
   entities:
   - uid: 22459
     components:
@@ -105879,13 +105901,6 @@ entities:
     - type: Transform
       pos: -5.47442,23.570398
       parent: 2
-- proto: PaperWrittenAMEScribbles
-  entities:
-  - uid: 1534
-    components:
-    - type: Transform
-      pos: 11.480261,-27.434395
-      parent: 2
 - proto: ParticleAcceleratorComputerCircuitboard
   entities:
   - uid: 5471
@@ -110183,6 +110198,11 @@ entities:
       parent: 2
 - proto: Rack
   entities:
+  - uid: 94
+    components:
+    - type: Transform
+      pos: 15.5,-24.5
+      parent: 2
   - uid: 1605
     components:
     - type: Transform
@@ -110242,6 +110262,11 @@ entities:
     - type: Transform
       pos: -40.5,-33.5
       parent: 2
+  - uid: 2190
+    components:
+    - type: Transform
+      pos: 17.5,-25.5
+      parent: 2
   - uid: 3526
     components:
     - type: Transform
@@ -110615,6 +110640,11 @@ entities:
     - type: Transform
       pos: 3.5,-4.5
       parent: 2
+  - uid: 22537
+    components:
+    - type: Transform
+      pos: 17.5,-26.5
+      parent: 2
 - proto: RadiationCollectorNoTank
   entities:
   - uid: 607
@@ -121356,7 +121386,7 @@ entities:
     - type: Transform
       pos: -35.5,-42.5
       parent: 2
-- proto: SophicScribe
+- proto: SophicScribeSpawner
   entities:
   - uid: 16214
     components:
@@ -125063,18 +125093,6 @@ entities:
     - type: Transform
       pos: 5.5,-23.5
       parent: 2
-  - uid: 2189
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 11.5,-27.5
-      parent: 2
-  - uid: 2190
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,-27.5
-      parent: 2
   - uid: 2191
     components:
     - type: Transform
diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml
index 2cba2930f0e..5891d0ca9b6 100644
--- a/Resources/Maps/glacier.yml
+++ b/Resources/Maps/glacier.yml
@@ -52876,8 +52876,6 @@ entities:
       - HamtrLLeg
       - HamtrRLeg
       - VimHarness
-      - ClothingOuterHardsuitJuggernautReverseEngineered
-      - ClothingOuterHardsuitSyndieReverseEngineered
       - JetpackBlue
       - JetpackMini
 - proto: ExtinguisherCabinetFilled
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
index 2ad7628ddb3..daa5e95777b 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
@@ -77,3 +77,23 @@
   cost: 1000
   category: cargoproduct-category-name-security
   group: market
+
+- type: cargoProduct
+  id: SecurityShanlinTacsuit
+  icon:
+    sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi
+    state: icon
+  product: CrateSecurityShanlinTacsuit
+  cost: 17500
+  category: cargoproduct-category-name-security
+  group: market
+
+- type: cargoProduct
+  id: SecurityGuanYuTacsuit
+  icon:
+    sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/juggernaut.rsi
+    state: icon
+  product: CrateSecurityGuanYuTacsuit
+  cost: 30000
+  category: cargoproduct-category-name-security
+  group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
index 592c1535083..b1ef5eb0d1c 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
@@ -113,4 +113,24 @@
       - id: TrackingImplanter
         amount: 4
 
+- type: entity
+  id: CrateSecurityShanlinTacsuit
+  parent: CrateSecgear
+  name: shanlin tacsuit crate
+  description: Contains a single CSA-51a Shanlin tacsuit. Requires Security access to open.
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingOuterHardsuitSyndieReverseEngineered
+
+- type: entity
+  id: CrateSecurityGuanYuTacsuit
+  parent: CrateSecgear
+  name: shanlin tacsuit crate
+  description: Contains a single CSA-80UA Guan-Yu tacsuit. Requires Security access to open.
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingOuterHardsuitJuggernautReverseEngineered
+
 # Cosmetic Crates
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index ba889285a16..6a0f445fc94 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -61,11 +61,6 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitAtmos
-  - type: ReverseEngineering # Nyano
-    difficulty: 5
-    newItem: ClothingOuterHardsuitJuggernautReverseEngineered
-    recipes:
-      - ClothingOuterHardsuitJuggernautReverseEngineered
 
 #Engineering Hardsuit
 - type: entity
@@ -557,11 +552,6 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSyndie
-  - type: ReverseEngineering # Nyano
-    difficulty: 5
-    newItem: ClothingOuterHardsuitSyndieReverseEngineered
-    recipes:
-      - ClothingOuterHardsuitSyndieReverseEngineered
   - type: Tag
     tags:
     - MonkeyWearable
diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
index 096e88bcb6f..469bab32782 100644
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -77,6 +77,9 @@
     animationState: foam-dissolve
   - type: Slippery
   - type: StepTrigger
+    triggerGroups:
+      types:
+      - SlipTile
   # disabled until foam reagent duplication is fixed
   #- type: ScoopableSolution
   #  solution: solutionArea
@@ -135,7 +138,7 @@
   - type: RCDDeconstructable
     cost: 2
     delay: 2
-    fx: EffectRCDDeconstruct2  
+    fx: EffectRCDDeconstruct2
   - type: Clickable
   - type: InteractionOutline
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml
index 2c845e1d0f0..d3156c50a3f 100644
--- a/Resources/Prototypes/Entities/Effects/puddle.yml
+++ b/Resources/Prototypes/Entities/Effects/puddle.yml
@@ -149,6 +149,9 @@
   - type: EdgeSpreader
     id: Puddle
   - type: StepTrigger
+    triggerGroups:
+      types:
+      - SlipTile
   - type: Drink
     delay: 3
     transferAmount: 1
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 29234ea34cf..01eed043139 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1689,6 +1689,10 @@
   - type: FireVisuals
     sprite: Mobs/Effects/onfire.rsi
     normalState: Mouse_burning
+  - type: StepTriggerImmune
+    whitelist:
+      types:
+      - Landmine
 
 - type: entity
   parent: MobMouse
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index d01fc8b8de2..90d9a5e5c97 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -137,6 +137,9 @@
   - type: Speech
     speechVerb: Cluwne
   - type: StepTrigger
+    triggerGroups:
+      types:
+      - SlipEntity
     intersectRatio: 0.2
   - type: Fixtures
     fixtures:
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 6c9ec2049f4..e0300fa5033 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -25,6 +25,8 @@
   - type: GhostHearing
   - type: Hands
   - type: Puller
+    pushAcceleration: 1000000 # Will still be capped in max speed
+    maxPushRange: 20
   - type: CombatMode
   - type: Physics
     ignorePaused: true
diff --git a/Resources/Prototypes/Entities/Mobs/Player/ipc.yml b/Resources/Prototypes/Entities/Mobs/Player/ipc.yml
index 1bed477b7d1..247226dc7d5 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/ipc.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/ipc.yml
@@ -111,6 +111,10 @@
   - type: OfferItem
   - type: LayingDown
   - type: Carriable
+  - type: StepTriggerImmune
+    whitelist:
+      types:
+      - Shard
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
index 42383d9a426..81c9e596163 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -114,6 +114,10 @@
     walkModifier: 0.75
   - type: SpeedModifierImmunity
   - type: NoSlip
+  - type: StepTriggerImmune
+    whitelist:
+      types:
+      - Shard
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Prototypes/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/Entities/Mobs/Species/harpy.yml
index 05ac3de8bb3..8882da868b1 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/harpy.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/harpy.yml
@@ -123,6 +123,11 @@
     - GalacticCommon
     - SolCommon
   - type: StepTriggerImmune
+    whitelist:
+      types:
+      - Shard
+      - Landmine
+      - Mousetrap
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 3f0277e1bc3..930d7fa64dc 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -314,6 +314,9 @@
     launchForwardsMultiplier: 1.5
   - type: StepTrigger
     intersectRatio: 0.2
+    triggerGroups:
+      types:
+      - SlipEntity
   - type: CollisionWake
     enabled: false
   - type: Physics
diff --git a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
index c3bd74dd751..a93cd545bfc 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
@@ -13,6 +13,9 @@
     - type: StepTrigger
       intersectRatio: 0.2
       requiredTriggeredSpeed: 0
+      triggerGroups:
+        types:
+        - Mousetrap
     - type: Mousetrap
     - type: TriggerOnStepTrigger
     - type: ShoesRequiredStepTrigger
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index f0d07f9434a..1a388997835 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -272,6 +272,9 @@
     paralyzeTime: 4
     launchForwardsMultiplier: 1.5
   - type: StepTrigger
+    triggerGroups:
+      types:
+      - SlipEntity
   - type: CollisionWake
     enabled: false
   - type: Physics
diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice.yml b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
index 852a1c2699c..f7395ef9ca6 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/dice.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
@@ -119,6 +119,9 @@
         mask:
         - ItemMask
   - type: StepTrigger
+    triggerGroups:
+      types:
+      - Shard
     intersectRatio: 0.2
   - type: TriggerOnStepTrigger
   - type: ShoesRequiredStepTrigger
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index 6cdc066cf10..34685343145 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -64,6 +64,9 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: StepTrigger
+    triggerGroups:
+      types:
+      - Shard
     intersectRatio: 0.2
   - type: ShoesRequiredStepTrigger
   - type: Slippery
diff --git a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
index a3e3485bc65..97053660a19 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
@@ -40,6 +40,9 @@
         params:
             maxDistance: 10
   - type: StepTrigger
+    triggerGroups:
+      types:
+      - Landmine
     requiredTriggeredSpeed: 0
     stepOn: true
 
diff --git a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
index 9561fa3538f..bb284000a76 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
@@ -111,6 +111,9 @@
       paralyzeTime: 2
       launchForwardsMultiplier: 1.5
     - type: StepTrigger
+      triggerGroups:
+        types:
+        - SlipTile
       intersectRatio: 0.2
     - type: Physics
     - type: Fixtures
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
index 5678de6bafc..5fe88f8d0cf 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
@@ -24,6 +24,9 @@
     paralyzeTime: 2
     launchForwardsMultiplier: 1.5
   - type: StepTrigger
+    triggerGroups:
+      types:
+      - SlipEntity
     intersectRatio: 0.2
   - type: CollisionWake
     enabled: false
@@ -157,6 +160,9 @@
     paralyzeTime: 5
     launchForwardsMultiplier: 2.5
   - type: StepTrigger
+    triggerGroups:
+      types:
+      - SlipEntity
     intersectRatio: 0.04
   - type: Item
     heldPrefix: syndie
@@ -198,6 +204,9 @@
   - type: Slippery
     paralyzeTime: 2
   - type: StepTrigger
+    triggerGroups:
+      types:
+      - SlipEntity
   - type: Item
     heldPrefix: gibs
   - type: FlavorProfile
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 4b58642c307..c85314e91ca 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -81,6 +81,7 @@
       - CartridgeAntiMateriel
     capacity: 5
     proto: CartridgeAntiMateriel
+  - type: Telescope
 
 - type: entity
   name: musket
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index b30a2855796..6630a22ea7d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -43,6 +43,7 @@
   - type: Tool
     qualities:
       - Prying
+      - Axing
   - type: ToolTileCompatible
   - type: Prying
   - type: UseDelay
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 2d4bc9e0d8f..e5a9cb35417 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -628,8 +628,6 @@
     - HamtrRLeg
     - VimHarness
   # Begin Nyano additions
-    - ClothingOuterHardsuitJuggernautReverseEngineered
-    - ClothingOuterHardsuitSyndieReverseEngineered
     - JetpackBlue
     - JetpackMini
   # End Nyano additions
diff --git a/Resources/Prototypes/Entities/Structures/Specific/bay12barbershop.yml b/Resources/Prototypes/Entities/Structures/Specific/bay12barbershop.yml
index e66ae347d97..2b0f2a788a6 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/bay12barbershop.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/bay12barbershop.yml
@@ -10,7 +10,7 @@
   - type: Anchorable
   - type: Rotatable
   - type: Sprite
-    sprite: Structures/Specific/barbershop.rsi
+    sprite: Structures/Specific/barberchair.rsi
     state: barberchair
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Tiles/bananium.yml b/Resources/Prototypes/Entities/Tiles/bananium.yml
index c9a6ec28441..9e8a46b2c35 100644
--- a/Resources/Prototypes/Entities/Tiles/bananium.yml
+++ b/Resources/Prototypes/Entities/Tiles/bananium.yml
@@ -47,6 +47,9 @@
     paralyzeTime: 2
     launchForwardsMultiplier: 1.5
   - type: StepTrigger
+    triggerGroups:
+      types:
+      - SlipTile
     intersectRatio: 0.2
   - type: Physics
     bodyType: Static
diff --git a/Resources/Prototypes/Entities/Tiles/chasm.yml b/Resources/Prototypes/Entities/Tiles/chasm.yml
index 23f3ad83950..85bc7b5ab34 100644
--- a/Resources/Prototypes/Entities/Tiles/chasm.yml
+++ b/Resources/Prototypes/Entities/Tiles/chasm.yml
@@ -14,6 +14,9 @@
     blacklist:
       tags:
       - Catwalk
+    triggerGroups:
+      types:
+      - Chasm
   - type: Transform
     anchored: true
   - type: Clickable
@@ -55,7 +58,7 @@
     sprite: Tiles/Planet/Chasms/chromite_chasm.rsi
   - type: Icon
     sprite: Tiles/Planet/Chasms/chromite_chasm.rsi
-    
+
 - type: entity
   parent: FloorChasmEntity
   id: FloorDesertChasm
@@ -65,7 +68,7 @@
     sprite: Tiles/Planet/Chasms/desert_chasm.rsi
   - type: Icon
     sprite: Tiles/Planet/Chasms/desert_chasm.rsi
-    
+
 - type: entity
   parent: FloorChasmEntity
   id: FloorSnowChasm
@@ -74,4 +77,4 @@
   - type: Sprite
     sprite: Tiles/Planet/Chasms/snow_chasm.rsi
   - type: Icon
-    sprite: Tiles/Planet/Chasms/snow_chasm.rsi
\ No newline at end of file
+    sprite: Tiles/Planet/Chasms/snow_chasm.rsi
diff --git a/Resources/Prototypes/Entities/Tiles/lava.yml b/Resources/Prototypes/Entities/Tiles/lava.yml
index 72641309b31..9d61304af9d 100644
--- a/Resources/Prototypes/Entities/Tiles/lava.yml
+++ b/Resources/Prototypes/Entities/Tiles/lava.yml
@@ -13,6 +13,9 @@
     blacklist:
       tags:
         - Catwalk
+    triggerGroups:
+      types:
+        - Lava
   - type: Lava
     fireStacks: 0.75
   - type: Transform
diff --git a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
index 08f46538631..500286ead31 100644
--- a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
+++ b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
@@ -13,6 +13,9 @@
     blacklist:
       tags:
       - Catwalk
+    triggerGroups:
+      types:
+      - Lava
   - type: Lava
     fireStacks: 0.75
   - type: Transform
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/hardsuits.yml
index 6498eda075e..4e988c27406 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -19,8 +19,6 @@
     sprite:  Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSyndieReverseEngineered
-  - type: ReverseEngineering
-    newItem: null
 
 - type: entity
   parent: ClothingOuterHardsuitJuggernaut
@@ -35,8 +33,6 @@
     sprite:  Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/juggernaut.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitJuggernautReverseEngineered
-  - type: ReverseEngineering
-    newItem: null
 
 - type: entity
   parent: ClothingOuterHardsuitERTLeader
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
index a1ca357b080..411eb13444b 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
@@ -80,6 +80,12 @@
     stripTimeReduction: 0
     stripTimeMultiplier: 0.667
   - type: StepTriggerImmune
+    whitelist:
+      types:
+        - Shard
+        - Landmine
+        - Mousetrap
+        - SlipEntity
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/hardsuits.yml b/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/hardsuits.yml
deleted file mode 100644
index 560c03db49c..00000000000
--- a/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/hardsuits.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-- type: latheRecipe
-  id: ClothingOuterHardsuitSyndieReverseEngineered
-  result: ClothingOuterHardsuitSyndieReverseEngineered
-  completetime: 25
-  materials:
-     Steel: 6000
-     Glass: 1500
-     Uranium: 100
-     Plastic: 100
-     Gold: 200
-
-- type: latheRecipe
-  id: ClothingOuterHardsuitJuggernautReverseEngineered
-  result: ClothingOuterHardsuitJuggernautReverseEngineered
-  completetime: 25
-  materials:
-     Steel: 12000
-     Glass: 3000
-     Uranium: 500
-     Plastic: 500
-     Gold: 250
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
index 1f78015cd63..f7a31205706 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
@@ -32,6 +32,7 @@
   - !type:AddComponentSpecial
     components:
     - type: Psionic
+      powerSlots: 2
   - !type:AddComponentSpecial
     components:
     - type: InnatePsionicPowers
diff --git a/Resources/Prototypes/Psionics/psionics.yml b/Resources/Prototypes/Psionics/psionics.yml
index b8f798d4b63..461098eab21 100644
--- a/Resources/Prototypes/Psionics/psionics.yml
+++ b/Resources/Prototypes/Psionics/psionics.yml
@@ -119,6 +119,7 @@
     - type: UniversalLanguageSpeaker
   initializationFeedback: xenoglossy-power-initialization-feedback
   metapsionicFeedback: psionic-language-power-feedback # Reuse for telepathy, clairaudience, etc
+  powerSlotCost: 0
 
 - type: psionicPower
   id: PsychognomyPower #i.e. reverse physiognomy
@@ -128,6 +129,7 @@
     - type: Psychognomist
   initializationFeedback: psychognomy-power-initialization-feedback
   metapsionicFeedback: psionic-language-power-feedback
+  powerSlotCost: 0
 
 - type: psionicPower
   id: TelepathyPower
@@ -137,3 +139,4 @@
     - type: Telepathy
   initializationFeedback: telepathy-power-initialization-feedback
   metapsionicFeedback: psionic-language-power-feedback # Reuse for telepathy, clairaudience, etc
+  powerSlotCost: 0
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index e2d06f3af96..46d91ee00ee 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -38,6 +38,7 @@
     components:
     - type: BibleUser # Nyano - Lets them heal with bibles
     - type: Psionic # Nyano - They start with telepathic chat
+      powerSlots: 3
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
   - !type:AddComponentSpecial
diff --git a/Resources/Prototypes/StepTrigger/StepTriggerTypes.yml b/Resources/Prototypes/StepTrigger/StepTriggerTypes.yml
new file mode 100644
index 00000000000..6d03908a17f
--- /dev/null
+++ b/Resources/Prototypes/StepTrigger/StepTriggerTypes.yml
@@ -0,0 +1,20 @@
+- type: stepTriggerType
+  id: Lava
+
+- type: stepTriggerType
+  id: Landmine
+
+- type: stepTriggerType
+  id: Shard
+
+- type: stepTriggerType
+  id: Chasm
+
+- type: stepTriggerType
+  id: Mousetrap
+
+- type: stepTriggerType
+  id: SlipTile
+
+- type: stepTriggerType
+  id: SlipEntity
diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml
index 7edb1ae784c..0a74ef9fd43 100644
--- a/Resources/Prototypes/Tiles/plating.yml
+++ b/Resources/Prototypes/Tiles/plating.yml
@@ -4,6 +4,7 @@
   sprite: /Textures/Tiles/plating.png
   baseTurf: Lattice
   isSubfloor: true
+  deconstructTools: [ Axing ]
   footstepSounds:
     collection: FootstepPlating
   friction: 0.3
@@ -20,6 +21,7 @@
   - 1.0
   baseTurf: Lattice
   isSubfloor: true
+  deconstructTools: [ Axing ]
   footstepSounds:
     collection: FootstepPlating
   friction: 0.3
@@ -31,6 +33,7 @@
   sprite: /Textures/Tiles/plating_burnt.png
   baseTurf: Lattice
   isSubfloor: true
+  deconstructTools: [ Axing ]
   footstepSounds:
     collection: FootstepPlating
   friction: 0.3
@@ -42,6 +45,7 @@
   sprite: /Textures/Tiles/Asteroid/asteroid_plating.png
   baseTurf: Lattice
   isSubfloor: true
+  deconstructTools: [ Axing ]
   footstepSounds:
     collection: FootstepPlating
   friction: 0.3
@@ -53,6 +57,7 @@
   sprite: /Textures/Tiles/Misc/clockwork/clockwork_floor.png
   baseTurf: Lattice
   isSubfloor: true
+  deconstructTools: [ Axing ]
   footstepSounds:
     collection: FootstepPlating
   friction: 0.3
@@ -64,6 +69,7 @@
   sprite: /Textures/Tiles/snow_plating.png #Not in the snow planet RSI because it doesn't have any metadata. Should probably be moved to its own folder later.
   baseTurf: Lattice
   isSubfloor: true
+  deconstructTools: [ Axing ]
   footstepSounds:
     collection: FootstepPlating
   friction: 0.15 #a little less then actual snow
diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
index c24e8927693..3afc3bfba43 100644
--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -191,3 +191,41 @@
       damageModifiers:
         coefficients:
           Blunt: 1.1
+
+- type: trait
+  id: Photophobia
+  category: Visual
+  points: 1
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Vulpkanin # This trait functions exactly as-is for the Vulpkanin trait.
+  components:
+    - type: Flashable
+      eyeDamageChance: 0.3
+      eyeDamage: 1
+      durationMultiplier: 1.5
+
+- type: trait
+  id: Clumsy
+  category: Physical
+  points: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Clown # This trait functions exactly as is for the Clown's trait.
+    - !type:CharacterDepartmentRequirement
+      inverted: true
+      departments:
+        - Command # Because I know for a fact people will play Captain and grief with their inability to fight back.
+        - Security # Because I know for a fact people will play Security and grief with their inability to use guns.
+  components:
+    - type: Clumsy
+      clumsyDamage:
+        types:
+          Blunt: 5
+          Piercing: 4
+        groups:
+          Burn: 3
diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml
index cfc15d4ee25..8debf7ffbfb 100644
--- a/Resources/Prototypes/Traits/physical.yml
+++ b/Resources/Prototypes/Traits/physical.yml
@@ -231,3 +231,173 @@
           Blunt: 1.5
           Slash: 1.5
           Piercing: 1.5
+
+- type: trait
+  id: Small
+  category: Physical
+  points: -2
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Felinid # Felinids already have this feature by default.
+    - !type:CharacterHeightRequirement
+      max: 150
+    - !type:CharacterWidthRequirement
+      max: 32
+  components:
+    - type: PseudoItem
+      storedOffset: 0,17
+      shape:
+        - 0,0,1,4
+        - 0,2,3,4
+        - 4,0,5,4
+
+- type: trait
+  id: TemperatureTolerance
+  category: Physical
+  points: -1
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Vulpkanin # This trait functions exactly as-is for the Vulpkanin trait.
+  components:
+    - type: TemperatureProtection
+      coefficient: 0.1 # Enough resistance to walk into the chef's freezer, or tolerate daytime temperatures on Glacier without a jacket.
+
+# These traits largely exist to demonstrate more of the "Component Removals" functionality. This way contributors
+# can get used to seeing that they can "Remove and Replace" a pre-existing component.
+# When declared, componentRemovals work like a "RemComp" that activates upon joining a round.
+- type: trait
+  id: Talons
+  category: Physical
+  points: -1
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Harpy # Harpies already have talons
+        - Arachnid # Apparently they have a "piercing" bite
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - Claws
+  componentRemovals:
+    - MeleeWeapon # Remove the original innate melee attack, so that it can be replaced with a new one.
+  components:
+    - type: MeleeWeapon
+      soundHit:
+        collection: AlienClaw
+      animation: WeaponArcClaw
+      damage:
+        types:
+          Piercing: 5 # No, this isn't "OP", this is literally the worst brute damage type in the game.
+                      # Same deal as Slash, except that a majority of all armor provides Piercing resistance.
+
+- type: trait
+  id: Claws
+  category: Physical
+  points: -1
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Felinid # Felinids already have cat claws.
+        - Reptilian # Reptilians also have cat claws.
+        # - Vulpkanin # Vulpkanin have "Blunt" claws. One could argue this trait "Sharpens" their claws.
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - Talons
+  componentRemovals:
+    - MeleeWeapon # Remove the original innate melee attack, so that it can be replaced with a new one.
+  components:
+    - type: MeleeWeapon
+      soundHit:
+        collection: AlienClaw
+      angle: 30
+      animation: WeaponArcClaw
+      damage:
+        types:
+          Slash: 5 # Trade stamina damage on hit for a very minor amount of extra bleed.
+                   # Blunt also deals bleed damage, so this is more of a sidegrade.
+
+- type: trait
+  id: NaturalWeaponRemoval
+  category: Physical
+  points: 0
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Human
+        - Oni
+        - SlimePerson
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - Talons
+        - Claws
+  componentRemovals:
+    - MeleeWeapon # Remove the original innate melee attack, so that it can be replaced with a new one.
+  components:
+    - type: MeleeWeapon
+      soundHit:
+        collection: Punch
+      angle: 30
+      animation: WeaponArcFist
+      damage:
+        types:
+          Blunt: 5
+
+- type: trait
+  id: StrikingCalluses
+  category: Physical
+  points: -4
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      species:
+        - Human # Entirely arbitrary, I've decided I want a trait unique to humans. Since they don't normally get anything exciting.
+                # When we get the Character Records system in, I also want to make this require certain Backgrounds.
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - Claws
+        - Talons
+    - !type:CharacterLogicOrRequirement
+      requirements:
+        - !type:CharacterTraitRequirement
+          traits:
+            - MartialArtist
+        - !type:CharacterJobRequirement
+          jobs:
+            - Boxer
+  componentRemovals:
+    - MeleeWeapon
+  components:
+    - type: MeleeWeapon
+      soundHit:
+        collection: Punch
+      angle: 30
+      animation: WeaponArcFist
+      damage:
+        types:
+          Blunt: 6
+
+- type: trait
+  id: Spinarette
+  category: Physical
+  points: -4
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Arachnid
+        - Arachne
+  components:
+    - type: Sericulture
+      action: ActionSericulture
+      productionLength: 2
+      entityProduced: MaterialWebSilk1
+      hungerCost: 4
diff --git a/Resources/Prototypes/Traits/skills.yml b/Resources/Prototypes/Traits/skills.yml
index 735370ff13f..015c9f50233 100644
--- a/Resources/Prototypes/Traits/skills.yml
+++ b/Resources/Prototypes/Traits/skills.yml
@@ -268,6 +268,12 @@
   points: -3
   components:
     - type: StepTriggerImmune
+      whitelist:
+        types:
+        - Shard
+        - Landmine
+        - Mousetrap
+        - SlipEntity
   requirements:
     - !type:CharacterSpeciesRequirement
       inverted: true
diff --git a/Resources/Prototypes/tool_qualities.yml b/Resources/Prototypes/tool_qualities.yml
index ff55d9fcf14..4508ea94b71 100644
--- a/Resources/Prototypes/tool_qualities.yml
+++ b/Resources/Prototypes/tool_qualities.yml
@@ -67,3 +67,10 @@
   toolName: tool-quality-rolling-tool-name
   spawn: RollingPin
   icon: { sprite: Objects/Tools/rolling_pin.rsi, state: icon }
+
+- type: tool
+  id: Axing
+  name: tool-quality-axing-name
+  toolName: tool-quality-axing-tool-name
+  spawn: FireAxe
+  icon: { sprite: Objects/Weapons/Melee/fireaxe.rsi, state: icon }
diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/left.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/left.png
index 9631b4b1714..beb8cd4a0b2 100644
Binary files a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/left.png and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/left.png differ
diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/right.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/right.png
index ea0922930fe..c1f2949a719 100644
Binary files a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/right.png and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/right.png differ
diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/left.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/left.png
index 260c7298f77..b6c1ef00fcb 100644
Binary files a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/left.png and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/left.png differ
diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/right.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/right.png
index b6c1ef00fcb..260c7298f77 100644
Binary files a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/right.png and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/right.png differ
diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/left.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/left.png
index d456300e104..a412a51871b 100644
Binary files a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/left.png and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/left.png differ
diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/right.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/right.png
index a412a51871b..d456300e104 100644
Binary files a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/right.png and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/right.png differ
diff --git a/Resources/Textures/Structures/Specific/barberchair.rsi/barberchair.png b/Resources/Textures/Structures/Specific/barberchair.rsi/barberchair.png
new file mode 100644
index 00000000000..244a875dca4
Binary files /dev/null and b/Resources/Textures/Structures/Specific/barberchair.rsi/barberchair.png differ
diff --git a/Resources/Textures/Structures/Specific/barberchair.rsi/meta.json b/Resources/Textures/Structures/Specific/barberchair.rsi/meta.json
new file mode 100644
index 00000000000..2e6b70f2fcd
--- /dev/null
+++ b/Resources/Textures/Structures/Specific/barberchair.rsi/meta.json
@@ -0,0 +1,15 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from BlueMoon at https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/blob/master/modular_bluemoon/krashly/icons/obj/chairs.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "barberchair",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Specific/barbershop.rsi/barberchair.png b/Resources/Textures/Structures/Specific/barbershop.rsi/barberchair.png
deleted file mode 100644
index 7e8fd78ab75..00000000000
Binary files a/Resources/Textures/Structures/Specific/barbershop.rsi/barberchair.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Specific/barbershop.rsi/meta.json b/Resources/Textures/Structures/Specific/barbershop.rsi/meta.json
index 1226428bcfb..6d57cc380d5 100644
--- a/Resources/Textures/Structures/Specific/barbershop.rsi/meta.json
+++ b/Resources/Textures/Structures/Specific/barbershop.rsi/meta.json
@@ -18,9 +18,6 @@
         ]
       ]
     },
-    {
-      "name": "barberchair"
-    },
     {
       "name": "dyedispenser"
     },
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index 2cca749317a..33b4166161a 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -543,3 +543,6 @@ binds:
 - function: Hotbar9
   type: State
   key: Num9
+- function: LookUp
+  type: State
+  key: Space