diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUi.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUi.cs
index ea5aa3cf256..2dbe923b2a6 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUi.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUi.cs
@@ -18,15 +18,6 @@ public override Control GetUIFragmentRoot()
     public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner)
     {
         _fragment = new CrimeAssistUiFragment();
-
-        _fragment.OnSync += _ => SendSyncMessage(userInterface);
-    }
-
-    private void SendSyncMessage(BoundUserInterface userInterface)
-    {
-        var syncMessage = new CrimeAssistSyncMessageEvent();
-        var message = new CartridgeUiMessage(syncMessage);
-        userInterface.SendMessage(message);
     }
 
     public override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiFragment.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiFragment.xaml.cs
index e3163975d12..fb085a8a799 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiFragment.xaml.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiFragment.xaml.cs
@@ -1,7 +1,6 @@
 using Content.Client.Message;
 using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
 using Robust.Client.AutoGenerated;
-using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
@@ -13,9 +12,7 @@ namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
 public sealed partial class CrimeAssistUiFragment : BoxContainer
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IResourceCache _resourceCache = default!;
 
-    public event Action<bool>? OnSync;
     private CrimeAssistPage _currentPage;
     private List<CrimeAssistPage>? _pages;
 
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml
new file mode 100644
index 00000000000..2de8a37ff77
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml
@@ -0,0 +1,19 @@
+<BoxContainer xmlns="https://spacestation14.io"
+        xmlns:cartridges="clr-namespace:Content.Client.DeltaV.CartridgeLoader.Cartridges"
+        xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+        HorizontalExpand="True"
+        VerticalExpand="True"
+        Margin="5">
+    <!-- All labels populated in constructor -->
+    <BoxContainer Orientation="Horizontal" HorizontalAlignment="Left">
+        <BoxContainer Orientation="Vertical">
+            <Label Name="Status"/>
+            <Label Text="{Loc 'criminal-records-console-reason'}"/>
+        </BoxContainer>
+        <customControls:VSeparator StyleClasses="LowDivider" Margin="8 0"/>
+        <BoxContainer Orientation="Vertical">
+            <Label Name="Title"/>
+	        <Label Name="Reason"/>
+        </BoxContainer>
+    </BoxContainer>
+</BoxContainer>
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml.cs
new file mode 100644
index 00000000000..e8dd4eea446
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml.cs
@@ -0,0 +1,21 @@
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class SecWatchEntryControl : BoxContainer
+{
+    public SecWatchEntryControl(SecWatchEntry entry)
+    {
+        RobustXamlLoader.Load(this);
+
+        Status.Text = Loc.GetString($"criminal-records-status-{entry.Status.ToString().ToLower()}");
+        Title.Text = Loc.GetString("sec-watch-entry", ("name", entry.Name), ("job", entry.Job));
+
+        Reason.Text = entry.Reason ?? Loc.GetString("sec-watch-no-reason");
+    }
+}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUi.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUi.cs
new file mode 100644
index 00000000000..da5ff825b91
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUi.cs
@@ -0,0 +1,27 @@
+using Content.Client.UserInterface.Fragments;
+using Content.Shared.CartridgeLoader;
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+public sealed partial class SecWatchUi : UIFragment
+{
+    private SecWatchUiFragment? _fragment;
+
+    public override Control GetUIFragmentRoot()
+    {
+        return _fragment!;
+    }
+
+    public override void Setup(BoundUserInterface ui, EntityUid? owner)
+    {
+        _fragment = new SecWatchUiFragment();
+    }
+
+    public override void UpdateState(BoundUserInterfaceState state)
+    {
+        if (state is SecWatchUiState cast)
+            _fragment?.UpdateState(cast);
+    }
+}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml
new file mode 100644
index 00000000000..7fb2c42debc
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml
@@ -0,0 +1,13 @@
+<cartridges:SecWatchUiFragment xmlns="https://spacestation14.io"
+        xmlns:cartridges="clr-namespace:Content.Client.DeltaV.CartridgeLoader.Cartridges"
+        Margin="5"
+        VerticalExpand="True">
+    <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
+        <Label Text="{Loc 'sec-watch-title'}" HorizontalExpand="True" HorizontalAlignment="Center"/>
+        <Label Name="NoEntries" Text="{Loc 'sec-watch-no-entries'}" HorizontalExpand="True" HorizontalAlignment="Center" Visible="False"/>
+        <ScrollContainer HorizontalExpand="True" VerticalExpand="True">
+            <!-- Populated when state received -->
+            <BoxContainer Name="Entries" Orientation="Vertical" VerticalAlignment="Top"/>
+        </ScrollContainer>
+    </BoxContainer>
+</cartridges:SecWatchUiFragment>
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml.cs
new file mode 100644
index 00000000000..ad152840529
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml.cs
@@ -0,0 +1,25 @@
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class SecWatchUiFragment : BoxContainer
+{
+    public SecWatchUiFragment()
+    {
+        RobustXamlLoader.Load(this);
+    }
+
+    public void UpdateState(SecWatchUiState state)
+    {
+        NoEntries.Visible = state.Entries.Count == 0;
+        Entries.RemoveAllChildren();
+        foreach (var entry in state.Entries)
+        {
+            Entries.AddChild(new SecWatchEntryControl(entry));
+        }
+    }
+}
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index c797f02a754..04810b07719 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -2086,7 +2086,7 @@ void AddSelector(LoadoutPreferenceSelector selector, int points, string id)
                 selector.PreferenceChanged += preference =>
                 {
                     // Make sure they have enough loadout points
-                    preference = preference ? CheckPoints(points, preference) : CheckPoints(-points, preference);
+                    preference = preference ? CheckPoints(-points, preference) : CheckPoints(points, preference);
 
                     // Update Preferences
                     Profile = Profile?.WithLoadoutPreference(id, preference);
diff --git a/Content.Client/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveVisuals.cs b/Content.Client/Psionics/Glimmer/GlimmerReactiveVisuals.cs
similarity index 100%
rename from Content.Client/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveVisuals.cs
rename to Content.Client/Psionics/Glimmer/GlimmerReactiveVisuals.cs
diff --git a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs b/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs
similarity index 92%
rename from Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs
rename to Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs
index 0b5fc7ad38c..0d8accb9f86 100644
--- a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs
+++ b/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs
@@ -1,10 +1,11 @@
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
+using Content.Client.Psionics.UI;
 using Content.Client.UserInterface.Fragments;
 using Content.Shared.CartridgeLoader.Cartridges;
 using Content.Shared.CartridgeLoader;
 
-namespace Content.Client.Nyanotrasen.CartridgeLoader.Cartridges;
+namespace Content.Client.Psionics.GlimmerMonitor;
 
 public sealed partial class GlimmerMonitorUi : UIFragment
 {
diff --git a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml b/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml
similarity index 87%
rename from Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
rename to Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml
index 119a1831e6e..ade0720696b 100644
--- a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
+++ b/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml
@@ -1,8 +1,9 @@
-<cartridges:GlimmerMonitorUiFragment xmlns:cartridges="clr-namespace:Content.Client.Nyanotrasen.CartridgeLoader.Cartridges"
+<cartridges:GlimmerMonitorUiFragment xmlns:cartridges="clr-namespace:Content.Client.Psionics.GlimmerMonitor"
                                  xmlns="https://spacestation14.io" Margin="1 0 2 0">
     <PanelContainer StyleClasses="BackgroundDark"></PanelContainer>
     <BoxContainer Name="SettingsBox" Orientation="Horizontal" HorizontalExpand="True" VerticalExpand="False">
         <Label Text="{Loc 'glimmer-monitor-interval'}"/>
+        <Button Name="IntervalButton6s" Access="Public" Text="6s" StyleClasses="OpenRight"/>
         <Button Name="IntervalButton1" Access="Public" Text="1m" StyleClasses="OpenRight"/>
         <Button Name="IntervalButton5" Access="Public" Text="5m" StyleClasses="OpenBoth"/>
         <Button Name="IntervalButton10" Access="Public" Text="10m" StyleClasses="OpenLeft"/>
diff --git a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs b/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml.cs
similarity index 87%
rename from Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
rename to Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml.cs
index 43d9202aa45..f0dcfbce65a 100644
--- a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
+++ b/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml.cs
@@ -1,12 +1,12 @@
 using System.Linq;
 using System.Numerics;
-using Content.Client.Nyanotrasen.UserInterface;
+using Content.Client.Psionics.UI;
 using Robust.Client.AutoGenerated;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Nyanotrasen.CartridgeLoader.Cartridges;
+namespace Content.Client.Psionics.GlimmerMonitor;
 
 [GenerateTypedNameReferences]
 public sealed partial class GlimmerMonitorUiFragment : BoxContainer
@@ -26,12 +26,14 @@ public GlimmerMonitorUiFragment()
         VerticalExpand = true;
 
         var intervalGroup = new ButtonGroup();
+        IntervalButton6s.Group = intervalGroup;
         IntervalButton1.Group = intervalGroup;
         IntervalButton5.Group = intervalGroup;
         IntervalButton10.Group = intervalGroup;
 
-        IntervalButton1.Pressed = true;
+        IntervalButton6s.Pressed = true;
 
+        IntervalButton6s.OnPressed += _ => UpdateState(_cachedValues);
         IntervalButton1.OnPressed += _ => UpdateState(_cachedValues);
         IntervalButton5.OnPressed += _ => UpdateState(_cachedValues);
         IntervalButton10.OnPressed += _ => UpdateState(_cachedValues);
@@ -62,14 +64,12 @@ private List<int> FormatGlimmerValues(List<int> glimmerValues)
     {
         var returnList = glimmerValues;
 
-        if (IntervalButton5.Pressed)
-        {
-            returnList = GetAveragedList(glimmerValues, 5);
-        }
-        else if (IntervalButton10.Pressed)
-        {
+        if (IntervalButton1.Pressed)
             returnList = GetAveragedList(glimmerValues, 10);
-        }
+        else if (IntervalButton5.Pressed)
+            returnList = GetAveragedList(glimmerValues, 50);
+        else if (IntervalButton10.Pressed)
+            returnList = GetAveragedList(glimmerValues, 100);
 
         return ClipToFifteen(returnList);
     }
diff --git a/Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs b/Content.Client/Psionics/Telepathy/PsionicChatUpdateSystem.cs
similarity index 92%
rename from Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs
rename to Content.Client/Psionics/Telepathy/PsionicChatUpdateSystem.cs
index 84602052fe7..7bb88764a1f 100644
--- a/Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs
+++ b/Content.Client/Psionics/Telepathy/PsionicChatUpdateSystem.cs
@@ -1,8 +1,8 @@
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Client.Chat.Managers;
 using Robust.Client.Player;
 
-namespace Content.Client.Nyanotrasen.Chat
+namespace Content.Client.Psionics.Chat
 {
     public sealed class PsionicChatUpdateSystem : EntitySystem
     {
diff --git a/Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsEUI.cs b/Content.Client/Psionics/UserInterface/AcceptPsionicsEUI.cs
similarity index 100%
rename from Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsEUI.cs
rename to Content.Client/Psionics/UserInterface/AcceptPsionicsEUI.cs
diff --git a/Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsWindow.cs b/Content.Client/Psionics/UserInterface/AcceptPsionicsWindow.cs
similarity index 100%
rename from Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsWindow.cs
rename to Content.Client/Psionics/UserInterface/AcceptPsionicsWindow.cs
diff --git a/Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs b/Content.Client/Psionics/UserInterface/GlimmerGraph.cs
similarity index 97%
rename from Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs
rename to Content.Client/Psionics/UserInterface/GlimmerGraph.cs
index c4a9109dcd8..111c810acb1 100644
--- a/Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs
+++ b/Content.Client/Psionics/UserInterface/GlimmerGraph.cs
@@ -4,7 +4,7 @@
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 
-namespace Content.Client.Nyanotrasen.UserInterface;
+namespace Content.Client.Psionics.UI;
 
 public sealed class GlimmerGraph : Control
 {
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index a12511e97c3..f989fa0ee75 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -20,7 +20,6 @@
 using Content.Shared.Examine;
 using Content.Shared.Input;
 using Content.Shared.Radio;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.Player;
@@ -37,7 +36,7 @@
 using Robust.Shared.Replays;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Content.Client.Nyanotrasen.Chat; //Nyano - Summary: chat namespace.
+using Content.Client.Psionics.Chat;
 
 namespace Content.Client.UserInterface.Systems.Chat;
 
@@ -61,7 +60,7 @@ public sealed class ChatUIController : UIController
     [UISystemDependency] private readonly GhostSystem? _ghost = default;
     [UISystemDependency] private readonly TypingIndicatorSystem? _typingIndicator = default;
     [UISystemDependency] private readonly ChatSystem? _chatSys = default;
-    [UISystemDependency] private readonly PsionicChatUpdateSystem? _psionic = default!; //Nyano - Summary: makes the psionic chat available.
+    [UISystemDependency] private readonly PsionicChatUpdateSystem? _psionic = default!; //EE - Summary: makes the psionic chat available.
 
     [ValidatePrototypeId<ColorPalettePrototype>]
     private const string ChatNamePalette = "ChatNames";
@@ -82,7 +81,7 @@ public sealed class ChatUIController : UIController
         {SharedChatSystem.AdminPrefix, ChatSelectChannel.Admin},
         {SharedChatSystem.RadioCommonPrefix, ChatSelectChannel.Radio},
         {SharedChatSystem.DeadPrefix, ChatSelectChannel.Dead},
-        {SharedChatSystem.TelepathicPrefix, ChatSelectChannel.Telepathic} //Nyano - Summary: adds the telepathic prefix =.
+        {SharedChatSystem.TelepathicPrefix, ChatSelectChannel.Telepathic} //EE - Summary: adds the telepathic prefix =.
     };
 
     public static readonly Dictionary<ChatSelectChannel, char> ChannelPrefixes = new()
@@ -96,7 +95,7 @@ public sealed class ChatUIController : UIController
         {ChatSelectChannel.Admin, SharedChatSystem.AdminPrefix},
         {ChatSelectChannel.Radio, SharedChatSystem.RadioCommonPrefix},
         {ChatSelectChannel.Dead, SharedChatSystem.DeadPrefix},
-        {ChatSelectChannel.Telepathic, SharedChatSystem.TelepathicPrefix } //Nyano - Summary: associates telepathic with =.
+        {ChatSelectChannel.Telepathic, SharedChatSystem.TelepathicPrefix } //EE - Summary: associates telepathic with =.
     };
 
     /// <summary>
diff --git a/Content.Server/Abilities/Mime/MimePowersComponent.cs b/Content.Server/Abilities/Mime/MimePowersComponent.cs
index fd4fc2c2af9..757528a9cbc 100644
--- a/Content.Server/Abilities/Mime/MimePowersComponent.cs
+++ b/Content.Server/Abilities/Mime/MimePowersComponent.cs
@@ -47,5 +47,17 @@ public sealed partial class MimePowersComponent : Component
         /// </summary>
         [DataField("vowCooldown")]
         public TimeSpan VowCooldown = TimeSpan.FromMinutes(5);
+
+        /// <summary
+        /// Psionic Feedback for if a mime with their vow intact is scanned by a Mantis
+        /// </summary>
+        [DataField("mimeFeedback")]
+        public string MimeFeedback = "mime-feedback";
+
+        /// <summary
+        /// Psionic Feedback for if a mime with their vow intact is scanned by a Mantis
+        /// </summary>
+        [DataField("mimeBrokenFeedback")]
+        public string MimeBrokenFeedback = "mime-broken-feedback";
     }
 }
diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs
index c1d2643d6fa..0a40350889e 100644
--- a/Content.Server/Abilities/Mime/MimePowersSystem.cs
+++ b/Content.Server/Abilities/Mime/MimePowersSystem.cs
@@ -1,5 +1,4 @@
 using Content.Server.Popups;
-using Content.Server.Speech.Muting;
 using Content.Shared.Actions;
 using Content.Shared.Actions.Events;
 using Content.Shared.Alert;
@@ -10,7 +9,7 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
-using Content.Shared.Abilities.Psionics; //Nyano - Summary: Makes Mime psionic.
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Speech.Muting;
 
 namespace Content.Server.Abilities.Mime
@@ -58,14 +57,21 @@ private void OnComponentInit(EntityUid uid, MimePowersComponent component, Compo
             EnsureComp<MutedComponent>(uid);
             _alertsSystem.ShowAlert(uid, AlertType.VowOfSilence);
             _actionsSystem.AddAction(uid, ref component.InvisibleWallActionEntity, component.InvisibleWallAction, uid);
-            //Nyano - Summary: Add Psionic Ability to Mime.
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-                psionic.PsionicAbility = component.InvisibleWallActionEntity;
+
+            // Mimes gain their power from a special Vow, but this vow extends to Telepathic speech.
+            if (EnsureComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.TelepathicMute = true;
+                psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.MimeFeedback);
+                psionic.Dampening += 1f;
+            }
         }
 
         /// <summary>
         /// Creates an invisible wall in a free space after some checks.
         /// </summary>
+        // TODO: Consider separating this out from the Mime entirely, and make a standalone "Telekinetic Barricade" power.
         private void OnInvisibleWall(EntityUid uid, MimePowersComponent component, InvisibleWallActionEvent args)
         {
             if (!component.Enabled)
@@ -98,9 +104,9 @@ private void OnInvisibleWall(EntityUid uid, MimePowersComponent component, Invis
                     return;
                 }
             }
-            // Begin Nyano-code: mime powers are psionic.
-            _psionics.LogPowerUsed(uid, "invisible wall");
-            // End Nyano-code.
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+                _psionics.LogPowerUsed(uid, "invisible wall", psionic, 4, 6);
+
             _popupSystem.PopupEntity(Loc.GetString("mime-invisible-wall-popup", ("mime", uid)), uid);
             // Make sure we set the invisible wall to despawn properly
             Spawn(component.WallPrototype, _turf.GetTileCenter(tile.Value));
@@ -126,6 +132,14 @@ public void BreakVow(EntityUid uid, MimePowersComponent? mimePowers = null)
             _alertsSystem.ClearAlert(uid, AlertType.VowOfSilence);
             _alertsSystem.ShowAlert(uid, AlertType.VowBroken);
             _actionsSystem.RemoveAction(uid, mimePowers.InvisibleWallActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.TelepathicMute = false;
+                psionic.ActivePowers.Remove(mimePowers);
+                psionic.PsychicFeedback.Remove(mimePowers.MimeFeedback);
+                psionic.PsychicFeedback.Add(mimePowers.MimeBrokenFeedback);
+                psionic.Dampening -= 1f;
+            }
         }
 
         /// <summary>
@@ -149,6 +163,14 @@ public void RetakeVow(EntityUid uid, MimePowersComponent? mimePowers = null)
             _alertsSystem.ClearAlert(uid, AlertType.VowBroken);
             _alertsSystem.ShowAlert(uid, AlertType.VowOfSilence);
             _actionsSystem.AddAction(uid, ref mimePowers.InvisibleWallActionEntity, mimePowers.InvisibleWallAction, uid);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.TelepathicMute = true;
+                psionic.ActivePowers.Add(mimePowers);
+                psionic.PsychicFeedback.Add(mimePowers.MimeFeedback);
+                psionic.PsychicFeedback.Remove(mimePowers.MimeBrokenFeedback);
+                psionic.Dampening += 1f;
+            }
         }
     }
 }
diff --git a/Content.Server/Anomaly/AnomalySystem.Psionics.cs b/Content.Server/Anomaly/AnomalySystem.Psionics.cs
index 95fda1d5035..84f200f47ba 100644
--- a/Content.Server/Anomaly/AnomalySystem.Psionics.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Psionics.cs
@@ -1,4 +1,4 @@
-using Content.Server.Abilities.Psionics; //Nyano - Summary: the psniocs bin where dispel is located.
+using Content.Server.Psionics.Abilities;
 using Content.Shared.Anomaly;
 using Content.Shared.Anomaly.Components;
 using Robust.Shared.Random;
@@ -14,8 +14,6 @@ private void InitializePsionics()
     {
         SubscribeLocalEvent<AnomalyComponent, DispelledEvent>(OnDispelled);
     }
