diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUi.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUi.cs
index 2dbe923b2a6..ea5aa3cf256 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUi.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUi.cs
@@ -18,6 +18,15 @@ 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 fb085a8a799..e3163975d12 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiFragment.xaml.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiFragment.xaml.cs
@@ -1,6 +1,7 @@
 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;
@@ -12,7 +13,9 @@ 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
deleted file mode 100644
index 2de8a37ff77..00000000000
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<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
deleted file mode 100644
index e8dd4eea446..00000000000
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index da5ff825b91..00000000000
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUi.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 7fb2c42debc..00000000000
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml
+++ /dev/null
@@ -1,13 +0,0 @@
-<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
deleted file mode 100644
index ad152840529..00000000000
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-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/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs b/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs
similarity index 92%
rename from Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs
rename to Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs
index 0d8accb9f86..0b5fc7ad38c 100644
--- a/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs
+++ b/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs
@@ -1,11 +1,10 @@
 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.Psionics.GlimmerMonitor;
+namespace Content.Client.Nyanotrasen.CartridgeLoader.Cartridges;
 
 public sealed partial class GlimmerMonitorUi : UIFragment
 {
diff --git a/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml b/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
similarity index 87%
rename from Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml
rename to Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
index ade0720696b..119a1831e6e 100644
--- a/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml
+++ b/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
@@ -1,9 +1,8 @@
-<cartridges:GlimmerMonitorUiFragment xmlns:cartridges="clr-namespace:Content.Client.Psionics.GlimmerMonitor"
+<cartridges:GlimmerMonitorUiFragment xmlns:cartridges="clr-namespace:Content.Client.Nyanotrasen.CartridgeLoader.Cartridges"
                                  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/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml.cs b/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
similarity index 87%
rename from Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml.cs
rename to Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
index f0dcfbce65a..43d9202aa45 100644
--- a/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml.cs
+++ b/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
@@ -1,12 +1,12 @@
 using System.Linq;
 using System.Numerics;
-using Content.Client.Psionics.UI;
+using Content.Client.Nyanotrasen.UserInterface;
 using Robust.Client.AutoGenerated;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Psionics.GlimmerMonitor;
+namespace Content.Client.Nyanotrasen.CartridgeLoader.Cartridges;
 
 [GenerateTypedNameReferences]
 public sealed partial class GlimmerMonitorUiFragment : BoxContainer
@@ -26,14 +26,12 @@ public GlimmerMonitorUiFragment()
         VerticalExpand = true;
 
         var intervalGroup = new ButtonGroup();
-        IntervalButton6s.Group = intervalGroup;
         IntervalButton1.Group = intervalGroup;
         IntervalButton5.Group = intervalGroup;
         IntervalButton10.Group = intervalGroup;
 
-        IntervalButton6s.Pressed = true;
+        IntervalButton1.Pressed = true;
 
-        IntervalButton6s.OnPressed += _ => UpdateState(_cachedValues);
         IntervalButton1.OnPressed += _ => UpdateState(_cachedValues);
         IntervalButton5.OnPressed += _ => UpdateState(_cachedValues);
         IntervalButton10.OnPressed += _ => UpdateState(_cachedValues);
@@ -64,12 +62,14 @@ private List<int> FormatGlimmerValues(List<int> glimmerValues)
     {
         var returnList = glimmerValues;
 
-        if (IntervalButton1.Pressed)
-            returnList = GetAveragedList(glimmerValues, 10);
-        else if (IntervalButton5.Pressed)
-            returnList = GetAveragedList(glimmerValues, 50);
+        if (IntervalButton5.Pressed)
+        {
+            returnList = GetAveragedList(glimmerValues, 5);
+        }
         else if (IntervalButton10.Pressed)
-            returnList = GetAveragedList(glimmerValues, 100);
+        {
+            returnList = GetAveragedList(glimmerValues, 10);
+        }
 
         return ClipToFifteen(returnList);
     }
diff --git a/Content.Client/Psionics/Telepathy/PsionicChatUpdateSystem.cs b/Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs
similarity index 92%
rename from Content.Client/Psionics/Telepathy/PsionicChatUpdateSystem.cs
rename to Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs
index 7bb88764a1f..84602052fe7 100644
--- a/Content.Client/Psionics/Telepathy/PsionicChatUpdateSystem.cs
+++ b/Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs
@@ -1,8 +1,8 @@
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Client.Chat.Managers;
 using Robust.Client.Player;
 
-namespace Content.Client.Psionics.Chat
+namespace Content.Client.Nyanotrasen.Chat
 {
     public sealed class PsionicChatUpdateSystem : EntitySystem
     {
diff --git a/Content.Client/Psionics/Glimmer/GlimmerReactiveVisuals.cs b/Content.Client/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveVisuals.cs
similarity index 100%
rename from Content.Client/Psionics/Glimmer/GlimmerReactiveVisuals.cs
rename to Content.Client/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveVisuals.cs
diff --git a/Content.Client/Psionics/UserInterface/AcceptPsionicsEUI.cs b/Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsEUI.cs
similarity index 100%
rename from Content.Client/Psionics/UserInterface/AcceptPsionicsEUI.cs
rename to Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsEUI.cs
diff --git a/Content.Client/Psionics/UserInterface/AcceptPsionicsWindow.cs b/Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsWindow.cs
similarity index 100%
rename from Content.Client/Psionics/UserInterface/AcceptPsionicsWindow.cs
rename to Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsWindow.cs
diff --git a/Content.Client/Psionics/UserInterface/GlimmerGraph.cs b/Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs
similarity index 97%
rename from Content.Client/Psionics/UserInterface/GlimmerGraph.cs
rename to Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs
index 111c810acb1..c4a9109dcd8 100644
--- a/Content.Client/Psionics/UserInterface/GlimmerGraph.cs
+++ b/Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs
@@ -4,7 +4,7 @@
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 
-namespace Content.Client.Psionics.UI;
+namespace Content.Client.Nyanotrasen.UserInterface;
 
 public sealed class GlimmerGraph : Control
 {
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index 954a705fceb..c0137fcf644 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -1879,7 +1879,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/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index 0bab11f0265..508e3650645 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -21,6 +21,7 @@
 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 +38,7 @@
 using Robust.Shared.Replays;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Content.Client.Psionics.Chat;
+using Content.Client.Nyanotrasen.Chat; //Nyano - Summary: chat namespace.
 
 namespace Content.Client.UserInterface.Systems.Chat;
 
@@ -60,7 +61,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!; //EE - Summary: makes the psionic chat available.
+    [UISystemDependency] private readonly PsionicChatUpdateSystem? _psionic = default!; //Nyano - Summary: makes the psionic chat available.
 
     [ValidatePrototypeId<ColorPalettePrototype>]
     private const string ChatNamePalette = "ChatNames";
@@ -82,7 +83,7 @@ public sealed class ChatUIController : UIController
         {SharedChatSystem.AdminPrefix, ChatSelectChannel.Admin},
         {SharedChatSystem.RadioCommonPrefix, ChatSelectChannel.Radio},
         {SharedChatSystem.DeadPrefix, ChatSelectChannel.Dead},
-        {SharedChatSystem.TelepathicPrefix, ChatSelectChannel.Telepathic} //EE - Summary: adds the telepathic prefix =.
+        {SharedChatSystem.TelepathicPrefix, ChatSelectChannel.Telepathic} //Nyano - Summary: adds the telepathic prefix =.
     };
 
     public static readonly Dictionary<ChatSelectChannel, char> ChannelPrefixes = new()
@@ -97,7 +98,7 @@ public sealed class ChatUIController : UIController
         {ChatSelectChannel.Admin, SharedChatSystem.AdminPrefix},
         {ChatSelectChannel.Radio, SharedChatSystem.RadioCommonPrefix},
         {ChatSelectChannel.Dead, SharedChatSystem.DeadPrefix},
-        {ChatSelectChannel.Telepathic, SharedChatSystem.TelepathicPrefix } //EE - Summary: associates telepathic with =.
+        {ChatSelectChannel.Telepathic, SharedChatSystem.TelepathicPrefix } //Nyano - Summary: associates telepathic with =.
     };
 
     /// <summary>
diff --git a/Content.Server/Abilities/Mime/MimePowersComponent.cs b/Content.Server/Abilities/Mime/MimePowersComponent.cs
index 757528a9cbc..fd4fc2c2af9 100644
--- a/Content.Server/Abilities/Mime/MimePowersComponent.cs
+++ b/Content.Server/Abilities/Mime/MimePowersComponent.cs
@@ -47,17 +47,5 @@ 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 0a40350889e..c1d2643d6fa 100644
--- a/Content.Server/Abilities/Mime/MimePowersSystem.cs
+++ b/Content.Server/Abilities/Mime/MimePowersSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Popups;
+using Content.Server.Speech.Muting;
 using Content.Shared.Actions;
 using Content.Shared.Actions.Events;
 using Content.Shared.Alert;
@@ -9,7 +10,7 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics; //Nyano - Summary: Makes Mime psionic.
 using Content.Shared.Speech.Muting;
 
 namespace Content.Server.Abilities.Mime
@@ -57,21 +58,14 @@ 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);
-
-            // 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;
-            }
+            //Nyano - Summary: Add Psionic Ability to Mime.
+            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+                psionic.PsionicAbility = component.InvisibleWallActionEntity;
         }
 
         /// <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)
@@ -104,9 +98,9 @@ private void OnInvisibleWall(EntityUid uid, MimePowersComponent component, Invis
                     return;
                 }
             }
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-                _psionics.LogPowerUsed(uid, "invisible wall", psionic, 4, 6);
-
+            // Begin Nyano-code: mime powers are psionic.
+            _psionics.LogPowerUsed(uid, "invisible wall");
+            // End Nyano-code.
             _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));
@@ -132,14 +126,6 @@ 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>
@@ -163,14 +149,6 @@ 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 8fa88c468c1..6251e00be23 100644
--- a/Content.Server/Anomaly/AnomalySystem.Psionics.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Psionics.cs
@@ -1,4 +1,4 @@
-using Content.Server.Psionics.Abilities;
+using Content.Server.Abilities.Psionics;
 using Content.Shared.Anomaly;
 using Content.Shared.Anomaly.Components;
 using Robust.Shared.Random;
diff --git a/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs b/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs
index 710c37b62fe..a58d3a3c122 100644
--- a/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs
+++ b/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs
@@ -1,6 +1,8 @@
+using Content.Server.Atmos.EntitySystems;
+
 namespace Content.Server.Atmos.Components;
 
-[RegisterComponent]
+[RegisterComponent, Access(typeof(FlammableSystem))]
 public sealed partial class IgniteOnCollideComponent : Component
 {
     /// <summary>
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 450a35f438c..9e06003ef6f 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -8,7 +8,9 @@
 using Content.Server.Language;
 using Content.Server.Speech.Components;
 using Content.Server.Speech.EntitySystems;
-using Content.Server.Psionics.Telepathy;
+using Content.Server.Nyanotrasen.Chat;
+using Content.Server.Speech.Components;
+using Content.Server.Speech.EntitySystems;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.ActionBlocker;
diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs
index 00ffd27703e..92e658591a0 100644
--- a/Content.Server/Cloning/CloningSystem.cs
+++ b/Content.Server/Cloning/CloningSystem.cs
@@ -24,7 +24,6 @@
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Roles.Jobs;
-using Content.Shared.Psionics.Abilities;
 using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
@@ -202,18 +201,6 @@ public bool TryCloning(EntityUid uid, EntityUid bodyToClone, Entity<MindComponen
             if (_configManager.GetCVar(CCVars.BiomassEasyMode))
                 cloningCost = (int) Math.Round(cloningCost * EasyModeCloningCost);
 
-            if (TryComp<PsionicInsulationComponent>(bodyToClone, out var insul))
-            {
-                if (clonePod.ConnectedConsole != null)
-                {
-                    _chatSystem.TrySendInGameICMessage(clonePod.ConnectedConsole.Value,
-                        Loc.GetString("cloning-console-insulation-error"),
-                        InGameICChatType.Speak, false);
-                }
-
-                return false;
-            }
-
             // Check if they have the uncloneable trait
             if (TryComp<UncloneableComponent>(bodyToClone, out _))
             {
diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/SecWatchCartridgeComponent.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/SecWatchCartridgeComponent.cs
deleted file mode 100644
index 7ccc90ef797..00000000000
--- a/Content.Server/DeltaV/CartridgeLoader/Cartridges/SecWatchCartridgeComponent.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index 16da24514cb..00000000000
--- a/Content.Server/DeltaV/CartridgeLoader/Cartridges/SecWatchCartridgeSystem.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-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
new file mode 100644
index 00000000000..741a6134580
--- /dev/null
+++ b/Content.Server/DeltaV/CartridgeLoader/CrimeAssistCartridgeComponent.cs
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 00000000000..06732c2c534
--- /dev/null
+++ b/Content.Server/DeltaV/CartridgeLoader/CrimeAssistCartridgeSystem.cs
@@ -0,0 +1,16 @@
+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 22d96a54146..ec9ec770313 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.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/Psionics/Abilities/DispelPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs
similarity index 70%
rename from Content.Server/Psionics/Abilities/DispelPowerSystem.cs
rename to Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs
index 3d7d5c20c7c..d338a5a5bcb 100644
--- a/Content.Server/Psionics/Abilities/DispelPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs
@@ -1,21 +1,24 @@
 using Content.Shared.Actions;
 using Content.Shared.StatusEffect;
-using Content.Shared.Psionics.Abilities;
-using Content.Shared.Psionics.Glimmer;
+using Content.Shared.Abilities.Psionics;
 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.Psionics.Abilities
+namespace Content.Server.Abilities.Psionics
 {
     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!;
@@ -24,7 +27,8 @@ 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 GlimmerSystem _glimmerSystem = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly SharedMindSystem _mindSystem = default!;
 
 
         public override void Initialize()
@@ -32,7 +36,7 @@ public override void Initialize()
             base.Initialize();
             SubscribeLocalEvent<DispelPowerComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<DispelPowerComponent, ComponentShutdown>(OnShutdown);
-            SubscribeLocalEvent<DispelPowerComponent, DispelPowerActionEvent>(OnPowerUsed);
+            SubscribeLocalEvent<DispelPowerActionEvent>(OnPowerUsed);
 
             SubscribeLocalEvent<DispellableComponent, DispelledEvent>(OnDispelled);
             SubscribeLocalEvent<DamageOnDispelComponent, DispelledEvent>(OnDmgDispelled);
@@ -44,17 +48,15 @@ public override void Initialize()
 
         private void OnInit(EntityUid uid, DispelPowerComponent component, ComponentInit args)
         {
-            EnsureComp<PsionicComponent>(uid, out var psionic);
-            _actions.AddAction(uid, ref component.DispelActionEntity, component.DispelActionId);
-            _actions.TryGetActionData(component.DispelActionEntity, out var actionData);
+            _actions.AddAction(uid, ref component.DispelActionEntity, component.DispelActionId );
+            _actions.TryGetActionData( component.DispelActionEntity, out var actionData );
             if (actionData is { UseDelay: not null })
-                _actions.SetCooldown(component.DispelActionEntity, actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification));
-
-            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;
+                _actions.StartUseDelay(component.DispelActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+            {
+                psionic.PsionicAbility = component.DispelActionEntity;
+                psionic.ActivePowers.Add(component);
+            }
         }
 
         private void OnShutdown(EntityUid uid, DispelPowerComponent component, ComponentShutdown args)
@@ -64,14 +66,12 @@ 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(EntityUid uid, DispelPowerComponent component, DispelPowerActionEvent args)
+        private void OnPowerUsed(DispelPowerActionEvent args)
         {
-            if (!_psionics.CheckCanTargetCast(uid, args.Target, out var psionic))
+            if (HasComp<PsionicInsulationComponent>(args.Target))
                 return;
 
             var ev = new DispelledEvent();
@@ -79,16 +79,8 @@ private void OnPowerUsed(EntityUid uid, DispelPowerComponent component, DispelPo
 
             if (ev.Handled)
             {
-                _actions.TryGetActionData(component.DispelActionEntity, out var actionData);
-                if (actionData is { UseDelay: not null })
-                    _actions.SetCooldown(component.DispelActionEntity, actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification));
                 args.Handled = true;
-                _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));
+                _psionics.LogPowerUsed(args.Performer, "dispel");
             }
         }
 
@@ -104,7 +96,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);
@@ -153,3 +145,5 @@ public void DealDispelDamage(EntityUid uid, DamageSpecifier? damage = null)
     }
     public sealed class DispelledEvent : HandledEntityEventArgs {}
 }
+
+
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
new file mode 100644
index 00000000000..b775117b716
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
@@ -0,0 +1,74 @@
+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/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
similarity index 72%
rename from Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs
rename to Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
index b4129581ec1..b23224cab48 100644
--- a/Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
@@ -1,6 +1,5 @@
 using Content.Shared.Actions;
-using Content.Shared.Psionics.Abilities;
-using Content.Shared.Psionics;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.Speech;
 using Content.Shared.Stealth.Components;
 using Content.Shared.Mobs.Components;
@@ -9,16 +8,21 @@
 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.Psionics.Abilities
+namespace Content.Server.Abilities.Psionics
 {
     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!;
@@ -29,27 +33,26 @@ public override void Initialize()
             base.Initialize();
             SubscribeLocalEvent<MindSwapPowerComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<MindSwapPowerComponent, ComponentShutdown>(OnShutdown);
-            SubscribeLocalEvent<MindSwapPowerComponent, MindSwapPowerActionEvent>(OnPowerUsed);
+            SubscribeLocalEvent<MindSwapPowerActionEvent>(OnPowerUsed);
             SubscribeLocalEvent<MindSwappedComponent, MindSwapPowerReturnActionEvent>(OnPowerReturned);
             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)
         {
-            EnsureComp<PsionicComponent>(uid, out var psionic);
-            _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.SetCooldown(component.MindSwapActionEntity, actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification));
-
-            psionic.ActivePowers.Add(component);
-            psionic.PsychicFeedback.Add(component.MindSwapFeedback);
-            psionic.Amplification += 1f;
+                _actions.StartUseDelay(component.MindSwapActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+            {
+                psionic.PsionicAbility = component.MindSwapActionEntity;
+                psionic.ActivePowers.Add(component);
+            }
         }
 
         private void OnShutdown(EntityUid uid, MindSwapPowerComponent component, ComponentShutdown args)
@@ -58,25 +61,20 @@ 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(EntityUid uid, MindSwapPowerComponent component, MindSwapPowerActionEvent args)
+        private void OnPowerUsed(MindSwapPowerActionEvent args)
         {
-
-            if (!(TryComp<DamageableComponent>(args.Target, out var damageable) && damageable.DamageContainerID == "Biological")
-                || !_psionics.CheckCanTargetCast(uid, args.Target, out var psionic))
+            if (!(TryComp<DamageableComponent>(args.Target, out var damageable) && damageable.DamageContainerID == "Biological"))
                 return;
 
-            _actions.TryGetActionData(component.MindSwapActionEntity, out var actionData);
-            if (actionData is { UseDelay: not null })
-                _actions.SetCooldown(component.MindSwapActionEntity, actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification));
+            if (HasComp<PsionicInsulationComponent>(args.Target))
+                return;
 
             Swap(args.Performer, args.Target);
 
-            _psionics.LogPowerUsed(args.Performer, "mind swap", psionic, 8, 12);
+            _psionics.LogPowerUsed(args.Performer, "mind swap");
             args.Handled = true;
         }
 
@@ -127,8 +125,8 @@ private void OnDispelled(EntityUid uid, MindSwappedComponent component, Dispelle
 
         private void OnMobStateChanged(EntityUid uid, MindSwappedComponent component, MobStateChangedEvent args)
         {
-            if (args.NewMobState == MobState.Dead || args.NewMobState == MobState.Critical)
-                Swap(uid, component.OriginalEntity, true);
+            if (args.NewMobState == MobState.Dead)
+                RemComp<MindSwappedComponent>(uid);
         }
 
         private void OnGhostAttempt(GhostAttemptHandleEvent args)
@@ -153,23 +151,8 @@ 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.ActivePowers.Add(component);
-                psionic.PsychicFeedback.Add(component.MindSwappedFeedback);
-                if (actionData is { UseDelay: not null })
-                    _actions.SetCooldown(component.MindSwapReturnActionEntity, actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification));
-            }
-        }
-
-        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);
-            }
+            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+                psionic.PsionicAbility = component.MindSwapReturnActionEntity;
         }
 
         public void Swap(EntityUid performer, EntityUid target, bool end = false)
@@ -182,13 +165,11 @@ 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
@@ -221,7 +202,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)
         {
 
@@ -239,9 +220,5 @@ 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/Psionics/Abilities/MindSwappedComponent.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs
similarity index 79%
rename from Content.Server/Psionics/Abilities/MindSwappedComponent.cs
rename to Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs
index 82c0313bca6..72cd6a66ef9 100644
--- a/Content.Server/Psionics/Abilities/MindSwappedComponent.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Psionics.Abilities
+namespace Content.Server.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class MindSwappedComponent : Component
@@ -14,8 +14,5 @@ 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/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
new file mode 100644
index 00000000000..0fd261ef12f
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
@@ -0,0 +1,73 @@
+using Content.Shared.Actions;
+using Content.Shared.Abilities.Psionics;
+using Content.Server.Psionics;
+using Content.Shared.StatusEffect;
+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
+{
+    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!;
+
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<NoosphericZapPowerComponent, ComponentInit>(OnInit);
+            SubscribeLocalEvent<NoosphericZapPowerComponent, ComponentShutdown>(OnShutdown);
+            SubscribeLocalEvent<NoosphericZapPowerActionEvent>(OnPowerUsed);
+        }
+
+        private void OnInit(EntityUid uid, NoosphericZapPowerComponent component, ComponentInit args)
+        {
+            _actions.AddAction(uid, ref component.NoosphericZapActionEntity, component.NoosphericZapActionId );
+            _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)
+            {
+                psionic.PsionicAbility = component.NoosphericZapActionEntity;
+                psionic.ActivePowers.Add(component);
+            }
+        }
+
+        private void OnShutdown(EntityUid uid, NoosphericZapPowerComponent component, ComponentShutdown args)
+        {
+            _actions.RemoveAction(uid, component.NoosphericZapActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+            }
+        }
+
+        private void OnPowerUsed(NoosphericZapPowerActionEvent args)
+        {
+            if (!HasComp<PotentialPsionicComponent>(args.Target))
+                return;
+
+            if (HasComp<PsionicInsulationComponent>(args.Target))
+                return;
+
+            _beam.TryCreateBeam(args.Performer, args.Target, "LightningNoospheric");
+
+            _stunSystem.TryParalyze(args.Target, TimeSpan.FromSeconds(5), false);
+            _statusEffectsSystem.TryAddStatusEffect(args.Target, "Stutter", TimeSpan.FromSeconds(10), false, "StutteringAccent");
+
+            _psionics.LogPowerUsed(args.Performer, "noospheric zap");
+            args.Handled = true;
+        }
+    }
+}
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
new file mode 100644
index 00000000000..5ca1dc7a6dc
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
@@ -0,0 +1,134 @@
+using Content.Shared.Actions;
+using Content.Shared.CombatMode.Pacification;
+using Content.Shared.Abilities.Psionics;
+using Content.Shared.Damage;
+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.Actions.Events;
+using Robust.Shared.Audio.Systems;
+
+namespace Content.Server.Abilities.Psionics
+{
+    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!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<PsionicInvisibilityPowerComponent, ComponentInit>(OnInit);
+            SubscribeLocalEvent<PsionicInvisibilityPowerComponent, ComponentShutdown>(OnShutdown);
+            SubscribeLocalEvent<PsionicInvisibilityPowerComponent, PsionicInvisibilityPowerActionEvent>(OnPowerUsed);
+            SubscribeLocalEvent<RemovePsionicInvisibilityOffPowerActionEvent>(OnPowerOff);
+            SubscribeLocalEvent<PsionicInvisibilityUsedComponent, ComponentInit>(OnStart);
+            SubscribeLocalEvent<PsionicInvisibilityUsedComponent, ComponentShutdown>(OnEnd);
+            SubscribeLocalEvent<PsionicInvisibilityUsedComponent, DamageChangedEvent>(OnDamageChanged);
+        }
+
+        private void OnInit(EntityUid uid, PsionicInvisibilityPowerComponent component, ComponentInit args)
+        {
+            _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)
+            {
+                psionic.PsionicAbility = component.PsionicInvisibilityActionEntity;
+                psionic.ActivePowers.Add(component);
+            }
+        }
+
+        private void OnShutdown(EntityUid uid, PsionicInvisibilityPowerComponent component, ComponentShutdown args)
+        {
+            _actions.RemoveAction(uid, component.PsionicInvisibilityActionEntity);
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+            }
+        }
+
+        private void OnPowerUsed(EntityUid uid, PsionicInvisibilityPowerComponent component, PsionicInvisibilityPowerActionEvent args)
+        {
+            if (HasComp<PsionicInvisibilityUsedComponent>(uid))
+                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);
+
+            _psionics.LogPowerUsed(uid, "psionic invisibility");
+            args.Handled = true;
+        }
+
+        private void OnPowerOff(RemovePsionicInvisibilityOffPowerActionEvent args)
+        {
+            if (!HasComp<PsionicInvisibilityUsedComponent>(args.Performer))
+                return;
+
+            ToggleInvisibility(args.Performer);
+            args.Handled = true;
+        }
+
+        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);
+
+        }
+
+        private void OnEnd(EntityUid uid, PsionicInvisibilityUsedComponent component, ComponentShutdown args)
+        {
+            if (Terminating(uid))
+                return;
+
+            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);
+            DirtyEntity(uid);
+        }
+
+        private void OnDamageChanged(EntityUid uid, PsionicInvisibilityUsedComponent component, DamageChangedEvent args)
+        {
+            if (!args.DamageIncreased)
+                return;
+
+            ToggleInvisibility(uid);
+        }
+
+        public void ToggleInvisibility(EntityUid uid)
+        {
+            if (!HasComp<PsionicInvisibilityUsedComponent>(uid))
+            {
+                EnsureComp<PsionicInvisibilityUsedComponent>(uid);
+            } else
+            {
+                RemComp<PsionicInvisibilityUsedComponent>(uid);
+            }
+        }
+    }
+}
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
new file mode 100644
index 00000000000..097a0cb750b
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
@@ -0,0 +1,129 @@
+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.Actions;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+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
+{
+    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()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<PsionicRegenerationPowerComponent, ComponentInit>(OnInit);
+            SubscribeLocalEvent<PsionicRegenerationPowerComponent, ComponentShutdown>(OnShutdown);
+            SubscribeLocalEvent<PsionicRegenerationPowerComponent, PsionicRegenerationPowerActionEvent>(OnPowerUsed);
+
+            SubscribeLocalEvent<PsionicRegenerationPowerComponent, DispelledEvent>(OnDispelled);
+            SubscribeLocalEvent<PsionicRegenerationPowerComponent, PsionicRegenerationDoAfterEvent>(OnDoAfter);
+        }
+
+        private void OnInit(EntityUid uid, PsionicRegenerationPowerComponent component, ComponentInit args)
+        {
+            _actions.AddAction(uid, ref component.PsionicRegenerationActionEntity, component.PsionicRegenerationActionId );
+            _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)
+            {
+                psionic.PsionicAbility = component.PsionicRegenerationActionEntity;
+                psionic.ActivePowers.Add(component);
+            }
+        }
+
+        private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent component, PsionicRegenerationPowerActionEvent args)
+        {
+            var ev = new PsionicRegenerationDoAfterEvent(_gameTiming.CurTime);
+            var doAfterArgs = new DoAfterArgs(EntityManager, uid, component.UseDelay, ev, uid);
+
+            _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);
+
+            _audioSystem.PlayPvs(component.SoundUse, component.Owner, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
+            _psionics.LogPowerUsed(uid, "psionic regeneration");
+            args.Handled = true;
+        }
+
+        private void OnShutdown(EntityUid uid, PsionicRegenerationPowerComponent component, ComponentShutdown args)
+        {
+            _actions.RemoveAction(uid, component.PsionicRegenerationActionEntity);
+
+            if (TryComp<PsionicComponent>(uid, out var psionic))
+            {
+                psionic.ActivePowers.Remove(component);
+            }
+        }
+
+        private void OnDispelled(EntityUid uid, PsionicRegenerationPowerComponent component, DispelledEvent args)
+        {
+            if (component.DoAfter == null)
+                return;
+
+            _doAfterSystem.Cancel(component.DoAfter);
+            component.DoAfter = null;
+
+            args.Handled = true;
+        }
+
+        private void OnDoAfter(EntityUid uid, PsionicRegenerationPowerComponent component, PsionicRegenerationDoAfterEvent args)
+        {
+            component.DoAfter = null;
+
+            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));
+            _bloodstreamSystem.TryAddToChemicals(uid, solution, stream);
+        }
+    }
+}
+
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
new file mode 100644
index 00000000000..407b72c6b58
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
@@ -0,0 +1,66 @@
+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
new file mode 100644
index 00000000000..f7ae04b61ea
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
@@ -0,0 +1,67 @@
+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
new file mode 100644
index 00000000000..ee16aaccfb6
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs
@@ -0,0 +1,143 @@
+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/Psionics/Audio/GlimmerSoundComponent.cs b/Content.Server/Nyanotrasen/Audio/GlimmerSoundComponent.cs
similarity index 80%
rename from Content.Server/Psionics/Audio/GlimmerSoundComponent.cs
rename to Content.Server/Nyanotrasen/Audio/GlimmerSoundComponent.cs
index 9a6c62381be..850be3e831c 100644
--- a/Content.Server/Psionics/Audio/GlimmerSoundComponent.cs
+++ b/Content.Server/Nyanotrasen/Audio/GlimmerSoundComponent.cs
@@ -2,8 +2,12 @@
 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.Psionics.Audio