-
-    //Nyano - Summary: gives dispellable behavior to Anomalies. 
     private void OnDispelled(EntityUid uid, AnomalyComponent component, DispelledEvent args)
     {
         _dispel.DealDispelDamage(uid);
diff --git a/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs b/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs
index a58d3a3c122..710c37b62fe 100644
--- a/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs
+++ b/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs
@@ -1,8 +1,6 @@
-using Content.Server.Atmos.EntitySystems;
-
 namespace Content.Server.Atmos.Components;
 
-[RegisterComponent, Access(typeof(FlammableSystem))]
+[RegisterComponent]
 public sealed partial class IgniteOnCollideComponent : Component
 {
     /// <summary>
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 7eecaa32b43..7190b94e141 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -9,7 +9,7 @@
 using Content.Server.Speech;
 using Content.Server.Speech.Components;
 using Content.Server.Speech.EntitySystems;
-using Content.Server.Nyanotrasen.Chat;
+using Content.Server.Psionics.Telepathy;
 using Content.Server.Speech.Components;
 using Content.Server.Speech.EntitySystems;
 using Content.Server.Station.Components;
diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/SecWatchCartridgeComponent.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/SecWatchCartridgeComponent.cs
new file mode 100644
index 00000000000..7ccc90ef797
--- /dev/null
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/SecWatchCartridgeComponent.cs
@@ -0,0 +1,23 @@
+using Content.Shared.Security;
+
+namespace Content.Server.CartridgeLoader.Cartridges;
+
+[RegisterComponent, Access(typeof(SecWatchCartridgeSystem))]
+public sealed partial class SecWatchCartridgeComponent : Component
+{
+    /// <summary>
+    /// Only show people with these statuses.
+    /// </summary>
+    [DataField]
+    public List<SecurityStatus> Statuses = new()
+    {
+        SecurityStatus.Suspected,
+        SecurityStatus.Wanted
+    };
+
+    /// <summary>
+    /// Station entity thats getting its records checked.
+    /// </summary>
+    [DataField]
+    public EntityUid? Station;
+}
diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/SecWatchCartridgeSystem.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/SecWatchCartridgeSystem.cs
new file mode 100644
index 00000000000..16da24514cb
--- /dev/null
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/SecWatchCartridgeSystem.cs
@@ -0,0 +1,73 @@
+using Content.Server.Station.Systems;
+using Content.Server.StationRecords;
+using Content.Server.StationRecords.Systems;
+using Content.Shared.CartridgeLoader;
+using Content.Shared.CartridgeLoader.Cartridges;
+using Content.Shared.CriminalRecords;
+using Content.Shared.StationRecords;
+
+namespace Content.Server.CartridgeLoader.Cartridges;
+
+public sealed class SecWatchCartridgeSystem : EntitySystem
+{
+    [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoader = default!;
+    [Dependency] private readonly StationRecordsSystem _records = default!;
+    [Dependency] private readonly StationSystem _station = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RecordModifiedEvent>(OnRecordModified);
+
+        SubscribeLocalEvent<SecWatchCartridgeComponent, CartridgeUiReadyEvent>(OnUiReady);
+    }
+
+    private void OnRecordModified(RecordModifiedEvent args)
+    {
+        // when a record is modified update the ui of every loaded cartridge tuned to the same station
+        var query = EntityQueryEnumerator<SecWatchCartridgeComponent, CartridgeComponent>();
+        while (query.MoveNext(out var uid, out var comp, out var cartridge))
+        {
+            if (cartridge.LoaderUid is not {} loader || comp.Station != args.Station)
+                continue;
+
+            UpdateUI((uid, comp), loader);
+        }
+    }
+
+    private void OnUiReady(Entity<SecWatchCartridgeComponent> ent, ref CartridgeUiReadyEvent args)
+    {
+        UpdateUI(ent, args.Loader);
+    }
+
+    private void UpdateUI(Entity<SecWatchCartridgeComponent> ent, EntityUid loader)
+    {
+        // if the loader is on a grid, update the station
+        // if it is off grid use the cached station
+        if (_station.GetOwningStation(loader) is {} station)
+            ent.Comp.Station = station;
+
+        if (!TryComp<StationRecordsComponent>(ent.Comp.Station, out var records))
+            return;
+
+        station = ent.Comp.Station.Value;
+
+        var entries = new List<SecWatchEntry>();
+        foreach (var (id, criminal) in _records.GetRecordsOfType<CriminalRecord>(station, records))
+        {
+            if (!ent.Comp.Statuses.Contains(criminal.Status))
+                continue;
+
+            var key = new StationRecordKey(id, station);
+            if (!_records.TryGetRecord<GeneralStationRecord>(key, out var general, records))
+                continue;
+
+            var status = criminal.Status;
+            entries.Add(new SecWatchEntry(general.Name, general.JobTitle, criminal.Status, criminal.Reason));
+        }
+
+        var state = new SecWatchUiState(entries);
+        _cartridgeLoader.UpdateCartridgeUiState(loader, state);
+    }
+}
diff --git a/Content.Server/DeltaV/CartridgeLoader/CrimeAssistCartridgeComponent.cs b/Content.Server/DeltaV/CartridgeLoader/CrimeAssistCartridgeComponent.cs
deleted file mode 100644
index 741a6134580..00000000000
--- a/Content.Server/DeltaV/CartridgeLoader/CrimeAssistCartridgeComponent.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Content.Server.DeltaV.CartridgeLoader.Cartridges;
-
-[RegisterComponent]
-public sealed partial class CrimeAssistCartridgeComponent : Component
-{ }
diff --git a/Content.Server/DeltaV/CartridgeLoader/CrimeAssistCartridgeSystem.cs b/Content.Server/DeltaV/CartridgeLoader/CrimeAssistCartridgeSystem.cs
deleted file mode 100644
index 06732c2c534..00000000000
--- a/Content.Server/DeltaV/CartridgeLoader/CrimeAssistCartridgeSystem.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Shared.CartridgeLoader;
-using Content.Server.DeltaV.CartridgeLoader;
-using Content.Server.CartridgeLoader.Cartridges;
-using Content.Server.CartridgeLoader;
-
-namespace Content.Server.DeltaV.CartridgeLoader.Cartridges;
-
-public sealed class CrimeAssistCartridgeSystem : EntitySystem
-{
-    [Dependency] private readonly CartridgeLoaderSystem? _cartridgeLoaderSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-    }
-}
diff --git a/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs b/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs
index ec9ec770313..22d96a54146 100644
--- a/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs
+++ b/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs
@@ -5,7 +5,7 @@
 using Content.Server.Psionics.Glimmer;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Psionics.Glimmer;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
deleted file mode 100644
index b775117b716..00000000000
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Abilities.Psionics;
-using Content.Shared.StatusEffect;
-using Content.Shared.Popups;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-using Content.Shared.Mind;
-using Content.Shared.Actions.Events;
-
-namespace Content.Server.Abilities.Psionics
-{
-    public sealed class MetapsionicPowerSystem : EntitySystem
-    {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
-        [Dependency] private readonly SharedActionsSystem _actions = default!;
-        [Dependency] private readonly EntityLookupSystem _lookup = default!;
-        [Dependency] private readonly SharedPopupSystem _popups = default!;
-        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly SharedMindSystem _mindSystem = default!;
-
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<MetapsionicPowerComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<MetapsionicPowerComponent, ComponentShutdown>(OnShutdown);
-            SubscribeLocalEvent<MetapsionicPowerComponent, MetapsionicPowerActionEvent>(OnPowerUsed);
-        }
-
-        private void OnInit(EntityUid uid, MetapsionicPowerComponent component, ComponentInit args)
-        {
-            _actions.AddAction(uid, ref component.MetapsionicActionEntity, component.MetapsionicActionId );
-            _actions.TryGetActionData( component.MetapsionicActionEntity, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(component.MetapsionicActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-            {
-                psionic.PsionicAbility = component.MetapsionicActionEntity;
-                psionic.ActivePowers.Add(component);
-            }
-
-        }
-
-        private void OnShutdown(EntityUid uid, MetapsionicPowerComponent component, ComponentShutdown args)
-        {
-            _actions.RemoveAction(uid, component.MetapsionicActionEntity);
-
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Remove(component);
-            }
-        }
-
-        private void OnPowerUsed(EntityUid uid, MetapsionicPowerComponent component, MetapsionicPowerActionEvent args)
-        {
-            foreach (var entity in _lookup.GetEntitiesInRange(uid, component.Range))
-            {
-                if (HasComp<PsionicComponent>(entity) && entity != uid && !HasComp<PsionicInsulationComponent>(entity) &&
-                    !(HasComp<ClothingGrantPsionicPowerComponent>(entity) && Transform(entity).ParentUid == uid))
-                {
-                    _popups.PopupEntity(Loc.GetString("metapsionic-pulse-success"), uid, uid, PopupType.LargeCaution);
-                    args.Handled = true;
-                    return;
-                }
-            }
-            _popups.PopupEntity(Loc.GetString("metapsionic-pulse-failure"), uid, uid, PopupType.Large);
-            _psionics.LogPowerUsed(uid, "metapsionic pulse", 2, 4);
-
-            args.Handled = true;
-        }
-    }
-}
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
deleted file mode 100644
index 407b72c6b58..00000000000
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Abilities.Psionics;
-using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
-using Content.Server.Popups;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-using Content.Server.Mind;
-using Content.Shared.Actions.Events;
-
-namespace Content.Server.Abilities.Psionics
-{
-    public sealed class PyrokinesisPowerSystem : EntitySystem
-    {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly SharedActionsSystem _actions = default!;
-        [Dependency] private readonly FlammableSystem _flammableSystem = default!;
-        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
-        [Dependency] private readonly PopupSystem _popupSystem = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly MindSystem _mindSystem = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<PyrokinesisPowerComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<PyrokinesisPowerComponent, ComponentShutdown>(OnShutdown);
-            SubscribeLocalEvent<PyrokinesisPowerActionEvent>(OnPowerUsed);
-        }
-
-        private void OnInit(EntityUid uid, PyrokinesisPowerComponent component, ComponentInit args)
-        {
-            _actions.AddAction(uid, ref component.PyrokinesisActionEntity, component.PyrokinesisActionId );
-            _actions.TryGetActionData( component.PyrokinesisActionEntity, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(component.PyrokinesisActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-            {
-                psionic.PsionicAbility = component.PyrokinesisActionEntity;
-                psionic.ActivePowers.Add(component);
-            }
-        }
-
-        private void OnShutdown(EntityUid uid, PyrokinesisPowerComponent component, ComponentShutdown args)
-        {
-            _actions.RemoveAction(uid, component.PyrokinesisActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Remove(component);
-            }
-        }
-
-        private void OnPowerUsed(PyrokinesisPowerActionEvent args)
-        {
-            if (!TryComp<FlammableComponent>(args.Target, out var flammableComponent))
-                return;
-
-            flammableComponent.FireStacks += 5;
-            _flammableSystem.Ignite(args.Target, args.Target);
-            _popupSystem.PopupEntity(Loc.GetString("pyrokinesis-power-used", ("target", args.Target)), args.Target, Shared.Popups.PopupType.LargeCaution);
-
-            _psionics.LogPowerUsed(args.Performer, "pyrokinesis");
-            args.Handled = true;
-        }
-    }
-}
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
deleted file mode 100644
index f7ae04b61ea..00000000000
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.StatusEffect;
-using Content.Shared.Abilities.Psionics;
-using Content.Shared.Mind.Components;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-using Content.Server.Mind;
-using Content.Shared.Actions.Events;
-
-namespace Content.Server.Abilities.Psionics
-{
-    public sealed class TelegnosisPowerSystem : EntitySystem
-    {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
-        [Dependency] private readonly SharedActionsSystem _actions = default!;
-        [Dependency] private readonly MindSwapPowerSystem _mindSwap = default!;
-        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly MindSystem _mindSystem = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<TelegnosisPowerComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<TelegnosisPowerComponent, ComponentShutdown>(OnShutdown);
-            SubscribeLocalEvent<TelegnosisPowerComponent, TelegnosisPowerActionEvent>(OnPowerUsed);
-            SubscribeLocalEvent<TelegnosticProjectionComponent, MindRemovedMessage>(OnMindRemoved);
-        }
-
-        private void OnInit(EntityUid uid, TelegnosisPowerComponent component, ComponentInit args)
-        {
-            _actions.AddAction(uid, ref component.TelegnosisActionEntity, component.TelegnosisActionId );
-            _actions.TryGetActionData( component.TelegnosisActionEntity, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(component.TelegnosisActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-            {
-                psionic.PsionicAbility = component.TelegnosisActionEntity;
-                psionic.ActivePowers.Add(component);
-            }
-        }
-
-        private void OnShutdown(EntityUid uid, TelegnosisPowerComponent component, ComponentShutdown args)
-        {
-            _actions.RemoveAction(uid, component.TelegnosisActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Remove(component);
-            }
-        }
-
-        private void OnPowerUsed(EntityUid uid, TelegnosisPowerComponent component, TelegnosisPowerActionEvent args)
-        {
-            var projection = Spawn(component.Prototype, Transform(uid).Coordinates);
-            Transform(projection).AttachToGridOrMap();
-            _mindSwap.Swap(uid, projection);
-
-            _psionics.LogPowerUsed(uid, "telegnosis");
-            args.Handled = true;
-        }
-        private void OnMindRemoved(EntityUid uid, TelegnosticProjectionComponent component, MindRemovedMessage args)
-        {
-            QueueDel(uid);
-        }
-    }
-}
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs
deleted file mode 100644
index ee16aaccfb6..00000000000
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-using Content.Shared.Abilities.Psionics;
-using Content.Shared.Actions;
-using Content.Shared.Psionics.Glimmer;
-using Content.Shared.Random;
-using Content.Shared.Random.Helpers;
-using Content.Server.EUI;
-using Content.Server.Psionics;
-using Content.Server.Mind;
-using Content.Shared.Mind;
-using Content.Shared.Mind.Components;
-using Content.Shared.StatusEffect;
-using Robust.Shared.Random;
-using Robust.Shared.Prototypes;
-using Robust.Server.GameObjects;
-using Robust.Server.Player;
-using Robust.Shared.Player;
-
-namespace Content.Server.Abilities.Psionics
-{
-    public sealed class PsionicAbilitiesSystem : EntitySystem
-    {
-        [Dependency] private readonly IComponentFactory _componentFactory = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
-        [Dependency] private readonly IPlayerManager _playerManager = default!;
-        [Dependency] private readonly EuiManager _euiManager = default!;
-        [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
-        [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly MindSystem _mindSystem = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<PsionicAwaitingPlayerComponent, PlayerAttachedEvent>(OnPlayerAttached);
-        }
-
-        private void OnPlayerAttached(EntityUid uid, PsionicAwaitingPlayerComponent component, PlayerAttachedEvent args)
-        {
-            if (TryComp<PsionicBonusChanceComponent>(uid, out var bonus) && bonus.Warn == true)
-                _euiManager.OpenEui(new AcceptPsionicsEui(uid, this), args.Player);
-            else
-                AddRandomPsionicPower(uid);
-            RemCompDeferred<PsionicAwaitingPlayerComponent>(uid);
-        }
-
-        public void AddPsionics(EntityUid uid, bool warn = true)
-        {
-            if (Deleted(uid))
-                return;
-
-            if (HasComp<PsionicComponent>(uid))
-                return;
-
-            //Don't know if this will work. New mind state vs old.
-            if (!TryComp<MindContainerComponent>(uid, out var mindContainer) ||
-                !_mindSystem.TryGetMind(uid, out _, out var mind ))
-            //||
-            //!_mindSystem.TryGetMind(uid, out var mind, mindContainer))
-            {
-                EnsureComp<PsionicAwaitingPlayerComponent>(uid);
-                return;
-            }
-
-            if (!_mindSystem.TryGetSession(mind, out var client))
-                return;
-
-            if (warn && TryComp<ActorComponent>(uid, out var actor))
-                _euiManager.OpenEui(new AcceptPsionicsEui(uid, this), client);
-            else
-                AddRandomPsionicPower(uid);
-        }
-
-        public void AddPsionics(EntityUid uid, string powerComp)
-        {
-            if (Deleted(uid))
-                return;
-
-            if (HasComp<PsionicComponent>(uid))
-                return;
-
-            AddComp<PsionicComponent>(uid);
-
-            var newComponent = (Component) _componentFactory.GetComponent(powerComp);
-            newComponent.Owner = uid;
-
-            EntityManager.AddComponent(uid, newComponent);
-        }
-
-        public void AddRandomPsionicPower(EntityUid uid)
-        {
-            AddComp<PsionicComponent>(uid);
-
-            if (!_prototypeManager.TryIndex<WeightedRandomPrototype>("RandomPsionicPowerPool", out var pool))
-            {
-                Logger.Error("Can't index the random psionic power pool!");
-                return;
-            }
-
-            // uh oh, stinky!
-            var newComponent = (Component) _componentFactory.GetComponent(pool.Pick());
-            newComponent.Owner = uid;
-
-            EntityManager.AddComponent(uid, newComponent);
-
-            _glimmerSystem.Glimmer += _random.Next(1, 5);
-        }
-
-        public void RemovePsionics(EntityUid uid)
-        {
-            if (!TryComp<PsionicComponent>(uid, out var psionic))
-                return;
-
-            if (!psionic.Removable)
-                return;
-
-            if (!_prototypeManager.TryIndex<WeightedRandomPrototype>("RandomPsionicPowerPool", out var pool))
-            {
-                Logger.Error("Can't index the random psionic power pool!");
-                return;
-            }
-
-            foreach (var compName in pool.Weights.Keys)
-            {
-                // component moment
-                var comp = _componentFactory.GetComponent(compName);
-                if (EntityManager.TryGetComponent(uid, comp.GetType(), out var psionicPower))
-                    RemComp(uid, psionicPower);
-            }
-            if (psionic.PsionicAbility != null){
-                _actionsSystem.TryGetActionData( psionic.PsionicAbility, out var psiAbility );
-                if (psiAbility != null){
-                    var owner = psiAbility.Owner;
-                    _actionsSystem.RemoveAction(uid, psiAbility.Owner);
-                }
-            }
-
-            _statusEffectsSystem.TryAddStatusEffect(uid, "Stutter", TimeSpan.FromMinutes(5), false, "StutteringAccent");
-
-            RemComp<PsionicComponent>(uid);
-        }
-    }
-}
diff --git a/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs b/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs
index a23a5b3d77d..0ce3f9d7c64 100644
--- a/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs
+++ b/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Chemistry.Reagent;
-using Content.Server.Abilities.Psionics;
+using Content.Server.Psionics.Abilities;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/Nyanotrasen/Chemistry/ReactionEffects/ChangeGlimmerReactionEffect.cs b/Content.Server/Nyanotrasen/Chemistry/ReactionEffects/ChangeGlimmerReactionEffect.cs
index 65aaf350cba..cd7010700a1 100644
--- a/Content.Server/Nyanotrasen/Chemistry/ReactionEffects/ChangeGlimmerReactionEffect.cs
+++ b/Content.Server/Nyanotrasen/Chemistry/ReactionEffects/ChangeGlimmerReactionEffect.cs
@@ -21,6 +21,6 @@ public override void Effect(ReagentEffectArgs args)
     {
         var glimmersys = args.EntityManager.EntitySysManager.GetEntitySystem<GlimmerSystem>();
 
-        glimmersys.Glimmer += Count;
+        glimmersys.DeltaGlimmerInput(Count);
     }
 }
diff --git a/Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs b/Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs
deleted file mode 100644
index 3b677bab2d4..00000000000
--- a/Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Content.Server.Objectives.Systems;
-
-namespace Content.Server.Objectives.Components;
-
-/// <summary>
-/// Requires that the player dies to be complete.
-/// </summary>
-[RegisterComponent, Access(typeof(BecomePsionicConditionSystem))]
-public sealed partial class BecomePsionicConditionComponent : Component
-{
-}
\ No newline at end of file
diff --git a/Content.Server/Nyanotrasen/Objectives/Systems/BecomePsionicConditionSystem.cs b/Content.Server/Nyanotrasen/Objectives/Systems/BecomePsionicConditionSystem.cs
deleted file mode 100644
index d090c320a41..00000000000
--- a/Content.Server/Nyanotrasen/Objectives/Systems/BecomePsionicConditionSystem.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.Abilities.Psionics;
-using Content.Server.Objectives.Components;
-using Content.Shared.Mind;
-using Content.Shared.Objectives.Components;
-
-namespace Content.Server.Objectives.Systems
-{
-    public sealed class BecomePsionicConditionSystem : EntitySystem
-    {
-        private EntityQuery<MetaDataComponent> _metaQuery;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<BecomePsionicConditionComponent, ObjectiveGetProgressEvent>(OnGetProgress);
-        }
-
-        private void OnGetProgress(EntityUid uid, BecomePsionicConditionComponent comp, ref ObjectiveGetProgressEvent args)
-        {
-            args.Progress = GetProgress(args.Mind);
-        }
-
-        private float GetProgress(MindComponent mind)
-        {
-            var entMan = IoCManager.Resolve<IEntityManager>();
-            if (HasComp<PsionicComponent>(mind.CurrentEntity))
-                return 1;
-            return 0;
-        }
-    }
-}
diff --git a/Content.Server/Nyanotrasen/Objectives/Systems/RaiseGlimmerConditionSystem.cs b/Content.Server/Nyanotrasen/Objectives/Systems/RaiseGlimmerConditionSystem.cs
index d7aae44afa7..5d2cd3fa633 100644
--- a/Content.Server/Nyanotrasen/Objectives/Systems/RaiseGlimmerConditionSystem.cs
+++ b/Content.Server/Nyanotrasen/Objectives/Systems/RaiseGlimmerConditionSystem.cs
@@ -6,8 +6,8 @@ namespace Content.Server.Objectives.Systems
 {
     public sealed class RaiseGlimmerConditionSystem : EntitySystem
     {
-        [Dependency] private readonly IEntitySystemManager _sysMan = default!;
         [Dependency] private readonly MetaDataSystem _metaData = default!;
+        [Dependency] private readonly GlimmerSystem _glimmer = default!;
         public override void Initialize()
         {
             base.Initialize();
@@ -32,8 +32,7 @@ private void OnGetProgress(EntityUid uid, RaiseGlimmerConditionComponent comp, r
 
         private float GetProgress(int target)
         {
-            var glimmer = _sysMan.GetEntitySystem<GlimmerSystem>().Glimmer;
-            var progress = Math.Min((float) glimmer / (float) target, 1f);
+            var progress = Math.Min((float) _glimmer.GlimmerOutput / (float) target, 1f);
             return progress;
         }
     }
diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs b/Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
deleted file mode 100644
index f0da85ce453..00000000000
--- a/Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using Robust.Shared.Random;
-using Robust.Shared.Timing;
-using Robust.Shared.Configuration;
-using Content.Shared.CCVar;
-using Content.Shared.Psionics.Glimmer;
-using Content.Shared.GameTicking;
-using Content.Server.CartridgeLoader.Cartridges;
-
-namespace Content.Server.Psionics.Glimmer
-{
-    /// <summary>
-    /// Handles the passive reduction of glimmer.
-    /// </summary>
-    public sealed class PassiveGlimmerReductionSystem : EntitySystem
-    {
-        [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly IGameTiming _timing = default!;
-        [Dependency] private readonly IConfigurationManager _cfg = default!;
-        [Dependency] private readonly GlimmerMonitorCartridgeSystem _cartridgeSys = default!;
-
-        /// List of glimmer values spaced by minute.
-        public List<int> GlimmerValues = new();
-
-        public TimeSpan TargetUpdatePeriod = TimeSpan.FromSeconds(6);
-
-        private int _updateIncrementor;
-        public TimeSpan NextUpdateTime = default!;
-        public TimeSpan LastUpdateTime = default!;
-
-        private float _glimmerLostPerSecond;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestartCleanup);
-            _cfg.OnValueChanged(CCVars.GlimmerLostPerSecond, UpdatePassiveGlimmer, true);
-        }
-
-        private void OnRoundRestartCleanup(RoundRestartCleanupEvent args)
-        {
-            GlimmerValues.Clear();
-        }
-
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-
-            var curTime = _timing.CurTime;
-            if (NextUpdateTime > curTime)
-                return;
-
-
-            var delta = curTime - LastUpdateTime;
-            var maxGlimmerLost = (int) Math.Round(delta.TotalSeconds * _glimmerLostPerSecond);
-
-            // It used to be 75% to lose one glimmer per ten seconds, but now it's 50% per six seconds.
-            // The probability is exactly the same over the same span of time. (0.25 ^ 3 == 0.5 ^ 6)
-            // This math is just easier to do for pausing's sake.
-            var actualGlimmerLost = _random.Next(0, 1 + maxGlimmerLost);
-
-            _glimmerSystem.Glimmer -= actualGlimmerLost;
-
-            _updateIncrementor++;
-
-            // Since we normally update every 6 seconds, this works out to a minute.
-            if (_updateIncrementor == 10)
-            {
-                GlimmerValues.Add(_glimmerSystem.Glimmer);
-
-                _updateIncrementor = 0;
-            }
-
-            NextUpdateTime = curTime + TargetUpdatePeriod;
-            LastUpdateTime = curTime;
-        }
-
-        private void UpdatePassiveGlimmer(float value) => _glimmerLostPerSecond = value;
-    }
-}
diff --git a/Content.Server/Nyanotrasen/Psionics/PotentialPsionicComponent.cs b/Content.Server/Nyanotrasen/Psionics/PotentialPsionicComponent.cs
deleted file mode 100644
index 9499497cd1d..00000000000
--- a/Content.Server/Nyanotrasen/Psionics/PotentialPsionicComponent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Content.Server.Psionics
-{
-    [RegisterComponent]
-    public sealed partial class PotentialPsionicComponent : Component
-    {
-        [DataField("chance")]
-        public float Chance = 0.04f;
-
-        /// <summary>
-        /// YORO (you only reroll once)
-        /// </summary>
-        public bool Rerolled = false;
-    }
-}
diff --git a/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs b/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs
index 148598fe2c3..c3eced61da9 100644
--- a/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs
+++ b/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs
@@ -5,16 +5,14 @@
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Psionics;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Chat;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Research.Prototypes;
-using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
@@ -168,7 +166,7 @@ private void DispenseLiquidReward(EntityUid uid, OracleComponent component)
             .Where(x => !x.Abstract)
             .Select(x => x.ID).ToList();
 
-        var amount = 20 + _random.Next(1, 30) + _glimmerSystem.Glimmer / 10f;
+        var amount = 20 + _random.Next(1, 30) + _glimmerSystem.GlimmerOutput / 10f;
         amount = (float) Math.Round(amount);
 
         var sol = new Solution();
diff --git a/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs b/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs
index bc3c22cc350..b1a6c1e9de1 100644
--- a/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs
+++ b/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Abilities.Psionics;
+using Content.Server.Psionics.Abilities;
 using Content.Server.Chat.Systems;
 using Content.Server.Radio.Components;
 using Content.Server.Radio.EntitySystems;
@@ -23,7 +23,7 @@ public override void Update(float frameTime)
     {
         base.Update(frameTime);
 
-        if (_glimmerSystem.Glimmer == 0)
+        if (_glimmerSystem.GlimmerOutput == 0)
             return; // yes, return. Glimmer value is global.
 
         var curTime = _timing.CurTime;
@@ -37,7 +37,7 @@ public override void Update(float frameTime)
             if (!TryComp<IntrinsicRadioTransmitterComponent>(scribe, out var radio))
                 continue;
 
-            var message = Loc.GetString("glimmer-report", ("level", _glimmerSystem.Glimmer));
+            var message = Loc.GetString("glimmer-report", ("level", (int) Math.Round(_glimmerSystem.GlimmerOutput)));
             var channel = _prototypeManager.Index<RadioChannelPrototype>("Science");
             _radioSystem.SendRadioMessage(scribe, message, channel, scribe);
 
@@ -61,7 +61,7 @@ private void OnInteractHand(EntityUid uid, SophicScribeComponent component, Inte
 
         component.StateTime = _timing.CurTime + component.StateCD;
 
-        _chat.TrySendInGameICMessage(uid, Loc.GetString("glimmer-report", ("level", _glimmerSystem.Glimmer)), InGameICChatType.Speak, true);
+        _chat.TrySendInGameICMessage(uid, Loc.GetString("glimmer-report", ("level", (int) Math.Round(_glimmerSystem.GlimmerOutput))), InGameICChatType.Speak, true);
     }
 
     private void OnGlimmerEventEnded(GlimmerEventEndedEvent args)
@@ -78,7 +78,7 @@ private void OnGlimmerEventEnded(GlimmerEventEndedEvent args)
                 speaker = swapped.OriginalEntity;
             }
 
-            var message = Loc.GetString(args.Message, ("decrease", args.GlimmerBurned), ("level", _glimmerSystem.Glimmer));
+            var message = Loc.GetString(args.Message, ("decrease", args.GlimmerBurned), ("level", (int) Math.Round(_glimmerSystem.GlimmerOutput)));
             var channel = _prototypeManager.Index<RadioChannelPrototype>("Common");
             _radioSystem.SendRadioMessage(speaker, message, channel, speaker);
         }
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/FreeProberRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/FreeProberRule.cs
index 0aa8ecc47cc..46dff726e55 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/FreeProberRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/FreeProberRule.cs
@@ -36,7 +36,7 @@ protected override void Started(EntityUid uid, FreeProberRuleComponent component
             }
         }
 
-        if (PossibleSpawns.Count == 0 || _glimmerSystem.Glimmer >= 500 || _robustRandom.Prob(0.25f))
+        if (PossibleSpawns.Count == 0 || _glimmerSystem.GlimmerOutput >= 500 || _robustRandom.Prob(0.25f))
         {
             var queryBattery = EntityQueryEnumerator<PowerNetworkBatteryComponent>();
             while (query.MoveNext(out var battery, out var _))
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerEventSystem.cs b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerEventSystem.cs
index a3d36ae7157..078826604eb 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerEventSystem.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerEventSystem.cs
@@ -13,7 +13,7 @@ protected override void Ended(EntityUid uid, GlimmerEventComponent component, Ga
             base.Ended(uid, component, gameRule, args);
 
             var glimmerBurned = RobustRandom.Next(component.GlimmerBurnLower, component.GlimmerBurnUpper);
-            _glimmerSystem.Glimmer -= glimmerBurned;
+            _glimmerSystem.DeltaGlimmerInput(-glimmerBurned);
 
             var reportEv = new GlimmerEventEndedEvent(component.SophicReport, glimmerBurned);
             RaiseLocalEvent(reportEv);
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs
index 66eea988aeb..89b5a176f24 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs
@@ -5,7 +5,7 @@
 using Content.Server.Psionics.Glimmer;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Psionics.Glimmer;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs
index 63944563269..89f3bc97501 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs
@@ -1,10 +1,9 @@
-using Robust.Server.GameObjects;
 using Robust.Shared.Random;
-using Content.Server.Abilities.Psionics;
+using Content.Server.Psionics.Abilities;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Psionics;
 using Content.Server.StationEvents.Components;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Robust.Shared.Player;
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs
index c04543d2195..cf7b8e6cc9c 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs
@@ -10,7 +10,7 @@
 using Content.Server.Power.EntitySystems;
 using Content.Server.Psionics.Glimmer;
 using Content.Server.StationEvents.Components;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Damage;
 using Content.Shared.Inventory;
 using Content.Shared.Mobs.Components;
@@ -77,7 +77,7 @@ protected override void Started(EntityUid uid, NoosphericFryRuleComponent compon
             damage.DamageDict.Add("Heat", 2.5);
             damage.DamageDict.Add("Shock", 2.5);
 
-            if (_glimmerSystem.Glimmer > 500 && _glimmerSystem.Glimmer < 750)
+            if (_glimmerSystem.GlimmerOutput > 500 && _glimmerSystem.GlimmerOutput < 750)
             {
                 damage *= 2;
                 if (TryComp<FlammableComponent>(pair.wearer, out var flammableComponent))
@@ -85,7 +85,7 @@ protected override void Started(EntityUid uid, NoosphericFryRuleComponent compon
                     flammableComponent.FireStacks += 1;
                     _flammableSystem.Ignite(pair.wearer, pair.wearer, flammableComponent);
                 }
-            } else if (_glimmerSystem.Glimmer > 750)
+            } else if (_glimmerSystem.GlimmerOutput > 750)
             {
                 damage *= 3;
                 if (TryComp<FlammableComponent>(pair.wearer, out var flammableComponent))
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
index 175318e15bd..021c9591022 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
@@ -1,9 +1,9 @@
 using Robust.Shared.Random;
-using Content.Server.Abilities.Psionics;
+using Content.Server.Psionics.Abilities;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Server.Psionics;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Zombies;
@@ -30,7 +30,7 @@ protected override void Started(EntityUid uid, NoosphericStormRuleComponent comp
                 continue;
 
             // Skip over those who are already psionic or those who are insulated, or zombies.
-            if (HasComp<PsionicComponent>(potentialPsionic) || HasComp<PsionicInsulationComponent>(potentialPsionic) || HasComp<ZombieComponent>(potentialPsionic))
+            if (HasComp<PsionicInsulationComponent>(potentialPsionic) || HasComp<ZombieComponent>(potentialPsionic))
                 continue;
 
             validList.Add(potentialPsionic);
@@ -54,6 +54,6 @@ protected override void Started(EntityUid uid, NoosphericStormRuleComponent comp
         //var glimmerSeverityMod = 1 + (component.GlimmerSeverityCoefficient * (GetSeverityModifier() - 1f));
         var glimmerAdded = (int) baseGlimmerAdd; // Math.Round(baseGlimmerAdd * glimmerSeverityMod);
 
-        _glimmerSystem.Glimmer += glimmerAdded;
+        _glimmerSystem.DeltaGlimmerInput(glimmerAdded);
     }
 }
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs
index 82c3d72b139..a11faa06933 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs
@@ -3,7 +3,7 @@
 using Content.Server.Psionics;
 using Content.Server.StationEvents.Components;
 using Content.Server.Stunnable;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.StatusEffect;
@@ -35,19 +35,15 @@ protected override void Started(EntityUid uid, NoosphericZapRuleComponent compon
             _stunSystem.TryParalyze(psion, TimeSpan.FromSeconds(5), false);
             _statusEffectsSystem.TryAddStatusEffect(psion, "Stutter", TimeSpan.FromSeconds(10), false, "StutteringAccent");
 
-            if (HasComp<PsionicComponent>(psion))
-                _popupSystem.PopupEntity(Loc.GetString("noospheric-zap-seize"), psion, psion, Shared.Popups.PopupType.LargeCaution);
+            if (potentialPsionicComponent.Rerolled)
+            {
+                potentialPsionicComponent.Rerolled = false;
+                _popupSystem.PopupEntity(Loc.GetString("noospheric-zap-seize-potential-regained"), psion, psion, Shared.Popups.PopupType.LargeCaution);
+            }
             else
             {
-                if (potentialPsionicComponent.Rerolled)
-                {
-                    potentialPsionicComponent.Rerolled = false;
-                    _popupSystem.PopupEntity(Loc.GetString("noospheric-zap-seize-potential-regained"), psion, psion, Shared.Popups.PopupType.LargeCaution);
-                } else
-                {
-                    _psionicsSystem.RollPsionics(psion, potentialPsionicComponent, multiplier: 0.25f);
-                    _popupSystem.PopupEntity(Loc.GetString("noospheric-zap-seize"), psion, psion, Shared.Popups.PopupType.LargeCaution);
-                }
+                _psionicsSystem.RollPsionics(psion, potentialPsionicComponent, multiplier: 0.25f);
+                _popupSystem.PopupEntity(Loc.GetString("noospheric-zap-seize"), psion, psion, Shared.Popups.PopupType.LargeCaution);
             }
         }
     }
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs
index 63e0a435cb0..753b2e25729 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs
@@ -4,7 +4,7 @@
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Mobs.Components;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.StatusEffect;
 using Content.Shared.Mobs.Systems;
 using Robust.Shared.Audio.Systems;
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs b/Content.Server/Psionics/Abilities/DispelPowerSystem.cs
similarity index 80%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs
rename to Content.Server/Psionics/Abilities/DispelPowerSystem.cs
index d338a5a5bcb..73c6f5d339c 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/DispelPowerSystem.cs
@@ -1,24 +1,21 @@
 using Content.Shared.Actions;
 using Content.Shared.StatusEffect;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
+using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Damage;
 using Content.Shared.Revenant.Components;
 using Content.Server.Guardian;
 using Content.Server.Bible.Components;
 using Content.Server.Popups;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
-using Robust.Shared.Timing;
-using Content.Shared.Mind;
 using Content.Shared.Actions.Events;
 using Robust.Shared.Audio.Systems;
 
-namespace Content.Server.Abilities.Psionics
+namespace Content.Server.Psionics.Abilities
 {
     public sealed class DispelPowerSystem : EntitySystem
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly DamageableSystem _damageableSystem = default!;
@@ -27,8 +24,7 @@ public sealed class DispelPowerSystem : EntitySystem
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly SharedMindSystem _mindSystem = default!;
+        [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
 
 
         public override void Initialize()
@@ -52,10 +48,13 @@ private void OnInit(EntityUid uid, DispelPowerComponent component, ComponentInit
             _actions.TryGetActionData( component.DispelActionEntity, out var actionData );
             if (actionData is { UseDelay: not null })
                 _actions.StartUseDelay(component.DispelActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+            if (TryComp<PsionicComponent>(uid, out var psionic))
             {
-                psionic.PsionicAbility = component.DispelActionEntity;
                 psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.DispelFeedback);
+                //It's fully intended that Dispel doesn't increase Amplification, and instead heavily spikes Dampening
+                //Antimage archetype.
+                psionic.Dampening += 1f;
             }
         }
 
@@ -66,12 +65,16 @@ private void OnShutdown(EntityUid uid, DispelPowerComponent component, Component
             if (TryComp<PsionicComponent>(uid, out var psionic))
             {
                 psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.DispelFeedback);
+                psionic.Dampening -= 1f;
             }
         }
 
         private void OnPowerUsed(DispelPowerActionEvent args)
         {
-            if (HasComp<PsionicInsulationComponent>(args.Target))
+            if (HasComp<PsionicInsulationComponent>(args.Target) || HasComp<PsionicInsulationComponent>(args.Performer))
+                return;
+            if (!TryComp<PsionicComponent>(args.Performer, out var psionic) || !HasComp<PsionicComponent>(args.Target))
                 return;
 
             var ev = new DispelledEvent();
@@ -80,7 +83,12 @@ private void OnPowerUsed(DispelPowerActionEvent args)
             if (ev.Handled)
             {
                 args.Handled = true;
-                _psionics.LogPowerUsed(args.Performer, "dispel");
+                _psionics.LogPowerUsed(args.Performer, "dispel", psionic, 1, 1, true);
+
+                // Redundant check here as well for a small performance optimization
+                // Dispel has its own niche equations for glimmer.
+                if (_glimmerSystem.GetGlimmerEnabled())
+                    _glimmerSystem.DeltaGlimmerOutput(-_random.NextFloat(2 * psionic.Dampening - psionic.Amplification, 4 * psionic.Dampening - psionic.Amplification));
             }
         }
 
@@ -96,7 +104,7 @@ private void OnDispelled(EntityUid uid, DispellableComponent component, Dispelle
         private void OnDmgDispelled(EntityUid uid, DamageOnDispelComponent component, DispelledEvent args)
         {
             var damage = component.Damage;
-            var modifier = (1 + component.Variance) - (_random.NextFloat(0, component.Variance * 2));
+            var modifier = 1 + component.Variance - _random.NextFloat(0, component.Variance * 2);
 
             damage *= modifier;
             DealDispelDamage(uid, damage);
@@ -145,5 +153,3 @@ public void DealDispelDamage(EntityUid uid, DamageSpecifier? damage = null)
     }
     public sealed class DispelledEvent : HandledEntityEventArgs {}
 }
-
-
diff --git a/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs
new file mode 100644
index 00000000000..8c72a02737b
--- /dev/null
+++ b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs
@@ -0,0 +1,174 @@
+using Content.Shared.Actions;
+using Content.Shared.Actions.Events;
+using Content.Shared.Psionics.Abilities;
+using Content.Shared.DoAfter;
+using Content.Shared.Popups;
+using Robust.Server.Audio;
+using Robust.Shared.Audio;
+using Robust.Shared.Timing;
+using Content.Shared.Psionics.Events;
+
+namespace Content.Server.Psionics.Abilities
+{
+    public sealed class MetapsionicPowerSystem : EntitySystem
+    {
+        [Dependency] private readonly SharedActionsSystem _actions = default!;
+        [Dependency] private readonly EntityLookupSystem _lookup = default!;
+        [Dependency] private readonly SharedPopupSystem _popups = default!;
+        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+        [Dependency] private readonly AudioSystem _audioSystem = default!;
+
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<MetapsionicPowerComponent, ComponentInit>(OnInit);
+            SubscribeLocalEvent<MetapsionicPowerComponent, ComponentShutdown>(OnShutdown);
+            SubscribeLocalEvent<MetapsionicPowerComponent, WideMetapsionicPowerActionEvent>(OnWidePowerUsed);
+            SubscribeLocalEvent<FocusedMetapsionicPowerActionEvent>(OnFocusedPowerUsed);
+            SubscribeLocalEvent<MetapsionicPowerComponent, FocusedMetapsionicDoAfterEvent>(OnDoAfter);
+        }
+
+        private void OnInit(EntityUid uid, MetapsionicPowerComponent component, ComponentInit args)
+        {
+            if (!TryComp(uid, out ActionsComponent? comp))
+                return;
+            _actions.AddAction(uid, ref component.ActionWideMetapsionicEntity, component.ActionWideMetapsionic, component: comp);
+            _actions.AddAction(uid, ref component.ActionFocusedMetapsionicEntity, component.ActionFocusedMetapsionic, component: comp);
+            _actions.TryGetActionData(component.ActionWideMetapsionicEntity, out var actionData);
+            if (actionData is { UseDelay: not null })
+            {
+                _actions.StartUseDelay(component.ActionWideMetapsionicEntity);
+                _actions.StartUseDelay(component.ActionFocusedMetapsionicEntity);
+            }
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.MetapsionicFeedback);
+                psionic.Amplification += 0.1f;
+                psionic.Dampening += 0.5f;
+            }
+
+        }
+
+        private void UpdateActions(EntityUid uid, MetapsionicPowerComponent? component = null)
+        {
+            if (!Resolve(uid, ref component))
+                return;
+            _actions.StartUseDelay(component.ActionWideMetapsionicEntity);
+            _actions.StartUseDelay(component.ActionFocusedMetapsionicEntity);
+        }
+
+        private void OnShutdown(EntityUid uid, MetapsionicPowerComponent component, ComponentShutdown args)
+        {
+            _actions.RemoveAction(uid, component.ActionWideMetapsionicEntity);
+            _actions.RemoveAction(uid, component.ActionFocusedMetapsionicEntity);
+
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.MetapsionicFeedback);
+                psionic.Amplification -= 0.1f;
+                psionic.Dampening -= 0.5f;
+            }
+        }
+
+        private void OnWidePowerUsed(EntityUid uid, MetapsionicPowerComponent component, WideMetapsionicPowerActionEvent args)
+        {
+            if (HasComp<PsionicInsulationComponent>(uid))
+                return;
+
+            if (!TryComp<PsionicComponent>(uid, out var psionic))
+                return;
+
+            foreach (var entity in _lookup.GetEntitiesInRange(uid, component.Range))
+            {
+                if (HasComp<PsionicComponent>(entity) && entity != uid && !HasComp<PsionicInsulationComponent>(entity) &&
+                    !(HasComp<ClothingGrantPsionicPowerComponent>(entity) && Transform(entity).ParentUid == uid))
+                {
+                    _popups.PopupEntity(Loc.GetString("metapsionic-pulse-success"), uid, uid, PopupType.LargeCaution);
+                    args.Handled = true;
+                    return;
+                }
+            }
+            _popups.PopupEntity(Loc.GetString("metapsionic-pulse-failure"), uid, uid, PopupType.Large);
+            _psionics.LogPowerUsed(uid, "metapsionic pulse", psionic, 2, 4);
+            UpdateActions(uid, component);
+            args.Handled = true;
+        }
+
+        private void OnFocusedPowerUsed(FocusedMetapsionicPowerActionEvent args)
+        {
+            if (!TryComp<PsionicComponent>(args.Performer, out var psionic))
+                return;
+
+            if (HasComp<PsionicInsulationComponent>(args.Target))
+                return;
+
+            if (!TryComp<MetapsionicPowerComponent>(args.Performer, out var component))
+                return;
+
+            var ev = new FocusedMetapsionicDoAfterEvent(_gameTiming.CurTime);
+
+            _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.Performer, component.UseDelay - psionic.Amplification, ev, args.Performer, args.Target, args.Performer)
+            {
+                BlockDuplicate = true,
+                BreakOnUserMove = true,
+                BreakOnTargetMove = true,
+                BreakOnDamage = true,
+            }, out var doAfterId);
+
+            component.DoAfter = doAfterId;
+
+            _popups.PopupEntity(Loc.GetString("focused-metapsionic-pulse-begin", ("entity", args.Target)), args.Performer, PopupType.Medium);
+
+            _audioSystem.PlayPvs(component.SoundUse, args.Performer, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
+            _psionics.LogPowerUsed(args.Performer, "focused metapsionic pulse", psionic, 3, 6);
+            args.Handled = true;
+
+            UpdateActions(args.Performer, component);
+        }
+
+        private void OnDoAfter(EntityUid uid, MetapsionicPowerComponent component, FocusedMetapsionicDoAfterEvent args)
+        {
+            component.DoAfter = null;
+
+            if (args.Target == null || args.Cancelled)
+                return;
+
+            if (TryComp<MindSwappedComponent>(args.Target, out var swapped))
+            {
+                _popups.PopupEntity(Loc.GetString(swapped.MindSwappedFeedback, ("entity", args.Target)), uid, uid, PopupType.LargeCaution);
+                return;
+            }
+
+            if (args.Target == uid)
+            {
+                _popups.PopupEntity(Loc.GetString("metapulse-self", ("entity", args.Target)), uid, uid, PopupType.LargeCaution);
+                return;
+            }
+
+            if (!HasComp<PotentialPsionicComponent>(args.Target))
+            {
+                _popups.PopupEntity(Loc.GetString("no-powers", ("entity", args.Target)), uid, uid, PopupType.LargeCaution);
+                return;
+            }
+
+            if (HasComp<PotentialPsionicComponent>(args.Target) & !HasComp<PsionicComponent>(args.Target))
+            {
+                _popups.PopupEntity(Loc.GetString("psychic-potential", ("entity", args.Target)), uid, uid, PopupType.LargeCaution);
+                return;
+            }
+
+            if (TryComp<PsionicComponent>(args.Target, out var psychic))
+            {
+                foreach (var psychicFeedback in psychic.PsychicFeedback)
+                {
+                    _popups.PopupEntity(Loc.GetString(psychicFeedback, ("entity", args.Target)), uid, uid, PopupType.LargeCaution);
+                }
+            }
+        }
+    }
+}
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs
similarity index 79%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
rename to Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs
index b23224cab48..25f0434c797 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Actions;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
+using Content.Shared.Psionics;
 using Content.Shared.Speech;
 using Content.Shared.Stealth.Components;
 using Content.Shared.Mobs.Components;
@@ -8,21 +9,16 @@
 using Content.Server.Mind;
 using Content.Shared.Mobs.Systems;
 using Content.Server.Popups;
-using Content.Server.Psionics;
 using Content.Server.GameTicking;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 using Content.Shared.Mind;
 using Content.Shared.Actions.Events;
 
-namespace Content.Server.Abilities.Psionics
+namespace Content.Server.Psionics.Abilities
 {
     public sealed class MindSwapPowerSystem : EntitySystem
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly MindSystem _mindSystem = default!;
@@ -38,20 +34,22 @@ public override void Initialize()
             SubscribeLocalEvent<MindSwappedComponent, DispelledEvent>(OnDispelled);
             SubscribeLocalEvent<MindSwappedComponent, MobStateChangedEvent>(OnMobStateChanged);
             SubscribeLocalEvent<GhostAttemptHandleEvent>(OnGhostAttempt);
-            //
             SubscribeLocalEvent<MindSwappedComponent, ComponentInit>(OnSwapInit);
+            SubscribeLocalEvent<MindSwappedComponent, ComponentShutdown>(OnSwapShutdown);
+            SubscribeLocalEvent<MindSwappedComponent, PsionicInsulationEvent>(OnInsulated);
         }
 
         private void OnInit(EntityUid uid, MindSwapPowerComponent component, ComponentInit args)
         {
-            _actions.AddAction(uid, ref component.MindSwapActionEntity, component.MindSwapActionId );
-            _actions.TryGetActionData( component.MindSwapActionEntity, out var actionData );
+            _actions.AddAction(uid, ref component.MindSwapActionEntity, component.MindSwapActionId);
+            _actions.TryGetActionData( component.MindSwapActionEntity, out var actionData);
             if (actionData is { UseDelay: not null })
                 _actions.StartUseDelay(component.MindSwapActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+            if (TryComp<PsionicComponent>(uid, out var psionic))
             {
-                psionic.PsionicAbility = component.MindSwapActionEntity;
                 psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.MindSwapFeedback);
+                psionic.Amplification += 1f;
             }
         }
 
@@ -61,20 +59,26 @@ private void OnShutdown(EntityUid uid, MindSwapPowerComponent component, Compone
             if (TryComp<PsionicComponent>(uid, out var psionic))
             {
                 psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.MindSwapFeedback);
+                psionic.Amplification -= 1f;
             }
         }
 
         private void OnPowerUsed(MindSwapPowerActionEvent args)
         {
+
             if (!(TryComp<DamageableComponent>(args.Target, out var damageable) && damageable.DamageContainerID == "Biological"))
                 return;
 
             if (HasComp<PsionicInsulationComponent>(args.Target))
                 return;
 
+            if (!TryComp<PsionicComponent>(args.Performer, out var psionic))
+                return;
+
             Swap(args.Performer, args.Target);
 
-            _psionics.LogPowerUsed(args.Performer, "mind swap");
+            _psionics.LogPowerUsed(args.Performer, "mind swap", psionic, 8, 12);
             args.Handled = true;
         }
 
@@ -125,8 +129,8 @@ private void OnDispelled(EntityUid uid, MindSwappedComponent component, Dispelle
 
         private void OnMobStateChanged(EntityUid uid, MindSwappedComponent component, MobStateChangedEvent args)
         {
-            if (args.NewMobState == MobState.Dead)
-                RemComp<MindSwappedComponent>(uid);
+            if (args.NewMobState == MobState.Dead || args.NewMobState == MobState.Critical)
+                Swap(uid, component.OriginalEntity, true);
         }
 
         private void OnGhostAttempt(GhostAttemptHandleEvent args)
@@ -151,8 +155,21 @@ private void OnSwapInit(EntityUid uid, MindSwappedComponent component, Component
             _actions.TryGetActionData( component.MindSwapReturnActionEntity, out var actionData );
             if (actionData is { UseDelay: not null })
                 _actions.StartUseDelay(component.MindSwapReturnActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-                psionic.PsionicAbility = component.MindSwapReturnActionEntity;
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.MindSwappedFeedback);
+            }
+        }
+
+        private void OnSwapShutdown(EntityUid uid, MindSwappedComponent component, ComponentShutdown args)
+        {
+            _actions.RemoveAction(uid, component.MindSwapReturnActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.MindSwappedFeedback);
+            }
         }
 
         public void Swap(EntityUid performer, EntityUid target, bool end = false)
@@ -165,11 +182,13 @@ public void Swap(EntityUid performer, EntityUid target, bool end = false)
             MindComponent? targetMind = null;
 
             // This is here to prevent missing MindContainerComponent Resolve errors.