+namespace Content.Server.Audio
 {
     [RegisterComponent]
     [Access(typeof(SharedAmbientSoundSystem), typeof(GlimmerReactiveSystem))]
diff --git a/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs b/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs
similarity index 79%
rename from Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs
rename to Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs
index 917511d1477..58ed1782741 100644
--- a/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs
+++ b/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs
@@ -2,8 +2,7 @@
 using Content.Server.Administration.Managers;
 using Content.Server.Chat.Managers;
 using Content.Server.Chat.Systems;
-using Content.Server.Popups;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.Chat;
 using Content.Shared.Database;
@@ -17,10 +16,10 @@
 using System.Linq;
 using System.Text;
 
-namespace Content.Server.Psionics.Telepathy
+namespace Content.Server.Nyanotrasen.Chat
 {
     /// <summary>
-    /// Extensions for Telepathic Chat
+    /// Extensions for nyano's chat stuff
     /// </summary>
 
     public sealed class NyanoChatSystem : EntitySystem
@@ -31,7 +30,6 @@ 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()
@@ -49,9 +47,7 @@ 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)
-                || HasComp<PotentialPsionicComponent>(entity) && !HasComp<PsionicComponent>(entity) && !HasComp<PsionicInsulationComponent>(entity))
+                .AddWhereAttachedEntity(entity => HasComp<SleepingComponent>(entity) || HasComp<SeeingRainbowsComponent>(entity) && !HasComp<PsionicsDisabledComponent>(entity) && !HasComp<PsionicInsulationComponent>(entity))
                 .Recipients
                 .Select(p => p.ConnectedClient);
 
@@ -65,7 +61,7 @@ private List<INetChannel> GetDreamers(IEnumerable<INetChannel> removeList)
 
         private bool IsEligibleForTelepathy(EntityUid entity)
         {
-            return TryComp<PsionicComponent>(entity, out var psionic) && psionic.Telepath
+            return HasComp<PsionicComponent>(entity)
                 && !HasComp<PsionicsDisabledComponent>(entity)
                 && !HasComp<PsionicInsulationComponent>(entity)
                 && (!TryComp<MobStateComponent>(entity, out var mobstate) || mobstate.CurrentState == MobState.Alive);
@@ -76,12 +72,6 @@ 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;
@@ -100,11 +90,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.DeltaGlimmerInput(1);
+                _glimmerSystem.Glimmer++;
 
-            if (_random.Prob(Math.Min(0.33f + (float) _glimmerSystem.GlimmerOutput / 1500, 1)))
+            if (_random.Prob(Math.Min(0.33f + ((float) _glimmerSystem.Glimmer / 1500), 1)))
             {
-                float obfuscation = 0.25f + (float) _glimmerSystem.GlimmerOutput / 2000;
+                float obfuscation = (0.25f + (float) _glimmerSystem.Glimmer / 2000);
                 var obfuscated = ObfuscateMessageReadability(message, obfuscation);
                 _chatManager.ChatMessageToMany(ChatChannel.Telepathic, obfuscated, messageWrap, source, hideChat, false, GetDreamers(clients), Color.PaleVioletRed);
             }
@@ -121,7 +111,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/Psionics/Telepathy/TelepathicRepeaterComponent.cs b/Content.Server/Nyanotrasen/Chat/TelepathicRepeaterComponent.cs
similarity index 82%
rename from Content.Server/Psionics/Telepathy/TelepathicRepeaterComponent.cs
rename to Content.Server/Nyanotrasen/Chat/TelepathicRepeaterComponent.cs
index 6e194f76c8f..fc199f4332a 100644
--- a/Content.Server/Psionics/Telepathy/TelepathicRepeaterComponent.cs
+++ b/Content.Server/Nyanotrasen/Chat/TelepathicRepeaterComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Psionics.Telepathy
+namespace Content.Server.Nyanotrasen.Chat
 {
     /// <summary>
     /// Repeats whatever is happening in telepathic chat.
diff --git a/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs b/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs
index 0ce3f9d7c64..a23a5b3d77d 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.Psionics.Abilities;
+using Content.Server.Abilities.Psionics;
 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 cd7010700a1..65aaf350cba 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.DeltaGlimmerInput(Count);
+        glimmersys.Glimmer += Count;
     }
 }
diff --git a/Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs b/Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs
new file mode 100644
index 00000000000..3b677bab2d4
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 00000000000..d090c320a41
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Objectives/Systems/BecomePsionicConditionSystem.cs
@@ -0,0 +1,32 @@
+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 5d2cd3fa633..d7aae44afa7 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,7 +32,8 @@ private void OnGetProgress(EntityUid uid, RaiseGlimmerConditionComponent comp, r
 
         private float GetProgress(int target)
         {
-            var progress = Math.Min((float) _glimmer.GlimmerOutput / (float) target, 1f);
+            var glimmer = _sysMan.GetEntitySystem<GlimmerSystem>().Glimmer;
+            var progress = Math.Min((float) glimmer / (float) target, 1f);
             return progress;
         }
     }
diff --git a/Content.Server/Psionics/AcceptPsionicsEui.cs b/Content.Server/Nyanotrasen/Psionics/AcceptPsionicsEui.cs
similarity index 95%
rename from Content.Server/Psionics/AcceptPsionicsEui.cs
rename to Content.Server/Nyanotrasen/Psionics/AcceptPsionicsEui.cs
index 7c652664c64..80fd8946f28 100644
--- a/Content.Server/Psionics/AcceptPsionicsEui.cs
+++ b/Content.Server/Nyanotrasen/Psionics/AcceptPsionicsEui.cs
@@ -1,7 +1,7 @@
 using Content.Shared.Psionics;
 using Content.Shared.Eui;
 using Content.Server.EUI;
-using Content.Server.Psionics.Abilities;
+using Content.Server.Abilities.Psionics;
 
 namespace Content.Server.Psionics
 {
diff --git a/Content.Server/Psionics/AntiPsychicWeaponComponent.cs b/Content.Server/Nyanotrasen/Psionics/AntiPsychicWeaponComponent.cs
similarity index 100%
rename from Content.Server/Psionics/AntiPsychicWeaponComponent.cs
rename to Content.Server/Nyanotrasen/Psionics/AntiPsychicWeaponComponent.cs
diff --git a/Content.Server/Psionics/Dreams/DreamSystem.cs b/Content.Server/Nyanotrasen/Psionics/Dreams/DreamSystem.cs
similarity index 93%
rename from Content.Server/Psionics/Dreams/DreamSystem.cs
rename to Content.Server/Nyanotrasen/Psionics/Dreams/DreamSystem.cs
index 1731c7a9bf5..d6067717c94 100644
--- a/Content.Server/Psionics/Dreams/DreamSystem.cs
+++ b/Content.Server/Nyanotrasen/Psionics/Dreams/DreamSystem.cs
@@ -1,14 +1,17 @@
 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/Psionics/Glimmer/GlimmerCommands.cs b/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerCommands.cs
similarity index 94%
rename from Content.Server/Psionics/Glimmer/GlimmerCommands.cs
rename to Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerCommands.cs
index d17f1c04565..744f4cdb9a8 100644
--- a/Content.Server/Psionics/Glimmer/GlimmerCommands.cs
+++ b/Content.Server/Nyanotrasen/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>().GlimmerOutput.ToString());
+        shell.WriteLine(entMan.EntitySysManager.GetEntitySystem<GlimmerSystem>().Glimmer.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>().SetGlimmerOutput(glimmerValue);
+        entMan.EntitySysManager.GetEntitySystem<GlimmerSystem>().Glimmer = glimmerValue;
     }
 }
diff --git a/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs b/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs
similarity index 94%
rename from Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
rename to Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs
index 584b1a61e2c..da3b07d6dab 100644
--- a/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
+++ b/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs
@@ -1,12 +1,14 @@
-using Content.Server.Psionics.Audio;
+using Content.Server.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;
@@ -14,6 +16,7 @@
 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;
@@ -176,7 +179,7 @@ private void AddShockVerb(EntityUid uid, SharedGlimmerReactiveComponent componen
                 Act = () =>
                 {
                     _sharedAudioSystem.PlayPvs(component.ShockNoises, args.User);
-                    _electrocutionSystem.TryDoElectrocution(args.User, null, (int) Math.Round(_glimmerSystem.GlimmerOutput / 200), TimeSpan.FromSeconds((float) _glimmerSystem.GlimmerOutput / 100), false);
+                    _electrocutionSystem.TryDoElectrocution(args.User, null, _glimmerSystem.Glimmer / 200, TimeSpan.FromSeconds((float) _glimmerSystem.Glimmer / 100), false);
                 },
                 Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/Spare/poweronoff.svg.192dpi.png")),
                 Text = Loc.GetString("power-switch-component-toggle-verb"),
@@ -190,7 +193,7 @@ private void OnDamageChanged(EntityUid uid, SharedGlimmerReactiveComponent compo
             if (args.Origin == null)
                 return;
 
-            if (!_random.Prob(_glimmerSystem.GlimmerOutput / 1000))
+            if (!_random.Prob((float) _glimmerSystem.Glimmer / 1000))
                 return;
 
             var tier = _glimmerSystem.GetGlimmerTier();
@@ -207,13 +210,13 @@ private void OnDestroyed(EntityUid uid, SharedGlimmerReactiveComponent component
             if (tier < GlimmerTier.High)
                 return;
 
-            var totalIntensity = (float) (_glimmerSystem.GlimmerOutput * 2);
-            var slope = (float) (11 - _glimmerSystem.GlimmerOutput / 100);
+            var totalIntensity = (float) (_glimmerSystem.Glimmer * 2);
+            var slope = (float) (11 - _glimmerSystem.Glimmer / 100);
             var maxIntensity = 20;
 
-            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);
+            var removed = (float) _glimmerSystem.Glimmer * _random.NextFloat(0.1f, 0.15f);
+            _glimmerSystem.Glimmer -= (int) removed;
+            BeamRandomNearProber(uid, _glimmerSystem.Glimmer / 350, _glimmerSystem.Glimmer / 50);
             _explosionSystem.QueueExplosion(uid, "Default", totalIntensity, slope, maxIntensity);
         }
 
@@ -222,7 +225,7 @@ private void OnUnanchorAttempt(EntityUid uid, SharedGlimmerReactiveComponent com
             if (_glimmerSystem.GetGlimmerTier() >= GlimmerTier.Dangerous)
             {
                 _sharedAudioSystem.PlayPvs(component.ShockNoises, args.User);
-                _electrocutionSystem.TryDoElectrocution(args.User, null, (int) Math.Round(_glimmerSystem.GlimmerOutput / 200), TimeSpan.FromSeconds((float) _glimmerSystem.GlimmerOutput / 100), false);
+                _electrocutionSystem.TryDoElectrocution(args.User, null, _glimmerSystem.Glimmer / 200, TimeSpan.FromSeconds((float) _glimmerSystem.Glimmer / 100), false);
                 args.Cancel();
             }
         }
@@ -265,7 +268,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.GlimmerOutput / 100))
+            if (distance > (float) (_glimmerSystem.Glimmer / 100))
                 return;
 
             string beamproto;
@@ -374,10 +377,10 @@ public override void Update(float frameTime)
                     _ghostSystem.MakeVisible(true);
                     _revenantSystem.MakeVisible(true);
                     GhostsVisible = true;