-            if(!_mindSystem.TryGetMind(performer, out var performerMindId, out performerMind)){
+            if (!_mindSystem.TryGetMind(performer, out var performerMindId, out performerMind))
+            {
                 performerMind = null;
             };
 
-            if(!_mindSystem.TryGetMind(target, out var targetMindId, out targetMind)){
+            if (!_mindSystem.TryGetMind(target, out var targetMindId, out targetMind))
+            {
                 targetMind = null;
             };
             //This is a terrible way to 'unattach' minds. I wanted to use UnVisit but in TransferTo's code they say
@@ -202,7 +221,7 @@ public void Swap(EntityUid performer, EntityUid target, bool end = false)
             perfComp.OriginalEntity = target;
             targetComp.OriginalEntity = performer;
         }
-
+        //It shouldn't actually be possible anymore to get trapped under most circumstances, but for niche edge cases, I am leaving this here
         public void GetTrapped(EntityUid uid)
         {
 
@@ -220,5 +239,9 @@ public void GetTrapped(EntityUid uid)
                 _metaDataSystem.SetEntityDescription(uid, Loc.GetString("telegnostic-trapped-entity-desc"));
             }
         }
+        public void OnInsulated(EntityUid uid, MindSwappedComponent component, PsionicInsulationEvent args)
+        {
+            Swap(uid, component.OriginalEntity, true);
+        }
     }
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs b/Content.Server/Psionics/Abilities/MindSwappedComponent.cs
similarity index 79%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs
rename to Content.Server/Psionics/Abilities/MindSwappedComponent.cs
index 72cd6a66ef9..82c0313bca6 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs
+++ b/Content.Server/Psionics/Abilities/MindSwappedComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Abilities.Psionics
+namespace Content.Server.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class MindSwappedComponent : Component
@@ -14,5 +14,8 @@ public sealed partial class MindSwappedComponent : Component
 
         [DataField("mindSwapReturnActionEntity")]
         public EntityUid? MindSwapReturnActionEntity;
+
+        [DataField("mindSwappedFeedback")]
+        public string MindSwappedFeedback = "mindswapped-feedback";
     }
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs
similarity index 57%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
rename to Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs
index 0fd261ef12f..ffadc61c199 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs
@@ -1,26 +1,21 @@
 using Content.Shared.Actions;
-using Content.Shared.Abilities.Psionics;
-using Content.Server.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.StatusEffect;
+using Content.Server.Electrocution;
 using Content.Server.Stunnable;
 using Content.Server.Beam;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-using Content.Server.Mind;
 using Content.Shared.Actions.Events;
 
-namespace Content.Server.Abilities.Psionics
+namespace Content.Server.Psionics.Abilities
 {
     public sealed class NoosphericZapPowerSystem : EntitySystem
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly StunSystem _stunSystem = default!;
         [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly BeamSystem _beam = default!;
-        [Dependency] private readonly MindSystem _mindSystem = default!;
+        [Dependency] private readonly ElectrocutionSystem _electrocution = default!;
 
 
         public override void Initialize()
@@ -37,10 +32,11 @@ private void OnInit(EntityUid uid, NoosphericZapPowerComponent component, Compon
             _actions.TryGetActionData( component.NoosphericZapActionEntity, out var actionData );
             if (actionData is { UseDelay: not null })
                 _actions.StartUseDelay(component.NoosphericZapActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+            if (TryComp<PsionicComponent>(uid, out var psionic))
             {
-                psionic.PsionicAbility = component.NoosphericZapActionEntity;
                 psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.NoosphericZapFeedback);
+                psionic.Amplification += 1f;
             }
         }
 
@@ -50,24 +46,32 @@ private void OnShutdown(EntityUid uid, NoosphericZapPowerComponent component, Co
             if (TryComp<PsionicComponent>(uid, out var psionic))
             {
                 psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.NoosphericZapFeedback);
+                psionic.Amplification -= 1f;
             }
         }
 
         private void OnPowerUsed(NoosphericZapPowerActionEvent args)
         {
-            if (!HasComp<PotentialPsionicComponent>(args.Target))
+            if (!TryComp<PsionicComponent>(args.Performer, out var psionic))
                 return;
 
-            if (HasComp<PsionicInsulationComponent>(args.Target))
-                return;
+            if (!HasComp<PsionicInsulationComponent>(args.Performer))
+            {
+                _beam.TryCreateBeam(args.Performer, args.Target, "LightningNoospheric");
+                _stunSystem.TryParalyze(args.Target, TimeSpan.FromSeconds(1 * psionic.Amplification), false);
 
-            _beam.TryCreateBeam(args.Performer, args.Target, "LightningNoospheric");
+                _electrocution.TryDoElectrocution(args.Target, null,
+                    (int) MathF.Round(5f * psionic.Amplification),
+                    new TimeSpan((long) MathF.Round(1f * psionic.Amplification)),
+                    true,
+                    ignoreInsulation: true);
 
-            _stunSystem.TryParalyze(args.Target, TimeSpan.FromSeconds(5), false);
-            _statusEffectsSystem.TryAddStatusEffect(args.Target, "Stutter", TimeSpan.FromSeconds(10), false, "StutteringAccent");
+                _statusEffectsSystem.TryAddStatusEffect(args.Target, "Stutter", TimeSpan.FromSeconds(2 * psionic.Amplification), false, "StutteringAccent");
 
-            _psionics.LogPowerUsed(args.Performer, "noospheric zap");
-            args.Handled = true;
+                _psionics.LogPowerUsed(args.Performer, "noopsheric zap", psionic, 6, 8);
+                args.Handled = true;
+            }
         }
     }
 }
diff --git a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
new file mode 100644
index 00000000000..24e6bbb8d3b
--- /dev/null
+++ b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
@@ -0,0 +1,111 @@
+using Content.Shared.Psionics.Abilities;
+using Content.Shared.Actions;
+using Content.Shared.Psionics.Glimmer;
+using Content.Shared.Random;
+using Content.Shared.Random.Helpers;
+using Content.Shared.StatusEffect;
+using Robust.Shared.Random;
+using Robust.Shared.Prototypes;
+using Content.Shared.Popups;
+
+namespace Content.Server.Psionics.Abilities
+{
+    public sealed class PsionicAbilitiesSystem : EntitySystem
+    {
+        [Dependency] private readonly IComponentFactory _componentFactory = default!;
+        [Dependency] private readonly IRobustRandom _random = default!;
+        [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+        [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
+        [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly SharedPopupSystem _popups = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+        }
+
+        /// <summary>
+        /// Adds a psychic power once a character rolls one. This used to be a system you have to select for. However the opt-in is no longer the text window, but is now done at character creation.
+        /// TODO: This is going to get removed when I reach Part 3 of my reworks, when I touch upon the GlimmerSystem itself and overhaul how players get powers.
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="component"></param>
+        /// <param name="args"></param>
+        public void AddPsionics(EntityUid uid)
+        {
+            if (Deleted(uid))
+                return;
+
+            AddRandomPsionicPower(uid);
+
+        }
+        public void AddRandomPsionicPower(EntityUid uid)
+        {
+            EnsureComp<PsionicComponent>(uid, out var psionic);
+
+            if (!_prototypeManager.TryIndex<WeightedRandomPrototype>("RandomPsionicPowerPool", out var pool))
+            {
+                Logger.Error("Can't index the random psionic power pool!");
+                return;
+            }
+
+            var newPool = pool;
+            foreach (var component in pool.Weights.Keys)
+            {
+                var checkedComponent = _componentFactory.GetComponent(component);
+                if (EntityManager.HasComponent(uid, checkedComponent.GetType()))
+                    newPool.Weights.Remove(component);
+            }
+
+            if (newPool.Weights.Keys != null)
+            {
+                var newComponent = _componentFactory.GetComponent(newPool.Pick());
+
+                EntityManager.AddComponent(uid, newComponent);
+                _glimmerSystem.DeltaGlimmerInput(_random.NextFloat(psionic.Amplification * psionic.Dampening, psionic.Amplification * psionic.Dampening * 5));
+            }
+            return;
+        }
+
+        public void RemovePsionics(EntityUid uid)
+        {
+            if (RemComp<PotentialPsionicComponent>(uid))
+            {
+                _popups.PopupEntity(Loc.GetString("mindbreaking-feedback", ("entity", uid)), uid, PopupType.Medium);
+            }
+
+            if (!TryComp<PsionicComponent>(uid, out var psionic))
+                return;
+
+            if (!psionic.Removable)
+                return;
+
+            if (!_prototypeManager.TryIndex<WeightedRandomPrototype>("RandomPsionicPowerPool", out var pool))
+            {
+                Logger.Error("Can't index the random psionic power pool!");
+                return;
+            }
+
+            foreach (var compName in pool.Weights.Keys)
+            {
+                // component moment
+                var comp = _componentFactory.GetComponent(compName);
+                if (EntityManager.TryGetComponent(uid, comp.GetType(), out var psionicPower))
+                    RemComp(uid, psionicPower);
+            }
+            if (psionic.PsionicAbility != null){
+                _actionsSystem.TryGetActionData( psionic.PsionicAbility, out var psiAbility );
+                if (psiAbility != null){
+                    _actionsSystem.RemoveAction(uid, psiAbility.Owner);
+                }
+            }
+
+            _statusEffectsSystem.TryAddStatusEffect(uid, "Stutter", TimeSpan.FromMinutes(5), false, "StutteringAccent");
+
+            _glimmerSystem.DeltaGlimmerOutput(-_random.NextFloat(psionic.Amplification * psionic.Dampening * 5, psionic.Amplification * psionic.Dampening * 10));
+            RemComp<PsionicComponent>(uid);
+            RemComp<PotentialPsionicComponent>(uid);
+        }
+    }
+}
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
similarity index 50%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
rename to Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
index 097a0cb750b..15fc092ebcf 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
@@ -1,45 +1,30 @@
 using Robust.Shared.Audio;
-using Robust.Server.GameObjects;
-using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
-using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.DoAfter;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Actions;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.FixedPoint;
+using Content.Shared.Mobs;
 using Content.Shared.Popups;
 using Content.Shared.Psionics.Events;
-using Content.Shared.Tag;
-using Content.Shared.Examine;
-using static Content.Shared.Examine.ExamineSystemShared;
 using Robust.Shared.Timing;
-using Content.Server.Mind;
 using Content.Shared.Actions.Events;
-using Content.Shared.Chemistry.EntitySystems;
 using Robust.Server.Audio;
 
-namespace Content.Server.Abilities.Psionics
+namespace Content.Server.Psionics.Abilities
 {
     public sealed class PsionicRegenerationPowerSystem : EntitySystem
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
-        [Dependency] private readonly SolutionContainerSystem _solutionSystem = default!;
         [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
         [Dependency] private readonly AudioSystem _audioSystem = default!;
-        [Dependency] private readonly TagSystem _tagSystem = default!;
         [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
         [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly MindSystem _mindSystem = default!;
-        [Dependency] private readonly ExamineSystemShared _examine = default!;
-
 
         public override void Initialize()
         {
@@ -47,7 +32,7 @@ public override void Initialize()
             SubscribeLocalEvent<PsionicRegenerationPowerComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<PsionicRegenerationPowerComponent, ComponentShutdown>(OnShutdown);
             SubscribeLocalEvent<PsionicRegenerationPowerComponent, PsionicRegenerationPowerActionEvent>(OnPowerUsed);
-
+            SubscribeLocalEvent<PsionicRegenerationPowerComponent, MobStateChangedEvent>(OnMobStateChangedEvent);
             SubscribeLocalEvent<PsionicRegenerationPowerComponent, DispelledEvent>(OnDispelled);
             SubscribeLocalEvent<PsionicRegenerationPowerComponent, PsionicRegenerationDoAfterEvent>(OnDoAfter);
         }
@@ -58,34 +43,84 @@ private void OnInit(EntityUid uid, PsionicRegenerationPowerComponent component,
             _actions.TryGetActionData( component.PsionicRegenerationActionEntity, out var actionData );
             if (actionData is { UseDelay: not null })
                 _actions.StartUseDelay(component.PsionicRegenerationActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+            if (TryComp<PsionicComponent>(uid, out var psionic))
             {
-                psionic.PsionicAbility = component.PsionicRegenerationActionEntity;
                 psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.RegenerationFeedback);
+                psionic.Amplification += 0.5f;
+                psionic.Dampening += 0.5f;
             }
         }
 
         private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent component, PsionicRegenerationPowerActionEvent args)
         {
+            if (!TryComp<PsionicComponent>(uid, out var psionic))
+                return;
+
             var ev = new PsionicRegenerationDoAfterEvent(_gameTiming.CurTime);
             var doAfterArgs = new DoAfterArgs(EntityManager, uid, component.UseDelay, ev, uid);
 
+            //Prevent the power from ignoring its own cooldown
+            _actions.TryGetActionData(component.PsionicRegenerationActionEntity, out var actionData);
+            var curTime = _gameTiming.CurTime;
+            if (actionData != null && actionData.Cooldown.HasValue && actionData.Cooldown.Value.End > curTime)
+                return;
+
             _doAfterSystem.TryStartDoAfter(doAfterArgs, out var doAfterId);
 
             component.DoAfter = doAfterId;
 
-            _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-begin", ("entity", uid)),
-                uid,
-                // TODO: Use LoS-based Filter when one is available.
-                Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !_examine.InRangeUnOccluded(uid, entity, ExamineRange, null)),
-                true,
-                PopupType.Medium);
+            _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-begin", ("entity", uid)), uid, PopupType.Medium);
+            _audioSystem.PlayPvs(component.SoundUse, uid, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
+
+            _psionics.LogPowerUsed(uid, "psionic regeneration", psionic, 6, 8);
 
-            _audioSystem.PlayPvs(component.SoundUse, component.Owner, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
-            _psionics.LogPowerUsed(uid, "psionic regeneration");
             args.Handled = true;
         }
 
+        /// <summary>
+        /// Regenerators automatically activate upon crit, provided the power was off cooldown at that exact point in time.
+        /// Self-rescusitation is also far more costly, and extremely obvious
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="component"></param>
+        /// <param name="args"></param>
+        private void OnMobStateChangedEvent(EntityUid uid, PsionicRegenerationPowerComponent component, MobStateChangedEvent args)
+        {
+            if (!TryComp<PsionicComponent>(uid, out var psionic))
+                return;
+
+            if (HasComp<PsionicInsulationComponent>(uid))
+                return;
+
+            if (args.NewMobState is MobState.Critical)
+            {
+                _actions.TryGetActionData(component.PsionicRegenerationActionEntity, out var actionData);
+                var curTime = _gameTiming.CurTime;
+                if (actionData != null && actionData.Cooldown.HasValue && actionData.Cooldown.Value.End > curTime)
+                    return;
+
+                if (actionData is { UseDelay: not null })
+                {
+                    component.SelfRevive = true;
+                    _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, uid, component.UseDelay, new PsionicRegenerationDoAfterEvent(_gameTiming.CurTime), uid, args.Target, uid)
+                    {
+                        BreakOnUserMove = false,
+                        BreakOnTargetMove = false,
+                        BreakOnWeightlessMove = false,
+                        BreakOnDamage = false,
+                        RequireCanInteract = false,
+                    });
+                    _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-self-revive", ("entity", uid)), uid, PopupType.MediumCaution);
+                    _audioSystem.PlayPvs(component.SoundUse, uid, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
+
+                    _psionics.LogPowerUsed(uid, "psionic regeneration", psionic, 10, 20);
+
+                    _actions.StartUseDelay(component.PsionicRegenerationActionEntity);
+                }
+            }
+        }
+
         private void OnShutdown(EntityUid uid, PsionicRegenerationPowerComponent component, ComponentShutdown args)
         {
             _actions.RemoveAction(uid, component.PsionicRegenerationActionEntity);
@@ -93,6 +128,9 @@ private void OnShutdown(EntityUid uid, PsionicRegenerationPowerComponent compone
             if (TryComp<PsionicComponent>(uid, out var psionic))
             {
                 psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.RegenerationFeedback);
+                psionic.Amplification -= 0.5f;
+                psionic.Dampening -= 0.5f;
             }
         }
 
@@ -111,19 +149,24 @@ private void OnDoAfter(EntityUid uid, PsionicRegenerationPowerComponent componen
         {
             component.DoAfter = null;
 
+            if (!TryComp<PsionicComponent>(uid, out var psionic))
+                return;
+
             if (!TryComp<BloodstreamComponent>(uid, out var stream))
                 return;
 
-            // DoAfter has no way to run a callback during the process to give
-            // small doses of the reagent, so we wait until either the action
-            // is cancelled (by being dispelled) or complete to give the
-            // appropriate dose. A timestamp delta is used to accomplish this.
             var percentageComplete = Math.Min(1f, (_gameTiming.CurTime - args.StartedAt).TotalSeconds / component.UseDelay);
 
             var solution = new Solution();
-            solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(component.EssenceAmount * percentageComplete));
+            solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(Math.Min(component.EssenceAmount * percentageComplete + 10f * psionic.Dampening, 15f)));
             _bloodstreamSystem.TryAddToChemicals(uid, solution, stream);
+            if (component.SelfRevive == true)
+            {
+                var critSolution = new Solution();
+                critSolution.AddReagent("Epinephrine", MathF.Min(5 + 5 * psionic.Dampening, 15));
+                _bloodstreamSystem.TryAddToChemicals(uid, critSolution, stream);
+                component.SelfRevive = false;
+            }
         }
     }
 }
-
diff --git a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
new file mode 100644
index 00000000000..f3e2cc69fd5
--- /dev/null
+++ b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
@@ -0,0 +1,157 @@
+using Content.Shared.Actions;
+using Content.Shared.DoAfter;
+using Content.Shared.Psionics.Abilities;
+using Content.Shared.Psionics.Glimmer;
+using Content.Server.Atmos.Components;
+using Content.Server.Weapons.Ranged.Systems;
+using Robust.Server.GameObjects;
+using Content.Shared.Actions.Events;
+using Content.Server.Explosion.Components;
+using Robust.Server.Audio;
+using Robust.Shared.Timing;
+using Content.Shared.Popups;
+using Content.Shared.Psionics.Events;
+using Content.Shared.Psionics;
+
+namespace Content.Server.Psionics.Abilities
+{
+    public sealed class PyrokinesisPowerSystem : EntitySystem
+    {
+        [Dependency] private readonly TransformSystem _xform = default!;
+        [Dependency] private readonly SharedActionsSystem _actions = default!;
+        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
+        [Dependency] private readonly GunSystem _gunSystem = default!;
+        [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
+        [Dependency] private readonly SharedPopupSystem _popup = default!;
+        [Dependency] private readonly AudioSystem _audioSystem = default!;
+        [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<PyrokinesisPowerComponent, ComponentInit>(OnInit);
+            SubscribeLocalEvent<PyrokinesisPowerComponent, ComponentShutdown>(OnShutdown);
+            SubscribeLocalEvent<PyrokinesisPowerActionEvent>(OnPowerUsed);
+            SubscribeLocalEvent<PyrokinesisPrechargeActionEvent>(OnPrecharge);
+            SubscribeLocalEvent<PyrokinesisPowerComponent, PyrokinesisPrechargeDoAfterEvent>(OnDoAfter);
+        }
+
+        private void OnInit(EntityUid uid, PyrokinesisPowerComponent component, ComponentInit args)
+        {
+            _actions.AddAction(uid, ref component.PyrokinesisPrechargeActionEntity, component.PyrokinesisPrechargeActionId);
+            _actions.TryGetActionData(component.PyrokinesisPrechargeActionEntity, out var actionData);
+            if (actionData is { UseDelay: not null })
+                _actions.StartUseDelay(component.PyrokinesisPrechargeActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.PyrokinesisFeedback);
+                psionic.Amplification += 1f;
+            }
+        }
+
+        private void OnPrecharge(PyrokinesisPrechargeActionEvent args)
+        {
+            if (!HasComp<PsionicInsulationComponent>(args.Performer)
+                && TryComp<PsionicComponent>(args.Performer, out var psionic)
+                && TryComp<PyrokinesisPowerComponent>(args.Performer, out var pyroComp))
+            {
+                _actions.AddAction(args.Performer, ref pyroComp.PyrokinesisActionEntity, pyroComp.PyrokinesisActionId);
+                _actions.TryGetActionData(pyroComp.PyrokinesisActionEntity, out var actionData);
+                if (actionData is { UseDelay: not null })
+                    _actions.StartUseDelay(pyroComp.PyrokinesisActionEntity);
+                _actions.TryGetActionData(pyroComp.PyrokinesisPrechargeActionEntity, out var prechargeData);
+                if (prechargeData is { UseDelay: not null })
+                    _actions.StartUseDelay(pyroComp.PyrokinesisPrechargeActionEntity);
+
+                if (_glimmerSystem.GlimmerOutput >= 100 * psionic.Dampening)
+                {
+                    _popup.PopupEntity(Loc.GetString(pyroComp.PyrokinesisObviousPopup, ("entity", args.Performer)), args.Performer, PopupType.Medium);
+                    _audioSystem.PlayPvs(pyroComp.SoundUse, args.Performer);
+                }
+                else
+                    _popup.PopupEntity(Loc.GetString(pyroComp.PyrokinesisSubtlePopup), args.Performer, args.Performer, PopupType.Medium);
+
+                pyroComp.FireballThrown = false;
+
+                var ev = new PyrokinesisPrechargeDoAfterEvent(_gameTiming.CurTime);
+                var duration = TimeSpan.FromSeconds(pyroComp.ResetDuration.Seconds + psionic.Dampening);
+
+                _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.Performer, duration, ev, args.Performer, args.Performer, args.Performer)
+                {
+                    BlockDuplicate = true,
+                    Hidden = true,
+                }, out var doAfterId);
+
+                pyroComp.ResetDoAfter = doAfterId;
+            }
+        }
+
+        private void OnShutdown(EntityUid uid, PyrokinesisPowerComponent component, ComponentShutdown args)
+        {
+            _actions.RemoveAction(uid, component.PyrokinesisPrechargeActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.PyrokinesisFeedback);
+                psionic.Amplification -= 1f;
+            }
+        }
+
+        private void OnPowerUsed(PyrokinesisPowerActionEvent args)
+        {
+            if (!HasComp<PsionicInsulationComponent>(args.Performer)
+                && TryComp<PsionicComponent>(args.Performer, out var psionic)
+                && TryComp<PyrokinesisPowerComponent>(args.Performer, out var pyroComp))
+            {
+                var spawnCoords = Transform(args.Performer).Coordinates;
+
+                var ent = Spawn("ProjectileAnomalyFireball", spawnCoords);
+
+                if (_glimmerSystem.GlimmerOutput >= 25 * psionic.Dampening)
+                    EnsureComp<PsionicallyInvisibleComponent>(ent);
+
+                if (TryComp<ExplosiveComponent>(ent, out var fireball))
+                {
+                    var psionicFactor = psionic.Amplification * _glimmerSystem.GetGlimmerEquilibriumRatio();
+                    fireball.MaxIntensity = 2 * psionicFactor;
+                    fireball.IntensitySlope = 1 * psionicFactor;
+                    fireball.TotalIntensity = 25 * psionicFactor;
+
+                    if (_glimmerSystem.GlimmerOutput >= GlimmerSystem.GlimmerEquilibrium)
+                        fireball.CanCreateVacuum = true;
+                    else fireball.CanCreateVacuum = false;
+
+                    if (psionic.Amplification > 5)
+                        if (EnsureComp<IgniteOnCollideComponent>(ent, out var ignite))
+                            ignite.FireStacks = 0.2f * psionic.Amplification;
+                }
+
+                var direction = args.Target.ToMapPos(EntityManager, _xform) - spawnCoords.ToMapPos(EntityManager, _xform);
+
+                _gunSystem.ShootProjectile(ent, direction, new System.Numerics.Vector2(0, 0), args.Performer, args.Performer, 20f);
+                _actions.RemoveAction(args.Performer, pyroComp.PyrokinesisActionEntity);
+                _doAfterSystem.Cancel(pyroComp.ResetDoAfter);
+                _psionics.LogPowerUsed(args.Performer, "pyrokinesis", psionic, 6, 8);
+                pyroComp.FireballThrown = true;
+                args.Handled = true;
+            }
+        }
+
+        private void OnDoAfter(EntityUid uid, PyrokinesisPowerComponent component, PyrokinesisPrechargeDoAfterEvent args)
+        {
+            if (!args.Cancelled && TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                if (!component.FireballThrown)
+                {
+                    _actions.TryGetActionData(component.PyrokinesisPrechargeActionEntity, out var actionData);
+                    if (actionData is { UseDelay: not null })
+                        _actions.SetCooldown(component.PyrokinesisPrechargeActionEntity, TimeSpan.FromSeconds(15 - psionic.Dampening));
+
+                    _popup.PopupEntity(Loc.GetString(component.PyrokinesisRefundCooldown), uid, uid, PopupType.Medium);
+                }
+                _actions.RemoveAction(uid, component.PyrokinesisActionEntity);
+            }
+        }
+    }
+}
diff --git a/Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs b/Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs
new file mode 100644
index 00000000000..cc67badbe72
--- /dev/null
+++ b/Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs
@@ -0,0 +1,72 @@
+using Content.Server.Body.Systems;
+using Content.Server.Body.Components;
+using Content.Shared.Actions;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Popups;
+using Content.Shared.Psionics.Abilities;
+using Content.Shared.Actions.Events;
+using Content.Shared.FixedPoint;
+
+namespace Content.Server.Psionics.Abilities
+{
+    public sealed class MassSleepPowerSystem : EntitySystem
+    {
+        [Dependency] private readonly SharedActionsSystem _actions = default!;
+        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
+        [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
+        [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<RegenerativeStasisPowerComponent, ComponentInit>(OnInit);
+            SubscribeLocalEvent<RegenerativeStasisPowerComponent, ComponentShutdown>(OnShutdown);
+            SubscribeLocalEvent<RegenerativeStasisPowerComponent, RegenerativeStasisPowerActionEvent>(OnPowerUsed);
+        }
+
+        private void OnInit(EntityUid uid, RegenerativeStasisPowerComponent component, ComponentInit args)
+        {
+            _actions.AddAction(uid, ref component.RegenerativeStasisActionEntity, component.RegenerativeStasisActionId);
+            _actions.TryGetActionData(component.RegenerativeStasisActionEntity, out var actionData);
+            if (actionData is { UseDelay: not null })
+                _actions.StartUseDelay(component.RegenerativeStasisActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.RegenerativeStasisFeedback);
+                psionic.Amplification += 0.5f;
+                psionic.Dampening += 0.5f;
+            }
+        }
+
+        private void OnShutdown(EntityUid uid, RegenerativeStasisPowerComponent component, ComponentShutdown args)
+        {
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.RegenerativeStasisFeedback);
+                psionic.Amplification -= 0.5f;
+                psionic.Dampening -= 0.5f;
+            }
+            _actions.RemoveAction(uid, component.RegenerativeStasisActionEntity);
+        }
+
+        private void OnPowerUsed(EntityUid uid, RegenerativeStasisPowerComponent component, RegenerativeStasisPowerActionEvent args)
+        {
+            if (TryComp<PsionicComponent>(uid, out var psionic)
+            && !HasComp<PsionicInsulationComponent>(uid)
+            && !HasComp<PsionicInsulationComponent>(args.Target)
+            && TryComp<BloodstreamComponent>(args.Target, out var stream))
+            {
+                var solution = new Solution();
+                solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(MathF.Min(2.5f * psionic.Amplification + psionic.Dampening, 15f)));
+                solution.AddReagent("Epinephrine", FixedPoint2.New(MathF.Min(2.5f * psionic.Dampening + psionic.Amplification, 15f)));
+                solution.AddReagent("Nocturine", 10f + (1 * psionic.Amplification + psionic.Dampening));
+                _bloodstreamSystem.TryAddToChemicals(args.Target, solution, stream);
+                _popupSystem.PopupEntity(Loc.GetString("regenerative-stasis-begin", ("entity", uid)), uid, PopupType.Medium);
+                _psionics.LogPowerUsed(uid, "regenerative stasis", psionic, 4, 6);
+                args.Handled = true;
+            }
+        }
+    }
+}
diff --git a/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs b/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs
new file mode 100644
index 00000000000..c5f8471a654
--- /dev/null
+++ b/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs
@@ -0,0 +1,104 @@
+using Content.Shared.Actions;
+using Content.Shared.Psionics.Abilities;
+using Content.Shared.Mind.Components;
+using Content.Shared.Actions.Events;
+using Content.Shared.Mobs;
+using Content.Shared.Storage.Components;
+
+namespace Content.Server.Psionics.Abilities
+{
+    public sealed class TelegnosisPowerSystem : EntitySystem
+    {
+        [Dependency] private readonly SharedActionsSystem _actions = default!;
+        [Dependency] private readonly MindSwapPowerSystem _mindSwap = default!;
+        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<TelegnosisPowerComponent, ComponentInit>(OnInit);
+            SubscribeLocalEvent<TelegnosisPowerComponent, ComponentShutdown>(OnShutdown);
+            SubscribeLocalEvent<TelegnosisPowerComponent, TelegnosisPowerActionEvent>(OnPowerUsed);
+            SubscribeLocalEvent<TelegnosticProjectionComponent, MindRemovedMessage>(OnMindRemoved);
+            SubscribeLocalEvent<TelegnosisPowerComponent, DispelledEvent>(OnDispelled);
+            SubscribeLocalEvent<TelegnosisPowerComponent, MobStateChangedEvent>(OnMobstateChanged);
+            SubscribeLocalEvent<TelegnosisPowerComponent, InsertIntoEntityStorageAttemptEvent>(OnStorageInsertAttempt);
+        }
+
+        private void OnInit(EntityUid uid, TelegnosisPowerComponent component, ComponentInit args)
+        {
+            _actions.AddAction(uid, ref component.TelegnosisActionEntity, component.TelegnosisActionId );
+            _actions.TryGetActionData( component.TelegnosisActionEntity, out var actionData );
+            if (actionData is { UseDelay: not null })
+                _actions.StartUseDelay(component.TelegnosisActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.TelegnosisFeedback);
+                psionic.Amplification += 0.3f;
+                psionic.Dampening += 0.3f;
+            }
+        }
+
+        private void OnShutdown(EntityUid uid, TelegnosisPowerComponent component, ComponentShutdown args)
+        {
+            _actions.RemoveAction(uid, component.TelegnosisActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.TelegnosisFeedback);
+                psionic.Amplification -= 0.3f;
+                psionic.Dampening -= 0.3f;
+            }
+        }
+
+        private void OnPowerUsed(EntityUid uid, TelegnosisPowerComponent component, TelegnosisPowerActionEvent args)
+        {
+            if (!TryComp<PsionicComponent>(uid, out var psionic))
+                return;
+
+            if (HasComp<PsionicInsulationComponent>(uid))
+                return;
+
+            var projection = Spawn(component.Prototype, Transform(uid).Coordinates);
+            Transform(projection).AttachToGridOrMap();
+            component.OriginalEntity = uid;
+            component.IsProjecting = true;
+            component.ProjectionUid = projection;
+            _mindSwap.Swap(uid, projection);
+
+            if (EnsureComp<TelegnosticProjectionComponent>(projection, out var projectionComponent))
+                projectionComponent.OriginalEntity = uid;
+
+            _psionics.LogPowerUsed(uid, "telegnosis", psionic, 8, 12);
+
+            args.Handled = true;
+        }
+        private void OnMindRemoved(EntityUid uid, TelegnosticProjectionComponent component, MindRemovedMessage args)
+        {
+            if (TryComp<TelegnosisPowerComponent>(component.OriginalEntity, out var originalEntity))
+                originalEntity.IsProjecting = false;
+
+            QueueDel(uid);
+        }
+
+        private void OnDispelled(EntityUid uid, TelegnosisPowerComponent component, DispelledEvent args)
+        {
+            if (component.IsProjecting)
+                _mindSwap.Swap(uid, component.ProjectionUid);
+        }
+
+        private void OnMobstateChanged(EntityUid uid, TelegnosisPowerComponent component, MobStateChangedEvent args)
+        {
+            if (component.IsProjecting && args.NewMobState is MobState.Critical
+            || component.IsProjecting && args.NewMobState is MobState.Dead)
+                _mindSwap.Swap(uid, component.ProjectionUid);
+        }
+
+        private void OnStorageInsertAttempt(EntityUid uid, TelegnosisPowerComponent component, InsertIntoEntityStorageAttemptEvent args)
+        {
+            if (component.IsProjecting)
+                _mindSwap.Swap(uid, component.ProjectionUid);
+        }
+    }
+}
diff --git a/Content.Server/Nyanotrasen/Psionics/AcceptPsionicsEui.cs b/Content.Server/Psionics/AcceptPsionicsEui.cs
similarity index 95%
rename from Content.Server/Nyanotrasen/Psionics/AcceptPsionicsEui.cs
rename to Content.Server/Psionics/AcceptPsionicsEui.cs
index 80fd8946f28..7c652664c64 100644
--- a/Content.Server/Nyanotrasen/Psionics/AcceptPsionicsEui.cs
+++ b/Content.Server/Psionics/AcceptPsionicsEui.cs
@@ -1,7 +1,7 @@
 using Content.Shared.Psionics;
 using Content.Shared.Eui;
 using Content.Server.EUI;
-using Content.Server.Abilities.Psionics;
+using Content.Server.Psionics.Abilities;
 
 namespace Content.Server.Psionics
 {
diff --git a/Content.Server/Nyanotrasen/Psionics/AntiPsychicWeaponComponent.cs b/Content.Server/Psionics/AntiPsychicWeaponComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/AntiPsychicWeaponComponent.cs
rename to Content.Server/Psionics/AntiPsychicWeaponComponent.cs
diff --git a/Content.Server/Nyanotrasen/Audio/GlimmerSoundComponent.cs b/Content.Server/Psionics/Audio/GlimmerSoundComponent.cs
similarity index 80%
rename from Content.Server/Nyanotrasen/Audio/GlimmerSoundComponent.cs
rename to Content.Server/Psionics/Audio/GlimmerSoundComponent.cs
index 850be3e831c..9a6c62381be 100644
--- a/Content.Server/Nyanotrasen/Audio/GlimmerSoundComponent.cs
+++ b/Content.Server/Psionics/Audio/GlimmerSoundComponent.cs
@@ -2,12 +2,8 @@
 using Content.Shared.Audio;
 using Content.Shared.Psionics.Glimmer;
 using Robust.Shared.Audio;
-using Robust.Shared.ComponentTrees;
-using Robust.Shared.GameStates;
-using Robust.Shared.Physics;
-using Robust.Shared.Serialization;
 
-namespace Content.Server.Audio
+namespace Content.Server.Psionics.Audio
 {
     [RegisterComponent]
     [Access(typeof(SharedAmbientSoundSystem), typeof(GlimmerReactiveSystem))]
diff --git a/Content.Server/Nyanotrasen/Psionics/Dreams/DreamSystem.cs b/Content.Server/Psionics/Dreams/DreamSystem.cs
similarity index 93%
rename from Content.Server/Nyanotrasen/Psionics/Dreams/DreamSystem.cs
rename to Content.Server/Psionics/Dreams/DreamSystem.cs
index d6067717c94..1731c7a9bf5 100644
--- a/Content.Server/Nyanotrasen/Psionics/Dreams/DreamSystem.cs
+++ b/Content.Server/Psionics/Dreams/DreamSystem.cs
@@ -1,17 +1,14 @@
 using Content.Shared.Dataset;
 using Content.Shared.Bed.Sleep;
-using Content.Server.Chat.Systems;
 using Content.Server.Chat.Managers;
 using Robust.Shared.Random;
 using Robust.Shared.Prototypes;
-using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 
 namespace Content.Server.Psionics.Dreams
 {
     public sealed class DreamsSystem : EntitySystem
     {
-        [Dependency] private readonly ChatSystem _chat = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly IChatManager _chatManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerCommands.cs b/Content.Server/Psionics/Glimmer/GlimmerCommands.cs
similarity index 94%
rename from Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerCommands.cs
rename to Content.Server/Psionics/Glimmer/GlimmerCommands.cs
index 744f4cdb9a8..d17f1c04565 100644
--- a/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerCommands.cs
+++ b/Content.Server/Psionics/Glimmer/GlimmerCommands.cs
@@ -14,7 +14,7 @@ public sealed class GlimmerShowCommand : IConsoleCommand
     public async void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         var entMan = IoCManager.Resolve<IEntityManager>();
-        shell.WriteLine(entMan.EntitySysManager.GetEntitySystem<GlimmerSystem>().Glimmer.ToString());
+        shell.WriteLine(entMan.EntitySysManager.GetEntitySystem<GlimmerSystem>().GlimmerOutput.ToString());
     }
 }
 
@@ -34,6 +34,6 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
             return;
 
         var entMan = IoCManager.Resolve<IEntityManager>();
-        entMan.EntitySysManager.GetEntitySystem<GlimmerSystem>().Glimmer = glimmerValue;
+        entMan.EntitySysManager.GetEntitySystem<GlimmerSystem>().SetGlimmerOutput(glimmerValue);
     }
 }
diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
similarity index 95%
rename from Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs
rename to Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
index da3b07d6dab..85034574885 100644
--- a/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs
+++ b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
@@ -1,14 +1,12 @@
-using Content.Server.Audio;
+using Content.Server.Psionics.Audio;
 using Content.Server.Power.Components;
 using Content.Server.Electrocution;
 using Content.Server.Lightning;
 using Content.Server.Explosion.EntitySystems;
-using Content.Server.Construction;
 using Content.Server.Ghost;
 using Content.Server.Revenant.EntitySystems;
 using Content.Shared.Audio;
 using Content.Shared.Construction.EntitySystems;
-using Content.Shared.Coordinates.Helpers;
 using Content.Shared.GameTicking;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Verbs;
@@ -16,7 +14,6 @@
 using Content.Shared.Damage;
 using Content.Shared.Destructible;
 using Content.Shared.Construction.Components;
-using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Weapons.Melee.Components;
 using Robust.Shared.Audio;
@@ -179,7 +176,7 @@ private void AddShockVerb(EntityUid uid, SharedGlimmerReactiveComponent componen
                 Act = () =>
                 {
                     _sharedAudioSystem.PlayPvs(component.ShockNoises, args.User);
-                    _electrocutionSystem.TryDoElectrocution(args.User, null, _glimmerSystem.Glimmer / 200, TimeSpan.FromSeconds((float) _glimmerSystem.Glimmer / 100), false);
+                    _electrocutionSystem.TryDoElectrocution(args.User, null, (int) Math.Round(_glimmerSystem.GlimmerOutput / 200), TimeSpan.FromSeconds((float) _glimmerSystem.GlimmerOutput / 100), false);
                 },
                 Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/Spare/poweronoff.svg.192dpi.png")),
                 Text = Loc.GetString("power-switch-component-toggle-verb"),
@@ -193,7 +190,7 @@ private void OnDamageChanged(EntityUid uid, SharedGlimmerReactiveComponent compo
             if (args.Origin == null)
                 return;
 
-            if (!_random.Prob((float) _glimmerSystem.Glimmer / 1000))
+            if (!_random.Prob(_glimmerSystem.GlimmerOutput / 1000))
                 return;
 
             var tier = _glimmerSystem.GetGlimmerTier();
@@ -210,13 +207,13 @@ private void OnDestroyed(EntityUid uid, SharedGlimmerReactiveComponent component
             if (tier < GlimmerTier.High)
                 return;
 
-            var totalIntensity = (float) (_glimmerSystem.Glimmer * 2);
-            var slope = (float) (11 - _glimmerSystem.Glimmer / 100);
+            var totalIntensity = (float) (_glimmerSystem.GlimmerOutput * 2);
+            var slope = (float) (11 - _glimmerSystem.GlimmerOutput / 100);
             var maxIntensity = 20;
 
-            var removed = (float) _glimmerSystem.Glimmer * _random.NextFloat(0.1f, 0.15f);
-            _glimmerSystem.Glimmer -= (int) removed;
-            BeamRandomNearProber(uid, _glimmerSystem.Glimmer / 350, _glimmerSystem.Glimmer / 50);
+            var removed = (float) _glimmerSystem.GlimmerOutput * _random.NextFloat(0.1f, 0.15f);
+            _glimmerSystem.DeltaGlimmerOutput(-removed);
+            BeamRandomNearProber(uid, (int) Math.Round(_glimmerSystem.GlimmerOutput / 350), _glimmerSystem.GlimmerOutput / 50);
             _explosionSystem.QueueExplosion(uid, "Default", totalIntensity, slope, maxIntensity);
         }
 
@@ -225,7 +222,7 @@ private void OnUnanchorAttempt(EntityUid uid, SharedGlimmerReactiveComponent com
             if (_glimmerSystem.GetGlimmerTier() >= GlimmerTier.Dangerous)
             {
                 _sharedAudioSystem.PlayPvs(component.ShockNoises, args.User);
-                _electrocutionSystem.TryDoElectrocution(args.User, null, _glimmerSystem.Glimmer / 200, TimeSpan.FromSeconds((float) _glimmerSystem.Glimmer / 100), false);
+                _electrocutionSystem.TryDoElectrocution(args.User, null, (int) Math.Round(_glimmerSystem.GlimmerOutput / 200), TimeSpan.FromSeconds((float) _glimmerSystem.GlimmerOutput / 100), false);
                 args.Cancel();
             }
         }
@@ -268,7 +265,7 @@ private void Beam(EntityUid prober, EntityUid target, GlimmerTier tier, bool obe
 
             if (!lxform.Coordinates.TryDistance(EntityManager, txform.Coordinates, out var distance))
                 return;
-            if (distance > (float) (_glimmerSystem.Glimmer / 100))
+            if (distance > (float) (_glimmerSystem.GlimmerOutput / 100))
                 return;
 
             string beamproto;
diff --git a/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs b/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
new file mode 100644
index 00000000000..f0a682961a3
--- /dev/null
+++ b/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
@@ -0,0 +1,57 @@
+using Robust.Shared.Timing;
+using Robust.Shared.Configuration;
+using Content.Shared.CCVar;
+using Content.Shared.Psionics.Glimmer;
+
+namespace Content.Server.Psionics.Glimmer
+{
+    /// <summary>
+    /// Handles the passive reduction of glimmer.
+    /// </summary>
+    public sealed class PassiveGlimmerReductionSystem : EntitySystem
+    {
+        [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
+        [Dependency] private readonly IGameTiming _timing = default!;
+        [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+        /// List of glimmer values spaced by minute.
+        public List<int> GlimmerValues = new();
+
+        public TimeSpan TargetUpdatePeriod = TimeSpan.FromSeconds(6);
+        public TimeSpan NextUpdateTime = default!;
+        public TimeSpan LastUpdateTime = default!;
+
+        private float _glimmerLinearDecay;
+        private bool _enabled;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            _cfg.OnValueChanged(CCVars.GlimmerLinearDecayPerMinute, UpdatePassiveGlimmer, true);
+            _enabled = _cfg.GetCVar(CCVars.GlimmerEnabled);
+            _cfg.OnValueChanged(CCVars.GlimmerEnabled, value => _enabled = value, true);
+        }
+
+        public override void Update(float frameTime)
+        {
+            base.Update(frameTime);
+            if (!_enabled)
+                return;
+
+            var curTime = _timing.CurTime;
+            if (NextUpdateTime > curTime)
+                return;
+
+            var glimmerDecay = _glimmerLinearDecay / (60 / TargetUpdatePeriod.Seconds);
+
+            _glimmerSystem.DeltaGlimmerOutput(-glimmerDecay);
+
+            GlimmerValues.Add((int) Math.Round(_glimmerSystem.GlimmerOutput));
+
+            NextUpdateTime = curTime + TargetUpdatePeriod;
+            LastUpdateTime = curTime;
+        }
+
+        private void UpdatePassiveGlimmer(float value) => _glimmerLinearDecay = value;
+    }
+}
diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs b/Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
rename to Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs b/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
similarity index 69%
rename from Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
rename to Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
index 75125569cb5..309bd732ef7 100644
--- a/Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
+++ b/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
@@ -2,6 +2,7 @@
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Anomaly.Components;
+using Content.Shared.Mobs;
 using Content.Shared.Psionics.Glimmer;
 
 namespace Content.Server.Psionics.Glimmer
@@ -22,6 +23,7 @@ public override void Initialize()
 
             SubscribeLocalEvent<GlimmerSourceComponent, AnomalyPulseEvent>(OnAnomalyPulse);
             SubscribeLocalEvent<GlimmerSourceComponent, AnomalySupercriticalEvent>(OnAnomalySupercritical);
+            SubscribeLocalEvent<GlimmerSourceComponent, MobStateChangedEvent>(OnMobStateChanged);
         }
 
         private void OnAnomalyVesselPowerChanged(EntityUid uid, AnomalyVesselComponent component, ref PowerChangedEvent args)
@@ -45,12 +47,18 @@ private void OnAnomalyPulse(EntityUid uid, GlimmerSourceComponent component, ref
             // component.
 
             if (TryComp<AnomalyComponent>(uid, out var anomaly))
-                _glimmerSystem.Glimmer += (int) (5f * anomaly.Severity);
+                _glimmerSystem.DeltaGlimmerInput(5f * anomaly.Severity);
         }
 
         private void OnAnomalySupercritical(EntityUid uid, GlimmerSourceComponent component, ref AnomalySupercriticalEvent args)
         {
-            _glimmerSystem.Glimmer += 100;
+            _glimmerSystem.DeltaGlimmerOutput(100);
+        }
+
+        private void OnMobStateChanged(EntityUid uid, GlimmerSourceComponent component, ref MobStateChangedEvent args)
+        {
+            if (args.NewMobState != MobState.Alive)
+                component.Active = false;
         }
 
         public override void Update(float frameTime)
@@ -68,14 +76,20 @@ public override void Update(float frameTime)
 
                 if (source.Accumulator > source.SecondsPerGlimmer)
                 {
+                    var glimmerEquilibrium = GlimmerSystem.GlimmerEquilibrium;
                     source.Accumulator -= source.SecondsPerGlimmer;
+
+                    // Shorthand explanation:
+                    // This makes glimmer far more "Swingy", by making both positive and negative glimmer sources scale quite dramatically with glimmer
                     if (source.AddToGlimmer)
                     {
-                        _glimmerSystem.Glimmer++;
+                        _glimmerSystem.DeltaGlimmerInput((_glimmerSystem.GlimmerOutput > glimmerEquilibrium ? _glimmerSystem.GetGlimmerOutputInteger() : 1f)
+                        * (_glimmerSystem.GlimmerOutput < glimmerEquilibrium ? _glimmerSystem.GetGlimmerEquilibriumRatio() : 1f));
                     }
                     else
                     {
-                        _glimmerSystem.Glimmer--;
+                        _glimmerSystem.DeltaGlimmerInput(-(_glimmerSystem.GlimmerOutput > glimmerEquilibrium ? _glimmerSystem.GetGlimmerOutputInteger() : 1f)
+                        * (_glimmerSystem.GlimmerOutput > glimmerEquilibrium ? _glimmerSystem.GetGlimmerEquilibriumRatio() : 1f));
                     }
                 }
             }
diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs b/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
similarity index 87%
rename from Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
rename to Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
index 31e6b89f13d..c21444139d1 100644
--- a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
+++ b/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
@@ -1,5 +1,5 @@
-using Content.Shared.Abilities.Psionics;
-using Content.Server.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
+using Content.Shared.Psionics;
 using Content.Shared.Eye;
 using Content.Server.NPC.Systems;
 using Robust.Shared.Containers;
@@ -20,7 +20,6 @@ public override void Initialize()
             SubscribeLocalEvent<PotentialPsionicComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<PsionicInsulationComponent, ComponentInit>(OnInsulInit);
             SubscribeLocalEvent<PsionicInsulationComponent, ComponentShutdown>(OnInsulShutdown);
-            SubscribeLocalEvent<EyeComponent, ComponentInit>(OnEyeInit);
 
             /// Layer
             SubscribeLocalEvent<PsionicallyInvisibleComponent, ComponentInit>(OnInvisInit);
@@ -36,10 +35,16 @@ private void OnInit(EntityUid uid, PotentialPsionicComponent component, Componen
             SetCanSeePsionicInvisiblity(uid, false);
         }
 
+        /// <summary>
+        /// Being able to see invisible by default is no longer tracked by "Not having Potential Psionic".
+        /// Anything intended to be immune to invisibility(and mind magic in general) should instead have PsionicInsulation as a built-in component
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="component"></param>
+        /// <param name="args"></param>
         private void OnInsulInit(EntityUid uid, PsionicInsulationComponent component, ComponentInit args)
         {
-            if (!HasComp<PotentialPsionicComponent>(uid))
-                return;
+            RaiseLocalEvent(uid, new PsionicInsulationEvent());
 
             if (HasComp<PsionicInvisibilityUsedComponent>(uid))
                 _invisSystem.ToggleInvisibility(uid);
@@ -61,9 +66,6 @@ private void OnInsulInit(EntityUid uid, PsionicInsulationComponent component, Co
 
         private void OnInsulShutdown(EntityUid uid, PsionicInsulationComponent component, ComponentShutdown args)
         {
-            if (!HasComp<PotentialPsionicComponent>(uid))
-                return;
-
             SetCanSeePsionicInvisiblity(uid, false);
 
             if (!HasComp<PsionicComponent>(uid))
@@ -86,6 +88,7 @@ private void OnInvisInit(EntityUid uid, PsionicallyInvisibleComponent component,
             _visibilitySystem.AddLayer(uid, visibility, (int) VisibilityFlags.PsionicInvisibility, false);
             _visibilitySystem.RemoveLayer(uid, visibility, (int) VisibilityFlags.Normal, false);
             _visibilitySystem.RefreshVisibility(uid, visibility);
+            SetCanSeePsionicInvisiblity(uid, true);
         }
 
 
@@ -96,13 +99,10 @@ private void OnInvisShutdown(EntityUid uid, PsionicallyInvisibleComponent compon
                 _visibilitySystem.RemoveLayer(uid, visibility, (int) VisibilityFlags.PsionicInvisibility, false);
                 _visibilitySystem.AddLayer(uid, visibility, (int) VisibilityFlags.Normal, false);
                 _visibilitySystem.RefreshVisibility(uid, visibility);
+                SetCanSeePsionicInvisiblity(uid, false);
             }
         }
 
-        private void OnEyeInit(EntityUid uid, EyeComponent component, ComponentInit args)
-        {
-            //SetCanSeePsionicInvisiblity(uid, true); //JJ Comment - Not allowed to modifies .yml on spawn any longer. See UninitializedSaveTest.
-        }
         private void OnEntInserted(EntityUid uid, PsionicallyInvisibleComponent component, EntInsertedIntoContainerMessage args)
         {
             DirtyEntity(args.Entity);
@@ -125,7 +125,7 @@ public void SetCanSeePsionicInvisiblity(EntityUid uid, bool set)
             {
                 if (EntityManager.TryGetComponent(uid, out EyeComponent? eye))
                 {
-                    _eye.SetVisibilityMask(uid, eye.VisibilityMask & ~ (int) VisibilityFlags.PsionicInvisibility, eye);
+                    _eye.SetVisibilityMask(uid, eye.VisibilityMask & ~(int) VisibilityFlags.PsionicInvisibility, eye);
                 }
             }
         }
diff --git a/Content.Server/Psionics/PotentialPsionicComponent.cs b/Content.Server/Psionics/PotentialPsionicComponent.cs
new file mode 100644
index 00000000000..e874296a4c3
--- /dev/null
+++ b/Content.Server/Psionics/PotentialPsionicComponent.cs
@@ -0,0 +1,21 @@
+namespace Content.Server.Psionics
+{
+    [RegisterComponent]
+    public sealed partial class PotentialPsionicComponent : Component
+    {
+        /// <summary>
+        /// The base chance of an entity rolling psychic powers, which is increased by other modifiers such as glimmer.
+        /// </summary>
+        /// <remarks>
+        /// I have increased this to 10% up from its original value of 2%, because I estimate that most people won't take the Latent Psychic trait
+        /// Simply because they might not even know it exists
+        /// </remarks>
+        [DataField("chance")]
+        public float Chance = 0.10f;
+
+        /// <summary>
+        /// YORO (you only reroll once)
+        /// </summary>
+        public bool Rerolled = false;
+    }
+}
diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicAwaitingPlayerComponent.cs b/Content.Server/Psionics/PsionicAwaitingPlayerComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/PsionicAwaitingPlayerComponent.cs
rename to Content.Server/Psionics/PsionicAwaitingPlayerComponent.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicBonusChanceComponent.cs b/Content.Server/Psionics/PsionicBonusChanceComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/PsionicBonusChanceComponent.cs
rename to Content.Server/Psionics/PsionicBonusChanceComponent.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicsCommands.cs b/Content.Server/Psionics/PsionicsCommands.cs
similarity index 82%
rename from Content.Server/Nyanotrasen/Psionics/PsionicsCommands.cs
rename to Content.Server/Psionics/PsionicsCommands.cs
index 959251d1fb7..76c9022151e 100644
--- a/Content.Server/Nyanotrasen/Psionics/PsionicsCommands.cs
+++ b/Content.Server/Psionics/PsionicsCommands.cs
@@ -1,9 +1,7 @@
 using Content.Server.Administration;
 using Content.Shared.Administration;
-using Content.Shared.Abilities.Psionics;
-using Content.Shared.Mobs.Components;
+using Content.Shared.Psionics.Abilities;
 using Robust.Shared.Console;
-using Robust.Server.GameObjects;
 using Content.Shared.Actions;
 using Robust.Shared.Player;
 
@@ -19,7 +17,8 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         SharedActionsSystem actions = default!;
         var entMan = IoCManager.Resolve<IEntityManager>();
-        foreach (var (actor, mob, psionic, meta) in entMan.EntityQuery<ActorComponent, MobStateComponent, PsionicComponent, MetaDataComponent>()){
+        foreach (var (actor, psionic, meta) in entMan.EntityQuery<ActorComponent, PsionicComponent, MetaDataComponent>())
+        {
             // filter out xenos, etc, with innate telepathy
             actions.TryGetActionData( psionic.PsionicAbility, out var actionData );
             if (actionData == null || actionData.ToString() == null)
diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs
similarity index 89%
rename from Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
rename to Content.Server/Psionics/PsionicsSystem.cs
index 5a96af2e96b..6799b0bd3f5 100644
--- a/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Psionics/PsionicsSystem.cs
@@ -1,19 +1,14 @@
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.StatusEffect;
-using Content.Shared.Mobs;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Damage.Events;
-using Content.Shared.IdentityManagement;
 using Content.Shared.CCVar;
-using Content.Server.Abilities.Psionics;
-using Content.Server.Chat.Systems;
+using Content.Server.Psionics.Abilities;
 using Content.Server.Electrocution;
 using Content.Server.NPC.Components;
 using Content.Server.NPC.Systems;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Random;
 
@@ -27,7 +22,6 @@ public sealed class PsionicsSystem : EntitySystem
         [Dependency] private readonly ElectrocutionSystem _electrocutionSystem = default!;
         [Dependency] private readonly MindSwapPowerSystem _mindSwapPowerSystem = default!;
         [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
-        [Dependency] private readonly ChatSystem _chat = default!;
         [Dependency] private readonly NpcFactionSystem _npcFactonSystem = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
@@ -54,6 +48,7 @@ public override void Initialize()
             SubscribeLocalEvent<AntiPsionicWeaponComponent, StaminaMeleeHitEvent>(OnStamHit);
 
             SubscribeLocalEvent<PsionicComponent, ComponentInit>(OnInit);
+            SubscribeLocalEvent<PsionicComponent, MapInitEvent>(OnStartup);
             SubscribeLocalEvent<PsionicComponent, ComponentRemove>(OnRemove);
         }
 
@@ -87,7 +82,11 @@ private void OnMeleeHit(EntityUid uid, AntiPsionicWeaponComponent component, Mel
                     _electrocutionSystem.TryDoElectrocution(args.User, null, 20, TimeSpan.FromSeconds(5), false);
             }
         }
-
+        private void OnStartup(EntityUid uid, PsionicComponent component, MapInitEvent args)
+        {
+            component.Amplification += _random.NextFloat(0.3f, 1.1f);
+            component.Dampening += _random.NextFloat(0.3f, 1.1f);
+        }
         private void OnInit(EntityUid uid, PsionicComponent component, ComponentInit args)
         {
             if (!component.Removable)
@@ -104,7 +103,7 @@ private void OnInit(EntityUid uid, PsionicComponent component, ComponentInit arg
 
         private void OnRemove(EntityUid uid, PsionicComponent component, ComponentRemove args)
         {
-            if (!TryComp<NpcFactionMemberComponent>(uid, out var factions))
+            if (!HasComp<NpcFactionMemberComponent>(uid))
                 return;
 
             _npcFactonSystem.RemoveFaction(uid, "PsionicInterloper");
@@ -128,30 +127,25 @@ private void OnStamHit(EntityUid uid, AntiPsionicWeaponComponent component, Stam
 
         public void RollPsionics(EntityUid uid, PotentialPsionicComponent component, bool applyGlimmer = true, float multiplier = 1f)
         {
-            if (HasComp<PsionicComponent>(uid))
-                return;
-
             if (!_cfg.GetCVar(CCVars.PsionicRollsEnabled))
                 return;
 
             var chance = component.Chance;
-            var warn = true;
             if (TryComp<PsionicBonusChanceComponent>(uid, out var bonus))
             {
                 chance *= bonus.Multiplier;
                 chance += bonus.FlatBonus;
-                warn = bonus.Warn;
             }
 
             if (applyGlimmer)
-                chance += ((float) _glimmerSystem.Glimmer / 1000);
+                chance += (float) _glimmerSystem.GlimmerOutput / 1000;
 
             chance *= multiplier;
 
             chance = Math.Clamp(chance, 0, 1);
 
             if (_random.Prob(chance))
-                _psionicAbilitiesSystem.AddPsionics(uid, warn);
+                _psionicAbilitiesSystem.AddPsionics(uid);
         }
 
         public void RerollPsionics(EntityUid uid, PotentialPsionicComponent? psionic = null, float bonusMuliplier = 1f)
diff --git a/Content.Server/Nyanotrasen/Chat/TSayCommand.cs b/Content.Server/Psionics/Telepathy/TSayCommand.cs
similarity index 95%
rename from Content.Server/Nyanotrasen/Chat/TSayCommand.cs
rename to Content.Server/Psionics/Telepathy/TSayCommand.cs
index 9ba27b65d71..8fbaa5e17b2 100644
--- a/Content.Server/Nyanotrasen/Chat/TSayCommand.cs
+++ b/Content.Server/Psionics/Telepathy/TSayCommand.cs
@@ -1,11 +1,10 @@
 using Content.Server.Chat.Systems;
 using Content.Shared.Administration;
-using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
 using Robust.Shared.Player;
 
-namespace Content.Server.Chat.Commands
+namespace Content.Server.Psionics.Telepathy
 {
     [AnyCommand]
     internal sealed class TSayCommand : IConsoleCommand
diff --git a/Content.Server/Nyanotrasen/Chat/TelepathicRepeaterComponent.cs b/Content.Server/Psionics/Telepathy/TelepathicRepeaterComponent.cs
similarity index 82%
rename from Content.Server/Nyanotrasen/Chat/TelepathicRepeaterComponent.cs
rename to Content.Server/Psionics/Telepathy/TelepathicRepeaterComponent.cs
index fc199f4332a..6e194f76c8f 100644
--- a/Content.Server/Nyanotrasen/Chat/TelepathicRepeaterComponent.cs
+++ b/Content.Server/Psionics/Telepathy/TelepathicRepeaterComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Nyanotrasen.Chat
+namespace Content.Server.Psionics.Telepathy
 {
     /// <summary>
     /// Repeats whatever is happening in telepathic chat.
diff --git a/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs b/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs
similarity index 79%
rename from Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs
rename to Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs
index 58ed1782741..917511d1477 100644
--- a/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs
+++ b/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs
@@ -2,7 +2,8 @@
 using Content.Server.Administration.Managers;
 using Content.Server.Chat.Managers;
 using Content.Server.Chat.Systems;
-using Content.Shared.Abilities.Psionics;
+using Content.Server.Popups;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.Chat;
 using Content.Shared.Database;
@@ -16,10 +17,10 @@
 using System.Linq;
 using System.Text;
 
-namespace Content.Server.Nyanotrasen.Chat
+namespace Content.Server.Psionics.Telepathy
 {
     /// <summary>
-    /// Extensions for nyano's chat stuff
+    /// Extensions for Telepathic Chat
     /// </summary>
 
     public sealed class NyanoChatSystem : EntitySystem
@@ -30,6 +31,7 @@ public sealed class NyanoChatSystem : EntitySystem
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
         [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
         [Dependency] private readonly ChatSystem _chatSystem = default!;
+        [Dependency] private readonly PopupSystem _popupSystem = default!;
         private IEnumerable<INetChannel> GetPsionicChatClients()
         {
             return Filter.Empty()
@@ -47,7 +49,9 @@ private IEnumerable<INetChannel> GetAdminClients()
         private List<INetChannel> GetDreamers(IEnumerable<INetChannel> removeList)
         {
             var filtered = Filter.Empty()
-                .AddWhereAttachedEntity(entity => HasComp<SleepingComponent>(entity) || HasComp<SeeingRainbowsComponent>(entity) && !HasComp<PsionicsDisabledComponent>(entity) && !HasComp<PsionicInsulationComponent>(entity))
+                .AddWhereAttachedEntity(entity => HasComp<SleepingComponent>(entity)
+                || HasComp<SeeingRainbowsComponent>(entity) && !HasComp<PsionicsDisabledComponent>(entity) && !HasComp<PsionicInsulationComponent>(entity)
+                || HasComp<PotentialPsionicComponent>(entity) && !HasComp<PsionicComponent>(entity) && !HasComp<PsionicInsulationComponent>(entity))
                 .Recipients
                 .Select(p => p.ConnectedClient);
 
@@ -61,7 +65,7 @@ private List<INetChannel> GetDreamers(IEnumerable<INetChannel> removeList)
 
         private bool IsEligibleForTelepathy(EntityUid entity)
         {
-            return HasComp<PsionicComponent>(entity)
+            return TryComp<PsionicComponent>(entity, out var psionic) && psionic.Telepath
                 && !HasComp<PsionicsDisabledComponent>(entity)
                 && !HasComp<PsionicInsulationComponent>(entity)
                 && (!TryComp<MobStateComponent>(entity, out var mobstate) || mobstate.CurrentState == MobState.Alive);
@@ -72,6 +76,12 @@ public void SendTelepathicChat(EntityUid source, string message, bool hideChat)
             if (!IsEligibleForTelepathy(source))
                 return;
 
+            if (TryComp<PsionicComponent>(source, out var psionic) && psionic.TelepathicMute)
+            {
+                _popupSystem.PopupEntity(Loc.GetString("telepathic-mute-message"), source, source);
+                return;
+            }
+
             var clients = GetPsionicChatClients();
             var admins = GetAdminClients();
             string messageWrap;
@@ -90,11 +100,11 @@ public void SendTelepathicChat(EntityUid source, string message, bool hideChat)
             _chatManager.ChatMessageToMany(ChatChannel.Telepathic, message, adminMessageWrap, source, hideChat, true, admins, Color.PaleVioletRed);
 
             if (_random.Prob(0.1f))
-                _glimmerSystem.Glimmer++;
+                _glimmerSystem.DeltaGlimmerInput(1);
 
-            if (_random.Prob(Math.Min(0.33f + ((float) _glimmerSystem.Glimmer / 1500), 1)))
+            if (_random.Prob(Math.Min(0.33f + (float) _glimmerSystem.GlimmerOutput / 1500, 1)))
             {
-                float obfuscation = (0.25f + (float) _glimmerSystem.Glimmer / 2000);
+                float obfuscation = 0.25f + (float) _glimmerSystem.GlimmerOutput / 2000;
                 var obfuscated = ObfuscateMessageReadability(message, obfuscation);
                 _chatManager.ChatMessageToMany(ChatChannel.Telepathic, obfuscated, messageWrap, source, hideChat, false, GetDreamers(clients), Color.PaleVioletRed);
             }
@@ -111,7 +121,7 @@ private string ObfuscateMessageReadability(string message, float chance)
 
             for (var i = 0; i < message.Length; i++)
             {
-                if (char.IsWhiteSpace((modifiedMessage[i])))
+                if (char.IsWhiteSpace(modifiedMessage[i]))
                 {
                     continue;
                 }
diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
index 7784db015d3..ba07375699b 100644
--- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
@@ -13,7 +13,7 @@
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Timing;
-using Content.Shared.Abilities.Psionics; //Nyano - Summary: for the telegnostic projection.
+using Content.Shared.Psionics.Abilities; //EE - Summary: for the telegnostic projection.
 
 namespace Content.Server.Singularity.EntitySystems;
 
@@ -39,7 +39,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<MapGridComponent, EventHorizonAttemptConsumeEntityEvent>(PreventConsume);
         SubscribeLocalEvent<GhostComponent, EventHorizonAttemptConsumeEntityEvent>(PreventConsume);
-        SubscribeLocalEvent<TelegnosticProjectionComponent, EventHorizonAttemptConsumeEntityEvent>(PreventConsume); ///Nyano - Summary: the telegnositic projection has the same trait as ghosts. 
+        SubscribeLocalEvent<TelegnosticProjectionComponent, EventHorizonAttemptConsumeEntityEvent>(PreventConsume); ///EE - Summary: the telegnositic projection has the same trait as ghosts.
         SubscribeLocalEvent<StationDataComponent, EventHorizonAttemptConsumeEntityEvent>(PreventConsume);
         SubscribeLocalEvent<EventHorizonComponent, MapInitEvent>(OnHorizonMapInit);
         SubscribeLocalEvent<EventHorizonComponent, StartCollideEvent>(OnStartCollide);
diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs
index 261e8ca46dd..d33a373b377 100644
--- a/Content.Server/StationEvents/EventManagerSystem.cs
+++ b/Content.Server/StationEvents/EventManagerSystem.cs
@@ -191,8 +191,8 @@ private bool CanRun(EntityPrototype prototype, StationEventComponent stationEven
         // This could not be cleanly done anywhere else.
         if (_configurationManager.GetCVar(CCVars.GlimmerEnabled) &&
             prototype.TryGetComponent<GlimmerEventComponent>(out var glimmerEvent) &&
-            (_glimmerSystem.Glimmer < glimmerEvent.MinimumGlimmer ||
-            _glimmerSystem.Glimmer > glimmerEvent.MaximumGlimmer))
+            (_glimmerSystem.GlimmerOutput < glimmerEvent.MinimumGlimmer ||
+            _glimmerSystem.GlimmerOutput > glimmerEvent.MaximumGlimmer))
         {
             return false;
         }
diff --git a/Content.Server/Strip/StrippableSystem.cs b/Content.Server/Strip/StrippableSystem.cs
index 96b2ecc00c6..3b38b65a19d 100644
--- a/Content.Server/Strip/StrippableSystem.cs
+++ b/Content.Server/Strip/StrippableSystem.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Ensnaring;
 using Content.Shared.CombatMode;
@@ -21,18 +20,21 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
+using System.Linq;
 
 namespace Content.Server.Strip
 {
     public sealed class StrippableSystem : SharedStrippableSystem
     {
-        [Dependency] private readonly SharedCuffableSystem _cuffable = default!;
-        [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
         [Dependency] private readonly InventorySystem _inventorySystem = default!;
-        [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-        [Dependency] private readonly SharedPopupSystem _popup = default!;
-        [Dependency] private readonly EnsnareableSystem _ensnaring = default!;
+        [Dependency] private readonly EnsnareableSystem _ensnaringSystem = default!;
         [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
+
+        [Dependency] private readonly SharedCuffableSystem _cuffableSystem = default!;
+        [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+        [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
+        [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
 
         // TODO: ECS popups. Not all of these have ECS equivalents yet.
@@ -48,64 +50,58 @@ public override void Initialize()
             // BUI
             SubscribeLocalEvent<StrippableComponent, StrippingSlotButtonPressed>(OnStripButtonPressed);
             SubscribeLocalEvent<EnsnareableComponent, StrippingEnsnareButtonPressed>(OnStripEnsnareMessage);
+
+            // DoAfters
+            SubscribeLocalEvent<HandsComponent, DoAfterAttemptEvent<StrippableDoAfterEvent>>(OnStrippableDoAfterRunning);
+            SubscribeLocalEvent<HandsComponent, StrippableDoAfterEvent>(OnStrippableDoAfterFinished);
         }
 
-        private void OnStripEnsnareMessage(EntityUid uid, EnsnareableComponent component, StrippingEnsnareButtonPressed args)
+        private void AddStripVerb(EntityUid uid, StrippableComponent component, GetVerbsEvent<Verb> args)
         {
-            if (args.Session.AttachedEntity is not {Valid: true} user)
+            if (args.Hands == null || !args.CanAccess || !args.CanInteract || args.Target == args.User)
                 return;
 
-            foreach (var entity in component.Container.ContainedEntities)
+            if (!HasComp<ActorComponent>(args.User))
+                return;
+
+            Verb verb = new()
             {
-                if (!TryComp<EnsnaringComponent>(entity, out var ensnaring))
-                    continue;
+                Text = Loc.GetString("strip-verb-get-data-text"),
+                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/outfit.svg.192dpi.png")),
+                Act = () => StartOpeningStripper(args.User, (uid, component), true),
+            };
 
-                _ensnaring.TryFree(uid, user, entity, ensnaring);
-                return;
-            }
+            args.Verbs.Add(verb);
         }
 
-        private void OnStripButtonPressed(Entity<StrippableComponent> strippable, ref StrippingSlotButtonPressed args)
+        private void AddStripExamineVerb(EntityUid uid, StrippableComponent component, GetVerbsEvent<ExamineVerb> args)
         {
-            if (args.Session.AttachedEntity is not {Valid: true} user ||
-                !TryComp<HandsComponent>(user, out var userHands))
-                return;
-
-            if (args.IsHand)
-            {
-                StripHand(user, args.Slot, strippable, userHands);
+            if (args.Hands == null || !args.CanAccess || !args.CanInteract || args.Target == args.User)
                 return;
-            }
 
-            if (!TryComp<InventoryComponent>(strippable, out var inventory))
+            if (!HasComp<ActorComponent>(args.User))
                 return;
 
-            var hasEnt = _inventorySystem.TryGetSlotEntity(strippable, args.Slot, out var held, inventory);
+            ExamineVerb verb = new()
+            {
+                Text = Loc.GetString("strip-verb-get-data-text"),
+                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/outfit.svg.192dpi.png")),
+                Act = () => StartOpeningStripper(args.User, (uid, component), true),
+                Category = VerbCategory.Examine,
+            };
 
-            if (userHands.ActiveHandEntity != null && !hasEnt)
-                PlaceActiveHandItemInInventory(user, strippable, userHands.ActiveHandEntity.Value, args.Slot, strippable);
-            else if (userHands.ActiveHandEntity == null && hasEnt)
-                TakeItemFromInventory(user, strippable, held!.Value, args.Slot, strippable);
+            args.Verbs.Add(verb);
         }
 
-        private void StripHand(EntityUid user, string handId, Entity<StrippableComponent> target, HandsComponent userHands)
+        private void OnActivateInWorld(EntityUid uid, StrippableComponent component, ActivateInWorldEvent args)
         {
-            if (!_handsSystem.TryGetHand(target, handId, out var hand))
+            if (args.Target == args.User)
                 return;
 
-            // is the target a handcuff?
-            if (TryComp(hand.HeldEntity, out VirtualItemComponent? virt)
-                && TryComp(target, out CuffableComponent? cuff)
-                && _cuffable.GetAllCuffs(cuff).Contains(virt.BlockingEntity))
-            {
-                _cuffable.TryUncuff(target, user, virt.BlockingEntity, cuffable: cuff);
+            if (!HasComp<ActorComponent>(args.User))
                 return;
-            }
 
-            if (userHands.ActiveHandEntity != null && hand.HeldEntity == null)
-                PlaceActiveHandItemInHands(user, target, userHands.ActiveHandEntity.Value, handId, target);
-            else if (userHands.ActiveHandEntity == null && hand.HeldEntity != null)
-                TakeItemFromHands(user, target, hand.HeldEntity.Value, handId, target);
+            StartOpeningStripper(args.User, (uid, component));
         }
 
         public override void StartOpeningStripper(EntityUid user, Entity<StrippableComponent> strippable, bool openInCombat = false)
@@ -123,352 +119,520 @@ public override void StartOpeningStripper(EntityUid user, Entity<StrippableCompo
             }
         }
 
-        private void AddStripVerb(EntityUid uid, StrippableComponent component, GetVerbsEvent<Verb> args)
+        private void OnStripButtonPressed(Entity<StrippableComponent> strippable, ref StrippingSlotButtonPressed args)
         {
-            if (args.Hands == null || !args.CanAccess || !args.CanInteract || args.Target == args.User)
+            if (args.Session.AttachedEntity is not { Valid: true } user ||
+                !TryComp<HandsComponent>(user, out var userHands))
                 return;
 
-            if (!HasComp<ActorComponent>(args.User))
+            if (args.IsHand)
+            {
+                StripHand((user, userHands), (strippable.Owner, null), args.Slot, strippable);
                 return;
+            }
 
-            Verb verb = new()
-            {
-                Text = Loc.GetString("strip-verb-get-data-text"),
-                Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/outfit.svg.192dpi.png")),
-                Act = () => StartOpeningStripper(args.User, (uid, component), true),
-            };
-            args.Verbs.Add(verb);
+            if (!TryComp<InventoryComponent>(strippable, out var inventory))
+                return;
+
+            var hasEnt = _inventorySystem.TryGetSlotEntity(strippable, args.Slot, out var held, inventory);
+
+            if (userHands.ActiveHandEntity != null && !hasEnt)
+                StartStripInsertInventory((user, userHands), strippable.Owner, userHands.ActiveHandEntity.Value, args.Slot);
+            else if (userHands.ActiveHandEntity == null && hasEnt)
+                StartStripRemoveInventory(user, strippable.Owner, held!.Value, args.Slot);
         }
 
-        private void AddStripExamineVerb(EntityUid uid, StrippableComponent component, GetVerbsEvent<ExamineVerb> args)
+        private void StripHand(
+            Entity<HandsComponent?> user,
+            Entity<HandsComponent?> target,
+            string handId,
+            StrippableComponent? targetStrippable)
         {
-            if (args.Hands == null || !args.CanAccess || !args.CanInteract || args.Target == args.User)
+            if (!Resolve(user, ref user.Comp) ||
+                !Resolve(target, ref target.Comp) ||
+                !Resolve(target, ref targetStrippable))
                 return;
 
-            if (!HasComp<ActorComponent>(args.User))
+            if (!_handsSystem.TryGetHand(target.Owner, handId, out var handSlot))
                 return;
 
-            ExamineVerb verb = new()
+            // Is the target a handcuff?
+            if (TryComp<VirtualItemComponent>(handSlot.HeldEntity, out var virtualItem) &&
+                TryComp<CuffableComponent>(target.Owner, out var cuffable) &&
+                _cuffableSystem.GetAllCuffs(cuffable).Contains(virtualItem.BlockingEntity))
             {
-                Text = Loc.GetString("strip-verb-get-data-text"),
-                Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/outfit.svg.192dpi.png")),
-                Act = () => StartOpeningStripper(args.User, (uid, component), true),
-                Category = VerbCategory.Examine,
-            };
+                _cuffableSystem.TryUncuff(target.Owner, user, virtualItem.BlockingEntity, cuffable);
+                return;
+            }
 
-            args.Verbs.Add(verb);
+            if (user.Comp.ActiveHandEntity != null && handSlot.HeldEntity == null)
+                StartStripInsertHand(user, target, user.Comp.ActiveHandEntity.Value, handId, targetStrippable);
+            else if (user.Comp.ActiveHandEntity == null && handSlot.HeldEntity != null)
+                StartStripRemoveHand(user, target, handSlot.HeldEntity.Value, handId, targetStrippable);
         }
 
-        private void OnActivateInWorld(EntityUid uid, StrippableComponent component, ActivateInWorldEvent args)
+        private void OnStripEnsnareMessage(EntityUid uid, EnsnareableComponent component, StrippingEnsnareButtonPressed args)
         {
-            if (args.Target == args.User)
+            if (args.Session.AttachedEntity is not { Valid: true } user)
                 return;
 
-            if (!HasComp<ActorComponent>(args.User))
-                return;
+            foreach (var entity in component.Container.ContainedEntities)
+            {
+                if (!TryComp<EnsnaringComponent>(entity, out var ensnaring))
+                    continue;
 
-            StartOpeningStripper(args.User, (uid, component));
+                _ensnaringSystem.TryFree(uid, user, entity, ensnaring);
+                return;
+            }
         }
 
         /// <summary>
-        ///     Places item in user's active hand to an inventory slot.
+        ///     Checks whether the item is in a user's active hand and whether it can be inserted into the inventory slot.
         /// </summary>
-        private async void PlaceActiveHandItemInInventory(
-            EntityUid user,
+        private bool CanStripInsertInventory(
+            Entity<HandsComponent?> user,
             EntityUid target,
             EntityUid held,
-            string slot,
-            StrippableComponent component)
+            string slot)
         {
-            var userHands = Comp<HandsComponent>(user);
+            if (!Resolve(user, ref user.Comp))
+                return false;
+
+            if (user.Comp.ActiveHand == null)
+                return false;
+
+            if (user.Comp.ActiveHandEntity == null)
+                return false;
+
+            if (user.Comp.ActiveHandEntity != held)
+                return false;
+
+            if (!_handsSystem.CanDropHeld(user, user.Comp.ActiveHand))
+            {
+                _popupSystem.PopupCursor(Loc.GetString("strippable-component-cannot-drop"), user);
+                return false;
+            }
+
+            if (_inventorySystem.TryGetSlotEntity(target, slot, out _))
+            {
+                _popupSystem.PopupCursor(Loc.GetString("strippable-component-item-slot-occupied", ("owner", target)), user);
+                return false;
+            }
 
-            bool Check()
+            if (!_inventorySystem.CanEquip(user, target, held, slot, out _))
             {
-                if (userHands.ActiveHandEntity != held)
-                    return false;
-
-                if (!_handsSystem.CanDropHeld(user, userHands.ActiveHand!))
-                {
-                    _popup.PopupCursor(Loc.GetString("strippable-component-cannot-drop"), user);
-                    return false;
-                }
-
-                if (_inventorySystem.TryGetSlotEntity(target, slot, out _))
-                {
-                    _popup.PopupCursor(Loc.GetString("strippable-component-item-slot-occupied",("owner", target)), user);
-                    return false;
-                }
-
-                if (!_inventorySystem.CanEquip(user, target, held, slot, out _))
-                {
-                    _popup.PopupCursor(Loc.GetString("strippable-component-cannot-equip-message",("owner", target)), user);
-                    return false;
-                }
-
-                return true;
+                _popupSystem.PopupCursor(Loc.GetString("strippable-component-cannot-equip-message", ("owner", target)), user);
+                return false;
             }
 
+            return true;
+        }
+
+        /// <summary>
+        ///     Begins a DoAfter to insert the item in the user's active hand into the inventory slot.
+        /// </summary>
+        private void StartStripInsertInventory(
+            Entity<HandsComponent?> user,
+            EntityUid target,
+            EntityUid held,
+            string slot)
+        {
+            if (!Resolve(user, ref user.Comp))
+                return;
+
+            if (!CanStripInsertInventory(user, target, held, slot))
+                return;
+
             if (!_inventorySystem.TryGetSlot(target, slot, out var slotDef))
             {
                 Log.Error($"{ToPrettyString(user)} attempted to place an item in a non-existent inventory slot ({slot}) on {ToPrettyString(target)}");
                 return;
             }
 
-            var userEv = new BeforeStripEvent(slotDef.StripTime);
-            RaiseLocalEvent(user, userEv);
-            var ev = new BeforeGettingStrippedEvent(userEv.Time, userEv.Stealth);
-            RaiseLocalEvent(target, ev);
+            var (time, stealth) = GetStripTimeModifiers(user, target, slotDef.StripTime);
+
+            if (!stealth)
+                _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner-insert", ("user", Identity.Entity(user, EntityManager)), ("item", user.Comp.ActiveHandEntity!.Value)), target, target, PopupType.Large);
+
+            var prefix = stealth ? "stealthily " : "";
+            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
 
-            var doAfterArgs = new DoAfterArgs(EntityManager, user, ev.Time, new AwaitedDoAfterEvent(), null, target: target, used: held)
+            var doAfterArgs = new DoAfterArgs(EntityManager, user, time, new StrippableDoAfterEvent(true, true, slot), user, target, held)
             {
-                ExtraCheck = Check,
-                Hidden = ev.Stealth,
+                Hidden = stealth,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
                 BreakOnTargetMove = true,
                 BreakOnUserMove = true,
                 NeedHand = true,
-                DuplicateCondition = DuplicateConditions.SameTool // Block any other DoAfters featuring this same entity.
+                DuplicateCondition = DuplicateConditions.SameTool
             };
 
-            if (!ev.Stealth && Check() && userHands.ActiveHandEntity != null)
-            {
-                var message = Loc.GetString("strippable-component-alert-owner-insert",
-                    ("user", Identity.Entity(user, EntityManager)), ("item", userHands.ActiveHandEntity));
-                _popup.PopupEntity(message, target, target, PopupType.Large);
-            }
+            _doAfterSystem.TryStartDoAfter(doAfterArgs);
+        }
 
-            var prefix = ev.Stealth ? "stealthily " : "";
-            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
+        /// <summary>
+        ///     Inserts the item in the user's active hand into the inventory slot.
+        /// </summary>
+        private void StripInsertInventory(
+            Entity<HandsComponent?> user,
+            EntityUid target,
+            EntityUid held,
+            string slot)
+        {
+            if (!Resolve(user, ref user.Comp))
+                return;
 
-            var result = await _doAfter.WaitDoAfter(doAfterArgs);
-            if (result != DoAfterStatus.Finished)
+            if (!CanStripInsertInventory(user, target, held, slot))
                 return;
 
-            DebugTools.Assert(userHands.ActiveHand?.HeldEntity == held);
+            if (!_handsSystem.TryDrop(user, handsComp: user.Comp))
+                return;
+
+            _inventorySystem.TryEquip(user, target, held, slot);
+            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
+        }
 
-            if (_handsSystem.TryDrop(user, handsComp: userHands))
+        /// <summary>
+        ///     Checks whether the item can be removed from the target's inventory.
+        /// </summary>
+        private bool CanStripRemoveInventory(
+            EntityUid user,
+            EntityUid target,
+            EntityUid item,
+            string slot)
+        {
+            if (!_inventorySystem.TryGetSlotEntity(target, slot, out var slotItem))
             {
-                _inventorySystem.TryEquip(user, target, held, slot);
+                _popupSystem.PopupCursor(Loc.GetString("strippable-component-item-slot-free-message", ("owner", target)), user);
+                return false;
+            }
 
-                _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
+            if (slotItem != item)
+                return false;
+
+            if (!_inventorySystem.CanUnequip(user, target, slot, out var reason))
+            {
+                _popupSystem.PopupCursor(Loc.GetString(reason), user);
+                return false;
             }
+
+            return true;
         }
 
         /// <summary>
-        ///     Places item in user's active hand in one of the entity's hands.
+        ///     Begins a DoAfter to remove the item from the target's inventory and insert it in the user's active hand.
         /// </summary>
-        private async void PlaceActiveHandItemInHands(
+        private void StartStripRemoveInventory(
             EntityUid user,
             EntityUid target,
-            EntityUid held,
-            string handName,
-            StrippableComponent component)
+            EntityUid item,
+            string slot)
         {
-            var hands = Comp<HandsComponent>(target);
-            var userHands = Comp<HandsComponent>(user);
+            if (!CanStripRemoveInventory(user, target, item, slot))
+                return;
+
+            if (!_inventorySystem.TryGetSlot(target, slot, out var slotDef))
+            {
+                Log.Error($"{ToPrettyString(user)} attempted to take an item from a non-existent inventory slot ({slot}) on {ToPrettyString(target)}");
+                return;
+            }
+
+            var (time, stealth) = GetStripTimeModifiers(user, target, slotDef.StripTime);
 
-            bool Check()
+            if (!stealth)
             {
-                if (userHands.ActiveHandEntity != held)
-                    return false;
-
-                if (!_handsSystem.CanDropHeld(user, userHands.ActiveHand!))
-                {
-                    _popup.PopupCursor(Loc.GetString("strippable-component-cannot-drop"), user);
-                    return false;
-                }
-
-                if (!_handsSystem.TryGetHand(target, handName, out var hand, hands)
-                    || !_handsSystem.CanPickupToHand(target, userHands.ActiveHandEntity.Value, hand, checkActionBlocker: false, hands))
-                {
-                    _popup.PopupCursor(Loc.GetString("strippable-component-cannot-put-message",("owner", target)), user);
-                    return false;
-                }
-
-                return true;
+                if (slotDef.StripHidden)
+                    _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner-hidden", ("slot", slot)), target, target, PopupType.Large);
+                else
+                    _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner", ("user", Identity.Entity(user, EntityManager)), ("item", item)), target, target, PopupType.Large);
             }
 
-            var userEv = new BeforeStripEvent(component.HandStripDelay);
-            RaiseLocalEvent(user, userEv);
-            var ev = new BeforeGettingStrippedEvent(userEv.Time, userEv.Stealth);
-            RaiseLocalEvent(target, ev);
+            var prefix = stealth ? "stealthily " : "";
+            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s {slot} slot");
 
-            var doAfterArgs = new DoAfterArgs(EntityManager, user, ev.Time, new AwaitedDoAfterEvent(), null, target: target, used: held)
+            var doAfterArgs = new DoAfterArgs(EntityManager, user, time, new StrippableDoAfterEvent(false, true, slot), user, target, item)
             {
-                ExtraCheck = Check,
-                Hidden = ev.Stealth,
+                Hidden = stealth,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
                 BreakOnTargetMove = true,
                 BreakOnUserMove = true,
                 NeedHand = true,
+                BreakOnHandChange = false, // Allow simultaneously removing multiple items.
                 DuplicateCondition = DuplicateConditions.SameTool
             };
 
-            var prefix = ev.Stealth ? "stealthily " : "";
-                _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
-
-            var result = await _doAfter.WaitDoAfter(doAfterArgs);
-            if (result != DoAfterStatus.Finished) return;
-
-            _handsSystem.TryDrop(user, checkActionBlocker: false, handsComp: userHands);
-            _handsSystem.TryPickup(target, held, handName, checkActionBlocker: false, animateUser: !ev.Stealth, animate: !ev.Stealth, handsComp: hands);
-            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
-            // hand update will trigger strippable update
+            _doAfterSystem.TryStartDoAfter(doAfterArgs);
         }
 
         /// <summary>
-        ///     Takes an item from the inventory and places it in the user's active hand.
+        ///     Removes the item from the target's inventory and inserts it in the user's active hand.
         /// </summary>
-        private async void TakeItemFromInventory(
+        private void StripRemoveInventory(
             EntityUid user,
             EntityUid target,
             EntityUid item,
             string slot,
-            Entity<StrippableComponent> strippable)
+            bool stealth)
+        {
+            if (!CanStripRemoveInventory(user, target, item, slot))
+                return;
+
+            if (!_inventorySystem.TryUnequip(user, target, slot))
+                return;
+
+            RaiseLocalEvent(item, new DroppedEvent(user), true); // Gas tank internals etc.
+
+            _handsSystem.PickupOrDrop(user, item, animateUser: stealth, animate: stealth);
+            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s {slot} slot");
+        }
+
+        /// <summary>
+        ///     Checks whether the item in the user's active hand can be inserted into one of the target's hands.
+        /// </summary>
+        private bool CanStripInsertHand(
+            Entity<HandsComponent?> user,
+            Entity<HandsComponent?> target,
+            EntityUid held,
+            string handName)
         {
-            bool Check()
+            if (!Resolve(user, ref user.Comp) ||
+                !Resolve(target, ref target.Comp))
+                return false;
+
+            if (user.Comp.ActiveHand == null)
+                return false;
+
+            if (user.Comp.ActiveHandEntity == null)
+                return false;
+
+            if (user.Comp.ActiveHandEntity != held)
+                return false;
+
+            if (!_handsSystem.CanDropHeld(user, user.Comp.ActiveHand))
             {
-                if (!_inventorySystem.TryGetSlotEntity(target, slot, out var ent) && ent == item)
-                {
-                    _popup.PopupCursor(Loc.GetString("strippable-component-item-slot-free-message", ("owner", target)), user);
-                    return false;
-                }
-
-                if (!_inventorySystem.CanUnequip(user, target, slot, out var reason))
-                {
-                    _popup.PopupCursor(Loc.GetString(reason), user);
-                    return false;
-                }
-
-                return true;
+                _popupSystem.PopupCursor(Loc.GetString("strippable-component-cannot-drop"), user);
+                return false;
             }
 
-            if (!_inventorySystem.TryGetSlot(target, slot, out var slotDef))
+            if (!_handsSystem.TryGetHand(target, handName, out var handSlot, target.Comp) ||
+                !_handsSystem.CanPickupToHand(target, user.Comp.ActiveHandEntity.Value, handSlot, checkActionBlocker: false, target.Comp))
             {
-                Log.Error($"{ToPrettyString(user)} attempted to take an item from a non-existent inventory slot ({slot}) on {ToPrettyString(target)}");
-                return;
+                _popupSystem.PopupCursor(Loc.GetString("strippable-component-cannot-put-message", ("owner", target)), user);
+                return false;
             }
 
-            var userEv = new BeforeStripEvent(slotDef.StripTime);
-            RaiseLocalEvent(user, userEv);
-            var ev = new BeforeGettingStrippedEvent(userEv.Time, userEv.Stealth);
-            RaiseLocalEvent(target, ev);
+            return true;
+        }
+
+        /// <summary>
+        ///     Begins a DoAfter to insert the item in the user's active hand into one of the target's hands.
+        /// </summary>
+        private void StartStripInsertHand(
+            Entity<HandsComponent?> user,
+            Entity<HandsComponent?> target,
+            EntityUid held,
+            string handName,
+            StrippableComponent? targetStrippable = null)
+        {
+            if (!Resolve(user, ref user.Comp) ||
+                !Resolve(target, ref target.Comp) ||
+                !Resolve(target, ref targetStrippable))
+                return;
+
+            if (!CanStripInsertHand(user, target, held, handName))
+                return;
+
+            var (time, stealth) = GetStripTimeModifiers(user, target, targetStrippable.HandStripDelay);
 
-            var doAfterArgs = new DoAfterArgs(EntityManager, user, ev.Time, new AwaitedDoAfterEvent(), null, target: target, used: item)
+            var prefix = stealth ? "stealthily " : "";
+            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
+
+            var doAfterArgs = new DoAfterArgs(EntityManager, user, time, new StrippableDoAfterEvent(true, false, handName), user, target, held)
             {
-                ExtraCheck = Check,
-                Hidden = ev.Stealth,
+                Hidden = stealth,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
                 BreakOnTargetMove = true,
                 BreakOnUserMove = true,
                 NeedHand = true,
-                BreakOnHandChange = false, // allow simultaneously removing multiple items.
                 DuplicateCondition = DuplicateConditions.SameTool
             };
 
-            if (!ev.Stealth && Check())
-            {
-                if (slotDef.StripHidden)
-                {
-                    _popup.PopupEntity(Loc.GetString("strippable-component-alert-owner-hidden", ("slot", slot)), target,
-                        target, PopupType.Large);
-                }
-                else if (_inventorySystem.TryGetSlotEntity(strippable, slot, out var slotItem))
-                {
-                    _popup.PopupEntity(Loc.GetString("strippable-component-alert-owner", ("user", Identity.Entity(user, EntityManager)), ("item", slotItem)), target,
-                        target, PopupType.Large);
-                }
-            }
-
-            var prefix = ev.Stealth ? "stealthily " : "";
-            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s {slot} slot");
+            _doAfterSystem.TryStartDoAfter(doAfterArgs);
+        }
 
-            var result = await _doAfter.WaitDoAfter(doAfterArgs);
-            if (result != DoAfterStatus.Finished)
+        /// <summary>
+        ///     Places the item in the user's active hand into one of the target's hands.
+        /// </summary>
+        private void StripInsertHand(
+            Entity<HandsComponent?> user,
+            Entity<HandsComponent?> target,
+            EntityUid held,
+            string handName,
+            bool stealth)
+        {
+            if (!Resolve(user, ref user.Comp) ||
+                !Resolve(target, ref target.Comp))
                 return;
 
-            if (!_inventorySystem.TryUnequip(user, strippable, slot))
+            if (!CanStripInsertHand(user, target, held, handName))
                 return;
 
-            // Raise a dropped event, so that things like gas tank internals properly deactivate when stripping
-            RaiseLocalEvent(item, new DroppedEvent(user), true);
-
-            _handsSystem.PickupOrDrop(user, item, animateUser: !ev.Stealth, animate: !ev.Stealth);
-            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s {slot} slot");
+            _handsSystem.TryDrop(user, checkActionBlocker: false, handsComp: user.Comp);
+            _handsSystem.TryPickup(target, held, handName, checkActionBlocker: false, animateUser: stealth, animate: stealth, handsComp: target.Comp);
+            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
 
+            // Hand update will trigger strippable update.
         }
 
         /// <summary>
-        ///     Takes an item from a hand and places it in the user's active hand.
+        ///     Checks whether the item is in the target's hand and whether it can be dropped.
         /// </summary>
-        private async void TakeItemFromHands(EntityUid user, EntityUid target, EntityUid item, string handName, Entity<StrippableComponent> strippable)
+        private bool CanStripRemoveHand(
+            EntityUid user,
+            Entity<HandsComponent?> target,
+            EntityUid item,
+            string handName)
         {
-            var hands = Comp<HandsComponent>(target);
-            var userHands = Comp<HandsComponent>(user);
+            if (!Resolve(target, ref target.Comp))
+                return false;
 
-            bool Check()
+            if (!_handsSystem.TryGetHand(target, handName, out var handSlot, target.Comp))
             {
-                if (!_handsSystem.TryGetHand(target, handName, out var hand, hands) || hand.HeldEntity != item)
-                {
-                    _popup.PopupCursor(Loc.GetString("strippable-component-item-slot-free-message",("owner", target)), user);
-                    return false;
-                }
-
-                if (HasComp<VirtualItemComponent>(hand.HeldEntity))
-                    return false;
-
-                if (!_handsSystem.CanDropHeld(target, hand, false))
-                {
-                    _popup.PopupCursor(Loc.GetString("strippable-component-cannot-drop-message",("owner", target)), user);
-                    return false;
-                }
-
-                return true;
+                _popupSystem.PopupCursor(Loc.GetString("strippable-component-item-slot-free-message", ("owner", target)), user);
+                return false;
             }
 
-            var userEv = new BeforeStripEvent(strippable.Comp.HandStripDelay);
-            RaiseLocalEvent(user, userEv);
-            var ev = new BeforeGettingStrippedEvent(userEv.Time, userEv.Stealth);
-            RaiseLocalEvent(target, ev);
+            if (HasComp<VirtualItemComponent>(handSlot.HeldEntity))
+                return false;
+
+            if (handSlot.HeldEntity == null)
+                return false;
 
-            var doAfterArgs = new DoAfterArgs(EntityManager, user, ev.Time, new AwaitedDoAfterEvent(), null, target: target, used: item)
+            if (handSlot.HeldEntity != item)
+                return false;
+
+            if (!_handsSystem.CanDropHeld(target, handSlot, false))
             {
-                ExtraCheck = Check,
-                Hidden = ev.Stealth,
+                _popupSystem.PopupCursor(Loc.GetString("strippable-component-cannot-drop-message", ("owner", target)), user);
+                return false;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        ///     Begins a DoAfter to remove the item from the target's hand and insert it in the user's active hand.
+        /// </summary>
+        private void StartStripRemoveHand(
+            Entity<HandsComponent?> user,
+            Entity<HandsComponent?> target,
+            EntityUid item,
+            string handName,
+            StrippableComponent? targetStrippable = null)
+        {
+            if (!Resolve(user, ref user.Comp) ||
+                !Resolve(target, ref target.Comp) ||
+                !Resolve(target, ref targetStrippable))
+                return;
+
+            if (!CanStripRemoveHand(user, target, item, handName))
+                return;
+
+            var (time, stealth) = GetStripTimeModifiers(user, target, targetStrippable.HandStripDelay);
+
+            if (!stealth)
+                _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner", ("user", Identity.Entity(user, EntityManager)), ("item", item)), target, target);
+
+            var prefix = stealth ? "stealthily " : "";
+            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s hands");
+
+            var doAfterArgs = new DoAfterArgs(EntityManager, user, time, new StrippableDoAfterEvent(false, false, handName), user, target, item)
+            {
+                Hidden = stealth,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
                 BreakOnTargetMove = true,
                 BreakOnUserMove = true,
                 NeedHand = true,
-                BreakOnHandChange = false, // allow simultaneously removing multiple items.
+                BreakOnHandChange = false, // Allow simultaneously removing multiple items.
                 DuplicateCondition = DuplicateConditions.SameTool
             };
 
-            if (!ev.Stealth && Check() && _handsSystem.TryGetHand(target, handName, out var handSlot, hands) && handSlot.HeldEntity != null)
+            _doAfterSystem.TryStartDoAfter(doAfterArgs);
+        }
+
+        /// <summary>
+        ///     Takes the item from the target's hand and inserts it in the user's active hand.
+        /// </summary>
+        private void StripRemoveHand(
+            Entity<HandsComponent?> user,
+            Entity<HandsComponent?> target,
+            EntityUid item,
+            string handName,
+            bool stealth)
+        {
+            if (!Resolve(user, ref user.Comp) ||
+                !Resolve(target, ref target.Comp))
+                return;
+
+            if (!CanStripRemoveHand(user, target, item, handName))
+                return;
+
+            _handsSystem.TryDrop(target, item, checkActionBlocker: false, handsComp: target.Comp);
+            _handsSystem.PickupOrDrop(user, item, animateUser: stealth, animate: stealth, handsComp: user.Comp);
+            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s hands");
+
+            // Hand update will trigger strippable update.
+        }
+
+        private void OnStrippableDoAfterRunning(Entity<HandsComponent> entity, ref DoAfterAttemptEvent<StrippableDoAfterEvent> ev)
+        {
+            var args = ev.DoAfter.Args;
+
+            DebugTools.Assert(entity.Owner == args.User);
+            DebugTools.Assert(args.Target != null);
+            DebugTools.Assert(args.Used != null);
+            DebugTools.Assert(ev.Event.SlotOrHandName != null);
+
+            if (ev.Event.InventoryOrHand)
             {
-                _popup.PopupEntity(
-                    Loc.GetString("strippable-component-alert-owner",
-                    ("user", Identity.Entity(user, EntityManager)), ("item", item)),
-                    strippable.Owner,
-                    strippable.Owner);
+                if ( ev.Event.InsertOrRemove && !CanStripInsertInventory((entity.Owner, entity.Comp), args.Target.Value, args.Used.Value, ev.Event.SlotOrHandName) ||
+                    !ev.Event.InsertOrRemove && !CanStripRemoveInventory(entity.Owner, args.Target.Value, args.Used.Value, ev.Event.SlotOrHandName))
+                        ev.Cancel();
             }
+            else
+            {
+                if ( ev.Event.InsertOrRemove && !CanStripInsertHand((entity.Owner, entity.Comp), args.Target.Value, args.Used.Value, ev.Event.SlotOrHandName) ||
+                    !ev.Event.InsertOrRemove && !CanStripRemoveHand(entity.Owner, args.Target.Value, args.Used.Value, ev.Event.SlotOrHandName))
+                        ev.Cancel();
+            }
+        }
 
-            var prefix = ev.Stealth ? "stealthily " : "";
-            _adminLogger.Add(LogType.Stripping, LogImpact.Low,
-                $"{ToPrettyString(user):actor} is trying to {prefix}strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s hands");
-
-            var result = await _doAfter.WaitDoAfter(doAfterArgs);
-            if (result != DoAfterStatus.Finished)
+        private void OnStrippableDoAfterFinished(Entity<HandsComponent> entity, ref StrippableDoAfterEvent ev)
+        {
+            if (ev.Cancelled)
                 return;
 
-            _handsSystem.TryDrop(target, item, checkActionBlocker: false, handsComp: hands);
-            _handsSystem.PickupOrDrop(user, item, animateUser: !ev.Stealth, animate: !ev.Stealth, handsComp: userHands);
-            // hand update will trigger strippable update
-            _adminLogger.Add(LogType.Stripping, LogImpact.Medium,
-                $"{ToPrettyString(user):actor} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s hands");
+            DebugTools.Assert(entity.Owner == ev.User);
+            DebugTools.Assert(ev.Target != null);
+            DebugTools.Assert(ev.Used != null);
+            DebugTools.Assert(ev.SlotOrHandName != null);
+
+            if (ev.InventoryOrHand)
+            {
+                if (ev.InsertOrRemove)
+                        StripInsertInventory((entity.Owner, entity.Comp), ev.Target.Value, ev.Used.Value, ev.SlotOrHandName);
+                else    StripRemoveInventory(entity.Owner, ev.Target.Value, ev.Used.Value, ev.SlotOrHandName, ev.Args.Hidden);
+            }
+            else
+            {
+                if (ev.InsertOrRemove)
+                        StripInsertHand((entity.Owner, entity.Comp), ev.Target.Value, ev.Used.Value, ev.SlotOrHandName, ev.Args.Hidden);
+                else    StripRemoveHand((entity.Owner, entity.Comp), ev.Target.Value, ev.Used.Value, ev.SlotOrHandName, ev.Args.Hidden);
+            }
         }
     }
 }
diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
index 27caebef808..de869ab7e89 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
@@ -366,13 +366,11 @@ private void OnExtractButton(EntityUid uid, AnalysisConsoleComponent component,
         _research.ModifyServerPoints(server.Value, pointValue, serverComponent);
         _artifact.AdjustConsumedPoints(artifact.Value, pointValue);
 
-        // Nyano - Summary - Begin modified code block: tie artifacts to glimmer.
         if (TryComp<ArtifactAnalyzerComponent>(component.AnalyzerEntity.Value, out var analyzer) &&
             analyzer != null)
         {
-            _glimmerSystem.Glimmer += (int) pointValue / analyzer.ExtractRatio;
+            _glimmerSystem.DeltaGlimmerInput(pointValue / analyzer.ExtractRatio);
         }
-        // Nyano - End modified code block.
 
         _audio.PlayPvs(component.ExtractSound, component.AnalyzerEntity.Value, AudioParams.Default.WithVolume(2f));
 
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 996d7772239..21f25080426 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -16,7 +16,7 @@
 using Content.Server.Roles;
 using Content.Server.Speech.Components;
 using Content.Server.Temperature.Components;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Psionics.Abilities;
 using Content.Shared.CombatMode;
 using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Damage;
@@ -59,9 +59,7 @@ public sealed partial class ZombieSystem
         [Dependency] private readonly IChatManager _chatMan = default!;
         [Dependency] private readonly MindSystem _mind = default!;
         [Dependency] private readonly SharedRoleSystem _roles = default!;
-        [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
-        [Dependency] private readonly ActionsSystem _actions = default!; // DeltaV - No psionic zombies
 
         /// <summary>
         /// Handles an entity turning into a zombie when they die or go into crit
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index ea28e86a0f0..1ae78102cef 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -2141,11 +2141,11 @@ public static readonly CVarDef<float>
             CVarDef.Create("glimmer.enabled", true, CVar.REPLICATED);
 
         /// <summary>
-        ///     Passive glimmer drain per second.
-        ///     Note that this is randomized and this is an average value.
+        ///     The rate at which glimmer linearly decays. Since glimmer increases (usually) follow a logistic curve, this means glimmer
+        ///     becomes increasingly harder to raise after ~502 points.
         /// </summary>
-        public static readonly CVarDef<float> GlimmerLostPerSecond =
-            CVarDef.Create("glimmer.passive_drain_per_second", 0.1f, CVar.SERVERONLY);
+        public static readonly CVarDef<float> GlimmerLinearDecayPerMinute =
+            CVarDef.Create("glimmer.linear_decay_per_minute", 6f, CVar.SERVERONLY);
 
         /// <summary>
         ///     Whether random rolls for psionics are allowed.
diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
index f189db005bc..976682c9903 100644
--- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
@@ -62,6 +62,11 @@ private void QuickEquip(
     {
         foreach (var slotDef in userEnt.Comp1.Slots)
         {
+            // Do not attempt to quick-equip clothing in pocket slots.
+            // We should probably add a special flag to SlotDefinition to skip quick equip if more similar slots get added.
+            if (slotDef.SlotFlags.HasFlag(SlotFlags.POCKET))
+                continue;
+
             if (!_invSystem.CanEquip(userEnt, toEquipEnt, slotDef.Name, out _, slotDef, userEnt, toEquipEnt))
                 continue;
 
diff --git a/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
index 0138de7a98f..22a1d1a8f52 100644
--- a/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
@@ -95,7 +95,7 @@ private void StartDoAfter(EntityUid user, EntityUid item, EntityUid wearer, Togg
         if (component.StripDelay == null)
             return;
 
-        var (time, stealth) = _strippable.GetStripTimeModifiers(user, wearer, (float) component.StripDelay.Value.TotalSeconds);
+        var (time, stealth) = _strippable.GetStripTimeModifiers(user, wearer, component.StripDelay.Value);
 
         var args = new DoAfterArgs(EntityManager, user, time, new ToggleClothingDoAfterEvent(), item, wearer, item)
         {
diff --git a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiState.cs b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiState.cs
deleted file mode 100644
index dd820f1a0b3..00000000000
--- a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiState.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared.CartridgeLoader;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.DeltaV.CartridgeLoader.Cartridges;
-
-[Serializable, NetSerializable]
-public sealed class CrimeAssistUiState : BoundUserInterfaceState
-{
-    public CrimeAssistUiState()
-    { }
-}
-
-[Serializable, NetSerializable]
-public sealed class CrimeAssistSyncMessageEvent : CartridgeMessageEvent
-{
-    public CrimeAssistSyncMessageEvent()
-    { }
-}
diff --git a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/SecWatchUiState.cs b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/SecWatchUiState.cs
new file mode 100644
index 00000000000..068b54a6ffb
--- /dev/null
+++ b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/SecWatchUiState.cs
@@ -0,0 +1,24 @@
+using Content.Shared.Security;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.CartridgeLoader.Cartridges;
+
+/// <summary>
+/// Show a list of wanted and suspected people from criminal records.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class SecWatchUiState : BoundUserInterfaceState
+{
+    public readonly List<SecWatchEntry> Entries;
+
+    public SecWatchUiState(List<SecWatchEntry> entries)
+    {
+        Entries = entries;
+    }
+}
+
+/// <summary>
+/// Entry for a person who is wanted or suspected.
+/// </summary>
+[Serializable, NetSerializable]
+public record struct SecWatchEntry(string Name, string Job, SecurityStatus Status, string? Reason);
diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs
index 24006b0c9f9..7bdd17ee6fa 100644
--- a/Content.Shared/Inventory/InventorySystem.Equip.cs
+++ b/Content.Shared/Inventory/InventorySystem.Equip.cs
@@ -176,7 +176,7 @@ public bool TryEquip(EntityUid actor, EntityUid target, EntityUid itemUid, strin
             };
 
             _doAfter.TryStartDoAfter(args);
-            return false;
+            return true; // Changed to return true even if the item wasn't equipped instantly
         }
 
         if (!_containerSystem.Insert(itemUid, slotContainer))
diff --git a/Content.Shared/Inventory/InventoryTemplatePrototype.cs b/Content.Shared/Inventory/InventoryTemplatePrototype.cs
index a4779699629..585f80d4ce9 100644
--- a/Content.Shared/Inventory/InventoryTemplatePrototype.cs
+++ b/Content.Shared/Inventory/InventoryTemplatePrototype.cs
@@ -20,7 +20,7 @@ public sealed partial class SlotDefinition
     [DataField("slotFlags")] public SlotFlags SlotFlags { get; private set; } = SlotFlags.PREVENTEQUIP;
     [DataField("showInWindow")] public bool ShowInWindow { get; private set; } = true;
     [DataField("slotGroup")] public string SlotGroup { get; private set; } = "Default";
-    [DataField("stripTime")] public float StripTime { get; private set; } = 4f;
+    [DataField("stripTime")] public TimeSpan StripTime { get; private set; } = TimeSpan.FromSeconds(4f);
 
     [DataField("uiWindowPos", required: true)]
     public Vector2i UIWindowPosition { get; private set; }
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
deleted file mode 100644
index 7d611c63dac..00000000000
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared.Actions;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.Abilities.Psionics
-{
-    [RegisterComponent]
-    public sealed partial class MassSleepPowerComponent : Component
-    {
-        public float Radius = 1.25f;
-        [DataField("massSleepActionId",
-        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? MassSleepActionId = "ActionMassSleep";
-
-        [DataField("massSleepActionEntity")]
-        public EntityUid? MassSleepActionEntity;
-    }
-}
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs
deleted file mode 100644
index e36a3c70e8a..00000000000
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Bed.Sleep;
-using Content.Shared.Magic.Events;
-using Content.Shared.Damage;
-using Content.Shared.Mobs.Components;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-using Content.Shared.Mind;
-using Content.Shared.Actions.Events;
-
-namespace Content.Shared.Abilities.Psionics
-{
-    public sealed class MassSleepPowerSystem : EntitySystem
-    {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly SharedActionsSystem _actions = default!;
-        [Dependency] private readonly EntityLookupSystem _lookup = default!;
-        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly SharedMindSystem _mindSystem = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<MassSleepPowerComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<MassSleepPowerComponent, ComponentShutdown>(OnShutdown);
-            SubscribeLocalEvent<MassSleepPowerComponent, MassSleepPowerActionEvent>(OnPowerUsed);
-        }
-
-        private void OnInit(EntityUid uid, MassSleepPowerComponent component, ComponentInit args)
-        {
-            _actions.AddAction(uid, ref component.MassSleepActionEntity, component.MassSleepActionId );
-            _actions.TryGetActionData( component.MassSleepActionEntity, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(component.MassSleepActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
-                psionic.PsionicAbility = component.MassSleepActionEntity;
-        }
-
-        private void OnShutdown(EntityUid uid, MassSleepPowerComponent component, ComponentShutdown args)
-        {
-            _actions.RemoveAction(uid, component.MassSleepActionEntity);
-        }
-
-        private void OnPowerUsed(EntityUid uid, MassSleepPowerComponent component, MassSleepPowerActionEvent args)
-        {
-            foreach (var entity in _lookup.GetEntitiesInRange(args.Target, component.Radius))
-            {
-                if (HasComp<MobStateComponent>(entity) && entity != uid && !HasComp<PsionicInsulationComponent>(entity))
-                {
-                    if (TryComp<DamageableComponent>(entity, out var damageable) && damageable.DamageContainerID == "Biological")
-                        EnsureComp<SleepingComponent>(entity);
-                }
-            }
-            _psionics.LogPowerUsed(uid, "mass sleep");
-            args.Handled = true;
-        }
-    }
-}
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
deleted file mode 100644
index c9d0130221a..00000000000
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Shared.Actions;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.Abilities.Psionics
-{
-    [RegisterComponent]
-    public sealed partial class MetapsionicPowerComponent : Component
-    {
-        [DataField("range")]
-        public float Range = 5f;
-
-        public InstantActionComponent? MetapsionicPowerAction = null;
-        [DataField("metapsionicActionId",
-        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? MetapsionicActionId = "ActionMetapsionic";
-
-        [DataField("metapsionicActionEntity")]
-        public EntityUid? MetapsionicActionEntity;
-    }
-}
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
deleted file mode 100644
index 28425afdb4c..00000000000
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared.Actions;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.Abilities.Psionics
-{
-    [RegisterComponent]
-    public sealed partial class PyrokinesisPowerComponent : Component
-    {
-        public EntityTargetActionComponent? PyrokinesisPowerAction = null;
-        [DataField("pyrokinesisActionId",
-        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? PyrokinesisActionId = "ActionPyrokinesis";
-
-        [DataField("pyrokinesisActionEntity")]
-        public EntityUid? PyrokinesisActionEntity;
-    }
-}
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
deleted file mode 100644
index 9d627cb42d8..00000000000
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Content.Shared.Abilities.Psionics
-{
-    [RegisterComponent]
-    public sealed partial class TelegnosticProjectionComponent : Component
-    {}
-}
\ No newline at end of file
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs
deleted file mode 100644
index 9091e03cfc3..00000000000
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Shared.Actions;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Abilities.Psionics
-{
-    [RegisterComponent, NetworkedComponent]
-    public sealed partial class PsionicComponent : Component
-    {
-        public EntityUid? PsionicAbility = null;
-
-        /// <summary>
-        ///     Ifrits, revenants, etc are explicitly magical beings that shouldn't get mindbreakered.
-        /// </summary>
-        [DataField("removable")]
-        public bool Removable = true;
-
-        [DataField("activePowers")]
-        public HashSet<Component> ActivePowers = new();
-    }
-}
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs
deleted file mode 100644
index 6666ee48d6c..00000000000
--- a/Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-namespace Content.Shared.Actions.Events;
-public sealed partial class MassSleepPowerActionEvent : WorldTargetActionEvent {}
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs
index b28801efe74..b7c3c8ad2d6 100644
--- a/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs
+++ b/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs
@@ -1,2 +1,3 @@
 namespace Content.Shared.Actions.Events;
-public sealed partial class MetapsionicPowerActionEvent : InstantActionEvent {}
+public sealed partial class WideMetapsionicPowerActionEvent : InstantActionEvent { }
+public sealed partial class FocusedMetapsionicPowerActionEvent : EntityTargetActionEvent { }
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs
index 896ec0bb63d..2493be58fab 100644
--- a/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs
+++ b/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs
@@ -1,2 +1,5 @@
 namespace Content.Shared.Actions.Events;
-public sealed partial class PyrokinesisPowerActionEvent : EntityTargetActionEvent {}
+public sealed partial class PyrokinesisPowerActionEvent : WorldTargetActionEvent {}
+public sealed partial class PyrokinesisPrechargeActionEvent : InstantActionEvent {}
+
+
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs
new file mode 100644
index 00000000000..4435f475a44
--- /dev/null
+++ b/Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs
@@ -0,0 +1,2 @@
+namespace Content.Shared.Actions.Events;
+public sealed partial class RegenerativeStasisPowerActionEvent : EntityTargetActionEvent {}
diff --git a/Content.Shared/Nyanotrasen/Psionics/Events.cs b/Content.Shared/Nyanotrasen/Psionics/Events.cs
deleted file mode 100644
index cf9a50c6e18..00000000000
--- a/Content.Shared/Nyanotrasen/Psionics/Events.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Robust.Shared.Serialization;
-using Content.Shared.DoAfter;
-
-namespace Content.Shared.Psionics.Events
-{
-    [Serializable, NetSerializable]
-    public sealed partial class PsionicRegenerationDoAfterEvent : DoAfterEvent
-    {
-        [DataField("startedAt", required: true)]
-        public TimeSpan StartedAt;
-
-        private PsionicRegenerationDoAfterEvent()
-        {
-        }
-
-        public PsionicRegenerationDoAfterEvent(TimeSpan startedAt)
-        {
-            StartedAt = startedAt;
-        }
-
-        public override DoAfterEvent Clone() => this;
-    }
-
-    [Serializable, NetSerializable]
-    public sealed partial class GlimmerWispDrainDoAfterEvent : SimpleDoAfterEvent
-    {
-    }
-}
diff --git a/Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs b/Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs
deleted file mode 100644
index 31af85bbb51..00000000000
--- a/Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using Robust.Shared.Serialization;
-using Robust.Shared.Configuration;
-using Content.Shared.CCVar;
-using Content.Shared.GameTicking;
-
-namespace Content.Shared.Psionics.Glimmer
-{
-    /// <summary>
-    /// This handles setting / reading the value of glimmer.
-    /// </summary>
-    public sealed class GlimmerSystem : EntitySystem
-    {
-        [Dependency] private readonly IConfigurationManager _cfg = default!;
-        private int _glimmer = 0;
-        public int Glimmer
-        {
-            get { return _glimmer; }
-            set { _glimmer = _enabled ? Math.Clamp(value, 0, 1000) : 0; }
-        }
-        private bool _enabled;
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
-            _enabled = _cfg.GetCVar(CCVars.GlimmerEnabled);
-            _cfg.OnValueChanged(CCVars.GlimmerEnabled, value => _enabled = value, true);
-        }
-
-        private void Reset(RoundRestartCleanupEvent args)
-        {
-            Glimmer = 0;
-        }
-
-        /// <summary>
-        /// Return an abstracted range of a glimmer count.
-        /// </summary>
-        /// <param name="glimmer">What glimmer count to check. Uses the current glimmer by default.</param>
-        public GlimmerTier GetGlimmerTier(int? glimmer = null)
-        {
-            if (glimmer == null)
-                glimmer = Glimmer;
-
-            return (glimmer) switch
-            {
-                <= 49 => GlimmerTier.Minimal,
-                >= 50 and <= 99 => GlimmerTier.Low,
-                >= 100 and <= 299 => GlimmerTier.Moderate,
-                >= 300 and <= 499 => GlimmerTier.High,
-                >= 500 and <= 899 => GlimmerTier.Dangerous,
-                _ => GlimmerTier.Critical,
-            };
-        }
-    }
-
-    [Serializable, NetSerializable]
-    public enum GlimmerTier : byte
-    {
-        Minimal,
-        Low,
-        Moderate,
-        High,
-        Dangerous,
-        Critical,
-    }
-}
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/AcceptPsionicsEuiMessage.cs b/Content.Shared/Psionics/Abilities/AcceptPsionicsEuiMessage.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/AcceptPsionicsEuiMessage.cs
rename to Content.Shared/Psionics/Abilities/AcceptPsionicsEuiMessage.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs b/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
similarity index 77%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
rename to Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
index ce86111fc4b..c3702880375 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
+++ b/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Damage;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     /// <summary>
     /// Takes damage when dispelled.
@@ -9,7 +9,7 @@ namespace Content.Shared.Abilities.Psionics
     public sealed partial class DamageOnDispelComponent : Component
     {
         [DataField("damage", required: true)]
-        public DamageSpecifier  Damage = default!;
+        public DamageSpecifier Damage = default!;
 
         [DataField("variance")]
         public float Variance = 0.5f;
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs b/Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs
similarity index 79%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs
index cd887866364..518a28b0967 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs
@@ -1,20 +1,22 @@
-using Content.Shared.Actions;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class DispelPowerComponent : Component
     {
         [DataField("range")]
         public float Range = 10f;
-        
+
         [DataField("dispelActionId",
         customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string? DispelActionId = "ActionDispel";
 
         [DataField("dispelActionEntity")]
         public EntityUid? DispelActionEntity;
+
+        [DataField("dispelFeedback")]
+        public string DispelFeedback = "dispel-feedback";
     }
 }
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispellableComponent.cs b/Content.Shared/Psionics/Abilities/Dispel/DispellableComponent.cs
similarity index 69%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispellableComponent.cs
rename to Content.Shared/Psionics/Abilities/Dispel/DispellableComponent.cs
index 40352004187..4bb5ee653d2 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispellableComponent.cs
+++ b/Content.Shared/Psionics/Abilities/Dispel/DispellableComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class DispellableComponent : Component
diff --git a/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs b/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
new file mode 100644
index 00000000000..2fbfe18327e
--- /dev/null
+++ b/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
@@ -0,0 +1,38 @@
+using Content.Shared.DoAfter;
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared.Psionics.Abilities
+{
+    [RegisterComponent]
+    public sealed partial class MetapsionicPowerComponent : Component
+    {
+        [DataField("doAfter")]
+        public DoAfterId? DoAfter;
+
+        [DataField("useDelay")]
+        public float UseDelay = 8f;
+        [DataField("soundUse")]
+
+        public SoundSpecifier SoundUse = new SoundPathSpecifier("/Audio/Nyanotrasen/heartbeat_fast.ogg");
+
+        [DataField("range")]
+        public float Range = 5f;
+
+        [DataField("actionWideMetapsionic", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        public string ActionWideMetapsionic = "ActionWideMetapsionic";
+
+        [DataField("actionWideMetapsionicEntity")]
+        public EntityUid? ActionWideMetapsionicEntity;
+
+        [DataField("actionFocusedMetapsionic", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        public string ActionFocusedMetapsionic = "ActionFocusedMetapsionic";
+
+        [DataField("actionFocusedMetapsionicEntity")]
+        public EntityUid? ActionFocusedMetapsionicEntity;
+
+        [DataField("metapsionicFeedback")]
+        public string MetapsionicFeedback = "metapsionic-feedback";
+    }
+}
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs b/Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
similarity index 76%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
index 6a3fc811c89..94b73c41e38 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class MindSwapPowerComponent : Component
@@ -12,5 +12,8 @@ public sealed partial class MindSwapPowerComponent : Component
 
         [DataField("mindSwapActionEntity")]
         public EntityUid? MindSwapActionEntity;
+
+        [DataField("mindSwapFeedback")]
+        public string MindSwapFeedback = "mind-swap-feedback";
     }
 }
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs b/Content.Shared/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
similarity index 77%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
index 0e91894b1dc..997db65e1b1 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class NoosphericZapPowerComponent : Component
@@ -13,5 +13,8 @@ public sealed partial class NoosphericZapPowerComponent : Component
 
         [DataField("noosphericZapActionEntity")]
         public EntityUid? NoosphericZapActionEntity;
+
+        [DataField("noosphericZapFeedback")]
+        public string NoosphericZapFeedback = "noospheric-zap-feedback";
     }
 }
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
similarity index 71%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
index 3e198aa9303..d9c36f5b22a 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class PsionicInvisibilityPowerComponent : Component
@@ -12,5 +12,11 @@ public sealed partial class PsionicInvisibilityPowerComponent : Component
 
         [DataField("psionicInvisibilityActionEntity")]
         public EntityUid? PsionicInvisibilityActionEntity;
+
+        [DataField("InvisibilityFeedback")]
+        public string InvisibilityFeedback = "invisibility-feedback";
+
+        [DataField("UseTimer")]
+        public float UseTimer = 30f;
     }
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerSystem.cs
similarity index 51%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
rename to Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerSystem.cs
index 5ca1dc7a6dc..540dc03341b 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
+++ b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerSystem.cs
@@ -1,31 +1,30 @@
 using Content.Shared.Actions;
-using Content.Shared.CombatMode.Pacification;
-using Content.Shared.Abilities.Psionics;
 using Content.Shared.Damage;
+using Content.Shared.DoAfter;
 using Content.Shared.Stunnable;
 using Content.Shared.Stealth;
 using Content.Shared.Stealth.Components;
-using Content.Server.Psionics;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Player;
-using Robust.Shared.Audio;
-using Robust.Shared.Timing;
-using Content.Server.Mind;
+using Content.Shared.Psionics.Events;
 using Content.Shared.Actions.Events;
+using Robust.Shared.Network;
 using Robust.Shared.Audio.Systems;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Weapons.Ranged.Events;
+using Content.Shared.Throwing;
+using Robust.Shared.Timing;
 
-namespace Content.Server.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     public sealed class PsionicInvisibilityPowerSystem : EntitySystem
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly SharedStunSystem _stunSystem = default!;
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly SharedStealthSystem _stealth = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly MindSystem _mindSystem = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+        [Dependency] private readonly INetManager _net = default!;
 
         public override void Initialize()
         {
@@ -37,51 +36,65 @@ public override void Initialize()
             SubscribeLocalEvent<PsionicInvisibilityUsedComponent, ComponentInit>(OnStart);
             SubscribeLocalEvent<PsionicInvisibilityUsedComponent, ComponentShutdown>(OnEnd);
             SubscribeLocalEvent<PsionicInvisibilityUsedComponent, DamageChangedEvent>(OnDamageChanged);
+            SubscribeLocalEvent<PsionicInvisibilityUsedComponent, AttackAttemptEvent>(OnAttackAttempt);
+            SubscribeLocalEvent<PsionicInvisibilityUsedComponent, ShotAttemptedEvent>(OnShootAttempt);
+            SubscribeLocalEvent<PsionicInvisibilityUsedComponent, ThrowAttemptEvent>(OnThrowAttempt);
+            SubscribeLocalEvent<PsionicInvisibilityUsedComponent, PsionicInsulationEvent>(OnInsulated);
         }
 
         private void OnInit(EntityUid uid, PsionicInvisibilityPowerComponent component, ComponentInit args)
         {
-            _actions.AddAction(uid, ref component.PsionicInvisibilityActionEntity, component.PsionicInvisibilityActionId );
-            _actions.TryGetActionData( component.PsionicInvisibilityActionEntity, out var actionData );
+            _actions.AddAction(uid, ref component.PsionicInvisibilityActionEntity, component.PsionicInvisibilityActionId);
+            _actions.TryGetActionData( component.PsionicInvisibilityActionEntity, out var actionData);
             if (actionData is { UseDelay: not null })
                 _actions.StartUseDelay(component.PsionicInvisibilityActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+            if (TryComp<PsionicComponent>(uid, out var psionic))
             {
-                psionic.PsionicAbility = component.PsionicInvisibilityActionEntity;
                 psionic.ActivePowers.Add(component);
+                psionic.PsychicFeedback.Add(component.InvisibilityFeedback);
+                psionic.Amplification += 0.5f;
             }
         }
 
         private void OnShutdown(EntityUid uid, PsionicInvisibilityPowerComponent component, ComponentShutdown args)
         {
+            RemComp<PsionicInvisibilityUsedComponent>(uid);
+            RemComp<PsionicallyInvisibleComponent>(uid);
             _actions.RemoveAction(uid, component.PsionicInvisibilityActionEntity);
             if (TryComp<PsionicComponent>(uid, out var psionic))
             {
                 psionic.ActivePowers.Remove(component);
+                psionic.PsychicFeedback.Remove(component.InvisibilityFeedback);
+                psionic.Amplification -= 0.5f;
             }
         }
 
         private void OnPowerUsed(EntityUid uid, PsionicInvisibilityPowerComponent component, PsionicInvisibilityPowerActionEvent args)
         {
-            if (HasComp<PsionicInvisibilityUsedComponent>(uid))
+            if (!TryComp<PsionicComponent>(uid, out var psionic))
                 return;
 
-            ToggleInvisibility(args.Performer);
-            var action = Spawn(PsionicInvisibilityUsedComponent.PsionicInvisibilityUsedActionPrototype);
-            _actions.AddAction(uid, action, action);
-            _actions.TryGetActionData( action, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.StartUseDelay(action);
+            if (HasComp<PsionicInsulationComponent>(uid))
+                return;
 
-            _psionics.LogPowerUsed(uid, "psionic invisibility");
-            args.Handled = true;
+            var ev = new PsionicInvisibilityTimerEvent(_gameTiming.CurTime);
+            var doAfterArgs = new DoAfterArgs(EntityManager, uid, component.UseTimer, ev, uid) { Hidden = true };
+            if (_doAfterSystem.TryStartDoAfter(doAfterArgs, out var doAfterId))
+            {
+                ToggleInvisibility(args.Performer);
+                if (TryComp<PsionicInvisibilityUsedComponent>(uid, out var invis))
+                {
+                    _actions.AddAction(uid, ref invis.PsionicInvisibilityUsedActionEntity, invis.PsionicInvisibilityUsedActionId);
+                    invis.DoAfter = doAfterId;
+                }
+
+                _psionics.LogPowerUsed(uid, "psionic invisibility", psionic, 8, 12);
+                args.Handled = true;
+            }
         }
 
         private void OnPowerOff(RemovePsionicInvisibilityOffPowerActionEvent args)
         {
-            if (!HasComp<PsionicInvisibilityUsedComponent>(args.Performer))
-                return;
-
             ToggleInvisibility(args.Performer);
             args.Handled = true;
         }
@@ -89,10 +102,11 @@ private void OnPowerOff(RemovePsionicInvisibilityOffPowerActionEvent args)
         private void OnStart(EntityUid uid, PsionicInvisibilityUsedComponent component, ComponentInit args)
         {
             EnsureComp<PsionicallyInvisibleComponent>(uid);
-            EnsureComp<PacifiedComponent>(uid);
             var stealth = EnsureComp<StealthComponent>(uid);
             _stealth.SetVisibility(uid, 0.66f, stealth);
-            _audio.PlayPvs("/Audio/Effects/toss.ogg", uid);
+
+            if (_net.IsServer)
+                _audio.PlayPvs("/Audio/Effects/toss.ogg", uid);
 
         }
 
@@ -101,25 +115,42 @@ private void OnEnd(EntityUid uid, PsionicInvisibilityUsedComponent component, Co
             if (Terminating(uid))
                 return;
 
+            _doAfterSystem.Cancel(component.DoAfter);
             RemComp<PsionicallyInvisibleComponent>(uid);
-            RemComp<PacifiedComponent>(uid);
             RemComp<StealthComponent>(uid);
-            _audio.PlayPvs("/Audio/Effects/toss.ogg", uid);
-            //Pretty sure this DOESN'T work as intended.
-            _actions.RemoveAction(uid, component.PsionicInvisibilityUsedActionEntity);
 
-            _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(8), false);
+            if (_net.IsServer)
+                _audio.PlayPvs("/Audio/Effects/toss.ogg", uid);
+
+            _actions.RemoveAction(uid, component.PsionicInvisibilityUsedActionEntity);
             DirtyEntity(uid);
         }
 
+        private void OnAttackAttempt(EntityUid uid, PsionicInvisibilityUsedComponent component, AttackAttemptEvent args)
+        {
+            RemComp<PsionicInvisibilityUsedComponent>(uid);
+        }
+
+        private void OnShootAttempt(EntityUid uid, PsionicInvisibilityUsedComponent component, ShotAttemptedEvent args)
+        {
+            RemComp<PsionicInvisibilityUsedComponent>(uid);
+        }
+
+        private void OnThrowAttempt(EntityUid uid, PsionicInvisibilityUsedComponent component, ThrowAttemptEvent args)
+        {
+            RemComp<PsionicInvisibilityUsedComponent>(uid);
+        }
         private void OnDamageChanged(EntityUid uid, PsionicInvisibilityUsedComponent component, DamageChangedEvent args)
         {
+            if (!TryComp<PsionicComponent>(uid, out var psionic))
+                return;
+
             if (!args.DamageIncreased)
                 return;
 
             ToggleInvisibility(uid);
+            _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(4f / psionic.Dampening + psionic.Amplification), false);
         }
-
         public void ToggleInvisibility(EntityUid uid)
         {
             if (!HasComp<PsionicInvisibilityUsedComponent>(uid))
@@ -130,5 +161,20 @@ public void ToggleInvisibility(EntityUid uid)
                 RemComp<PsionicInvisibilityUsedComponent>(uid);
             }
         }
+
+        public void OnDoAfter(EntityUid uid, PsionicInvisibilityPowerComponent component, PsionicInvisibilityTimerEvent args)
+        {
+            if (!args.Cancelled)
+                RemComp<PsionicInvisibilityUsedComponent>(uid);
+        }
+
+        private void OnInsulated(EntityUid uid, PsionicInvisibilityUsedComponent component, PsionicInsulationEvent args)
+        {
+            if (!TryComp<PsionicComponent>(uid, out var psionic))
+                return;
+
+            RemComp<PsionicInvisibilityUsedComponent>(uid);
+            _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(4f / psionic.Dampening + psionic.Amplification), false);
+        }
     }
 }
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
similarity index 68%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
rename to Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
index 9037b8bcdfe..22d1b928553 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
+++ b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
@@ -1,17 +1,19 @@
+using Content.Shared.DoAfter;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-namespace Content.Shared.Abilities.Psionics
+
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class PsionicInvisibilityUsedComponent : Component
     {
-        [ValidatePrototypeId<EntityPrototype>]
-        public const string PsionicInvisibilityUsedActionPrototype = "ActionPsionicInvisibilityUsed";
-        [DataField("psionicInvisibilityUsedActionId",
+        [DataField("psionicInvisibilityActionId",
         customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string? PsionicInvisibilityUsedActionId = "ActionPsionicInvisibilityUsed";
 
         [DataField("psionicInvisibilityUsedActionEntity")]
         public EntityUid? PsionicInvisibilityUsedActionEntity;
+
+        public DoAfterId? DoAfter;
     }
 }
diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibleContactsComponent.cs
similarity index 89%
rename from Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
rename to Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibleContactsComponent.cs
index 859ceb7b83a..376414eedce 100644
--- a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
+++ b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibleContactsComponent.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Whitelist;
-using Robust.Shared.Timing;
 
-namespace Content.Server.Psionics
+namespace Content.Shared.Psionics
 {
     [RegisterComponent]
     public sealed partial class PsionicInvisibleContactsComponent : Component
diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibleContactsSystem.cs
similarity index 94%
rename from Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
rename to Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibleContactsSystem.cs
index cec755e3260..f71605238ae 100644
--- a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
+++ b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibleContactsSystem.cs
@@ -2,9 +2,8 @@
 using Content.Shared.Stealth.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
-using Robust.Shared.Timing;
 
-namespace Content.Server.Psionics
+namespace Content.Shared.Psionics
 {
     /// <summary>
     /// Allows an entity to become psionically invisible when touching certain entities.
@@ -12,7 +11,6 @@ namespace Content.Server.Psionics
     public sealed class PsionicInvisibleContactsSystem : EntitySystem
     {
         [Dependency] private readonly SharedStealthSystem _stealth = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
 
         public override void Initialize()
         {
diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicallyInvisibleComponent.cs b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicallyInvisibleComponent.cs
similarity index 76%
rename from Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicallyInvisibleComponent.cs
rename to Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicallyInvisibleComponent.cs
index 5352f5737f2..87d3f250b1e 100644
--- a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicallyInvisibleComponent.cs
+++ b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicallyInvisibleComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Psionics
+namespace Content.Shared.Psionics
 {
     [RegisterComponent]
     public sealed partial class PsionicallyInvisibleComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs b/Content.Shared/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
similarity index 76%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
index 4a62e84d191..3184bf7de5b 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
@@ -3,7 +3,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class PsionicRegenerationPowerComponent : Component
@@ -12,7 +12,7 @@ public sealed partial class PsionicRegenerationPowerComponent : Component
         public DoAfterId? DoAfter;
 
         [DataField("essence")]
-        public float EssenceAmount = 20;
+        public float EssenceAmount = 10;
 
         [DataField("useDelay")]
         public float UseDelay = 8f;
@@ -26,6 +26,12 @@ public sealed partial class PsionicRegenerationPowerComponent : Component
 
         [DataField("psionicRegenerationActionEntity")]
         public EntityUid? PsionicRegenerationActionEntity;
+
+        [DataField("regenerationFeedback")]
+        public string RegenerationFeedback = "regeneration-feedback";
+
+        [DataField("selfRevive")]
+        public bool SelfRevive { get; set; } = false;
     }
 }
 
diff --git a/Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs b/Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
new file mode 100644
index 00000000000..b95ead8ec1a
--- /dev/null
+++ b/Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
@@ -0,0 +1,45 @@
+using Content.Shared.DoAfter;
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared.Psionics.Abilities
+{
+    [RegisterComponent]
+    public sealed partial class PyrokinesisPowerComponent : Component
+    {
+        [DataField("pyrokinesisPrechargeActionId",
+        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        public string? PyrokinesisPrechargeActionId = "ActionPrechargePyrokinesis";
+
+        [DataField("pyrokinesisPrechargeActionEntity")]
+        public EntityUid? PyrokinesisPrechargeActionEntity;
+
+        [DataField("pyrokinesisActionId",
+        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        public string? PyrokinesisActionId = "ActionPyrokinesis";
+
+        [DataField("pyrokinesisActionEntity")]
+        public EntityUid? PyrokinesisActionEntity;
+
+        [DataField("pyrokinesisFeedback")]
+        public string PyrokinesisFeedback = "pyrokinesis-feedback";
+
+        [DataField]
+        public string PyrokinesisObviousPopup = "pyrokinesis-obvious";
+
+        [DataField]
+        public string PyrokinesisSubtlePopup = "pyrokinesis-subtle";
+
+        [DataField]
+        public string PyrokinesisRefundCooldown = "pyrokinesis-refund-cooldown";
+
+        public DoAfterId? ResetDoAfter;
+        public bool FireballThrown;
+
+        [DataField]
+        public SoundSpecifier SoundUse = new SoundPathSpecifier("/Audio/Items/welder.ogg");
+        [DataField]
+        public TimeSpan ResetDuration = TimeSpan.FromSeconds(7);
+    }
+}
diff --git a/Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPrechargeComponent.cs b/Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPrechargeComponent.cs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Content.Shared/Psionics/Abilities/RegenerativeStasis/RegenerativeStasisPowerComponent.cs b/Content.Shared/Psionics/Abilities/RegenerativeStasis/RegenerativeStasisPowerComponent.cs
new file mode 100644
index 00000000000..7caa6100806
--- /dev/null
+++ b/Content.Shared/Psionics/Abilities/RegenerativeStasis/RegenerativeStasisPowerComponent.cs
@@ -0,0 +1,19 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared.Psionics.Abilities
+{
+    [RegisterComponent]
+    public sealed partial class RegenerativeStasisPowerComponent : Component
+    {
+        [DataField("regenerativeStasisActionId",
+        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        public string? RegenerativeStasisActionId = "ActionRegenerativeStasis";
+
+        [DataField("regenerativeStasisActionEntity")]
+        public EntityUid? RegenerativeStasisActionEntity;
+
+        [DataField("regenerativeStasisFeedback")]
+        public string RegenerativeStasisFeedback = "regenerative-stasis-feedback";
+    }
+}
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
similarity index 73%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
index 51958822a41..f1a71332b18 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
+++ b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
@@ -3,7 +3,7 @@
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class TelegnosisPowerComponent : Component
@@ -19,5 +19,11 @@ public sealed partial class TelegnosisPowerComponent : Component
 
         [DataField("telegnosisActionEntity")]
         public EntityUid? TelegnosisActionEntity;
+
+        [DataField("telegnosisFeedback")]
+        public string TelegnosisFeedback = "telegnosis-feedback";
+        public EntityUid OriginalEntity = default!;
+        public EntityUid ProjectionUid = default!;
+        public bool IsProjecting = false;
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
new file mode 100644
index 00000000000..bc18ff9f3c2
--- /dev/null
+++ b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
@@ -0,0 +1,8 @@
+namespace Content.Shared.Psionics.Abilities
+{
+    [RegisterComponent]
+    public sealed partial class TelegnosticProjectionComponent : Component
+    {
+        public EntityUid OriginalEntity = default!;
+    }
+}
diff --git a/Content.Shared/Psionics/Events.cs b/Content.Shared/Psionics/Events.cs
new file mode 100644
index 00000000000..88cf17a4a2f
--- /dev/null
+++ b/Content.Shared/Psionics/Events.cs
@@ -0,0 +1,82 @@
+using Robust.Shared.Serialization;
+using Content.Shared.DoAfter;
+
+namespace Content.Shared.Psionics.Events
+{
+    [Serializable, NetSerializable]
+    public sealed partial class PsionicRegenerationDoAfterEvent : DoAfterEvent
+    {
+        [DataField("startedAt", required: true)]
+        public TimeSpan StartedAt;
+
+        private PsionicRegenerationDoAfterEvent()
+        {
+        }
+
+        public PsionicRegenerationDoAfterEvent(TimeSpan startedAt)
+        {
+            StartedAt = startedAt;
+        }
+
+        public override DoAfterEvent Clone() => this;
+    }
+
+    [Serializable, NetSerializable]
+    public sealed partial class PsionicInvisibilityTimerEvent : DoAfterEvent
+    {
+        [DataField("startedAt", required: true)]
+        public TimeSpan StartedAt;
+
+        private PsionicInvisibilityTimerEvent()
+        {
+        }
+
+        public PsionicInvisibilityTimerEvent(TimeSpan startedAt)
+        {
+            StartedAt = startedAt;
+        }
+
+        public override DoAfterEvent Clone() => this;
+    }
+
+    [Serializable, NetSerializable]
+    public sealed partial class FocusedMetapsionicDoAfterEvent : DoAfterEvent
+    {
+        [DataField("startedAt", required: true)]
+        public TimeSpan StartedAt;
+
+        private FocusedMetapsionicDoAfterEvent()
+        {
+        }
+
+        public FocusedMetapsionicDoAfterEvent(TimeSpan startedAt)
+        {
+            StartedAt = startedAt;
+        }
+
+        public override DoAfterEvent Clone() => this;
+    }
+
+    [Serializable, NetSerializable]
+    public sealed partial class PyrokinesisPrechargeDoAfterEvent : DoAfterEvent
+    {
+        [DataField("startedAt", required: true)]
+        public TimeSpan StartedAt;
+
+        private PyrokinesisPrechargeDoAfterEvent()
+        {
+        }
+
+        public PyrokinesisPrechargeDoAfterEvent(TimeSpan startedAt)
+        {
+            StartedAt = startedAt;
+        }
+
+        public override DoAfterEvent Clone() => this;
+    }
+
+    [Serializable, NetSerializable]
+    public sealed partial class GlimmerWispDrainDoAfterEvent : SimpleDoAfterEvent
+    {
+    }
+}
diff --git a/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs b/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
new file mode 100644
index 00000000000..9b8d20b295d
--- /dev/null
+++ b/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
@@ -0,0 +1,183 @@
+using Robust.Shared.Serialization;
+using Robust.Shared.Configuration;
+using Content.Shared.CCVar;
+using Content.Shared.GameTicking;
+
+namespace Content.Shared.Psionics.Glimmer
+{
+    /// <summary>
+    /// This handles setting / reading the value of glimmer.
+    /// </summary>
+    public sealed class GlimmerSystem : EntitySystem
+    {
+        [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+        private float _glimmerInput = 0;
+        /// <summary>
+        ///     GlimmerInput represents the system-facing value of the station's glimmer, and is given by f(y) for this graph: https://www.desmos.com/calculator/posutiq38e
+        ///     Where x = GlimmerOutput and y = GlimmerInput
+        /// </summary>
+        /// <remarks>
+        ///     This is private set for a good reason, if you're looking to change it, do so via DeltaGlimmerInput or SetGlimmerInput
+        /// </remarks>
+        public float GlimmerInput
+        {
+            get { return _glimmerInput; }
+            private set { _glimmerInput = _enabled ? Math.Max(value, 0) : 0; }
+        }
+        private float _glimmerOutput = 0;
+
+        /// <summary>
+        ///     This constant is equal to the intersection of the Glimmer Equation(https://www.desmos.com/calculator/posutiq38e) and the line Y = X.
+        /// </summary>
+        public const float GlimmerEquilibrium = 502.941f;
+
+
+        /// <summary>
+        ///     Glimmer Output represents the player-facing value of the station's glimmer, and is given by f(x) for this graph: https://www.desmos.com/calculator/posutiq38e
+        ///     Where x = GlimmerInput and y = GlimmerOutput
+        /// </summary>
+        /// <remarks>
+        ///     This is private set for a good reason, if you're looking to change it, do so via DeltaGlimmerOutput or SetGlimmerOutput
+        /// </remarks>
+        public float GlimmerOutput
+        {
+            get { return _glimmerOutput; }
+            private set { _glimmerOutput = _enabled ? Math.Clamp(value, 0, 999.999f) : 0; }
+        }
+        private bool _enabled;
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
+            _enabled = _cfg.GetCVar(CCVars.GlimmerEnabled);
+            _cfg.OnValueChanged(CCVars.GlimmerEnabled, value => _enabled = value, true);
+        }
+
+        private void Reset(RoundRestartCleanupEvent args)
+        {
+            GlimmerInput = 0;
+            GlimmerOutput = 0;
+        }
+
+        /// <summary>
+        ///     Return an abstracted range of a glimmer count. This is a legacy system used to support the Prober,
+        ///     and is the lowest form of abstracted glimmer. It's meant more for sprite states than math.
+        /// </summary>
+        /// <param name="glimmer">What glimmer count to check. Uses the current glimmer by default.</param>
+        public GlimmerTier GetGlimmerTier(float? glimmer = null)
+        {
+            if (glimmer == null)
+                glimmer = GlimmerOutput;
+
+            return glimmer switch
+            {
+                <= 49 => GlimmerTier.Minimal,
+                >= 50 and <= 399 => GlimmerTier.Low,
+                >= 400 and <= 599 => GlimmerTier.Moderate,
+                >= 600 and <= 699 => GlimmerTier.High,
+                >= 700 and <= 899 => GlimmerTier.Dangerous,
+                _ => GlimmerTier.Critical,
+            };
+        }
+
+        /// <summary>
+        ///     Returns a 0 through 10 range of glimmer. Do not divide by this for any reason.
+        /// </summary>
+        /// <returns></returns>
+        public int GetGlimmerOutputInteger()
+        {
+            if (!_enabled)
+                return 1;
+            else return (int) MathF.Round(GlimmerOutput / 1000);
+        }
+
+        /// <summary>
+        ///     This is the public facing function for modifying Glimmer based on the log scale. Simply add or subtract to this with any nonzero number
+        ///     Go through this if you want glimmer to be modified faster if its below 502.941f, and slower if above said equilibrium
+        /// </summary>
+        /// <param name="delta"></param>
+        public void DeltaGlimmerInput(float delta)
+        {
+            if (_enabled && delta != 0)
+            {
+                GlimmerInput += delta;
+                GlimmerOutput = 2000 / (1 + MathF.Pow(MathF.E, -.0022f * GlimmerInput)) - 1000;
+            }
+        }
+
+        /// <summary>
+        ///     This is the public facing function for modifying Glimmer based on a linear scale. Simply add or subtract to this with any nonzero number.
+        ///     This is primarily intended for load bearing systems such as Probers and Drainers, and should not be called by most things by design.
+        /// </summary>
+        /// <param name="delta"></param>
+        public void DeltaGlimmerOutput(float delta)
+        {
+            if (_enabled && delta != 0)
+            {
+                GlimmerOutput += delta;
+                GlimmerInput = 2000 / (1 + MathF.Pow(MathF.E, -.0022f * GlimmerOutput)) - 1000;
+            }
+        }
+
+        /// <summary>
+        ///     This directly sets the Player-Facing side of Glimmer to a given value, and is not intended to be called by anything other than admin commands.
+        ///     This is clamped between 0 and 999.999f
+        /// </summary>
+        /// <param name="set"></param>
+        public void SetGlimmerOutput(float set)
+        {
+            if (_enabled && set != 0)
+            {
+                GlimmerOutput = Math.Clamp(set, 0, 999.999f);
+                GlimmerInput = 2000 / (1 + MathF.Pow(MathF.E, -.0022f * GlimmerOutput)) - 1000;
+            }
+        }
+
+        /// <summary>
+        ///     This directly sets the code-facing side of Glimmer to a given value, and is not intended to be called by anything other than admin commands.
+        ///     This accepts any positive float input.
+        /// </summary>
+        /// <param name="set"></param>
+        public void SetGlimmerInput(float set)
+        {
+            if (_enabled && set >= 0)
+            {
+                GlimmerInput = set;
+                GlimmerOutput = 2000 / (1 + MathF.Pow(MathF.E, -.0022f * GlimmerOutput)) - 1000;
+            }
+        }
+
+        /// <summary>
+        ///     Outputs the ratio between actual glimmer and glimmer equilibrium(The intersection of the Glimmer Equation and the line y = x).
+        ///     This will return 0.01f if glimmer is 0, and 1 if glimmer is disabled.
+        /// </summary>
+        public float GetGlimmerEquilibriumRatio()
+        {
+            if (!_enabled)
+                return 1;
+            else if (GlimmerOutput == 0)
+                return 0.01f;
+            else return GlimmerOutput / GlimmerEquilibrium;
+        }
+
+        /// <summary>
+        ///     Returns the GlimmerEnabled CVar, useful for niche early exits in systems that otherwise don't have any calls to CVars.
+        /// </summary>
+        public bool GetGlimmerEnabled()
+        {
+            return _enabled;
+        }
+    }
+
+    [Serializable, NetSerializable]
+    public enum GlimmerTier : byte
+    {
+        Minimal,
+        Low,
+        Moderate,
+        High,
+        Dangerous,
+        Critical,
+    }
+}
diff --git a/Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs b/Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs
rename to Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs b/Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs
rename to Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/ClothingGrantPsionicPowerComponent.cs b/Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
similarity index 84%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
rename to Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
index 4cbb05c8395..f09efc3064c 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
+++ b/Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class ClothingGrantPsionicPowerComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs b/Content.Shared/Psionics/Items/HeadCageComponent.cs
similarity index 96%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs
rename to Content.Shared/Psionics/Items/HeadCageComponent.cs
index acaa832860f..c03241e47c7 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs
+++ b/Content.Shared/Psionics/Items/HeadCageComponent.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using Robust.Shared.Audio;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class HeadCageComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs b/Content.Shared/Psionics/Items/HeadCagedComponent.cs
similarity index 81%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs
rename to Content.Shared/Psionics/Items/HeadCagedComponent.cs
index f8af46b8878..0f826f7a05e 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs
+++ b/Content.Shared/Psionics/Items/HeadCagedComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     /// <summary>
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/PsionicItemsSystem.cs b/Content.Shared/Psionics/Items/PsionicItemsSystem.cs
similarity index 98%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/PsionicItemsSystem.cs
rename to Content.Shared/Psionics/Items/PsionicItemsSystem.cs
index f88acf61f3c..950353c5dfb 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/PsionicItemsSystem.cs
+++ b/Content.Shared/Psionics/Items/PsionicItemsSystem.cs
@@ -2,7 +2,7 @@
 using Content.Shared.Clothing.Components;
 using Content.Shared.StatusEffect;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     public sealed class PsionicItemsSystem : EntitySystem
     {
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/TinfoilHatComponent.cs b/Content.Shared/Psionics/Items/TinfoilHatComponent.cs
similarity index 90%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/TinfoilHatComponent.cs
rename to Content.Shared/Psionics/Items/TinfoilHatComponent.cs
index 5086b9f4977..6ef7bdc823b 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/TinfoilHatComponent.cs
+++ b/Content.Shared/Psionics/Items/TinfoilHatComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class TinfoilHatComponent : Component
diff --git a/Content.Shared/Psionics/PsionicComponent.cs b/Content.Shared/Psionics/PsionicComponent.cs
new file mode 100644
index 00000000000..748b8ddd92a
--- /dev/null
+++ b/Content.Shared/Psionics/PsionicComponent.cs
@@ -0,0 +1,41 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Psionics.Abilities
+{
+    [RegisterComponent, NetworkedComponent]
+    public sealed partial class PsionicComponent : Component
+    {
+        public EntityUid? PsionicAbility = null;
+
+        /// <summary>
+        ///     Ifrits, revenants, etc are explicitly magical beings that shouldn't get mindbreakered.
+        /// </summary>
+        [DataField("removable")]
+        public bool Removable = true;
+
+        [DataField("activePowers")]
+        public List<Component> ActivePowers = new();
+
+        [DataField("psychicFeedback")]
+        public List<string> PsychicFeedback = new();
+
+        /// <summary>
+        ///     An abstraction of how "Powerful" a psychic is. This is most commonly used as a multiplier on numerical outputs for psychic powers.
+        /// </summary>
+        /// <remarks>
+        ///     For an ordinary human, this will be between 0.5 and 1.2, but may be higher for some entities.
+        /// </remarks>
+        [DataField]
+        public float Amplification = 0.1f;
+
+        /// <summary>
+        ///     An abstraction of how much "Control" a psychic has over their powers. This is most commonly used to decrease glimmer output of powers,
+        ///     or to make obvious powers less likely to be obvious.
+        /// </summary>
+        [DataField]
+        public float Dampening = 0.1f;
+        public bool Telepath = true;
+        public bool TelepathicMute = false;
+        public bool InnatePsiChecked = false;
+    }
+}
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicInsulationComponent.cs b/Content.Shared/Psionics/PsionicInsulationComponent.cs
similarity index 82%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicInsulationComponent.cs
rename to Content.Shared/Psionics/PsionicInsulationComponent.cs
index 12370da5ae4..2ab054b1f8f 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicInsulationComponent.cs
+++ b/Content.Shared/Psionics/PsionicInsulationComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     [RegisterComponent]
     public sealed partial class PsionicInsulationComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicsDisabledComponent.cs b/Content.Shared/Psionics/PsionicsDisabledComponent.cs
similarity index 84%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicsDisabledComponent.cs
rename to Content.Shared/Psionics/PsionicsDisabledComponent.cs
index 28e7157a9d2..00cf5506523 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicsDisabledComponent.cs
+++ b/Content.Shared/Psionics/PsionicsDisabledComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     /// <summary>
     /// Only use this for the status effect, please.
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/SharedPsionicAbilitiesSystem.cs b/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
similarity index 82%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/SharedPsionicAbilitiesSystem.cs
rename to Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
index 2739d5ba31a..4dd8fa2442f 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/SharedPsionicAbilitiesSystem.cs
+++ b/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
@@ -7,7 +7,7 @@
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Psionics.Abilities
 {
     public sealed class SharedPsionicAbilitiesSystem : EntitySystem
     {
@@ -73,7 +73,7 @@ public void SetPsionicsThroughEligibility(EntityUid uid)
             if (actionData == null)
                 return;
 
-            _actions.SetEnabled(actionData.Owner, IsEligibleForPsionics(uid));
+            _actions.SetEnabled(uid, IsEligibleForPsionics(uid));
         }
 
         private bool IsEligibleForPsionics(EntityUid uid)
@@ -82,13 +82,21 @@ private bool IsEligibleForPsionics(EntityUid uid)
                 && (!TryComp<MobStateComponent>(uid, out var mobstate) || mobstate.CurrentState == MobState.Alive);
         }
 
-        public void LogPowerUsed(EntityUid uid, string power, int minGlimmer = 8, int maxGlimmer = 12)
+        public void LogPowerUsed(EntityUid uid, string power, PsionicComponent? psionic = null, int minGlimmer = 8, int maxGlimmer = 12, bool overrideGlimmer = false)
         {
             _adminLogger.Add(Database.LogType.Psionics, Database.LogImpact.Medium, $"{ToPrettyString(uid):player} used {power}");
             var ev = new PsionicPowerUsedEvent(uid, power);
             RaiseLocalEvent(uid, ev, false);
 
-            _glimmerSystem.Glimmer += _robustRandom.Next(minGlimmer, maxGlimmer);
+            //Redundant check for the GlimmerEnabled CVar because I want to skip this math too if its turned off.
+            if (_glimmerSystem.GetGlimmerEnabled() && !overrideGlimmer)
+            {
+                if (psionic == null)
+                    _glimmerSystem.DeltaGlimmerInput(_robustRandom.NextFloat(minGlimmer, maxGlimmer));
+                else _glimmerSystem.DeltaGlimmerInput(_robustRandom.NextFloat(
+                    minGlimmer * psionic.Amplification - psionic.Dampening,
+                    maxGlimmer * psionic.Amplification - psionic.Dampening));
+            }
         }
     }
 
diff --git a/Content.Shared/Psionics/SharedPsionicSystem.Insulated.cs b/Content.Shared/Psionics/SharedPsionicSystem.Insulated.cs
new file mode 100644
index 00000000000..5c89f39354c
--- /dev/null
+++ b/Content.Shared/Psionics/SharedPsionicSystem.Insulated.cs
@@ -0,0 +1,4 @@
+namespace Content.Shared.Psionics
+{
+    public readonly record struct PsionicInsulationEvent;
+}
diff --git a/Content.Shared/Strip/Components/StrippableComponent.cs b/Content.Shared/Strip/Components/StrippableComponent.cs
index fbf99992e3c..4faca4d8f21 100644
--- a/Content.Shared/Strip/Components/StrippableComponent.cs
+++ b/Content.Shared/Strip/Components/StrippableComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.DoAfter;
 using Content.Shared.Inventory;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
@@ -8,10 +9,10 @@ namespace Content.Shared.Strip.Components
     public sealed partial class StrippableComponent : Component
     {
         /// <summary>
-        /// The strip delay for hands.
+        ///     The strip delay for hands.
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite), DataField("handDelay")]
-        public float HandStripDelay = 4f;
+        public TimeSpan HandStripDelay = TimeSpan.FromSeconds(4f);
     }
 
     [NetSerializable, Serializable]
@@ -21,63 +22,63 @@ public enum StrippingUiKey : byte
     }
 
     [NetSerializable, Serializable]
-    public sealed class StrippingSlotButtonPressed : BoundUserInterfaceMessage
+    public sealed class StrippingSlotButtonPressed(string slot, bool isHand) : BoundUserInterfaceMessage
     {
-        public readonly string Slot;
-
-        public readonly bool IsHand;
-
-        public StrippingSlotButtonPressed(string slot, bool isHand)
-        {
-            Slot = slot;
-            IsHand = isHand;
-        }
+        public readonly string Slot = slot;
+        public readonly bool IsHand = isHand;
     }
 
     [NetSerializable, Serializable]
-    public sealed class StrippingEnsnareButtonPressed : BoundUserInterfaceMessage
-    {
-        public StrippingEnsnareButtonPressed()
-        {
-        }
-    }
+    public sealed class StrippingEnsnareButtonPressed : BoundUserInterfaceMessage;
 
-    public abstract class BaseBeforeStripEvent : EntityEventArgs, IInventoryRelayEvent
+    [ByRefEvent]
+    public abstract class BaseBeforeStripEvent(TimeSpan initialTime, bool stealth = false) : EntityEventArgs, IInventoryRelayEvent
     {
-        public readonly float InitialTime;
-        public float Time => MathF.Max(InitialTime * Multiplier + Additive, 0f);
-        public float Additive = 0;
+        public readonly TimeSpan InitialTime = initialTime;
         public float Multiplier = 1f;
-        public bool Stealth;
+        public TimeSpan Additive = TimeSpan.Zero;
+        public bool Stealth = stealth;
 
-        public SlotFlags TargetSlots { get; } = SlotFlags.GLOVES;
+        public TimeSpan Time => TimeSpan.FromSeconds(MathF.Max(InitialTime.Seconds * Multiplier + Additive.Seconds, 0f));
 
-        public BaseBeforeStripEvent(float initialTime, bool stealth = false)
-        {
-            InitialTime = initialTime;
-            Stealth = stealth;
-        }
+        public SlotFlags TargetSlots { get; } = SlotFlags.GLOVES;
     }
 
     /// <summary>
-    /// Used to modify strip times. Raised directed at the user.
+    ///     Used to modify strip times. Raised directed at the user.
     /// </summary>
     /// <remarks>
-    /// This is also used by some stripping related interactions, i.e., interactions with items that are currently equipped by another player.
+    ///     This is also used by some stripping related interactions, i.e., interactions with items that are currently equipped by another player.
     /// </remarks>
-    public sealed class BeforeStripEvent : BaseBeforeStripEvent
-    {
-        public BeforeStripEvent(float initialTime, bool stealth = false) : base(initialTime, stealth) { }
-    }
+    [ByRefEvent]
+    public sealed class BeforeStripEvent(TimeSpan initialTime, bool stealth = false) : BaseBeforeStripEvent(initialTime, stealth);
 
     /// <summary>
-    /// Used to modify strip times. Raised directed at the target.
+    ///     Used to modify strip times. Raised directed at the target.
     /// </summary>
     /// <remarks>
-    /// This is also used by some stripping related interactions, i.e., interactions with items that are currently equipped by another player.
+    ///     This is also used by some stripping related interactions, i.e., interactions with items that are currently equipped by another player.
     /// </remarks>
-    public sealed class BeforeGettingStrippedEvent : BaseBeforeStripEvent
+    [ByRefEvent]
+    public sealed class BeforeGettingStrippedEvent(TimeSpan initialTime, bool stealth = false) : BaseBeforeStripEvent(initialTime, stealth);
+
+    /// <summary>
+    ///     Organizes the behavior of DoAfters for <see cref="StrippableSystem">.
+    /// </summary>
+    [Serializable, NetSerializable]
+    public sealed partial class StrippableDoAfterEvent : DoAfterEvent
     {
-        public BeforeGettingStrippedEvent(float initialTime, bool stealth = false) : base(initialTime, stealth) { }
+        public readonly bool InsertOrRemove;
+        public readonly bool InventoryOrHand;
+        public readonly string SlotOrHandName;
+
+        public StrippableDoAfterEvent(bool insertOrRemove, bool inventoryOrHand, string slotOrHandName)
+        {
+            InsertOrRemove = insertOrRemove;
+            InventoryOrHand = inventoryOrHand;
+            SlotOrHandName = slotOrHandName;
+        }
+
+        public override DoAfterEvent Clone() => this;
     }
 }
diff --git a/Content.Shared/Strip/Components/ThievingComponent.cs b/Content.Shared/Strip/Components/ThievingComponent.cs
index 83679f132c4..a851dd5ef63 100644
--- a/Content.Shared/Strip/Components/ThievingComponent.cs
+++ b/Content.Shared/Strip/Components/ThievingComponent.cs
@@ -11,7 +11,7 @@ public sealed partial class ThievingComponent : Component
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
     [DataField("stripTimeReduction")]
-    public float StripTimeReduction = 0.5f;
+    public TimeSpan StripTimeReduction = TimeSpan.FromSeconds(0.5f);
 
     /// <summary>
     /// Should it notify the user if they're stripping a pocket?
diff --git a/Content.Shared/Strip/SharedStrippableSystem.cs b/Content.Shared/Strip/SharedStrippableSystem.cs
index a698ae5035a..7afd4f245a1 100644
--- a/Content.Shared/Strip/SharedStrippableSystem.cs
+++ b/Content.Shared/Strip/SharedStrippableSystem.cs
@@ -14,12 +14,12 @@ public override void Initialize()
         SubscribeLocalEvent<StrippableComponent, DragDropDraggedEvent>(OnDragDrop);
     }
 
-    public (float Time, bool Stealth) GetStripTimeModifiers(EntityUid user, EntityUid target, float initialTime)
+    public (TimeSpan Time, bool Stealth) GetStripTimeModifiers(EntityUid user, EntityUid target, TimeSpan initialTime)
     {
         var userEv = new BeforeStripEvent(initialTime);
-        RaiseLocalEvent(user, userEv);
+        RaiseLocalEvent(user, ref userEv);
         var ev = new BeforeGettingStrippedEvent(userEv.Time, userEv.Stealth);
-        RaiseLocalEvent(target, ev);
+        RaiseLocalEvent(target, ref ev);
         return (ev.Time, ev.Stealth);
     }
 
diff --git a/Content.Shared/Strip/ThievingSystem.cs b/Content.Shared/Strip/ThievingSystem.cs
index 0ef4b66571f..2b3d3b38a00 100644
--- a/Content.Shared/Strip/ThievingSystem.cs
+++ b/Content.Shared/Strip/ThievingSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Inventory;
+using Content.Shared.Strip;
 using Content.Shared.Strip.Components;
 
 namespace Content.Shared.Strip;
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index cadb0a4b215..ff8b102bb57 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -443,7 +443,7 @@ protected void EjectCartridge(
         {
             Angle ejectAngle = angle.Value;
             ejectAngle += 3.7f; // 212 degrees; casings should eject slightly to the right and behind of a gun
-            ThrowingSystem.TryThrow(entity, ejectAngle.ToVec().Normalized() / 100, 5f);
+            ThrowingSystem.TryThrow(entity, ejectAngle.ToVec(), 625f);
         }
         if (playSound && TryComp<CartridgeAmmoComponent>(entity, out var cartridge))
         {
diff --git a/Resources/Audio/Nyanotrasen/heartbeat_fast.ogg b/Resources/Audio/Nyanotrasen/heartbeat_fast.ogg
new file mode 100644
index 00000000000..85a034d9bd0
Binary files /dev/null and b/Resources/Audio/Nyanotrasen/heartbeat_fast.ogg differ
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 6fe7b0ff689..c4056561c9c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4257,3 +4257,31 @@ Entries:
       message: Most items now take time to equip and unequip, especially space suits.
   id: 6132
   time: '2024-06-30T18:22:28.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Fix
+      message: >-
+        Spent bullet casings now fly away from a shooter in a cinematic manner,
+        rather than fall at their feet. 
+  id: 6133
+  time: '2024-07-01T22:37:29.0000000+00:00'
+- author: WarMechanic
+  changes:
+    - type: Fix
+      message: Fixed loadouts becoming uneditable after spending all your points
+  id: 6134
+  time: '2024-07-02T07:18:27.0000000+00:00'
+- author: deltanedas
+  changes:
+    - type: Add
+      message: >-
+        Security can find the new SecWatch™ app in their PDAs to see current
+        suspects and wanted criminals.
+  id: 6135
+  time: '2024-07-02T08:01:36.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Fix
+      message: Equipping clothing using the Z key works correctly again.
+  id: 6136
+  time: '2024-07-03T19:48:29.0000000+00:00'
diff --git a/Resources/Locale/en-US/customization/character-requirements.ftl b/Resources/Locale/en-US/customization/character-requirements.ftl
index b073bdb773f..e7bcf0669f7 100644
--- a/Resources/Locale/en-US/customization/character-requirements.ftl
+++ b/Resources/Locale/en-US/customization/character-requirements.ftl
@@ -9,7 +9,7 @@ character-species-requirement = You must {$inverted ->
 character-trait-requirement = You must {$inverted ->
     [true] not have
     *[other] have
-} the trait [color=lightblue]{$trait}[/color]
+} the trait [color=lightblue]{$traits}[/color]
 character-backpack-type-requirement = You must {$inverted ->
     [true] not use
     *[other] use
diff --git a/Resources/Locale/en-US/deltav/cartridge-loader/secwatch.ftl b/Resources/Locale/en-US/deltav/cartridge-loader/secwatch.ftl
new file mode 100644
index 00000000000..a5b96eab08f
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/cartridge-loader/secwatch.ftl
@@ -0,0 +1,5 @@
+sec-watch-program-name = SecWatch
+sec-watch-title = SecWatch 1.0
+sec-watch-no-entries = Everything's calm. Why not enjoy a Monkin Donut?
+sec-watch-entry = {$name}, {$job}
+sec-watch-no-reason = None given???
diff --git a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
index 91ae21233a3..c3a9641768f 100644
--- a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
@@ -3,8 +3,11 @@ cage-resist-third-person = {CAPITALIZE(THE($user))} starts removing {POSS-ADJ($u
 
 cage-uncage-verb = Uncage
 
-action-name-metapsionic = Metapsionic Pulse
-action-description-metapsionic = Send a mental pulse through the area to see if there are any psychics nearby.
+action-name-widemetapsionic = Wide Metapsionic Pulse
+action-description-widemetapsionic = Send a mental pulse through the area to see if there are any psychics nearby.
+
+action-name-focusedmetapsionic = Focused Metapsionic Pulse
+action-description-focusedmetapsionic = Probe an entity at close range to glean metaphorical information about any powers they may have
 
 metapsionic-pulse-success = You detect psychic presence nearby.
 metapsionic-pulse-failure = You don't detect any psychic presence nearby.
@@ -13,8 +16,8 @@ metapsionic-pulse-power = You detect that {$power} was used nearby.
 action-name-dispel = Dispel
 action-description-dispel = Dispel summoned entities such as familiars or forcewalls.
 
-action-name-mass-sleep = Mass Sleep
-action-description-mass-sleep = Put targets in a small area to sleep.
+action-name-regenerative-stasis = Regenerative Stasis
+action-description-regenerative-stasis = Puts the target into a brief stasis, during which time their wounds rapidly heal.
 
 accept-psionics-window-title = Psionic!
 accept-psionics-window-prompt-text-part = You rolled a psionic power!
@@ -23,13 +26,10 @@ accept-psionics-window-prompt-text-part = You rolled a psionic power!
                                          Do you still wish to be psionic?
 
 action-name-psionic-invisibility = Psionic Invisibility
-action-description-psionic-invisibility = Render yourself invisible to any entity that could potentially be psychic. Borgs, animals, and so on are not affected.
-
-action-name-psionic-invisibility = Psionic Invisibility
-action-description-psionic-invisibility = Render yourself invisible to any entity that could potentially be psychic. Borgs, animals, and so on are not affected.
+action-description-psionic-invisibility = Telepathically remove yourself from the vision of anyone not psionically insulated.
 
 action-name-psionic-invisibility-off = Turn Off Psionic Invisibility
-action-description-psionic-invisibility-off = Return to visibility, and receive a stun.
+action-description-psionic-invisibility-off = End your invisibility early.
 
 action-name-mind-swap = Mind Swap
 action-description-mind-swap = Swap minds with the target. Either can change back after 20 seconds.
@@ -63,8 +63,10 @@ action-name-noospheric-zap = Noospheric Zap
 action-description-noospheric-zap = Shocks the conciousness of the target and leaves them stunned and stuttering.
 
 action-name-pyrokinesis = Pyrokinesis
-action-description-pyrokinesis = Light a flammable target on fire.
-pyrokinesis-power-used = A wisp of flame engulfs {THE($target)}, igniting {OBJECT($target)}!
+action-description-pyrokinesis = Hurl a fire bolt at your target
+
+action-name-precharge-pyrokinesis = Precharge Pyrokinesis
+action-description-precharge-pyrokinesis = Draw forth the Secret of Fire, and prepare to launch a fire bolt
 
 action-name-psychokinesis = Psychokinesis
 action-description-psychokinesis = Bend the fabric of space to instantly move across it.
diff --git a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl
new file mode 100644
index 00000000000..311d71d6ac7
--- /dev/null
+++ b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl
@@ -0,0 +1,53 @@
+# Feedback messages for Focused Metapsionic Pulse
+metapulse-self = I AM.
+no-powers = {CAPITALIZE($entity)} will never awaken from the dream in this life
+psychic-potential = {CAPITALIZE($entity)} has a slim chance of awakening from the dream
+dispel-feedback = {CAPITALIZE($entity)} is a mighty stone, standing against the currents of fate
+metapsionic-feedback = {CAPITALIZE($entity)} gazes back upon thee
+mind-swap-feedback = {CAPITALIZE($entity)}'s vessel seems fit for other souls
+mindswapped-feedback = Cursed flesh! {CAPITALIZE($entity)} dwells within the wrong vessel!
+noospheric-zap-feedback = {CAPITALIZE($entity)}'s soul writhes with thunder from beyond the veil
+pyrokinesis-feedback = The Secret of Fire dwells within {CAPITALIZE($entity)}
+invisibility-feedback = {CAPITALIZE($entity)}'s wyrd seeks to hide from thine gaze
+telegnosis-feedback = {CAPITALIZE($entity)}'s soul travels across bridges composed of dreamlight
+metempsychotic-machine-feedback = The sea of fate flows through this machine
+regeneration-feedback = {CAPITALIZE($entity)} possesses an overwhelming will to live
+regenerative-stasis-feedback = {CAPITALIZE($entity)} possesses an overwhelming will such that others may live
+mime-feedback = A servant of the Silent Dreamer, {CAPITALIZE($entity)} bears His power in exchange for a vow of silence
+mime-broken-feedback = TREASONOUS VERMIN! {CAPITALIZE($entity)} HAS BETRAYED THEIR VOW! THE SILENT DREAMER DEMANDS THEIR HEAD!
+
+# Entity Feedback Messages
+ifrit-feedback = A spirit of Gehenna, bound by the will of a powerful psychic
+prober-feedback = A mirror into the end of time, the screaming of dead stars emanates from this machine
+drain-feedback = A mirror into a realm where the stars sit still forever, a cold and distant malevolence stares back
+sophic-grammateus-feedback = SEEKER, YOU NEED ONLY ASK FOR MY WISDOM.
+oracle-feedback = WHY DO YOU BOTHER ME SEEKER? HAVE I NOT MADE MY DESIRES CLEAR?
+orecrab-feedback = Heralds of the Lord of Earth, summoned to this realm from Grome's kingdom
+reagent-slime-feedback = Heralds of the Lord of Water, summoned to this realm from Straasha's kingdom.
+flesh-golem-feedback = Abominations pulled from dead realms, twisted amalgamations of those fallen to the influence of primordial Chaos
+glimmer-mite-feedback = A semi-corporeal parasite native to the dreamlight, its presence here brings forth the screams of dead stars.
+
+# Anomaly Feedback Messages
+anomaly-pyroclastic-feedback = A small mirror to the plane of Gehenna, truth lies within the Secret of Fire
+anomaly-gravity-feedback = Violet and crimson, blue of blue, impossibly dark yet greater than the whitest of white, a black star shines weakly at the end of it all
+anomaly-electricity-feedback = A mirror to a realm tiled by silicon, the lifeblood of artificial thought flows from it
+anomaly-flesh-feedback = From within it comes the suffering of damned mutants howling for all eternity
+anomaly-bluespace-feedback = A bridge of dreamlight, crossing into the space between realms of the multiverse
+anomaly-ice-feedback = Walls of blackened stone, ruin and famine wait for those who fall within
+anomaly-rock-feedback = A vast old oak dwells high over a plane of stone, it turns to stare back
+anomaly-flora-feedback = Musical notes drift around you, playfully beckoning, they wish to feast
+anomaly-liquid-feedback = A realm of twisting currents. Its placidity is a lie. The eyes within stare hungrilly
+anomaly-shadow-feedback = At the end of time, when all suns have set forever, there amidst the void stands a monument to past sins.
+
+# Power PVS Messages
+focused-metapsionic-pulse-begin = The air around {CAPITALIZE($entity)} begins to shimmer faintly
+psionic-regeneration-self-revive = {CAPITALIZE($entity)} begins to visibly regenerate
+mindbreaking-feedback = The light of life vanishes from {CAPITALIZE($entity)}'s eyes, leaving behind a husk pretending at sapience
+regenerative-stasis-begin = {CAPITALIZE($entity)} swoons for a moment, then begins visibly regenerating
+pyrokinesis-obvious = A mote of flame dances around {CAPITALIZE($entity)}'s fingers
+pyrokinesis-subtle = You draw upon the Secret of Fire.
+                     Use this action again to throw a fire bolt.
+pyrokinesis-refund-cooldown = You reclaim some of the energy spent drawing forth the Secret of Fire
+
+# Misc Psionic Messages
+telepathic-mute-message = You strain, but are unable to send your thoughts to the Noosphere
diff --git a/Resources/Locale/en-US/traits/categories.ftl b/Resources/Locale/en-US/traits/categories.ftl
index 56f0adeb479..153f8d01709 100644
--- a/Resources/Locale/en-US/traits/categories.ftl
+++ b/Resources/Locale/en-US/traits/categories.ftl
@@ -6,3 +6,4 @@ trait-category-Mental = Mental
 trait-category-Physical = Physical
 trait-category-Speech = Speech
 trait-category-Visual = Visual
+trait-category-Psionic = Psionic
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index e9163bdb548..dc3d407e5e8 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -31,3 +31,20 @@ trait-description-SocialAnxiety = You are anxious when you speak and stutter.
 
 trait-name-Snoring = Snoring
 trait-description-Snoring = You will snore while sleeping.
+
+trait-name-LatentPsychic = Latent Psychic
+trait-description-LatentPsychic = Your mind and soul are open to the noosphere, allowing for a limited use of Telepathy.
+                                  Thus, you are eligible for potentially receiving psychic powers.
+                                  It is possible that you may be hunted by otherworldly forces, so consider keeping your powers a secret.
+
+trait-name-PsionicInsulation = χ Waveform Misalignment
+trait-description-PsionicInsulation = Through a quirk of fate, your brainwaves are permanently out of phase with the noösphere
+                                      You are immune to both positive and negative effects of nearly all psychic powers,
+                                      But you can never be a psionic yourself in this life. This trait is incompatible with
+                                      all other psychic traits.
+
+trait-name-NaturalTelepath = Natural Telepath
+trait-description-NaturalTelepath = As a naturally occuring Telepath, you are capable of fluent telepathic communication, regardless of
+                                    whether or not you possess any notable psychic powers. This offers all of the same benefits and
+                                    drawbacks of Latent Psychic, except that you are guaranteed to start with full Telepathy. You may
+                                    still gain powers as normal for a Latent Psychic.
diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml b/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml
index 5b3615c55d8..25988f4a3a8 100644
--- a/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml
@@ -13,10 +13,10 @@
     torso:
       part: TorsoHarpy
       connections:
-      - left arm
       - right arm
-      - left leg
+      - left arm
       - right leg
+      - left leg
       organs:
         heart: OrganHumanHeart
         lungs: OrganHarpyLungs
@@ -47,4 +47,3 @@
       part: RightFootHarpy
     left foot:
       part: LeftFootHarpy
-
diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/vulpkanin.yml b/Resources/Prototypes/DeltaV/Body/Prototypes/vulpkanin.yml
index 3d1552ac81f..cdf787e4736 100644
--- a/Resources/Prototypes/DeltaV/Body/Prototypes/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/Body/Prototypes/vulpkanin.yml
@@ -1,4 +1,4 @@
-- type: body
+- type: body
   name: "vulpkanin"
   id: Vulpkanin
   root: torso
@@ -19,10 +19,10 @@
         liver: OrganAnimalLiver
         kidneys: OrganHumanKidneys
       connections:
-      - left arm
       - right arm
-      - left leg
+      - left arm
       - right leg
+      - left leg
     right arm:
       part: RightArmVulpkanin
       connections:
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
index fa51b99325c..003c899fc5c 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
@@ -84,7 +84,10 @@
   - type: PotentialPsionic
   - type: Psionic
     removable: false
-  # - type: PyrokinesisPower # Pending psionic rework
+    amplification: 4
+    psychicFeedback:
+    - "ifrit-feedback"
+  - type: PyrokinesisPower
   - type: Grammar
     attributes:
       proper: true
@@ -108,7 +111,7 @@
     requirements:
     - !type:DepartmentTimeRequirement
       department: Epistemics
-      time: 14400 # DeltaV - 4 hours
+      time: 14400
 
 - type: entity
   parent: WelderExperimental
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml
index e3eb9cd6de8..1f1000f04a7 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml
@@ -24,6 +24,10 @@
           Quantity: 15
   - type: PotentialPsionic
   - type: Psionic
+    removable: false
+    amplification: 1
+    psychicFeedback:
+    - "glimmer-mite-feedback"
   - type: GlimmerSource
   - type: AmbientSound
     range: 6
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml
index 1f4eb696c65..e2541def035 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml
@@ -26,4 +26,3 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
-  - type: PotentialPsionic
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml
index 06abe8c45fa..ea2357a5c06 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml
@@ -24,7 +24,6 @@
     - type: NpcFactionMember
       factions:
         - NanoTrasen
-    - type: PotentialPsionic
     - type: Respirator
       damage:
        types:
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml
index e3d5e9d2138..def215cee43 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml
@@ -17,4 +17,24 @@
     icon:
       sprite: DeltaV/Icons/cri.rsi
       state: cri
-  - type: CrimeAssistCartridge
+
+- type: entity
+  parent: BaseItem
+  id: SecWatchCartridge
+  name: sec watch cartridge
+  description: A cartridge that tracks the status of currently wanted individuals.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Devices/cartridge.rsi
+    state: cart-cri
+  - type: Icon
+    sprite: DeltaV/Objects/Devices/cartridge.rsi
+    state: cart-cri
+  - type: UIFragment
+    ui: !type:SecWatchUi
+  - type: Cartridge
+    programName: sec-watch-program-name
+    icon:
+      sprite: Objects/Weapons/Melee/stunbaton.rsi
+      state: stunbaton_on
+  - type: SecWatchCartridge
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
index 6ee3a7543f7..d9607390cd7 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
@@ -20,12 +20,13 @@
       map: [ "enum.PdaVisualLayers.IdLight" ]
       shader: "unshaded"
       visible: false
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
   - type: Pda
     id: BrigmedicIDCard
     state: pda-corpsman
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index 01fce382e37..fda467cb32d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -101,6 +101,12 @@
       - SimpleHostile
   - type: Damageable
     damageContainer: StructuralInorganic
+  - type: PotentialPsionic
+  - type: Psionic
+    removable: false
+    dampening: 1
+    psychicFeedback:
+    - "orecrab-feedback"
 
 - type: entity
   parent: MobOreCrab
@@ -292,6 +298,12 @@
     solution: bloodstream
   - type: DrainableSolution
     solution: bloodstream
+  - type: PotentialPsionic
+  - type: Psionic
+    removable: false
+    amplification: 1
+    psychicFeedback:
+    - "reagent-slime-feedback"
 
 - type: entity
   name: Reagent Slime Spawner
@@ -529,3 +541,20 @@
       - map: [ "enum.DamageStateVisualLayers.Base" ]
         state: alive
         color: "#3e901c"
+
+- type: entity
+  id: ReagentSlimeLoto
+  parent: ReagentSlime
+  suffix: LotophagoiOil
+  components:
+  - type: Bloodstream
+    bloodReagent: LotophagoiOil
+  - type: PointLight
+    color: "#ffbf00"
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Mobs/Aliens/elemental.rsi
+    layers:
+      - map: [ "enum.DamageStateVisualLayers.Base" ]
+        state: alive
+        color: "#ffbf00"
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
index 06ab02dedc9..93081d382a2 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
@@ -54,6 +54,11 @@
         Slash: 6
   - type: ReplacementAccent
     accent: genericAggressive
+  - type: Psionic
+    removable: false
+    amplification: 1
+    psychicFeedback:
+    - "flesh-golem-feedback"
 
 - type: entity
   parent: BaseMobFlesh
diff --git a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
index 5ebd43ddf48..d9dea3c18d9 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
@@ -11,4 +11,3 @@
     damageRecovery:
       types:
         Asphyxiation: -0.5
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
diff --git a/Resources/Prototypes/Entities/Mobs/Player/diona.yml b/Resources/Prototypes/Entities/Mobs/Player/diona.yml
index 28687c68bfc..dfd5e9a1be7 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/diona.yml
@@ -11,7 +11,6 @@
       damageRecovery:
         types:
           Asphyxiation: -1.0
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
 
 # Reformed Diona
 - type: entity
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
index fb84ad3650f..d1de65df012 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
@@ -3,5 +3,3 @@
   name: Urist McHands The Dwarf
   parent: BaseMobDwarf
   id: MobDwarf
-  components:
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml
index 6197c82c021..9a7c2ee65ec 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -3,8 +3,6 @@
   name: Urist McHands
   parent: BaseMobHuman
   id: MobHuman
-  components:
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
 
 #Syndie
 - type: entity
diff --git a/Resources/Prototypes/Entities/Mobs/Player/moth.yml b/Resources/Prototypes/Entities/Mobs/Player/moth.yml
index ffdb36d86bd..72feba958ab 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/moth.yml
@@ -3,5 +3,3 @@
   name: Urist McFluff
   parent: BaseMobMoth  
   id: MobMoth
-  components:
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
index 71d74222979..b9f265e0bcf 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
@@ -3,7 +3,5 @@
   name: Urisst' Mzhand
   parent: BaseMobReptilian
   id: MobReptilian
-  components:
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
 
 #Weh
diff --git a/Resources/Prototypes/Entities/Mobs/Player/slime.yml b/Resources/Prototypes/Entities/Mobs/Player/slime.yml
index 79669a8fe2a..4e5974b3084 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/slime.yml
@@ -2,5 +2,3 @@
   save: false
   parent: BaseMobSlimePerson
   id: MobSlimePerson
-  components:
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
index 7c3f857c001..5874e180a5e 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -16,14 +16,12 @@
     spawned:
     - id: FoodMeatHuman
       amount: 5
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
   - type: LanguageSpeaker
     speaks:
     - GalacticCommon
     - SolCommon
     understands:
     - GalacticCommon
-    - SolCommon
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 706cbd5dbbf..7155be68d74 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -173,12 +173,13 @@
     accentVColor: "#A32D26"
   - type: Icon
     state: pda-interncadet
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: BasePDA
@@ -430,12 +431,13 @@
     borderColor: "#6f6192"
   - type: Icon
     state: pda-lawyer
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: BasePDA
@@ -643,12 +645,13 @@
     accentHColor: "#447987"
   - type: Icon
     state: pda-hos
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: BasePDA
@@ -664,12 +667,13 @@
     accentVColor: "#949137"
   - type: Icon
     state: pda-warden
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: BasePDA
@@ -684,12 +688,13 @@
     borderColor: "#A32D26"
   - type: Icon
     state: pda-security
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: BasePDA
@@ -979,12 +984,13 @@
     borderColor: "#774705"
   - type: Icon
     state: pda-detective
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: BaseMedicalPDA
@@ -1001,12 +1007,13 @@
     accentVColor: "#d7d7d0"
   - type: Icon
     state: pda-brigmedic
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: ClownPDA
@@ -1092,12 +1099,13 @@
     accentVColor: "#DFDFDF"
   - type: Icon
     state: pda-seniorofficer
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: SyndiPDA
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
index e188ee8c658..3bef413dffa 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
@@ -11,10 +11,10 @@
         shape:
           !type:PhysShapeAabb
           bounds: "-0.10,-0.05,0.10,0.05"
-        density: 20
+        density: 0.5
         mask:
           - ItemMask
-        restitution: 0.3  # fite me
+        restitution: 0.7  # Small and bouncy
         friction: 0.2
   - type: Tag
     tags:
@@ -23,6 +23,11 @@
     size: Tiny
   - type: SpaceGarbage
   - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Weapons/Guns/Casings/casing_fall_1.ogg
+      params:
+        volume: -1
+  - type: EmitSoundOnCollide
     sound:
       path: /Audio/Weapons/Guns/Casings/casing_fall_2.ogg
       params:
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
index 43c0bdce12f..9a2bd4af69f 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
@@ -48,7 +48,7 @@
     sound:
       path: /Audio/Effects/teleport_arrival.ogg
   - type: Psionic #Nyano - Summary: makes psionic on creation.
-  - type: GlimmerSource #Nyano - Summary: makes this a potential source of Glimmer. 
+  - type: GlimmerSource #Nyano - Summary: makes this a potential source of Glimmer.
     active: false
 
 - type: entity
@@ -99,6 +99,12 @@
   - type: IgniteOnCollide
     fixtureId: fix1
     fireStacks: 1
+  - type: PotentialPsionic
+  - type: Psionic
+    removable: false
+    amplification: 5
+    psychicFeedback:
+    - "anomaly-pyroclastic-feedback"
 
 - type: entity
   id: AnomalyGravity
@@ -131,6 +137,12 @@
   - type: SingularityDistortion
     intensity: 1000
     falloffPower: 2.7
+  - type: PotentialPsionic
+  - type: Psionic
+    removable: false
+    amplification: 5
+    psychicFeedback:
+    - "anomaly-gravity-feedback"
 
 - type: entity
   id: AnomalyElectricity
@@ -154,6 +166,12 @@
     castShadows: false
   - type: ElectricityAnomaly
   - type: Electrified
+  - type: PotentialPsionic
+  - type: Psionic
+    removable: false
+    amplification: 5
+    psychicFeedback:
+    - "anomaly-electricity-feedback"
 
 - type: entity
   id: AnomalyFlesh
@@ -245,6 +263,12 @@
       - MobFleshClamp
       - MobFleshLover
       - FleshKudzu
+  - type: PotentialPsionic
+  - type: Psionic
+    removable: false
+    amplification: 5
+    psychicFeedback:
+    - "anomaly-flesh-feedback"
 
 - type: entity
   id: AnomalyBluespace
@@ -295,6 +319,12 @@
     anomalyContactDamage:
       types:
         Radiation: 10
+  - type: PotentialPsionic
+  - type: Psionic
+    removable: false
+    amplification: 5
+    psychicFeedback:
+    - "anomaly-bluespace-feedback"
 
 - type: entity
   id: AnomalyIce
@@ -344,6 +374,12 @@
     releasedGas: 8 # Frezon. Please replace if there is a better way to specify this
     releaseOnMaxSeverity: true
     spawnRadius: 0
+  - type: PotentialPsionic
+  - type: Psionic
+    removable: false
+    amplification: 5
+    psychicFeedback:
+    - "anomaly-ice-feedback"
 
 - type: entity
   id: AnomalyRockBase
@@ -380,6 +416,12 @@
         maxAmount: 50
         maxRange: 12
       floor: FloorAsteroidTile
+  - type: PotentialPsionic
+  - type: Psionic
+    removable: false
+    amplification: 5
+    psychicFeedback:
+    - "anomaly-rock-feedback"
 
 - type: entity
   id: AnomalyRockUranium
@@ -637,6 +679,12 @@
         maxRange: 6
       spawns:
       - KudzuFlowerAngry
+  - type: PotentialPsionic
+  - type: Psionic
+    removable: false
+    amplification: 5
+    psychicFeedback:
+    - "anomaly-flora-feedback"
 
 - type: entity
   id: AnomalyFloraBulb
@@ -795,6 +843,12 @@
     solution: anomaly
   - type: InjectableSolution
     solution: beaker
+  - type: PotentialPsionic
+  - type: Psionic
+    removable: false
+    amplification: 5
+    psychicFeedback:
+    - "anomaly-liquid-feedback"
 
 - type: entity
   id: AnomalyShadow
@@ -849,3 +903,9 @@
   - type: Tag
     tags:
       - SpookyFog
+  - type: PotentialPsionic
+  - type: Psionic
+    removable: false
+    amplification: 5
+    psychicFeedback:
+    - "anomaly-shadow-feedback"
diff --git a/Resources/Prototypes/Guidebook/psionics.yml b/Resources/Prototypes/Guidebook/psionics.yml
new file mode 100644
index 00000000000..6dbc012915a
--- /dev/null
+++ b/Resources/Prototypes/Guidebook/psionics.yml
@@ -0,0 +1,9 @@
+- type: guideEntry
+  id: Psionics
+  name: guide-entry-psionics
+  text: "/ServerInfo/Guidebook/Psionics.xml"
+
+# - type: guideEntry # When it's added
+#   id: AltarsGolemancy
+#   name: guide-entry-altars-golemancy
+#   text: "/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Altar.xml"
diff --git a/Resources/Prototypes/Nyanotrasen/Actions/types.yml b/Resources/Prototypes/Nyanotrasen/Actions/types.yml
index e6e4bdc5a75..4ee617931dc 100644
--- a/Resources/Prototypes/Nyanotrasen/Actions/types.yml
+++ b/Resources/Prototypes/Nyanotrasen/Actions/types.yml
@@ -36,18 +36,18 @@
     event: !type:DispelPowerActionEvent
 
 - type: entity
-  id: ActionMassSleep
-  name: action-name-mass-sleep
-  description: action-description-mass-sleep
+  id: ActionRegenerativeStasis
+  name: action-name-regenerative-stasis
+  description: action-description-regenerative-stasis
   noSpawn: true
   components:
-  - type: WorldTargetAction
+  - type: EntityTargetAction
     icon: Nyanotrasen/Interface/VerbIcons/mass_sleep.png
     useDelay: 60
     checkCanAccess: false
     range: 8
     itemIconStyle: BigAction
-    event: !type:MassSleepPowerActionEvent
+    event: !type:RegenerativeStasisPowerActionEvent
 
 - type: entity
   id: ActionMindSwap
@@ -94,24 +94,50 @@
   description: action-description-pyrokinesis
   noSpawn: true
   components:
-  - type: EntityTargetAction
+  - type: WorldTargetAction
     icon: Nyanotrasen/Interface/VerbIcons/pyrokinesis.png
-    useDelay: 50
-    range: 6
+    useDelay: 1
+    range: 15
     checkCanAccess: false
+    checkCanInteract: true
     itemIconStyle: BigAction
     event: !type:PyrokinesisPowerActionEvent
 
 - type: entity
-  id: ActionMetapsionic
-  name: action-name-metapsionic
-  description: action-description-metapsionic
+  id: ActionPrechargePyrokinesis
+  name: action-name-precharge-pyrokinesis
+  description: action-description-precharge-pyrokinesis
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: Nyanotrasen/Interface/VerbIcons/pyrokinesis.png
+    useDelay: 50
+    event: !type:PyrokinesisPrechargeActionEvent
+
+- type: entity
+  id: ActionWideMetapsionic
+  name: action-name-widemetapsionic
+  description: action-description-widemetapsionic
   noSpawn: true
   components:
   - type: InstantAction
     icon: Nyanotrasen/Interface/VerbIcons/metapsionic.png
     useDelay: 45
-    event: !type:MetapsionicPowerActionEvent
+    event: !type:WideMetapsionicPowerActionEvent
+
+- type: entity
+  id: ActionFocusedMetapsionic
+  name: action-name-focusedmetapsionic
+  description: action-description-focusedmetapsionic
+  noSpawn: true
+  components:
+  - type: EntityTargetAction
+    icon: Nyanotrasen/Interface/VerbIcons/metapsionic.png
+    useDelay: 45
+    range: 3
+    checkCanAccess: false
+    itemIconStyle: BigAction
+    event: !type:FocusedMetapsionicPowerActionEvent
 
 - type: entity
   id: ActionPsionicRegeneration
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/felinid.yml
index 6dd2a89e5a8..a09f3b6ab7f 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/felinid.yml
@@ -13,10 +13,10 @@
     torso:
       part: TorsoHuman
       connections:
-      - left arm
       - right arm
-      - left leg
+      - left arm
       - right leg
+      - left leg
       organs:
         heart: OrganAnimalHeart
         lungs: OrganHumanLungs
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml
index 2cd9785d989..83e3756c0f2 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml
@@ -120,6 +120,9 @@
         Slash: 0.85
         Piercing: 0.95
         Radiation: 0.95
+  - type: GuideHelp
+    guides:
+    - Psionics
 
 - type: entity
   parent: ClothingHeadBase
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
index 562b9c564ec..1166d8a29f5 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
@@ -32,4 +32,3 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
-  - type: PotentialPsionic
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
index db7936cc5b4..94ac8403adc 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
@@ -49,5 +49,3 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
-  - type: PotentialPsionic
-
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
index c2fd8786aff..4e6115ba339 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
@@ -32,12 +32,13 @@
     accentVColor: "#DFDFDF"
   - type: Icon
     state: pda-security
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: BasePDA
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml
index d8e791af1ed..d773cf87c76 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml
@@ -22,4 +22,7 @@
             NoMind: { state: pod_1 }
             Gore: { state: pod_1 }
             Idle: { state: pod_0 }
+    - type: PotentialPsionic
     - type: Psionic
+      psychicFeedback:
+      - "metempsychotic-machine-feedback"
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml
index e157f8b7ff4..eca5b5e3758 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml
@@ -4,7 +4,12 @@
   name: glimmer prober
   description: Probes the noösphere to generate research points. Might be worth turning off if glimmer is a problem.
   components:
+  - type: PotentialPsionic
   - type: Psionic
+    removable: false
+    amplification: 10
+    psychicFeedback:
+    - "prober-feedback"
   - type: GlimmerSource
   - type: Construction
     graph: GlimmerDevices
@@ -90,7 +95,12 @@
   name: glimmer drain
   description: Uses electricity to try and sort out the noösphere, reducing its level of entropy.
   components:
+  - type: PotentialPsionic
   - type: Psionic
+    removable: false
+    dampening: 10
+    psychicFeedback:
+    - "drain-feedback"
   - type: GlimmerSource
     addToGlimmer: false
   - type: Construction
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml
index f7481abf1ed..8470737c702 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml
@@ -16,7 +16,10 @@
   - type: Oracle
   - type: Speech
     speechSounds: Tenor
+  - type: PotentialPsionic
   - type: Psionic
+    psychicFeedback:
+    - "oracle-feedback"
   - type: SolutionContainerManager
     solutions:
       fountain:
@@ -42,3 +45,6 @@
   - type: SpriteFade
   - type: Tag
     tags: []
+  - type: GuideHelp
+    guides:
+    - Psionics
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml
index ae85cd25e03..8e34a07ea5e 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml
@@ -29,6 +29,8 @@
     - Science
   - type: PotentialPsionic #this makes her easier to access for glimmer events, dw about it
   - type: Psionic
+    psychicFeedback:
+    - "sophic-grammateus-feedback"
   - type: Grammar
     attributes:
       gender: female
diff --git a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
index f5626a0406f..decdcfdda26 100644
--- a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
+++ b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
@@ -145,7 +145,7 @@
   noSpawn: true
   components:
     - type: GlimmerEvent
-      minimumGlimmer: 500
+      minimumGlimmer: 700
       maximumGlimmer: 900
       report: glimmer-event-report-signatures
     - type: GlimmerRevenantRule
diff --git a/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml b/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml
index 77b180d6ea1..1e2ace9a287 100644
--- a/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml
+++ b/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml
@@ -1,13 +1,3 @@
-- type: guideEntry
-  id: Psionics
-  name: guide-entry-psionics
-  text: "/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Psionics.xml"
-
-# - type: guideEntry # When it's added
-#   id: AltarsGolemancy
-#   name: guide-entry-altars-golemancy
-#   text: "/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Altar.xml"
-
 - type: guideEntry
   id: ReverseEngineering
   name: guide-entry-reverse-engineering
diff --git a/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml b/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
index 53910a54a92..e6e497003d5 100644
--- a/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
+++ b/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
@@ -9,29 +9,6 @@
     stealGroup: AntiPsychicKnife
     owner: job-name-mantis
 
-- type: entity
-  id: BecomePsionicObjective
-  parent: BaseTraitorObjective
-  name: Become psionic
-  description: We need you to acquire psionics and keep them until your mission is complete.
-  noSpawn: true
-  components:
-  - type: NotJobsRequirement
-    jobs:
-      - Mime
-      - ForensicMantis
-  - type: Objective
-    difficulty: 2.5
-    #unique: false
-    icon:
-      sprite: Nyanotrasen/Icons/psi.rsi
-      state: psi
-  - type: ObjectiveBlacklistRequirement
-    blacklist:
-      components:
-      - BecomeGolemCondition
-  - type: BecomePsionicCondition
-
 #- type: entity
 #  id: BecomeGolemObjective
 #  parent: BaseTraitorObjective
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
index c3e682e02a9..15b2cdd4fa7 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
@@ -7,22 +7,24 @@
     - !type:OverallPlaytimeRequirement
       time: 18000
     - !type:DepartmentTimeRequirement
-      department: Epistemics # DeltaV - Epistemics Department replacing Science
+      department: Epistemics
       time: 3600
   startingGear: ForensicMantisGear
   icon: "JobIconForensicMantis"
   supervisors: job-supervisors-rd
-  antagAdvantage: 5 # DeltaV - From 4 to 5
-  canBeAntag: true # DeltaV - Mantis is no longer a Detective
-  # whitelistRequired: true
+  antagAdvantage: 5
+  canBeAntag: true
   access:
   - Research
   - Maintenance
-  - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
+  - Mantis
   special:
   - !type:AddComponentSpecial
     components:
+    - type: PotentialPsionic
     - type: Psionic
+      amplification: 0.3
+      dampening: 0.3
     - type: MetapsionicPower
 
 - type: startingGear
@@ -34,11 +36,10 @@
     head: ClothingHeadHatFezMantis
     id: ForensicMantisPDA
     eyes: ClothingEyesGlassesSunglasses
-    ears: ClothingHeadsetScience # DeltaV - Mantis is part of Epistemics
+    ears: ClothingHeadsetScience
     gloves: ClothingHandsGlovesColorWhite
     outerClothing: ClothingOuterCoatMantis
     belt: ClothingBeltMantis
-    # pocket2: ForensicScanner # DeltaV - Mantis is no longer a Detective
   innerClothingSkirt: ClothingUniformSkirtMantis
   satchel: ClothingBackpackSatchelMantisFilled
   duffelbag: ClothingBackpackDuffelMantisFilled
diff --git a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
index f40b688fd18..ca1764e204c 100644
--- a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
+++ b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
@@ -5,6 +5,8 @@
     DispelPower: 1
     TelegnosisPower: 1
     PsionicRegenerationPower: 1
-    MassSleepPower: 0.3
-#    PsionicInvisibilityPower: 0.15
+    RegenerativeStasisPower: 0.3
+    PsionicInvisibilityPower: 0.15
     MindSwapPower: 0.15
+    NoosphericZapPower: 0.15
+    PyrokinesisPower: 0.15
diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
index f00641702a2..b68f695050b 100644
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -39,7 +39,6 @@
     EscapeShuttleObjective: 1
     # DieObjective: 0.05 # DeltaV - Disable the lrp objective aka murderbone justification
     #HijackShuttleObjective: 0.02
-    BecomePsionicObjective: 1 # Nyanotrasen - Become Psionic objective, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
     #BecomeGolemObjective: 0.5 # Nyanotrasen - Become a golem objective, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
 
 - type: weightedRandom
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
index 3675306091a..36e709144da 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
@@ -13,6 +13,7 @@
   special:
   - !type:AddComponentSpecial
     components:
+    - type: PotentialPsionic
     - type: Psionic # Nyano - Summary: Makes the mime psionic.
     - type: MimePowers
     - type: FrenchAccent
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index cb720531c24..9051a6c618b 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -3,7 +3,7 @@
   name: job-name-rd
   description: job-description-rd
   playTimeTracker: JobResearchDirector
-  antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff
+  antagAdvantage: 6
   requirements:
     - !type:DepartmentTimeRequirement
       department: Epistemics # DeltaV - Epistemics Department replacing Science
@@ -19,20 +19,20 @@
   - Command
   - Maintenance
   - ResearchDirector
-  - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
-  - Chapel # DeltaV - Chaplain is in Epistemics
+  - Mantis
+  - Chapel
   - Cryogenics
-  special: # Nyanotrasen - Mystagogue can use the Bible
+  special:
   - !type:AddComponentSpecial
     components:
-    - type: BibleUser # Nyano - Lets them heal with bibles
-    - type: Psionic # Nyano - They start with telepathic chat
-    - type: DispelPower # Nyano - They get the Dispel psionic power on spawn
+    - type: BibleUser
+    - type: PotentialPsionic
+    - type: Psionic
+      dampening: 1 #Mystagogue gets a significant buff to his antimage abilities, making him better at dispelling than other people
+    - type: DispelPower
+    - type: CommandStaff
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
-  - !type:AddComponentSpecial
-    components:
-      - type: CommandStaff
 
 - type: startingGear
   id: ResearchDirectorGear
@@ -42,7 +42,7 @@
     shoes: ClothingShoesColorBrown
     id: RnDPDA
     ears: ClothingHeadsetRD
-    belt: BibleMystagogue # Nyanotrasen - Mystagogue book for their Ifrit
+    belt: BibleMystagogue
   innerClothingSkirt: ClothingUniformJumpskirtResearchDirector
   satchel: ClothingBackpackSatchelResearchDirectorFilled
   duffelbag: ClothingBackpackDuffelResearchDirectorFilled
diff --git a/Resources/Prototypes/Traits/categories.yml b/Resources/Prototypes/Traits/categories.yml
index ba3fd7b3456..617aa5f2f91 100644
--- a/Resources/Prototypes/Traits/categories.yml
+++ b/Resources/Prototypes/Traits/categories.yml
@@ -17,3 +17,6 @@
 
 - type: traitCategory
   id: Visual
+
+- type: traitCategory
+  id: Psionic
diff --git a/Resources/Prototypes/Traits/psionics.yml b/Resources/Prototypes/Traits/psionics.yml
new file mode 100644
index 00000000000..277070617cf
--- /dev/null
+++ b/Resources/Prototypes/Traits/psionics.yml
@@ -0,0 +1,39 @@
+- type: trait
+  id: LatentPsychic
+  category: Psionic
+  points: -1
+  components:
+    - type: PotentialPsionic
+  requirements:
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - PsionicInsulation
+        - NaturalTelepath
+
+- type: trait
+  id: PsionicInsulation
+  category: Psionic
+  points: -5
+  components:
+    - type: PsionicInsulation
+  requirements:
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - LatentPsychic
+        - NaturalTelepath
+
+- type: trait
+  id: NaturalTelepath
+  category: Psionic
+  points: -3
+  components:
+    - type: PotentialPsionic
+    - type: Psionic
+  requirements:
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - LatentPsychic
+        - PsionicInsulation
diff --git a/Resources/ServerInfo/Guidebook/Psionics.xml b/Resources/ServerInfo/Guidebook/Psionics.xml
new file mode 100644
index 00000000000..7645c3d80d4
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Psionics.xml
@@ -0,0 +1,108 @@
+<Document>
+# Psionics
+[color=#a4885c]Psionics[/color] are mental abilities that interface with the [color=#a4885c]noösphere[/color]. Humans have limited access to the noösphere's full potential, allowing some to find ways to command it.
+The abilities originate from distorting a noöspheric imprint into a specific shape, a bit like a lock and key. Having powers is like possessing a ring of keys, with each key granting one ability.
+Barring unusual circumstances, most psychics will only possess a single power, but there are hidden ways to obtain more.
+
+## Power Scaling
+The relative strength of a psychic entity is given as two measurements, [color=#ff4500]Amplification (kα)[/color], and [color=#87cefa]Dampening (kδ)[/color]. [color=#ff4500]Amplification[/color] is a measure of
+how forcefully an entity can manipulate the noösphere, bending its currents to their will. A Pyromancer with high Amplification can throw a deadlier firebolt, but the noösphere will respond in kind with a
+proportionally greater increase in Glimmer. [color=#87cefa]Dampening[/color] by contrast is a measure of how controlled an entity is with their powers. With some exceptions, Dampening directly decreases
+the amount of Glimmer generated by casting powers.
+
+<GuideEntityEmbed Entity="MobIfritFamiliar" />
+Many other creatures can have power scaling different from that of a human, and thus may interact with their powers in ways different from an equivalent humanoid psion. To give an example, an Ifrit will usually have
+five times as much Amplification as the baseline, causing their Pyromancy to be substantially more dangerous than that of a human Pyromancer.
+
+## Psionic Potential
+Not all individuals have the ability to become Psionic. Individuals who can are known as Latents. This is given by the Latent Psychic Trait that must be taken at character creation. Without said trait, an individual
+may never become a psychic at any point in the round. There are extraordinarily rare exceptions to this rule, but none are known publicly. Latents have innate access to a minor form of Telepathy, which is
+identical to that provided temporarily by powerful hallucinogens, as well as intense states of dreaming. They cannot speak Telepathically, however, until they have obtained the Telepathy power.
+
+## Telepathy
+Nearly all forms of Psionic Powers also come with a secondary power called [color=#32cd32]Telepathy[/color], which works like a sort of noöspheric radio channel shared by all those who have psionic potential.
+Telepathy is accessed by starting a message with the = sign. Telepathy requires that the user be alive and conscious, but is not inhibited by most sources of muteness.
+It is notable that all Telepathic messages are fully anonymous, and are not guaranteed to come from a human being. Woe befalls the fool who blindly trusts what he hears telepathically.
+
+Not all Psionic entities have Telepathy, but most do.
+
+## Glimmer
+[color=#a4885c]Glimmer[/color] is a more colloquial term for [color=#a4885c]noöspheric pressure[/color], measured in [color=#a4885c]milli-Psi (mΨ)[/color]. The noösphere can be considered analogous to a pool of still,
+onyx black water. The waters have an inherent desire for stillness, for law, for an order of all things. The usage of psychic powers is like throwing a rock into the pool, creating waves that can be measured. As the waves
+build up, primordial chaos can potentially enter through our realm through areas where the pool is at its thinnest. While exceptions exist, the psychic powers generally follow Gunderaan's First Law when increasing
+Glimmer. Thus, Glimmer increases are given by the formula:
+
+ΔΨ = ~0.006 * kα - kδ
+
+Verbally, this law is read as, "Change in Glimmer is equal to approximately six milli-Psi times Amplification, minus Dampening."
+
+<GuideEntityEmbed Entity="SophicScribe" />
+The [color=#a4885c]sophic scribe[/color] tracks glimmer.
+
+<Box>
+<GuideEntityEmbed Entity="GlimmerProber"/>
+<GuideEntityEmbed Entity="GlimmerDrain"/>
+</Box>
+
+Epistemics can build devices to interact with glimmer. These are usually the main determiners of where glimmer is going.
+[color=#a4885c]Glimmer probers[/color] will increase glimmer, but directly generate research points without further input. [color=#a4885c]Glimmer drains[/color] simply drain glimmer at the cost of electricity.
+
+Use of psionics will increase glimmer, as will [color=#a4885c]noöspheric storms[/color].
+
+## Discharges
+Glimmer will occasionally discharge if it's above 100 mΨ, causing a wide range of effects based on just how high it is. The most common is giving all entities with psionic potential a small seizure,
+which is something most people working on stations with an Epistemics department have grown used to.
+
+## Acquiring Psionics
+<GuideEntityEmbed Entity="Oracle" />
+
+First, an individual must be a Latent Psychic. Without the Potential for powers, an individual can never in their life obtain psionic abilities. All Latent Psychics start with a
+baseline 10% chance to start each round with a random psychic power. Some particular individuals may have a higher baseline chance. After this initial chance, individuals may obtain
+powers during a round by certain acts, such as consuming large quantities of hallucinogenic drugs. When this happens, the local Glimmer also acts as a way of increasing the chances of
+obtaining powers. Each individual has "One Free Reroll" of their powers, so use it wisely.
+
+The odds of obtaining powers via drug consumption are given by Gunderaan's Second Law:
+
+χ = (10 + 0.001Ψ + φ) * ψ
+
+Where χ is the percentage chance of obtaining powers, Ψ is the glimmer present during the roll, φ is the potential bonus chance some individuals may possess, and ψ is the potential multiplier
+that a given hallucinogen may have. Not all hallucinogens have the same chance of granting powers. Most famously, Lotophagic Oil multiplies a user's chances of obtaining powers by 4. Some individuals may also have
+an innate potential multiplier, such as the station's Chaplain.
+
+## Psionic Insulation
+<Box>
+<GuideEntityEmbed Entity="ClothingHeadTinfoil"/>
+<GuideEntityEmbed Entity="ClothingHeadHelmetInsulated"/>
+<GuideEntityEmbed Entity="PillCryptobiolin" />
+<GuideEntityEmbed Entity="ClothingHeadCage" />
+</Box>
+Psionic Insulation is a catch-all term for any source of protection from mind-affecting psionic powers, as well as some noöspheric discharges. It is most commonly obtained from wearing special
+protective headgear, or from drugs such as Cryptobiolin that render one temporarily protected. Some entities can be innately insulated, such as nearly all forms of synthetic life, though
+exceptions may exist. Rarer still, some humanoids may be born with an innate psionic insulation.
+
+## Handling Glimmer Emergencies
+<GuideEntityEmbed Entity="GlimmerProber"/>
+Probers should be turned off before glimmer exceeds 500 mΨ.
+
+<GuideEntityEmbed Entity="GlimmerDrain"/>
+Glimmer drains are quite effective at draining glimmer, taking it out as fast as a prober can put it in.
+
+<GuideEntityEmbed Entity="Ectoplasm" />
+[color=#a4885c]Ectoplasm[/color], combined in a beaker with equal parts water, ash, blood, and plasma, will produce a normality crystal when heated enough. [color=#fcdf03]Use a hot plate for this.[/color]
+Ectoplasm is needed for the construction of Glimmer Drains, and is a very rare substance that can only be obtained from noöspheric entities.
+
+## Mind Breaking
+<Box>
+<GuideEntityEmbed Entity="PillMindbreakerToxin" />
+<GuideEntityEmbed Entity="ShellSoulbreaker" />
+</Box>
+
+Mind Breaking is the act of permanently destroyed an individual's link to the noösphere, and as such is considered by space law to be an act equivalent to Murder. It is NOT the job of any individual
+on the station to go about mind breaking all psionics, such a thing must not be taken likely, and should only be performed under extreme circumstances. Once mind broken, an individual loses an essential
+spark of humanity, making it so that for the rest of their natural life, they can never again be a psychic.
+
+Mind Breaking is performed by either imbibing a pill of Mindbreaker Toxin, or an injection of Soulbreaker. It is to be performed only as an emergency measure during a Code White situation, and only with
+the permission of the station's Commanding Officer. Mind Breaking may also be given by the station's Commanding Officer as a Capital level punishment for the most egregious crimes, such as using psychic
+powers to commit heinous acts.
+
+</Document>
diff --git a/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Psionics.xml b/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Psionics.xml
deleted file mode 100644
index 2911dae1557..00000000000
--- a/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Psionics.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<Document>
-# Psionics
-[color=#a4885c]Psionics[/color] are mental abilities that interface with the [color=#a4885c]noösphere[/color]. Humans have limited access to the noösphere's full potential, allowing some to find ways to command it.
-The abilities originate from distorting a noöspheric imprint into a specific shape, a bit like a lock and key. This means that humans can only have a single ability at a time.
-An imprint shaped for metapsionics will not work for invisibility, and vice versa.
-
-<GuideEntityEmbed Entity="MobIfritFamiliar" />
-Many other creatures are much more in tune with it than humans, allowing them to access more powerful psionics like [color=#a4885c]kineses[/color].
-
-## Telepathy
-All psionic entities have a shared telepathic communication channel. It's anonymized, so you never know who you are talking to. Statistically, it probably is not human.
-
-## Glimmer
-[color=#a4885c]Glimmer[/color] is a more colloquial term for [color=#a4885c]noöspheric pressure[/color], measured in [color=#a4885c]milli-Psi (mΨ)[/color]. The noösphere can be considered analogous to an atmosphere. In a localized area, everything will equalize towards a certain pressure that's based off of the total energy in the system.
-Note that unlike atmospheres, areas of noopsheric pressure do not operate by physical contigiousness, but mental. This means that areas with intertwined destinies will experience the same latent glimmer regardless of physical separation.
-
-<GuideEntityEmbed Entity="SophicScribe" />
-The [color=#a4885c]sophic scribe[/color] tracks glimmer.
-
-<Box>
-<GuideEntityEmbed Entity="GlimmerProber"/>
-<GuideEntityEmbed Entity="GlimmerDrain"/>
-</Box>
-
-Epistemics can build devices to interact with glimmer. These are usually the main determiners of where glimmer is going.
-[color=#a4885c]Glimmer probers[/color] will increase glimmer, but directly generate research points without further input. [color=#a4885c]Glimmer drains[/color] simply drain glimmer at the cost of electricity.
-
-Use of psionics will increase glimmer, as will [color=#a4885c]noöspheric storms[/color].
-
-## Discharges
-Glimmer will occasionally discharge if it's above 100 mΨ, causing a wide range of effects based on just how high it is. The most common is giving all entities with psionic potential a small seizure,
-which is something most people working on stations with an Epistemics department have grown used to.
-
-## Acquiring Psionics
-<GuideEntityEmbed Entity="Oracle" />
-
-Psionics can be acquired in a number of ways. The oracle will sometimes dispense a strange liquid called [color=#a4885c]lotophagoi oil[/color], which at high glimmer levels is guaranteed to give psionics.
-
-Random discharges may give you psionics as the seizure knocks your noöspheric imprint into just the right shape.
-
-[color=#a4885c]Space drugs[/color] are an easier to acquire but much weaker alternative to lotophagoi oil.
-
-## Psionic Insulation
-<Box>
-<GuideEntityEmbed Entity="ClothingHeadTinfoil"/>
-<GuideEntityEmbed Entity="ClothingHeadHelmetInsulated"/>
-<GuideEntityEmbed Entity="PillCryptobiolin" />
-</Box>
-[color=#a4885c]Insulative clothing[/color] and [color=#a4885c]cryptobiolin[/color] will render you immune to psionics, but prevent you from using any you have.
-
-<GuideEntityEmbed Entity="ClothingHeadCage" />
-Security has a more forcible option for insulative clothing.
-
-## Handling Glimmer Emergencies
-<GuideEntityEmbed Entity="GlimmerProber"/>
-Probers should be turned off before glimmer exceeds 500 mΨ.
-
-<GuideEntityEmbed Entity="GlimmerDrain"/>
-Glimmer drains are quite effective at draining glimmer, taking it out as fast as a prober can put it in.
-
-<GuideEntityEmbed Entity="AltarNanotrasen" />
-Sacrificing psychics will reduce glimmer instantly by a decent amount.
-
-<GuideEntityEmbed Entity="PillMindbreakerToxin" />
-Metabolizing 20u or more of [color=#a4885c]mindbreaker[/color] will remove psionics from a person, meaning they will not generate any more glimmer.
-
-<GuideEntityEmbed Entity="ShellSoulbreaker" />
-[color=#a4885c]Soulbreaker[/color] shells will remove psionics from psychics they hit.
-
-<GuideEntityEmbed Entity="Ectoplasm" />
-[color=#a4885c]Ectoplasm[/color], combined in a beaker with equal parts water, ash, blood, and plasma, will produce a normality crystal when heated enough. [color=#fcdf03]Use a hot plate for this.[/color]
-
-</Document>