-                    //foreach (var reactive in reactives)
-                    //{
-                    //    BeamRandomNearProber(reactive.Owner, 1, 12);
-                    //}
+                    foreach (var reactive in reactives)
+                    {
+                        BeamRandomNearProber(reactive.Owner, 1, 12);
+                    }
                 } else if (GhostsVisible == true)
                 {
                     _ghostSystem.MakeVisible(false);
diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs b/Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
new file mode 100644
index 00000000000..f0da85ce453
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
@@ -0,0 +1,80 @@
+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/Glimmer/Structures/GlimmerSourceComponent.cs b/Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
new file mode 100644
index 00000000000..5babb6c446d
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
@@ -0,0 +1,27 @@
+namespace Content.Server.Psionics.Glimmer
+{
+    [RegisterComponent]
+    /// <summary>
+    /// Adds to glimmer at regular intervals. We'll use it for glimmer drains too when we get there.
+    /// </summary>
+    public sealed partial class GlimmerSourceComponent : Component
+    {
+        [DataField("accumulator")]
+        public float Accumulator = 0f;
+
+        [DataField("active")]
+        public bool Active = true;
+
+        /// <summary>
+        ///     Since glimmer is an int, we'll do it like this.
+        /// </summary>
+        [DataField("secondsPerGlimmer")]
+        public float SecondsPerGlimmer = 10f;
+
+        /// <summary>
+        ///     True if it produces glimmer, false if it subtracts it.
+        /// </summary>
+        [DataField("addToGlimmer")]
+        public bool AddToGlimmer = true;
+    }
+}
diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs b/Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
new file mode 100644
index 00000000000..75125569cb5
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
@@ -0,0 +1,84 @@
+using Content.Server.Anomaly.Components;
+using Content.Server.Power.Components;
+using Content.Server.Power.EntitySystems;
+using Content.Shared.Anomaly.Components;
+using Content.Shared.Psionics.Glimmer;
+
+namespace Content.Server.Psionics.Glimmer
+{
+    /// <summary>
+    /// Handles structures which add/subtract glimmer.
+    /// </summary>
+    public sealed class GlimmerStructuresSystem : EntitySystem
+    {
+        [Dependency] private readonly PowerReceiverSystem _powerReceiverSystem = default!;
+        [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<AnomalyVesselComponent, PowerChangedEvent>(OnAnomalyVesselPowerChanged);
+
+            SubscribeLocalEvent<GlimmerSourceComponent, AnomalyPulseEvent>(OnAnomalyPulse);
+            SubscribeLocalEvent<GlimmerSourceComponent, AnomalySupercriticalEvent>(OnAnomalySupercritical);
+        }
+
+        private void OnAnomalyVesselPowerChanged(EntityUid uid, AnomalyVesselComponent component, ref PowerChangedEvent args)
+        {
+            if (TryComp<GlimmerSourceComponent>(component.Anomaly, out var glimmerSource))
+                glimmerSource.Active = args.Powered;
+        }
+
+        private void OnAnomalyPulse(EntityUid uid, GlimmerSourceComponent component, ref AnomalyPulseEvent args)
+        {
+            // Anomalies are meant to have GlimmerSource on them with the
+            // active flag set to false, as they will be set to actively
+            // generate glimmer when scanned to an anomaly vessel for
+            // harvesting research points.
+            //
+            // It is not a bug that glimmer increases on pulse or
+            // supercritical with an inactive glimmer source.
+            //
+            // However, this will need to be reworked if a distinction
+            // needs to be made in the future. I suggest a GlimmerAnomaly
+            // component.
+
+            if (TryComp<AnomalyComponent>(uid, out var anomaly))
+                _glimmerSystem.Glimmer += (int) (5f * anomaly.Severity);
+        }
+
+        private void OnAnomalySupercritical(EntityUid uid, GlimmerSourceComponent component, ref AnomalySupercriticalEvent args)
+        {
+            _glimmerSystem.Glimmer += 100;
+        }
+
+        public override void Update(float frameTime)
+        {
+            base.Update(frameTime);
+            foreach (var source in EntityQuery<GlimmerSourceComponent>())
+            {
+                if (!_powerReceiverSystem.IsPowered(source.Owner))
+                    continue;
+
+                if (!source.Active)
+                    continue;
+
+                source.Accumulator += frameTime;
+
+                if (source.Accumulator > source.SecondsPerGlimmer)
+                {
+                    source.Accumulator -= source.SecondsPerGlimmer;
+                    if (source.AddToGlimmer)
+                    {
+                        _glimmerSystem.Glimmer++;
+                    }
+                    else
+                    {
+                        _glimmerSystem.Glimmer--;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
similarity index 87%
rename from Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
rename to Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
index c21444139d1..31e6b89f13d 100644
--- a/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
+++ b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
@@ -1,5 +1,5 @@
-using Content.Shared.Psionics.Abilities;
-using Content.Shared.Psionics;
+using Content.Shared.Abilities.Psionics;
+using Content.Server.Abilities.Psionics;
 using Content.Shared.Eye;
 using Content.Server.NPC.Systems;
 using Robust.Shared.Containers;
@@ -20,6 +20,7 @@ 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);
@@ -35,16 +36,10 @@ 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)
         {
-            RaiseLocalEvent(uid, new PsionicInsulationEvent());
+            if (!HasComp<PotentialPsionicComponent>(uid))
+                return;
 
             if (HasComp<PsionicInvisibilityUsedComponent>(uid))
                 _invisSystem.ToggleInvisibility(uid);
@@ -66,6 +61,9 @@ 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))
@@ -88,7 +86,6 @@ 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);
         }
 
 
@@ -99,10 +96,13 @@ 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.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibleContactsComponent.cs b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
similarity index 89%
rename from Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibleContactsComponent.cs
rename to Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
index 376414eedce..859ceb7b83a 100644
--- a/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibleContactsComponent.cs
+++ b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Whitelist;
+using Robust.Shared.Timing;
 
-namespace Content.Shared.Psionics
+namespace Content.Server.Psionics
 {
     [RegisterComponent]
     public sealed partial class PsionicInvisibleContactsComponent : Component
diff --git a/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibleContactsSystem.cs b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
similarity index 94%
rename from Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibleContactsSystem.cs
rename to Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
index f71605238ae..cec755e3260 100644
--- a/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibleContactsSystem.cs
+++ b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
@@ -2,8 +2,9 @@
 using Content.Shared.Stealth.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
+using Robust.Shared.Timing;
 
-namespace Content.Shared.Psionics
+namespace Content.Server.Psionics
 {
     /// <summary>
     /// Allows an entity to become psionically invisible when touching certain entities.
@@ -11,6 +12,7 @@ namespace Content.Shared.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.Shared/Psionics/Abilities/PsionicInvisibility/PsionicallyInvisibleComponent.cs b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicallyInvisibleComponent.cs
similarity index 76%
rename from Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicallyInvisibleComponent.cs
rename to Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicallyInvisibleComponent.cs
index 87d3f250b1e..5352f5737f2 100644
--- a/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicallyInvisibleComponent.cs
+++ b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicallyInvisibleComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Psionics
+namespace Content.Server.Psionics
 {
     [RegisterComponent]
     public sealed partial class PsionicallyInvisibleComponent : Component
diff --git a/Content.Server/Nyanotrasen/Psionics/PotentialPsionicComponent.cs b/Content.Server/Nyanotrasen/Psionics/PotentialPsionicComponent.cs
new file mode 100644
index 00000000000..9499497cd1d
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Psionics/PotentialPsionicComponent.cs
@@ -0,0 +1,14 @@
+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/Psionics/PsionicAwaitingPlayerComponent.cs b/Content.Server/Nyanotrasen/Psionics/PsionicAwaitingPlayerComponent.cs
similarity index 100%
rename from Content.Server/Psionics/PsionicAwaitingPlayerComponent.cs
rename to Content.Server/Nyanotrasen/Psionics/PsionicAwaitingPlayerComponent.cs
diff --git a/Content.Server/Psionics/PsionicBonusChanceComponent.cs b/Content.Server/Nyanotrasen/Psionics/PsionicBonusChanceComponent.cs
similarity index 100%
rename from Content.Server/Psionics/PsionicBonusChanceComponent.cs
rename to Content.Server/Nyanotrasen/Psionics/PsionicBonusChanceComponent.cs
diff --git a/Content.Server/Psionics/PsionicsCommands.cs b/Content.Server/Nyanotrasen/Psionics/PsionicsCommands.cs
similarity index 82%
rename from Content.Server/Psionics/PsionicsCommands.cs
rename to Content.Server/Nyanotrasen/Psionics/PsionicsCommands.cs
index 76c9022151e..959251d1fb7 100644
--- a/Content.Server/Psionics/PsionicsCommands.cs
+++ b/Content.Server/Nyanotrasen/Psionics/PsionicsCommands.cs
@@ -1,7 +1,9 @@
 using Content.Server.Administration;
 using Content.Shared.Administration;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
+using Content.Shared.Mobs.Components;
 using Robust.Shared.Console;
+using Robust.Server.GameObjects;
 using Content.Shared.Actions;
 using Robust.Shared.Player;
 
@@ -17,8 +19,7 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         SharedActionsSystem actions = default!;
         var entMan = IoCManager.Resolve<IEntityManager>();
-        foreach (var (actor, psionic, meta) in entMan.EntityQuery<ActorComponent, PsionicComponent, MetaDataComponent>())
-        {
+        foreach (var (actor, mob, psionic, meta) in entMan.EntityQuery<ActorComponent, MobStateComponent, 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/Psionics/PsionicsSystem.cs b/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
similarity index 89%
rename from Content.Server/Psionics/PsionicsSystem.cs
rename to Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
index 6799b0bd3f5..5a96af2e96b 100644
--- a/Content.Server/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
@@ -1,14 +1,19 @@
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 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.Psionics.Abilities;
+using Content.Server.Abilities.Psionics;
+using Content.Server.Chat.Systems;
 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;
 
@@ -22,6 +27,7 @@ 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!;
@@ -48,7 +54,6 @@ public override void Initialize()
             SubscribeLocalEvent<AntiPsionicWeaponComponent, StaminaMeleeHitEvent>(OnStamHit);
 
             SubscribeLocalEvent<PsionicComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<PsionicComponent, MapInitEvent>(OnStartup);
             SubscribeLocalEvent<PsionicComponent, ComponentRemove>(OnRemove);
         }
 
@@ -82,11 +87,7 @@ 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)
@@ -103,7 +104,7 @@ private void OnInit(EntityUid uid, PsionicComponent component, ComponentInit arg
 
         private void OnRemove(EntityUid uid, PsionicComponent component, ComponentRemove args)
         {
-            if (!HasComp<NpcFactionMemberComponent>(uid))
+            if (!TryComp<NpcFactionMemberComponent>(uid, out var factions))
                 return;
 
             _npcFactonSystem.RemoveFaction(uid, "PsionicInterloper");
@@ -127,25 +128,30 @@ 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.GlimmerOutput / 1000;
+                chance += ((float) _glimmerSystem.Glimmer / 1000);
 
             chance *= multiplier;
 
             chance = Math.Clamp(chance, 0, 1);
 
             if (_random.Prob(chance))
-                _psionicAbilitiesSystem.AddPsionics(uid);
+                _psionicAbilitiesSystem.AddPsionics(uid, warn);
         }
 
         public void RerollPsionics(EntityUid uid, PotentialPsionicComponent? psionic = null, float bonusMuliplier = 1f)
diff --git a/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs b/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs
index 14e3fe7fb8a..d29a191f88a 100644
--- a/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs
+++ b/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Psionics.Abilities;
+using Content.Server.Abilities.Psionics;
 using Content.Server.Chat.Systems;
 using Content.Server.Radio.Components;
 using Content.Server.Radio.EntitySystems;
@@ -24,7 +24,7 @@ public override void Update(float frameTime)
     {
         base.Update(frameTime);
 
-        if (_glimmerSystem.GlimmerOutput == 0)
+        if (_glimmerSystem.Glimmer == 0)
             return; // yes, return. Glimmer value is global.
 
         var curTime = _timing.CurTime;
@@ -38,7 +38,7 @@ public override void Update(float frameTime)
             if (!TryComp<IntrinsicRadioTransmitterComponent>(scribe, out var radio))
                 continue;
 
-            var message = Loc.GetString("glimmer-report", ("level", (int) Math.Round(_glimmerSystem.GlimmerOutput)));
+            var message = Loc.GetString("glimmer-report", ("level", _glimmerSystem.Glimmer));
             var channel = _prototypeManager.Index<RadioChannelPrototype>("Science");
             _radioSystem.SendRadioMessage(scribe, message, channel, scribe);
 
@@ -62,7 +62,7 @@ private void OnInteractHand(EntityUid uid, SophicScribeComponent component, Inte
 
         component.StateTime = _timing.CurTime + component.StateCD;
 
-        _chat.TrySendInGameICMessage(uid, Loc.GetString("glimmer-report", ("level", (int) Math.Round(_glimmerSystem.GlimmerOutput))), InGameICChatType.Speak, true);
+        _chat.TrySendInGameICMessage(uid, Loc.GetString("glimmer-report", ("level", _glimmerSystem.Glimmer)), InGameICChatType.Speak, true);
     }
 
     private void OnGlimmerEventEnded(GlimmerEventEndedEvent args)
@@ -79,7 +79,7 @@ private void OnGlimmerEventEnded(GlimmerEventEndedEvent args)
                 speaker = swapped.OriginalEntity;
             }
 
-            var message = Loc.GetString(args.Message, ("decrease", args.GlimmerBurned), ("level", (int) Math.Round(_glimmerSystem.GlimmerOutput)));
+            var message = Loc.GetString(args.Message, ("decrease", args.GlimmerBurned), ("level", _glimmerSystem.Glimmer));
             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 46dff726e55..0aa8ecc47cc 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.GlimmerOutput >= 500 || _robustRandom.Prob(0.25f))
+        if (PossibleSpawns.Count == 0 || _glimmerSystem.Glimmer >= 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 078826604eb..a3d36ae7157 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.DeltaGlimmerInput(-glimmerBurned);
+            _glimmerSystem.Glimmer -= 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 89b5a176f24..66eea988aeb 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.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs
index 3be2eed6387..63944563269 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs
@@ -1,9 +1,10 @@
+using Robust.Server.GameObjects;
 using Robust.Shared.Random;
-using Content.Server.Psionics.Abilities;
+using Content.Server.Abilities.Psionics;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Psionics;
 using Content.Server.StationEvents.Components;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Robust.Shared.Player;
@@ -66,11 +67,11 @@ protected override void Started(EntityUid uid, MassMindSwapRuleComponent compone
 
                 // Do the swap.
                 _mindSwap.Swap(actor, other);
-                //if (!component.IsTemporary)
-                //{
-                //    _mindSwap.GetTrapped(actor);
-                //    _mindSwap.GetTrapped(other);
-                //}
+                if (!component.IsTemporary)
+                {
+                    _mindSwap.GetTrapped(actor);
+                    _mindSwap.GetTrapped(other);
+                }
             } while (true);
         }
     }
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs
index d7880af9032..c04543d2195 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.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 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.GlimmerOutput > 500 && _glimmerSystem.GlimmerOutput < 750)
+            if (_glimmerSystem.Glimmer > 500 && _glimmerSystem.Glimmer < 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.GlimmerOutput > 750)
+            } else if (_glimmerSystem.Glimmer > 750)
             {
                 damage *= 3;
                 if (TryComp<FlammableComponent>(pair.wearer, out var flammableComponent))
@@ -103,7 +103,7 @@ protected override void Started(EntityUid uid, NoosphericFryRuleComponent compon
         while (queryReactive.MoveNext(out var reactive, out _, out var xform, out var physics))
         {
             // shoot out three bolts of lighting...
-            //_glimmerReactiveSystem.BeamRandomNearProber(reactive, 3, 12);
+            _glimmerReactiveSystem.BeamRandomNearProber(reactive, 3, 12);
 
             // try to anchor if we can
             if (!xform.Anchored)
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
index 021c9591022..175318e15bd 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.Psionics.Abilities;
+using Content.Server.Abilities.Psionics;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Server.Psionics;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 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<PsionicInsulationComponent>(potentialPsionic) || HasComp<ZombieComponent>(potentialPsionic))
+            if (HasComp<PsionicComponent>(potentialPsionic) || 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.DeltaGlimmerInput(glimmerAdded);
+        _glimmerSystem.Glimmer += glimmerAdded;
     }
 }
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs
index a11faa06933..82c3d72b139 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.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.StatusEffect;
@@ -35,15 +35,19 @@ 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 (potentialPsionicComponent.Rerolled)
-            {
-                potentialPsionicComponent.Rerolled = false;
-                _popupSystem.PopupEntity(Loc.GetString("noospheric-zap-seize-potential-regained"), psion, psion, Shared.Popups.PopupType.LargeCaution);
-            }
+            if (HasComp<PsionicComponent>(psion))
+                _popupSystem.PopupEntity(Loc.GetString("noospheric-zap-seize"), 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);
+                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);
+                }
             }
         }
     }
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs
index 753b2e25729..63e0a435cb0 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.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.StatusEffect;
 using Content.Shared.Mobs.Systems;
 using Robust.Shared.Audio.Systems;
diff --git a/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs
deleted file mode 100644
index a1b40b92320..00000000000
--- a/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-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)
-        {
-            EnsureComp<PsionicComponent>(uid, out var psionic);
-            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);
-            UpdateActions(uid, component, 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, PsionicComponent? psionic = null)
-        {
-            if (!Resolve(uid, ref component) || !Resolve(uid, ref psionic)
-            || !_actions.TryGetActionData(component.ActionWideMetapsionicEntity, out var actionData))
-                return;
-
-            if (actionData is { UseDelay: not null })
-            {
-                _actions.SetCooldown(component.ActionWideMetapsionicEntity, actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification));
-                _actions.SetCooldown(component.ActionFocusedMetapsionicEntity, actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification));
-            }
-        }
-
-        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, psionic);
-            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, psionic);
-        }
-
-        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/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs
deleted file mode 100644
index a1776acbd3c..00000000000
--- a/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Psionics.Abilities;
-using Content.Shared.StatusEffect;
-using Content.Server.Electrocution;
-using Content.Server.Stunnable;
-using Content.Server.Beam;
-using Content.Shared.Actions.Events;
-
-namespace Content.Server.Psionics.Abilities
-{
-    public sealed class NoosphericZapPowerSystem : EntitySystem
-    {
-        [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 BeamSystem _beam = default!;
-        [Dependency] private readonly ElectrocutionSystem _electrocution = default!;
-
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<NoosphericZapPowerComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<NoosphericZapPowerComponent, ComponentShutdown>(OnShutdown);
-            SubscribeLocalEvent<NoosphericZapPowerComponent, NoosphericZapPowerActionEvent>(OnPowerUsed);
-        }
-
-        private void OnInit(EntityUid uid, NoosphericZapPowerComponent component, ComponentInit args)
-        {
-            EnsureComp<PsionicComponent>(uid, out var psionic);
-            _actions.AddAction(uid, ref component.NoosphericZapActionEntity, component.NoosphericZapActionId );
-            _actions.TryGetActionData(component.NoosphericZapActionEntity, out var actionData);
-            if (actionData is { UseDelay: not null })
-                _actions.SetCooldown(component.NoosphericZapActionEntity, actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification));
-
-            psionic.ActivePowers.Add(component);
-            psionic.PsychicFeedback.Add(component.NoosphericZapFeedback);
-            psionic.Amplification += 1f;
-        }
-
-        private void OnShutdown(EntityUid uid, NoosphericZapPowerComponent component, ComponentShutdown args)
-        {
-            _actions.RemoveAction(uid, component.NoosphericZapActionEntity);
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Remove(component);
-                psionic.PsychicFeedback.Remove(component.NoosphericZapFeedback);
-                psionic.Amplification -= 1f;
-            }
-        }
-
-        private void OnPowerUsed(EntityUid uid, NoosphericZapPowerComponent component, NoosphericZapPowerActionEvent args)
-        {
-            if (_psionics.CheckCanTargetCast(uid, args.Target, out var psionic))
-            {
-
-                _actions.TryGetActionData(component.NoosphericZapActionEntity, out var actionData);
-                if (actionData is { UseDelay: not null })
-                    _actions.SetCooldown(component.NoosphericZapActionEntity, actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification));
-                _beam.TryCreateBeam(args.Performer, args.Target, "LightningNoospheric");
-                _stunSystem.TryParalyze(args.Target, TimeSpan.FromSeconds(1 * psionic.Amplification), false);
-
-                _electrocution.TryDoElectrocution(args.Target, null,
-                    (int) MathF.Round(5f * psionic.Amplification),
-                    new TimeSpan((long) MathF.Round(1f * psionic.Amplification)),
-                    true,
-                    ignoreInsulation: true);
-
-                _statusEffectsSystem.TryAddStatusEffect(args.Target, "Stutter", TimeSpan.FromSeconds(2 * psionic.Amplification), false, "StutteringAccent");
-
-                _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
deleted file mode 100644
index d65186309d3..00000000000
--- a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-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;
-using Robust.Shared.Serialization.Manager;
-
-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!;
-        [Dependency] private readonly ISerializationManager _serialization = 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 = _serialization.CreateCopy(pool, null, false, true);
-            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);
-                EnsureComp<PsionicInsulationComponent>(uid, out var insul);
-                insul.MindBroken = true;
-            }
-
-            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/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
deleted file mode 100644
index f675cc6ed89..00000000000
--- a/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-using Robust.Shared.Audio;
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Server.DoAfter;
-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 Robust.Shared.Timing;
-using Content.Shared.Actions.Events;
-using Robust.Server.Audio;
-
-namespace Content.Server.Psionics.Abilities
-{
-    public sealed class PsionicRegenerationPowerSystem : EntitySystem
-    {
-        [Dependency] private readonly SharedActionsSystem _actions = default!;
-        [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
-        [Dependency] private readonly AudioSystem _audioSystem = 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!;
-
-        public override void Initialize()
-        {
-            base.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);
-        }
-
-        private void OnInit(EntityUid uid, PsionicRegenerationPowerComponent component, ComponentInit args)
-        {
-            EnsureComp<PsionicComponent>(uid, out var psionic);
-            _actions.AddAction(uid, ref component.PsionicRegenerationActionEntity, component.PsionicRegenerationActionId);
-            _actions.TryGetActionData(component.PsionicRegenerationActionEntity, out var actionData);
-            if (actionData is { UseDelay: not null })
-                _actions.SetCooldown(component.PsionicRegenerationActionEntity, actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification));
-
-            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;
-
-            if (actionData is { UseDelay: not null })
-                _actions.SetCooldown(component.PsionicRegenerationActionEntity, actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification));
-
-            _doAfterSystem.TryStartDoAfter(doAfterArgs, out var doAfterId);
-
-            component.DoAfter = doAfterId;
-
-            _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);
-
-            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.SetCooldown(component.PsionicRegenerationActionEntity, 2 * (actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification)));
-                }
-            }
-        }
-
-        private void OnShutdown(EntityUid uid, PsionicRegenerationPowerComponent component, ComponentShutdown args)
-        {
-            _actions.RemoveAction(uid, component.PsionicRegenerationActionEntity);
-
-            if (TryComp<PsionicComponent>(uid, out var psionic))
-            {
-                psionic.ActivePowers.Remove(component);
-                psionic.PsychicFeedback.Remove(component.RegenerationFeedback);
-                psionic.Amplification -= 0.5f;
-                psionic.Dampening -= 0.5f;
-            }
-        }
-
-        private void OnDispelled(EntityUid uid, PsionicRegenerationPowerComponent component, DispelledEvent args)
-        {
-            if (component.DoAfter == null)
-                return;
-
-            _doAfterSystem.Cancel(component.DoAfter);
-            component.DoAfter = null;
-
-            args.Handled = true;
-        }
-
-        private void OnDoAfter(EntityUid uid, PsionicRegenerationPowerComponent component, PsionicRegenerationDoAfterEvent args)
-        {
-            component.DoAfter = null;
-
-            if (!TryComp<PsionicComponent>(uid, out var psionic))
-                return;
-
-            if (!TryComp<BloodstreamComponent>(uid, out var stream))
-                return;
-
-            var percentageComplete = Math.Min(1f, (_gameTiming.CurTime - args.StartedAt).TotalSeconds / component.UseDelay);
-
-            var solution = new Solution();
-            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
deleted file mode 100644
index 62e0c3ce56c..00000000000
--- a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-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 Content.Shared.Actions.Events;
-using Content.Server.Explosion.Components;
-using Robust.Shared.Audio.Systems;
-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 SharedTransformSystem _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 SharedAudioSystem _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)
-        {
-            EnsureComp<PsionicComponent>(uid, out var psionic);
-            _actions.AddAction(uid, ref component.PyrokinesisPrechargeActionEntity, component.PyrokinesisPrechargeActionId);
-            _actions.TryGetActionData(component.PyrokinesisPrechargeActionEntity, out var actionData);
-            if (actionData is { UseDelay: not null })
-                _actions.SetCooldown(component.PyrokinesisPrechargeActionEntity, actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification));
-
-            psionic.ActivePowers.Add(component);
-            psionic.PsychicFeedback.Add(component.PyrokinesisFeedback);
-            psionic.Amplification += 1f;
-        }
-
-        private void OnPrecharge(PyrokinesisPrechargeActionEvent args)
-        {
-            if (_psionics.CheckCanSelfCast(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.SetCooldown(pyroComp.PyrokinesisActionEntity, actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification));
-                _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 (_psionics.CheckCanSelfCast(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
deleted file mode 100644
index 87ec5adbce8..00000000000
--- a/Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-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)
-        {
-            EnsureComp<PsionicComponent>(uid, out var psionic);
-            _actions.AddAction(uid, ref component.RegenerativeStasisActionEntity, component.RegenerativeStasisActionId);
-            _actions.TryGetActionData(component.RegenerativeStasisActionEntity, out var actionData);
-            if (actionData is { UseDelay: not null })
-                _actions.SetCooldown(component.RegenerativeStasisActionEntity, actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification));
-
-            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", args.Target)), args.Target, PopupType.Medium);
-                _psionics.LogPowerUsed(uid, "regenerative stasis", psionic, 4, 6);
-                _actions.TryGetActionData(component.RegenerativeStasisActionEntity, out var actionData);
-                if (actionData is { UseDelay: not null })
-                    _actions.SetCooldown(component.RegenerativeStasisActionEntity, actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification));
-                args.Handled = true;
-            }
-        }
-    }
-}
diff --git a/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs b/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs
deleted file mode 100644
index 95b7995e673..00000000000
--- a/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-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)
-        {
-            EnsureComp<PsionicComponent>(uid, out var psionic);
-            _actions.AddAction(uid, ref component.TelegnosisActionEntity, component.TelegnosisActionId );
-            _actions.TryGetActionData( component.TelegnosisActionEntity, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.SetCooldown(component.TelegnosisActionEntity, actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification));
-
-            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);
-
-            _actions.TryGetActionData( component.TelegnosisActionEntity, out var actionData );
-            if (actionData is { UseDelay: not null })
-                _actions.SetCooldown(component.TelegnosisActionEntity, actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification));
-
-            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/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs b/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
deleted file mode 100644
index f0a682961a3..00000000000
--- a/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-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/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs b/Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
deleted file mode 100644
index 34cdba29bb2..00000000000
--- a/Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-namespace Content.Server.Psionics.Glimmer
-{
-    [RegisterComponent]
-    /// <summary>
-    /// Adds to glimmer at regular intervals. We'll use it for glimmer drains too when we get there.
-    /// </summary>
-    public sealed partial class GlimmerSourceComponent : Component
-    {
-        [DataField]
-        public float Accumulator = 0f;
-
-        [DataField]
-        public bool Active = true;
-
-        /// <summary>
-        ///     Since glimmer is an int, we'll do it like this.
-        /// </summary>
-        [DataField]
-        public float SecondsPerGlimmer = 10f;
-
-        /// <summary>
-        ///     True if it produces glimmer, false if it subtracts it.
-        /// </summary>
-        [DataField]
-        public bool AddToGlimmer = true;
-
-        /// <summary>
-        ///     If not null, this entity generates this value as a baseline number of research points per second, eg: Probers.
-        ///     Actual glimmer research sources will scale with GlimmerEquilibriumRatio
-        /// </summary>
-        [DataField]
-        public int? ResearchPointGeneration = null;
-
-        /// <summary>
-        ///     Controls whether this entity requires electrical power to generate research points.
-        /// </summary>
-        [DataField]
-        public bool RequiresPower = true;
-
-        /// <summary>
-        ///     Above GlimmerEquilibrium, glimmer generation is increased exponentially, but has an offset to prevent things from spiralling out of control.
-        ///     Increasing the offset will make this entity's exponential growth weaker, while decreasing it makes it stronger. Negative numbers are valid by the way :)
-        /// </summary>
-        [DataField]
-        public int GlimmerExponentOffset = 0;
-    }
-}
diff --git a/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs b/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
deleted file mode 100644
index 76ff5a823b3..00000000000
--- a/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-using Content.Server.Anomaly.Components;
-using Content.Server.Power.Components;
-using Content.Server.Power.EntitySystems;
-using Content.Server.Research.Components;
-using Content.Shared.Anomaly.Components;
-using Content.Shared.Mobs;
-using Content.Shared.Psionics.Glimmer;
-
-namespace Content.Server.Psionics.Glimmer
-{
-    /// <summary>
-    /// Handles structures which add/subtract glimmer.
-    /// </summary>
-    public sealed class GlimmerStructuresSystem : EntitySystem
-    {
-        [Dependency] private readonly PowerReceiverSystem _powerReceiverSystem = default!;
-        [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<AnomalyVesselComponent, PowerChangedEvent>(OnAnomalyVesselPowerChanged);
-
-            SubscribeLocalEvent<GlimmerSourceComponent, AnomalyPulseEvent>(OnAnomalyPulse);
-            SubscribeLocalEvent<GlimmerSourceComponent, AnomalySupercriticalEvent>(OnAnomalySupercritical);
-            SubscribeLocalEvent<GlimmerSourceComponent, MobStateChangedEvent>(OnMobStateChanged);
-            SubscribeLocalEvent<GlimmerSourceComponent, ComponentStartup>(OnInit);
-        }
-
-        private void OnInit(EntityUid uid, GlimmerSourceComponent component, ComponentStartup args)
-        {
-            if (component.ResearchPointGeneration != null)
-            {
-                EnsureComp<ResearchPointSourceComponent>(uid, out var points);
-                points.PointsPerSecond = component.ResearchPointGeneration.Value;
-                points.Active = true;
-            }
-        }
-
-        private void OnAnomalyVesselPowerChanged(EntityUid uid, AnomalyVesselComponent component, ref PowerChangedEvent args)
-        {
-            if (TryComp<GlimmerSourceComponent>(component.Anomaly, out var glimmerSource))
-                glimmerSource.Active = args.Powered;
-        }
-
-        private void OnAnomalyPulse(EntityUid uid, GlimmerSourceComponent component, ref AnomalyPulseEvent args)
-        {
-            // Anomalies are meant to have GlimmerSource on them with the
-            // active flag set to false, as they will be set to actively
-            // generate glimmer when scanned to an anomaly vessel for
-            // harvesting research points.
-            //
-            // It is not a bug that glimmer increases on pulse or
-            // supercritical with an inactive glimmer source.
-            //
-            // However, this will need to be reworked if a distinction
-            // needs to be made in the future. I suggest a GlimmerAnomaly
-            // component.
-
-            if (TryComp<AnomalyComponent>(uid, out var anomaly))
-                _glimmerSystem.DeltaGlimmerOutput(5f * anomaly.Severity);
-        }
-
-        private void OnAnomalySupercritical(EntityUid uid, GlimmerSourceComponent component, ref AnomalySupercriticalEvent args)
-        {
-            _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)
-        {
-            base.Update(frameTime);
-            var glimmerSources = Count<GlimmerSourceComponent>();
-            foreach (var source in EntityQuery<GlimmerSourceComponent>())
-            {
-                if (!_powerReceiverSystem.IsPowered(source.Owner)
-                    && source.RequiresPower)
-                {
-                    glimmerSources--;
-                    continue;
-                }
-
-                if (!source.Active)
-                {
-                    glimmerSources--;
-                    continue;
-                }
-
-                source.Accumulator += frameTime;
-
-                if (source.Accumulator > source.SecondsPerGlimmer)
-                {
-                    source.Accumulator -= source.SecondsPerGlimmer;
-
-                    // https://www.desmos.com/calculator/zjzefpue03
-                    // In Short: 1 prober makes 20 research points. 4 probers makes twice as many points as 1 prober. 9 probers makes 69 points in total between all 9.
-                    // This is then modified by afterwards by GlimmerEquilibrium, to help smooth out the curves. But also, now if you have more drainers than probers, the probers won't generate research!
-                    // Also, this counts things like Anomalies & Glimmer Mites! Which means scientists should be more encouraged to actively hunt mites.
-                    // As a fun novelty, this means that a highly psionic Epistemics department can essentially "Study" their powers for actual research points!
-                    if (source.ResearchPointGeneration != null
-                    && TryComp<ResearchPointSourceComponent>(source.Owner, out var research))
-                        research.PointsPerSecond = (int) MathF.Round(
-                            source.ResearchPointGeneration.Value / (MathF.Log(glimmerSources, 4) + 1)
-                            * _glimmerSystem.GetGlimmerEquilibriumRatio());
-
-                    // Shorthand explanation:
-                    // This makes glimmer far more "Swingy", by making both positive and negative glimmer sources scale quite dramatically with glimmer
-                    if (!_glimmerSystem.GetGlimmerEnabled())
-                        return;
-
-                    var glimmerEquilibrium = GlimmerSystem.GlimmerEquilibrium;
-
-                    if (source.AddToGlimmer)
-                    {
-                        _glimmerSystem.DeltaGlimmerInput((_glimmerSystem.GlimmerOutput > glimmerEquilibrium
-                        ? MathF.Pow(_glimmerSystem.GetGlimmerOutputInteger() - source.GlimmerExponentOffset + glimmerSources, 2) : 1f)
-                        * (_glimmerSystem.GlimmerOutput < glimmerEquilibrium ? _glimmerSystem.GetGlimmerEquilibriumRatio() : 1f));
-                    }
-                    else
-                    {
-                        _glimmerSystem.DeltaGlimmerInput(-(_glimmerSystem.GlimmerOutput > glimmerEquilibrium
-                        ? MathF.Pow(_glimmerSystem.GetGlimmerOutputInteger() - source.GlimmerExponentOffset + glimmerSources, 2) : 1f)
-                        * (_glimmerSystem.GlimmerOutput > glimmerEquilibrium ? _glimmerSystem.GetGlimmerEquilibriumRatio() : 1f));
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/Content.Server/Psionics/PotentialPsionicComponent.cs b/Content.Server/Psionics/PotentialPsionicComponent.cs
deleted file mode 100644
index e874296a4c3..00000000000
--- a/Content.Server/Psionics/PotentialPsionicComponent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-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/Psionics/Telepathy/TSayCommand.cs b/Content.Server/Psionics/Telepathy/TSayCommand.cs
deleted file mode 100644
index edb7e528e2e..00000000000
--- a/Content.Server/Psionics/Telepathy/TSayCommand.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Content.Server.Chat.Systems;
-using Content.Shared.Administration;
-using Content.Shared.Chat;
-using Robust.Server.Player;
-using Robust.Shared.Console;
-using Robust.Shared.Enums;
-using Robust.Shared.Player;
-
-namespace Content.Server.Psionics.Telepathy
-{
-    [AnyCommand]
-    internal sealed class TSayCommand : IConsoleCommand
-    {
-        public string Command => "tsay";
-        public string Description => "Send chat messages to the telepathic.";
-        public string Help => "tsay <text>";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            if (shell.Player is not ICommonSession player)
-            {
-                shell.WriteError("This command cannot be run from the server.");
-                return;
-            }
-
-            if (player.Status != SessionStatus.InGame)
-                return;
-
-            if (player.AttachedEntity is not {} playerEntity)
-            {
-                shell.WriteError("You don't have an entity!");
-                return;
-            }
-
-            if (args.Length < 1)
-                return;
-
-            var message = string.Join(" ", args).Trim();
-            if (string.IsNullOrEmpty(message))
-                return;
-            //Not sure if I should hide the logs from this. Default is false.
-            EntitySystem.Get<ChatSystem>().TrySendInGameICMessage(playerEntity, message, InGameICChatType.Telepathic, ChatTransmitRange.Normal, false, shell, player);
-        }
-    }
-}
diff --git a/Content.Server/Research/Oracle/OracleSystem.cs b/Content.Server/Research/Oracle/OracleSystem.cs
index c9b050a246d..52b58e29b64 100644
--- a/Content.Server/Research/Oracle/OracleSystem.cs
+++ b/Content.Server/Research/Oracle/OracleSystem.cs
@@ -7,7 +7,7 @@
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Psionics;
 using Content.Server.Research.Systems;
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.Chat;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
@@ -165,7 +165,7 @@ private void DispenseLiquidReward(Entity<OracleComponent> oracle)
             return;
 
         // Why is this hardcoded?
-        var amount = MathF.Round(20 + _random.Next(1, 30) + _glimmer.GlimmerOutput / 10f);
+        var amount = MathF.Round(20 + _random.Next(1, 30) + _glimmer.Glimmer / 10f);
         var temporarySol = new Solution();
         var reagent = _protoMan.Index(oracle.Comp.RewardReagents).Pick(_random);
 
diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
index ed53c3e1018..c74a3c49d63 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.Psionics.Abilities; //EE - Summary: for the telegnostic projection.
+using Content.Shared.Abilities.Psionics; //Nyano - 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); ///EE - Summary: the telegnositic projection has the same trait as ghosts.
+        SubscribeLocalEvent<TelegnosticProjectionComponent, EventHorizonAttemptConsumeEntityEvent>(PreventConsume); ///Nyano - 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 c6e9beeaca1..2d8606e9293 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.GlimmerOutput < glimmerEvent.MinimumGlimmer ||
-            _glimmerSystem.GlimmerOutput > glimmerEvent.MaximumGlimmer))
+            (_glimmerSystem.Glimmer < glimmerEvent.MinimumGlimmer ||
+            _glimmerSystem.Glimmer > glimmerEvent.MaximumGlimmer))
         {
             return false;
         }
diff --git a/Content.Server/Strip/StrippableSystem.cs b/Content.Server/Strip/StrippableSystem.cs
index d9f084252ae..3bd8b5108e0 100644
--- a/Content.Server/Strip/StrippableSystem.cs
+++ b/Content.Server/Strip/StrippableSystem.cs
@@ -250,7 +250,7 @@ private void StartStripInsertInventory(
                 return;
             }
 
-            var (time, stealth) = GetStripTimeModifiers(user, target, slotDef.StripTime);
+            var (time, stealth) = GetStripTimeModifiers(user, target, TimeSpan.FromSeconds(slotDef.StripTime));
 
             bool hidden = stealth == ThievingStealth.Hidden;
 
@@ -341,7 +341,7 @@ private void StartStripRemoveInventory(
                 return;
             }
 
-            var (time, stealth) = GetStripTimeModifiers(user, target, slotDef.StripTime);
+            var (time, stealth) = GetStripTimeModifiers(user, target, TimeSpan.FromSeconds(slotDef.StripTime));
 
             bool hidden = stealth == ThievingStealth.Hidden;
 
diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
index de869ab7e89..27caebef808 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
@@ -366,11 +366,13 @@ 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.DeltaGlimmerInput(pointValue / analyzer.ExtractRatio);
+            _glimmerSystem.Glimmer += (int) 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 c7e29166a0e..6d698578cbb 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.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Shared.CombatMode;
 using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Damage;
@@ -59,7 +59,9 @@ 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 1e06c6bef44..a9f8c5acadd 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -2255,11 +2255,11 @@ public static readonly CVarDef<float>
             CVarDef.Create("glimmer.enabled", true, CVar.REPLICATED);
 
         /// <summary>
-        ///     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.
+        ///     Passive glimmer drain per second.
+        ///     Note that this is randomized and this is an average value.
         /// </summary>
-        public static readonly CVarDef<float> GlimmerLinearDecayPerMinute =
-            CVarDef.Create("glimmer.linear_decay_per_minute", 6f, CVar.SERVERONLY);
+        public static readonly CVarDef<float> GlimmerLostPerSecond =
+            CVarDef.Create("glimmer.passive_drain_per_second", 0.1f, 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 087e2ecedab..700f6fe5511 100644
--- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
@@ -65,11 +65,6 @@ 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/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiState.cs b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiState.cs
new file mode 100644
index 00000000000..dd820f1a0b3
--- /dev/null
+++ b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiState.cs
@@ -0,0 +1,18 @@
+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
deleted file mode 100644
index 068b54a6ffb..00000000000
--- a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/SecWatchUiState.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-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 7bdd17ee6fa..24006b0c9f9 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 true; // Changed to return true even if the item wasn't equipped instantly
+            return false;
         }
 
         if (!_containerSystem.Insert(itemUid, slotContainer))
diff --git a/Content.Shared/Inventory/InventoryTemplatePrototype.cs b/Content.Shared/Inventory/InventoryTemplatePrototype.cs
index 585f80d4ce9..a4779699629 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 TimeSpan StripTime { get; private set; } = TimeSpan.FromSeconds(4f);
+    [DataField("stripTime")] public float StripTime { get; private set; } = 4f;
 
     [DataField("uiWindowPos", required: true)]
     public Vector2i UIWindowPosition { get; private set; }
diff --git a/Content.Shared/Psionics/Abilities/AcceptPsionicsEuiMessage.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/AcceptPsionicsEuiMessage.cs
similarity index 100%
rename from Content.Shared/Psionics/Abilities/AcceptPsionicsEuiMessage.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/AcceptPsionicsEuiMessage.cs
diff --git a/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
similarity index 77%
rename from Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
index c3702880375..ce86111fc4b 100644
--- a/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Damage;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     /// <summary>
     /// Takes damage when dispelled.
@@ -9,7 +9,7 @@ namespace Content.Shared.Psionics.Abilities
     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/Psionics/Abilities/Dispel/DispelPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs
similarity index 79%
rename from Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs
index 518a28b0967..cd887866364 100644
--- a/Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs
@@ -1,22 +1,20 @@
+using Content.Shared.Actions;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [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/Psionics/Abilities/Dispel/DispellableComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispellableComponent.cs
similarity index 69%
rename from Content.Shared/Psionics/Abilities/Dispel/DispellableComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispellableComponent.cs
index 4bb5ee653d2..40352004187 100644
--- a/Content.Shared/Psionics/Abilities/Dispel/DispellableComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispellableComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class DispellableComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
new file mode 100644
index 00000000000..7d611c63dac
--- /dev/null
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 00000000000..e36a3c70e8a
--- /dev/null
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs
@@ -0,0 +1,59 @@
+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
new file mode 100644
index 00000000000..c9d0130221a
--- /dev/null
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
@@ -0,0 +1,21 @@
+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/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
similarity index 76%
rename from Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
index 94b73c41e38..6a3fc811c89 100644
--- a/Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class MindSwapPowerComponent : Component
@@ -12,8 +12,5 @@ public sealed partial class MindSwapPowerComponent : Component
 
         [DataField("mindSwapActionEntity")]
         public EntityUid? MindSwapActionEntity;
-
-        [DataField("mindSwapFeedback")]
-        public string MindSwapFeedback = "mind-swap-feedback";
     }
 }
diff --git a/Content.Shared/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
similarity index 77%
rename from Content.Shared/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
index 997db65e1b1..0e91894b1dc 100644
--- a/Content.Shared/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class NoosphericZapPowerComponent : Component
@@ -13,8 +13,5 @@ public sealed partial class NoosphericZapPowerComponent : Component
 
         [DataField("noosphericZapActionEntity")]
         public EntityUid? NoosphericZapActionEntity;
-
-        [DataField("noosphericZapFeedback")]
-        public string NoosphericZapFeedback = "noospheric-zap-feedback";
     }
 }
diff --git a/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
similarity index 71%
rename from Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
index d9c36f5b22a..3e198aa9303 100644
--- a/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class PsionicInvisibilityPowerComponent : Component
@@ -12,11 +12,5 @@ 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.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
similarity index 68%
rename from Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
index 22d1b928553..9037b8bcdfe 100644
--- a/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
@@ -1,19 +1,17 @@
-using Content.Shared.DoAfter;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class PsionicInvisibilityUsedComponent : Component
     {
-        [DataField("psionicInvisibilityActionId",
+        [ValidatePrototypeId<EntityPrototype>]
+        public const string PsionicInvisibilityUsedActionPrototype = "ActionPsionicInvisibilityUsed";
+        [DataField("psionicInvisibilityUsedActionId",
         customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string? PsionicInvisibilityUsedActionId = "ActionPsionicInvisibilityUsed";
 
         [DataField("psionicInvisibilityUsedActionEntity")]
         public EntityUid? PsionicInvisibilityUsedActionEntity;
-
-        public DoAfterId? DoAfter;
     }
 }
diff --git a/Content.Shared/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
similarity index 76%
rename from Content.Shared/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
index 3184bf7de5b..4a62e84d191 100644
--- a/Content.Shared/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
@@ -3,7 +3,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [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 = 10;
+        public float EssenceAmount = 20;
 
         [DataField("useDelay")]
         public float UseDelay = 8f;
@@ -26,12 +26,6 @@ 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/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
new file mode 100644
index 00000000000..28425afdb4c
--- /dev/null
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
@@ -0,0 +1,18 @@
+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/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
similarity index 73%
rename from Content.Shared/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
index f1a71332b18..51958822a41 100644
--- a/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
@@ -3,7 +3,7 @@
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class TelegnosisPowerComponent : Component
@@ -19,11 +19,5 @@ 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/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
new file mode 100644
index 00000000000..9d627cb42d8
--- /dev/null
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared.Abilities.Psionics
+{
+    [RegisterComponent]
+    public sealed partial class TelegnosticProjectionComponent : Component
+    {}
+}
\ No newline at end of file
diff --git a/Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
similarity index 84%
rename from Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
index f09efc3064c..4cbb05c8395 100644
--- a/Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class ClothingGrantPsionicPowerComponent : Component
diff --git a/Content.Shared/Psionics/Items/HeadCageComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs
similarity index 96%
rename from Content.Shared/Psionics/Items/HeadCageComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs
index c03241e47c7..acaa832860f 100644
--- a/Content.Shared/Psionics/Items/HeadCageComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using Robust.Shared.Audio;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class HeadCageComponent : Component
diff --git a/Content.Shared/Psionics/Items/HeadCagedComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs
similarity index 81%
rename from Content.Shared/Psionics/Items/HeadCagedComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs
index 0f826f7a05e..f8af46b8878 100644
--- a/Content.Shared/Psionics/Items/HeadCagedComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     /// <summary>
diff --git a/Content.Shared/Psionics/Items/PsionicItemsSystem.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/PsionicItemsSystem.cs
similarity index 98%
rename from Content.Shared/Psionics/Items/PsionicItemsSystem.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Items/PsionicItemsSystem.cs
index 950353c5dfb..f88acf61f3c 100644
--- a/Content.Shared/Psionics/Items/PsionicItemsSystem.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/PsionicItemsSystem.cs
@@ -2,7 +2,7 @@
 using Content.Shared.Clothing.Components;
 using Content.Shared.StatusEffect;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     public sealed class PsionicItemsSystem : EntitySystem
     {
diff --git a/Content.Shared/Psionics/Items/TinfoilHatComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/TinfoilHatComponent.cs
similarity index 90%
rename from Content.Shared/Psionics/Items/TinfoilHatComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/Items/TinfoilHatComponent.cs
index 6ef7bdc823b..5086b9f4977 100644
--- a/Content.Shared/Psionics/Items/TinfoilHatComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/TinfoilHatComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class TinfoilHatComponent : Component
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs
new file mode 100644
index 00000000000..9091e03cfc3
--- /dev/null
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs
@@ -0,0 +1,20 @@
+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/Psionics/PsionicInsulationComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicInsulationComponent.cs
similarity index 66%
rename from Content.Shared/Psionics/PsionicInsulationComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicInsulationComponent.cs
index 4b999523bca..12370da5ae4 100644
--- a/Content.Shared/Psionics/PsionicInsulationComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicInsulationComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     [RegisterComponent]
     public sealed partial class PsionicInsulationComponent : Component
@@ -6,8 +6,5 @@ public sealed partial class PsionicInsulationComponent : Component
         public bool Passthrough = false;
 
         public List<String> SuppressedFactions = new();
-
-        [DataField]
-        public bool MindBroken = false;
     }
 }
diff --git a/Content.Shared/Psionics/PsionicsDisabledComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicsDisabledComponent.cs
similarity index 84%
rename from Content.Shared/Psionics/PsionicsDisabledComponent.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicsDisabledComponent.cs
index 00cf5506523..28e7157a9d2 100644
--- a/Content.Shared/Psionics/PsionicsDisabledComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicsDisabledComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     /// <summary>
     /// Only use this for the status effect, please.
diff --git a/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/SharedPsionicAbilitiesSystem.cs
similarity index 66%
rename from Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
rename to Content.Shared/Nyanotrasen/Abilities/Psionics/SharedPsionicAbilitiesSystem.cs
index fda1ef4fd40..2739d5ba31a 100644
--- a/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/SharedPsionicAbilitiesSystem.cs
@@ -1,16 +1,13 @@
-using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Actions;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Examine;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Popups;
 using Content.Shared.Psionics.Glimmer;
-using Robust.Shared.Network;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Psionics.Abilities
+namespace Content.Shared.Abilities.Psionics
 {
     public sealed class SharedPsionicAbilitiesSystem : EntitySystem
     {
@@ -20,7 +17,6 @@ public sealed class SharedPsionicAbilitiesSystem : EntitySystem
         [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
         [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
         [Dependency] private readonly IRobustRandom _robustRandom = default!;
-        [Dependency] private readonly INetManager _net = default!;
 
         public override void Initialize()
         {
@@ -28,7 +24,6 @@ public override void Initialize()
             SubscribeLocalEvent<PsionicsDisabledComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<PsionicsDisabledComponent, ComponentShutdown>(OnShutdown);
             SubscribeLocalEvent<PsionicComponent, PsionicPowerUsedEvent>(OnPowerUsed);
-            SubscribeLocalEvent<PsionicInsulationComponent, ExaminedEvent>(OnExamined);
 
             SubscribeLocalEvent<PsionicComponent, MobStateChangedEvent>(OnMobStateChanged);
         }
@@ -78,15 +73,7 @@ public void SetPsionicsThroughEligibility(EntityUid uid)
             if (actionData == null)
                 return;
 
-            _actions.SetEnabled(uid, IsEligibleForPsionics(uid));
-        }
-
-        private void OnExamined(EntityUid uid, PsionicInsulationComponent component, ExaminedEvent args)
-        {
-            if (!component.MindBroken || !args.IsInDetailsRange)
-                return;
-
-            args.PushMarkup($"[color=mediumpurple]{Loc.GetString("examine-mindbroken-message", ("entity", uid))}[/color]");
+            _actions.SetEnabled(actionData.Owner, IsEligibleForPsionics(uid));
         }
 
         private bool IsEligibleForPsionics(EntityUid uid)
@@ -95,38 +82,13 @@ private bool IsEligibleForPsionics(EntityUid uid)
                 && (!TryComp<MobStateComponent>(uid, out var mobstate) || mobstate.CurrentState == MobState.Alive);
         }
 
-        public bool CheckCanSelfCast(EntityUid uid, [NotNullWhen(true)] out PsionicComponent? psiComp)
-        {
-            if (!HasComp<PsionicInsulationComponent>(uid))
-                return TryComp(uid, out psiComp);
-            psiComp = null;
-            return false;
-        }
-
-        public bool CheckCanTargetCast(EntityUid performer, EntityUid target, [NotNullWhen(true)] out PsionicComponent? psiComp)
-        {
-            if (!HasComp<PsionicInsulationComponent>(performer)
-                && !HasComp<PsionicInsulationComponent>(target))
-                return TryComp(performer, out psiComp);
-            psiComp = null;
-            return false;
-        }
-
-        public void LogPowerUsed(EntityUid uid, string power, PsionicComponent? psionic = null, int minGlimmer = 8, int maxGlimmer = 12, bool overrideGlimmer = false)
+        public void LogPowerUsed(EntityUid uid, string power, int minGlimmer = 8, int maxGlimmer = 12)
         {
             _adminLogger.Add(Database.LogType.Psionics, Database.LogImpact.Medium, $"{ToPrettyString(uid):player} used {power}");
             var ev = new PsionicPowerUsedEvent(uid, power);
             RaiseLocalEvent(uid, ev, false);
 
-            //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));
-            }
+            _glimmerSystem.Glimmer += _robustRandom.Next(minGlimmer, maxGlimmer);
         }
     }
 
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs
new file mode 100644
index 00000000000..6666ee48d6c
--- /dev/null
+++ b/Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs
@@ -0,0 +1,2 @@
+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 b7c3c8ad2d6..b28801efe74 100644
--- a/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs
+++ b/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs
@@ -1,3 +1,2 @@
 namespace Content.Shared.Actions.Events;
-public sealed partial class WideMetapsionicPowerActionEvent : InstantActionEvent { }
-public sealed partial class FocusedMetapsionicPowerActionEvent : EntityTargetActionEvent { }
+public sealed partial class MetapsionicPowerActionEvent : InstantActionEvent {}
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs
index 2493be58fab..896ec0bb63d 100644
--- a/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs
+++ b/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs
@@ -1,5 +1,2 @@
 namespace Content.Shared.Actions.Events;
-public sealed partial class PyrokinesisPowerActionEvent : WorldTargetActionEvent {}
-public sealed partial class PyrokinesisPrechargeActionEvent : InstantActionEvent {}
-
-
+public sealed partial class PyrokinesisPowerActionEvent : EntityTargetActionEvent {}
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs
deleted file mode 100644
index 4435f475a44..00000000000
--- a/Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-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
new file mode 100644
index 00000000000..cf9a50c6e18
--- /dev/null
+++ b/Content.Shared/Nyanotrasen/Psionics/Events.cs
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 00000000000..31af85bbb51
--- /dev/null
+++ b/Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs
@@ -0,0 +1,65 @@
+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/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs b/Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs
similarity index 100%
rename from Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs
rename to Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs
diff --git a/Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs b/Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs
similarity index 100%
rename from Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs
rename to Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs
diff --git a/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs b/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
deleted file mode 100644
index 2fbfe18327e..00000000000
--- a/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-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/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerSystem.cs b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerSystem.cs
deleted file mode 100644
index 0eeb7ec280d..00000000000
--- a/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerSystem.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Damage;
-using Content.Shared.DoAfter;
-using Content.Shared.Stunnable;
-using Content.Shared.Stealth;
-using Content.Shared.Stealth.Components;
-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.Shared.Psionics.Abilities
-{
-    public sealed class PsionicInvisibilityPowerSystem : EntitySystem
-    {
-        [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 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()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<PsionicInvisibilityPowerComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<PsionicInvisibilityPowerComponent, ComponentShutdown>(OnShutdown);
-            SubscribeLocalEvent<PsionicInvisibilityPowerComponent, PsionicInvisibilityPowerActionEvent>(OnPowerUsed);
-            SubscribeLocalEvent<RemovePsionicInvisibilityOffPowerActionEvent>(OnPowerOff);
-            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);
-            SubscribeLocalEvent<PsionicInvisibilityPowerComponent, PsionicInvisibilityTimerEvent>(OnDoAfter);
-        }
-
-        private void OnInit(EntityUid uid, PsionicInvisibilityPowerComponent component, ComponentInit args)
-        {
-            EnsureComp<PsionicComponent>(uid, out var psionic);
-            _actions.AddAction(uid, ref component.PsionicInvisibilityActionEntity, component.PsionicInvisibilityActionId);
-            _actions.TryGetActionData(component.PsionicInvisibilityActionEntity, out var actionData);
-            if (actionData is { UseDelay: not null })
-                _actions.SetCooldown(component.PsionicInvisibilityActionEntity, actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification));
-
-            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 (!_psionics.CheckCanSelfCast(uid, out var psionic))
-                return;
-
-            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;
-            }
-
-            _actions.TryGetActionData(component.PsionicInvisibilityActionEntity, out var actionData);
-            if (actionData is { UseDelay: not null })
-                _actions.SetCooldown(component.PsionicInvisibilityActionEntity, actionData.UseDelay.Value - TimeSpan.FromSeconds(psionic.Dampening + psionic.Amplification));
-        }
-
-        private void OnPowerOff(RemovePsionicInvisibilityOffPowerActionEvent args)
-        {
-            ToggleInvisibility(args.Performer);
-            args.Handled = true;
-        }
-
-        private void OnStart(EntityUid uid, PsionicInvisibilityUsedComponent component, ComponentInit args)
-        {
-            EnsureComp<PsionicallyInvisibleComponent>(uid);
-            var stealth = EnsureComp<StealthComponent>(uid);
-            _stealth.SetVisibility(uid, 0.66f, stealth);
-
-            if (_net.IsServer)
-                _audio.PlayPvs("/Audio/Effects/toss.ogg", uid);
-
-        }
-
-        private void OnEnd(EntityUid uid, PsionicInvisibilityUsedComponent component, ComponentShutdown args)
-        {
-            if (Terminating(uid))
-                return;
-
-            _doAfterSystem.Cancel(component.DoAfter);
-            RemComp<PsionicallyInvisibleComponent>(uid);
-            RemComp<StealthComponent>(uid);
-
-            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))
-            {
-                EnsureComp<PsionicInvisibilityUsedComponent>(uid);
-            } else
-            {
-                RemComp<PsionicInvisibilityUsedComponent>(uid);
-            }
-        }
-
-        private 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/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs b/Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
deleted file mode 100644
index b95ead8ec1a..00000000000
--- a/Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-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
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/Content.Shared/Psionics/Abilities/RegenerativeStasis/RegenerativeStasisPowerComponent.cs b/Content.Shared/Psionics/Abilities/RegenerativeStasis/RegenerativeStasisPowerComponent.cs
deleted file mode 100644
index 7caa6100806..00000000000
--- a/Content.Shared/Psionics/Abilities/RegenerativeStasis/RegenerativeStasisPowerComponent.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-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/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
deleted file mode 100644
index bc18ff9f3c2..00000000000
--- a/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 88cf17a4a2f..00000000000
--- a/Content.Shared/Psionics/Events.cs
+++ /dev/null
@@ -1,82 +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 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
deleted file mode 100644
index 9b8d20b295d..00000000000
--- a/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
+++ /dev/null
@@ -1,183 +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 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/Psionics/PsionicComponent.cs b/Content.Shared/Psionics/PsionicComponent.cs
deleted file mode 100644
index 748b8ddd92a..00000000000
--- a/Content.Shared/Psionics/PsionicComponent.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-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/Psionics/SharedPsionicSystem.Insulated.cs b/Content.Shared/Psionics/SharedPsionicSystem.Insulated.cs
deleted file mode 100644
index 5c89f39354c..00000000000
--- a/Content.Shared/Psionics/SharedPsionicSystem.Insulated.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Content.Shared.Psionics
-{
-    public readonly record struct PsionicInsulationEvent;
-}
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 3c5e5c79846..fde0c56c24b 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -451,7 +451,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(), 625f);
+            ThrowingSystem.TryThrow(entity, ejectAngle.ToVec().Normalized() / 100, 5f);
         }
         if (playSound && TryComp<CartridgeAmmoComponent>(entity, out var cartridge))
         {
diff --git a/Resources/Audio/Nyanotrasen/heartbeat_fast.ogg b/Resources/Audio/Nyanotrasen/heartbeat_fast.ogg
deleted file mode 100644
index 85a034d9bd0..00000000000
Binary files a/Resources/Audio/Nyanotrasen/heartbeat_fast.ogg and /dev/null differ
diff --git a/Resources/Locale/en-US/deltav/cartridge-loader/secwatch.ftl b/Resources/Locale/en-US/deltav/cartridge-loader/secwatch.ftl
deleted file mode 100644
index a5b96eab08f..00000000000
--- a/Resources/Locale/en-US/deltav/cartridge-loader/secwatch.ftl
+++ /dev/null
@@ -1,5 +0,0 @@
-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 c3a9641768f..91ae21233a3 100644
--- a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
@@ -3,11 +3,8 @@ cage-resist-third-person = {CAPITALIZE(THE($user))} starts removing {POSS-ADJ($u
 
 cage-uncage-verb = Uncage
 
-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
+action-name-metapsionic = Metapsionic Pulse
+action-description-metapsionic = Send a mental pulse through the area to see if there are any psychics nearby.
 
 metapsionic-pulse-success = You detect psychic presence nearby.
 metapsionic-pulse-failure = You don't detect any psychic presence nearby.
@@ -16,8 +13,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-regenerative-stasis = Regenerative Stasis
-action-description-regenerative-stasis = Puts the target into a brief stasis, during which time their wounds rapidly heal.
+action-name-mass-sleep = Mass Sleep
+action-description-mass-sleep = Put targets in a small area to sleep.
 
 accept-psionics-window-title = Psionic!
 accept-psionics-window-prompt-text-part = You rolled a psionic power!
@@ -26,10 +23,13 @@ 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 = Telepathically remove yourself from the vision of anyone not psionically insulated.
+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-name-psionic-invisibility-off = Turn Off Psionic Invisibility
-action-description-psionic-invisibility-off = End your invisibility early.
+action-description-psionic-invisibility-off = Return to visibility, and receive a stun.
 
 action-name-mind-swap = Mind Swap
 action-description-mind-swap = Swap minds with the target. Either can change back after 20 seconds.
@@ -63,10 +63,8 @@ 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 = 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-description-pyrokinesis = Light a flammable target on fire.
+pyrokinesis-power-used = A wisp of flame engulfs {THE($target)}, igniting {OBJECT($target)}!
 
 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
deleted file mode 100644
index 76e67a5a02d..00000000000
--- a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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
-examine-mindbroken-message = Eyes unblinking, staring listfully into the horizon. {CAPITALIZE($entity)} is a sack of meat pretending it has a soul.
-                             There is nothing behind its gaze.
-cloning-console-insulation-error = ERROR: NON-SOPHONT LOADED, NO SOUL FOUND.
diff --git a/Resources/Locale/en-US/traits/categories.ftl b/Resources/Locale/en-US/traits/categories.ftl
index 153f8d01709..56f0adeb479 100644
--- a/Resources/Locale/en-US/traits/categories.ftl
+++ b/Resources/Locale/en-US/traits/categories.ftl
@@ -6,4 +6,3 @@ 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 9bc453f50a0..be90a388260 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -41,10 +41,10 @@ trait-description-LatentPsychic = Your mind and soul are open to the noosphere,
                                   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 = You are a flesh automaton animated by neurotransmitters. Within your skull lies a
-                                      1.5kg sack of meat pretending at sentience. By modern epistemiological theory, you aren't even a sophont.
-                                      The good news is that you are immune to most positive and negative effects of psychic powers. There may be other
-                                      consequences to this malady.
+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
diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml b/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml
index 25988f4a3a8..5b3615c55d8 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:
-      - right arm
       - left arm
-      - right leg
+      - right arm
       - left leg
+      - right leg
       organs:
         heart: OrganHumanHeart
         lungs: OrganHarpyLungs
@@ -47,3 +47,4 @@
       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 cdf787e4736..3d1552ac81f 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:
-      - right arm
       - left arm
-      - right leg
+      - right arm
       - left leg
+      - right 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 e455d1ce9cc..2dad0fe2e65 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
@@ -84,10 +84,7 @@
   - type: PotentialPsionic
   - type: Psionic
     removable: false
-    amplification: 4
-    psychicFeedback:
-    - "ifrit-feedback"
-  - type: PyrokinesisPower
+  # - type: PyrokinesisPower # Pending psionic rework
   - type: Grammar
     attributes:
       proper: true
@@ -111,7 +108,7 @@
     requirements:
     - !type:DepartmentTimeRequirement
       department: Epistemics
-      time: 14400
+      time: 14400 # DeltaV - 4 hours
 
 - 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 d0982c81744..e3eb9cd6de8 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml
@@ -24,12 +24,7 @@
           Quantity: 15
   - type: PotentialPsionic
   - type: Psionic
-    removable: false
-    amplification: 1
-    psychicFeedback:
-    - "glimmer-mite-feedback"
   - type: GlimmerSource
-    glimmerExponentOffset: 3
   - type: AmbientSound
     range: 6
     volume: -3
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml
index ea2357a5c06..06abe8c45fa 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml
@@ -24,6 +24,7 @@
     - 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 def215cee43..e3d5e9d2138 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml
@@ -17,24 +17,4 @@
     icon:
       sprite: DeltaV/Icons/cri.rsi
       state: cri
-
-- 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
+  - type: CrimeAssistCartridge
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
index d9607390cd7..6ee3a7543f7 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
@@ -20,13 +20,12 @@
       map: [ "enum.PdaVisualLayers.IdLight" ]
       shader: "unshaded"
       visible: false
-  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
+  - type: CartridgeLoader # DeltaV - Crime Assist
     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 b1d037f756d..c2380c40278 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -101,12 +101,6 @@
       - SimpleHostile
   - type: Damageable
     damageContainer: StructuralInorganic
-  - type: PotentialPsionic
-  - type: Psionic
-    removable: false
-    dampening: 1
-    psychicFeedback:
-    - "orecrab-feedback"
 
 - type: entity
   parent: MobOreCrab
@@ -536,20 +530,3 @@
       - 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 93081d382a2..06ab02dedc9 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
@@ -54,11 +54,6 @@
         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/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index cf563989bf5..d1b3bd6a6a9 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -118,6 +118,7 @@
   - type: Grammar
     attributes:
       gender: male
+  - type: PotentialPsionic # Nyano
   - type: LanguageKnowledge
     speaks:
     - GalacticCommon
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index d618e407134..397989643e6 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -121,6 +121,8 @@
     molsPerSecondPerUnitMass: 0.0005
   - type: Speech
     speechVerb: LargeMob
+  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
+    chance: -2
   - type: Psionic #Nyano - Summary: makes psionic by default.
     removable: false
   - type: LanguageKnowledge
diff --git a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
index d9dea3c18d9..5ebd43ddf48 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
@@ -11,3 +11,4 @@
     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 dfd5e9a1be7..28687c68bfc 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/diona.yml
@@ -11,6 +11,7 @@
       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 d1de65df012..fb84ad3650f 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
@@ -3,3 +3,5 @@
   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/harpy.yml b/Resources/Prototypes/Entities/Mobs/Player/harpy.yml
index e2541def035..1f4eb696c65 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/harpy.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/harpy.yml
@@ -26,3 +26,4 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
+  - type: PotentialPsionic
diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml
index 9a7c2ee65ec..6197c82c021 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -3,6 +3,8 @@
   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 72feba958ab..ffdb36d86bd 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/moth.yml
@@ -3,3 +3,5 @@
   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 b9f265e0bcf..71d74222979 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
@@ -3,5 +3,7 @@
   name: Urisst' Mzhand
   parent: BaseMobReptilian
   id: MobReptilian
+  components:
+    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
 
 #Weh
diff --git a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
index f9132ce0ea0..bf41f2dda6e 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
@@ -8,6 +8,7 @@
     interactSuccessString: hugging-success-generic
     interactSuccessSound: /Audio/Effects/thudswoosh.ogg
     messagePerceivedByOthers: hugging-success-generic-others
+  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
 
 - type: entity
   name: skeleton pirate
diff --git a/Resources/Prototypes/Entities/Mobs/Player/slime.yml b/Resources/Prototypes/Entities/Mobs/Player/slime.yml
index 4e5974b3084..79669a8fe2a 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/slime.yml
@@ -2,3 +2,5 @@
   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 ac373725ce4..e00e06279e5 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -16,6 +16,7 @@
     spawned:
     - id: FoodMeatHuman
       amount: 5
+  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
   - type: LanguageKnowledge
     speaks:
     - GalacticCommon
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 0f68afefe69..22b0832fc31 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -174,13 +174,12 @@
     accentVColor: "#A32D26"
   - type: Icon
     state: pda-interncadet
-  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
+  - type: CartridgeLoader # DeltaV - Crime Assist
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
-      - SecWatchCartridge
 
 - type: entity
   parent: BasePDA
@@ -432,13 +431,12 @@
     borderColor: "#6f6192"
   - type: Icon
     state: pda-lawyer
-  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
+  - type: CartridgeLoader # DeltaV - Crime Assist
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
-      - SecWatchCartridge
 
 - type: entity
   parent: BasePDA
@@ -646,13 +644,12 @@
     accentHColor: "#447987"
   - type: Icon
     state: pda-hos
-  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
+  - type: CartridgeLoader # DeltaV - Crime Assist
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
-      - SecWatchCartridge
 
 - type: entity
   parent: BasePDA
@@ -668,13 +665,12 @@
     accentVColor: "#949137"
   - type: Icon
     state: pda-warden
-  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
+  - type: CartridgeLoader # DeltaV - Crime Assist
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
-      - SecWatchCartridge
 
 - type: entity
   parent: BasePDA
@@ -689,13 +685,12 @@
     borderColor: "#A32D26"
   - type: Icon
     state: pda-security
-  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
+  - type: CartridgeLoader # DeltaV - Crime Assist
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
-      - SecWatchCartridge
 
 - type: entity
   parent: BasePDA
@@ -985,13 +980,12 @@
     borderColor: "#774705"
   - type: Icon
     state: pda-detective
-  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
+  - type: CartridgeLoader # DeltaV - Crime Assist
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
-      - SecWatchCartridge
 
 - type: entity
   parent: BaseMedicalPDA
@@ -1008,13 +1002,12 @@
     accentVColor: "#d7d7d0"
   - type: Icon
     state: pda-brigmedic
-  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
+  - type: CartridgeLoader # DeltaV - Crime Assist
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
-      - SecWatchCartridge
 
 - type: entity
   parent: ClownPDA
@@ -1100,13 +1093,12 @@
     accentVColor: "#DFDFDF"
   - type: Icon
     state: pda-seniorofficer
-  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
+  - type: CartridgeLoader # DeltaV - Crime Assist
     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 3bef413dffa..e188ee8c658 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: 0.5
+        density: 20
         mask:
           - ItemMask
-        restitution: 0.7  # Small and bouncy
+        restitution: 0.3  # fite me
         friction: 0.2
   - type: Tag
     tags:
@@ -23,11 +23,6 @@
     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 8969a359d57..dc96fadcdfe 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
@@ -49,7 +49,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: SecretDataAnomaly
     randomStartSecretMin: 0
@@ -102,12 +102,6 @@
   - type: IgniteOnCollide
     fixtureId: fix1
     fireStacks: 1
-  - type: PotentialPsionic
-  - type: Psionic
-    removable: false
-    amplification: 5
-    psychicFeedback:
-    - "anomaly-pyroclastic-feedback"
 
 - type: entity
   id: AnomalyGravity
@@ -140,12 +134,6 @@
   - type: SingularityDistortion
     intensity: 1000
     falloffPower: 2.7
-  - type: PotentialPsionic
-  - type: Psionic
-    removable: false
-    amplification: 5
-    psychicFeedback:
-    - "anomaly-gravity-feedback"
 
 - type: entity
   id: AnomalyElectricity
@@ -169,12 +157,6 @@
     castShadows: false
   - type: ElectricityAnomaly
   - type: Electrified
-  - type: PotentialPsionic
-  - type: Psionic
-    removable: false
-    amplification: 5
-    psychicFeedback:
-    - "anomaly-electricity-feedback"
 
 - type: entity
   id: AnomalyFlesh
@@ -268,12 +250,6 @@
       - MobFleshClamp
       - MobFleshLover
       - FleshKudzu
-  - type: PotentialPsionic
-  - type: Psionic
-    removable: false
-    amplification: 5
-    psychicFeedback:
-    - "anomaly-flesh-feedback"
 
 - type: entity
   id: AnomalyBluespace
@@ -324,12 +300,6 @@
     anomalyContactDamage:
       types:
         Radiation: 10
-  - type: PotentialPsionic
-  - type: Psionic
-    removable: false
-    amplification: 5
-    psychicFeedback:
-    - "anomaly-bluespace-feedback"
 
 - type: entity
   id: AnomalyIce
@@ -378,12 +348,6 @@
     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
@@ -422,12 +386,6 @@
         maxAmount: 50
         maxRange: 12
       floor: FloorAsteroidTile
-  - type: PotentialPsionic
-  - type: Psionic
-    removable: false
-    amplification: 5
-    psychicFeedback:
-    - "anomaly-rock-feedback"
 
 - type: entity
   id: AnomalyRockUranium
@@ -687,12 +645,6 @@
         maxRange: 6
       spawns:
       - KudzuFlowerAngry
-  - type: PotentialPsionic
-  - type: Psionic
-    removable: false
-    amplification: 5
-    psychicFeedback:
-    - "anomaly-flora-feedback"
 
 - type: entity
   id: AnomalyFloraBulb
@@ -853,12 +805,6 @@
     solution: anomaly
   - type: InjectableSolution
     solution: beaker
-  - type: PotentialPsionic
-  - type: Psionic
-    removable: false
-    amplification: 5
-    psychicFeedback:
-    - "anomaly-liquid-feedback"
 
 - type: entity
   id: AnomalyShadow
@@ -915,9 +861,3 @@
   - type: Tag
     tags:
       - SpookyFog
-  - type: PotentialPsionic
-  - type: Psionic
-    removable: false
-    amplification: 5
-    psychicFeedback:
-    - "anomaly-shadow-feedback"
diff --git a/Resources/Prototypes/Entities/Structures/Specific/oracle.yml b/Resources/Prototypes/Entities/Structures/Specific/oracle.yml
index 754ab82c00c..50a8488bd8b 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/oracle.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/oracle.yml
@@ -17,8 +17,6 @@
     speechSounds: Tenor
   - type: PotentialPsionic
   - type: Psionic
-    psychicFeedback:
-    - "oracle-feedback"
   - type: SolutionContainerManager
     solutions:
       fountain:
diff --git a/Resources/Prototypes/Guidebook/psionics.yml b/Resources/Prototypes/Guidebook/psionics.yml
deleted file mode 100644
index 6dbc012915a..00000000000
--- a/Resources/Prototypes/Guidebook/psionics.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- 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 793f328b7a0..04002f5755d 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: ActionRegenerativeStasis
-  name: action-name-regenerative-stasis
-  description: action-description-regenerative-stasis
+  id: ActionMassSleep
+  name: action-name-mass-sleep
+  description: action-description-mass-sleep
   noSpawn: true
   components:
-  - type: EntityTargetAction
+  - type: WorldTargetAction
     icon: Nyanotrasen/Interface/VerbIcons/mass_sleep.png
     useDelay: 60
     checkCanAccess: false
     range: 8
     itemIconStyle: BigAction
-    event: !type:RegenerativeStasisPowerActionEvent
+    event: !type:MassSleepPowerActionEvent
 
 - type: entity
   id: ActionMindSwap
@@ -94,50 +94,24 @@
   description: action-description-pyrokinesis
   noSpawn: true
   components:
-  - type: WorldTargetAction
+  - type: EntityTargetAction
     icon: Nyanotrasen/Interface/VerbIcons/pyrokinesis.png
-    useDelay: 1
-    range: 15
+    useDelay: 50
+    range: 6
     checkCanAccess: false
-    checkCanInteract: true
     itemIconStyle: BigAction
     event: !type:PyrokinesisPowerActionEvent
 
 - type: entity
-  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
+  id: ActionMetapsionic
+  name: action-name-metapsionic
+  description: action-description-metapsionic
   noSpawn: true
   components:
   - type: InstantAction
     icon: Nyanotrasen/Interface/VerbIcons/metapsionic.png
     useDelay: 45
-    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
+    event: !type:MetapsionicPowerActionEvent
 
 - 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 a09f3b6ab7f..6dd2a89e5a8 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:
-      - right arm
       - left arm
-      - right leg
+      - right arm
       - left leg
+      - right 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 781e42c1728..2cd9785d989 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml
@@ -113,8 +113,6 @@
     sprite: Nyanotrasen/Clothing/Head/Helmets/insulative_skullcap.rsi
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Head/Helmets/insulative_skullcap.rsi
-  - type: TinfoilHat
-    destroyOnFry: false
   - type: Armor
     modifiers:
       coefficients:
@@ -122,9 +120,6 @@
         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 1166d8a29f5..562b9c564ec 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
@@ -32,3 +32,4 @@
   - 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 94ac8403adc..db7936cc5b4 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
@@ -49,3 +49,5 @@
   - 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 4e6115ba339..c2fd8786aff 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
@@ -32,13 +32,12 @@
     accentVColor: "#DFDFDF"
   - type: Icon
     state: pda-security
-  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
+  - type: CartridgeLoader # DeltaV - Crime Assist
     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 d773cf87c76..d8e791af1ed 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml
@@ -22,7 +22,4 @@
             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 161c5b4ef52..e157f8b7ff4 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml
@@ -4,14 +4,8 @@
   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
-    researchPointGeneration: 20
   - type: Construction
     graph: GlimmerDevices
     node: glimmerProber
@@ -96,12 +90,7 @@
   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/sophicscribe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml
index 8e34a07ea5e..ae85cd25e03 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml
@@ -29,8 +29,6 @@
     - 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 d10e42a6614..ac62ed78ebe 100644
--- a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
+++ b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
@@ -158,7 +158,7 @@
   noSpawn: true
   components:
     - type: GlimmerEvent
-      minimumGlimmer: 700
+      minimumGlimmer: 500
       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 1e2ace9a287..77b180d6ea1 100644
--- a/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml
+++ b/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml
@@ -1,3 +1,13 @@
+- 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 e6e497003d5..53910a54a92 100644
--- a/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
+++ b/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
@@ -9,6 +9,29 @@
     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/psionicPowers.yml b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
index ca1764e204c..f40b688fd18 100644
--- a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
+++ b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
@@ -5,8 +5,6 @@
     DispelPower: 1
     TelegnosisPower: 1
     PsionicRegenerationPower: 1
-    RegenerativeStasisPower: 0.3
-    PsionicInvisibilityPower: 0.15
+    MassSleepPower: 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 0bfc31bee19..263494f7987 100644
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -40,6 +40,7 @@
     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 36e709144da..3675306091a 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
@@ -13,7 +13,6 @@
   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 e6de7e4cac3..737fc709c57 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
+  antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff
   requirements:
     - !type:CharacterDepartmentTimeRequirement
       department: Epistemics # DeltaV - Epistemics Department replacing Science
@@ -19,20 +19,20 @@
   - Command
   - Maintenance
   - ResearchDirector
-  - Mantis
-  - Chapel
+  - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
+  - Chapel # DeltaV - Chaplain is in Epistemics
   - Cryogenics
-  special:
+  special: # Nyanotrasen - Mystagogue can use the Bible
   - !type:AddComponentSpecial
     components:
-    - 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: 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:AddImplantSpecial
     implants: [ MindShieldImplant ]
+  - !type:AddComponentSpecial
+    components:
+      - type: CommandStaff
 
 - type: startingGear
   id: ResearchDirectorGear
@@ -42,7 +42,7 @@
     shoes: ClothingShoesColorBrown
     id: RnDPDA
     ears: ClothingHeadsetRD
-    belt: BibleMystagogue
+    belt: BibleMystagogue # Nyanotrasen - Mystagogue book for their Ifrit
   innerClothingSkirt: ClothingUniformJumpskirtResearchDirector
   satchel: ClothingBackpackSatchelResearchDirectorFilled
   duffelbag: ClothingBackpackDuffelResearchDirectorFilled
diff --git a/Resources/Prototypes/Traits/categories.yml b/Resources/Prototypes/Traits/categories.yml
index 617aa5f2f91..ba3fd7b3456 100644
--- a/Resources/Prototypes/Traits/categories.yml
+++ b/Resources/Prototypes/Traits/categories.yml
@@ -17,6 +17,3 @@
 
 - type: traitCategory
   id: Visual
-
-- type: traitCategory
-  id: Psionic
diff --git a/Resources/Prototypes/Traits/psionics.yml b/Resources/Prototypes/Traits/psionics.yml
deleted file mode 100644
index b896a8f745c..00000000000
--- a/Resources/Prototypes/Traits/psionics.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-- 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
-      mindBroken: true
-  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
deleted file mode 100644
index 7645c3d80d4..00000000000
--- a/Resources/ServerInfo/Guidebook/Psionics.xml
+++ /dev/null
@@ -1,108 +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. 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
new file mode 100644
index 00000000000..2911dae1557
--- /dev/null
+++ b/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Psionics.xml
@@ -0,0 +1,73 @@
+<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>